diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-02 23:14:08 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-02 23:14:08 +0000 |
| commit | 04b834e92508a407e8f51c730ddc9bdca862d4b6 (patch) | |
| tree | 7e0765dd690b31aa6aaf91989517470d3abc1428 /src/boot/strap/tokens.clisp | |
| parent | 6c36217f8a6721a3695e6c8d0b5f86401b5ed18b (diff) | |
| download | open-axiom-04b834e92508a407e8f51c730ddc9bdca862d4b6.tar.gz | |
* boot/ast.boot (idList?, charList?, stringLits?): New.
(bfMember): Use them for special cases.
* boot/parser.boot (bpDefinition): Stop support MDEF forms.
(bpMdef, bpMDefTail): Remove.
* boot/tokens.boot: "==>" is no longer a token.
Diffstat (limited to 'src/boot/strap/tokens.clisp')
| -rw-r--r-- | src/boot/strap/tokens.clisp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 226429a2..f17b0d63 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -9,12 +9,13 @@ (DEFUN |shoeStartsId| (|x|) (OR (ALPHA-CHAR-P |x|) - (MEMBER |x| (LIST (|char| '$) (|char| '?) (|char| '%))))) + (|charMember?| |x| (LIST (|char| '$) (|char| '?) (|char| '%))))) (DEFUN |shoeIdChar| (|x|) (OR (ALPHANUMERICP |x|) - (MEMBER |x| - (LIST (|char| '|'|) (|char| '?) (|char| '%) (|char| '!))))) + (|charMember?| |x| + (LIST (|char| '|'|) (|char| '?) (|char| '%) (|char| '!) + (|char| '&))))) (DEFUN |subString| (|s| |f| &OPTIONAL (|n| NIL)) (COND @@ -43,10 +44,10 @@ (LIST "^=" 'SHOENERETIRED) (LIST "~=" 'SHOENE) (LIST ".." 'SEG) (LIST "#" 'LENGTH) (LIST "=>" 'EXIT) (LIST "->" 'ARROW) (LIST ":=" 'BEC) (LIST "+->" 'GIVES) - (LIST "==" 'DEF) (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF) - (LIST "(" 'OPAREN) (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) - (LIST "|)" 'CBRACK) (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) - (LIST "suchthat" 'BAR) (LIST "'" 'QUOTE) (LIST "|" 'BAR))) + (LIST "==" 'DEF) (LIST "<=>" 'TDEF) (LIST "(" 'OPAREN) + (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) (LIST "|)" 'CBRACK) + (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) (LIST "suchthat" 'BAR) + (LIST "'" 'QUOTE) (LIST "|" 'BAR))) (DEFUN |shoeKeyTableCons| () (PROG (|KeyTable|) |