diff options
author | dos-reis <gdr@axiomatics.org> | 2013-06-17 05:27:37 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2013-06-17 05:27:37 +0000 |
commit | 6d045b14a250fecdf63018c3bb55f36a8539194d (patch) | |
tree | 2498dde9d23d49014987e84f2e9e77de89162420 /src/algebra/string.spad.pamphlet | |
parent | c773f40fecf4755ea2a45e4e79ee37e0a1b45d54 (diff) | |
download | open-axiom-6d045b14a250fecdf63018c3bb55f36a8539194d.tar.gz |
Consolidate parsers in one pamphlet.
Diffstat (limited to 'src/algebra/string.spad.pamphlet')
-rw-r--r-- | src/algebra/string.spad.pamphlet | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/algebra/string.spad.pamphlet b/src/algebra/string.spad.pamphlet index 78bb6628..87f1f9e8 100644 --- a/src/algebra/string.spad.pamphlet +++ b/src/algebra/string.spad.pamphlet @@ -199,7 +199,7 @@ CharacterClass: Join(SetCategory, ConvertibleTo String, ++ \spadfunFrom{alphanumeric?}{Character} is true. == add - import %iinc: Integer -> Integer from Foreign Builtin + import %iinc: NonNegativeInteger -> PositiveInteger from Foreign Builtin import %idec: Integer -> Integer from Foreign Builtin Rep := IndexedBits(0) @@ -240,7 +240,10 @@ CharacterClass: Join(SetCategory, ConvertibleTo String, coerce(cl):OutputForm == (convert(cl)@String)::OutputForm -- Stuff to make a legal SetAggregate view - # a == (n := 0; for i in 0..%idec N | a.i repeat n := %iinc n; n) + # a == + n := 0 + for i in 0..%idec N | a.i repeat n := %iinc n + n empty():% == charClass [] brace():% == charClass [] |