diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-01 02:13:22 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-01 02:13:22 +0000 |
| commit | 590b110c303021694c0ed17008d1a3f526f04451 (patch) | |
| tree | ad8e9f73c87ada979f6656e4cd2c6019ea015243 /src/boot/strap/tokens.clisp | |
| parent | 07fcfb463c0ea0ef40cc8886ee12c4dd20d9d759 (diff) | |
| download | open-axiom-590b110c303021694c0ed17008d1a3f526f04451.tar.gz | |
* boot/tokens.boot: Don't rename append.
* boot/parser.boot (bpTyping): Support universally quantified types.
* boot/ast.boot: Rewrite APPEND as append.
(%Forall): New AST node.
* boot/translator.boot: Translate it.
Diffstat (limited to 'src/boot/strap/tokens.clisp')
| -rw-r--r-- | src/boot/strap/tokens.clisp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 074db86d..64772c34 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -25,9 +25,9 @@ (LIST (LIST "and" 'AND) (LIST "by" 'BY) (LIST "case" 'CASE) (LIST "catch" 'CATCH) (LIST "cross" 'CROSS) (LIST "else" 'ELSE) (LIST "finally" 'FINALLY) - (LIST "for" 'FOR) (LIST "has" 'HAS) (LIST "if" 'IF) - (LIST "import" 'IMPORT) (LIST "in" 'IN) (LIST "is" 'IS) - (LIST "isnt" 'ISNT) (LIST "leave" 'LEAVE) + (LIST "for" 'FOR) (LIST "forall" 'FORALL) (LIST "has" 'HAS) + (LIST "if" 'IF) (LIST "import" 'IMPORT) (LIST "in" 'IN) + (LIST "is" 'IS) (LIST "isnt" 'ISNT) (LIST "leave" 'LEAVE) (LIST "module" 'MODULE) (LIST "namespace" 'NAMESPACE) (LIST "of" 'OF) (LIST "or" 'OR) (LIST "rem" 'REM) (LIST "repeat" 'REPEAT) (LIST "return" 'RETURN) @@ -181,11 +181,11 @@ (LIST 'STRCONC "") (LIST '|strconc| "") (LIST 'CONCAT "") (LIST 'MAX (- 999999)) (LIST 'MIN 999999) (LIST '* 1) (LIST '|times| 1) - (LIST 'CONS NIL) (LIST 'APPEND NIL) - (LIST '|append| NIL) (LIST '|append!| NIL) - (LIST 'UNION NIL) (LIST 'UNIONQ NIL) - (LIST '|union| NIL) (LIST '|and| T) (LIST '|or| NIL) - (LIST 'AND T) (LIST 'OR NIL))) + (LIST 'CONS NIL) (LIST '|append| NIL) + (LIST '|append!| NIL) (LIST 'UNION NIL) + (LIST 'UNIONQ NIL) (LIST '|union| NIL) + (LIST '|and| T) (LIST '|or| NIL) (LIST 'AND T) + (LIST 'OR NIL))) (|i| NIL)) (LOOP (COND @@ -199,10 +199,9 @@ (LIST (LIST '|abs| 'ABS) (LIST '|abstractChar| 'CODE-CHAR) (LIST '|alphabetic?| 'ALPHA-CHAR-P) (LIST '|alphanumeric?| 'ALPHANUMERICP) - (LIST '|and| 'AND) (LIST '|append| 'APPEND) - (LIST '|apply| 'APPLY) (LIST '|array?| 'ARRAYP) - (LIST '|arrayRef| 'AREF) (LIST '|atom| 'ATOM) - (LIST '|bitmask| 'SBIT) + (LIST '|and| 'AND) (LIST '|apply| 'APPLY) + (LIST '|array?| 'ARRAYP) (LIST '|arrayRef| 'AREF) + (LIST '|atom| 'ATOM) (LIST '|bitmask| 'SBIT) (LIST '|canonicalFilename| 'PROBE-FILE) (LIST '|charByName| 'NAME-CHAR) (LIST '|charDowncase| 'CHAR-DOWNCASE) |