diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-12-28 06:12:21 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-12-28 06:12:21 +0000 |
| commit | 292bd212f1c30a51f0191128d5a9cd2691c5ccf9 (patch) | |
| tree | b3df4b4c43f312e5f0ac52dde5de9b3791833714 /src/boot/strap/tokens.clisp | |
| parent | 1fd6a63bbce9234ba3b8efa12c9a91643f0a87a1 (diff) | |
| download | open-axiom-292bd212f1c30a51f0191128d5a9cd2691c5ccf9.tar.gz | |
* boot/tokens.boot: Remove redundant renaming of REM.
loopBody and loopExit are not selectors.
* interp/i-output.boot: Include sys-utility.
* interp/sys-utility.boot (last): New macro.
(loopBody): Likewise.
* interp/vmlisp.lisp (LASTNODE): Remove.
(LASTPAIR): Likewise.
(last): Do not define here.
Diffstat (limited to 'src/boot/strap/tokens.clisp')
| -rw-r--r-- | src/boot/strap/tokens.clisp | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 3d170958..e59680a6 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -219,9 +219,9 @@ (LIST '|writeLine| 'WRITE-LINE) (LIST '|writeNewline| 'TERPRI) (LIST '|writeString| 'WRITE-STRING) (LIST 'PLUS '+) (LIST 'MINUS '-) (LIST 'TIMES '*) (LIST 'POWER 'EXPT) - (LIST 'REM 'REM) (LIST 'QUO 'TRUNCATE) (LIST 'SLASH '/) - (LIST 'LT '<) (LIST 'GT '>) (LIST 'LE '<=) (LIST 'GE '>=) - (LIST 'SHOEEQ 'EQUAL) (LIST 'SHOENE '/=) (LIST 'T 'T$))) + (LIST 'QUO 'TRUNCATE) (LIST 'SLASH '/) (LIST 'LT '<) (LIST 'GT '>) + (LIST 'LE '<=) (LIST 'GE '>=) (LIST 'SHOEEQ 'EQUAL) + (LIST 'SHOENE '/=) (LIST 'T 'T$))) (|i| NIL)) (LOOP (COND @@ -232,26 +232,27 @@ (LET ((|bfVar#1| (LIST (LIST '|absKind| 'CAR) (LIST '|absParms| 'CADR) - (LIST '|absBody| 'CADDR) (LIST '|setName| 0) (LIST '|setLabel| 1) - (LIST '|setLevel| 2) (LIST '|setType| 3) (LIST '|setVar| 4) - (LIST '|setLeaf| 5) (LIST '|setDef| 6) (LIST '|aGeneral| 4) - (LIST '|aMode| 1) (LIST '|aModeSet| 3) (LIST '|aTree| 0) - (LIST '|aValue| 2) (LIST '|args| 'CDR) (LIST '|attributes| 'CADDR) - (LIST '|cacheCount| 'CADDDDR) (LIST '|cacheName| 'CADR) - (LIST '|cacheReset| 'CADDDR) (LIST '|cacheType| 'CADDR) - (LIST '|env| 'CADDR) (LIST '|expr| 'CAR) (LIST 'CAR 'CAR) - (LIST '|mmCondition| 'CAADR) (LIST '|mmDC| 'CAAR) - (LIST '|mmImplementation| 'CADADR) (LIST '|mmSignature| 'CDAR) - (LIST '|mmTarget| 'CADAR) (LIST '|mmSource| 'CDDAR) - (LIST '|mapOpsig| 'CAR) (LIST '|mapOperation| 'CAAR) - (LIST '|mapSignature| 'CADAR) (LIST '|mapTarget| 'CAADAR) - (LIST '|mapSource| 'CDADAR) (LIST '|mapPredicate| 'CADR) - (LIST '|mapImpl| 'CADDR) (LIST '|mapKind| 'CAADDR) - (LIST '|mode| 'CADR) (LIST '|op| 'CAR) (LIST '|opcode| 'CADR) - (LIST '|opSig| 'CADR) (LIST 'CDR 'CDR) (LIST '|sig| 'CDDR) - (LIST '|source| 'CDR) (LIST '|streamCode| 'CADDDR) - (LIST '|streamDef| 'CADDR) (LIST '|streamName| 'CADR) - (LIST '|target| 'CAR))) + (LIST '|absBody| 'CADDR) (LIST '|loopBody| '|loopBody|) + (LIST '|loopExit| '|last|) (LIST '|setName| 0) + (LIST '|setLabel| 1) (LIST '|setLevel| 2) (LIST '|setType| 3) + (LIST '|setVar| 4) (LIST '|setLeaf| 5) (LIST '|setDef| 6) + (LIST '|aGeneral| 4) (LIST '|aMode| 1) (LIST '|aModeSet| 3) + (LIST '|aTree| 0) (LIST '|aValue| 2) (LIST '|args| 'CDR) + (LIST '|attributes| 'CADDR) (LIST '|cacheCount| 'CADDDDR) + (LIST '|cacheName| 'CADR) (LIST '|cacheReset| 'CADDDR) + (LIST '|cacheType| 'CADDR) (LIST '|env| 'CADDR) + (LIST '|expr| 'CAR) (LIST 'CAR 'CAR) (LIST '|mmCondition| 'CAADR) + (LIST '|mmDC| 'CAAR) (LIST '|mmImplementation| 'CADADR) + (LIST '|mmSignature| 'CDAR) (LIST '|mmTarget| 'CADAR) + (LIST '|mmSource| 'CDDAR) (LIST '|mapOpsig| 'CAR) + (LIST '|mapOperation| 'CAAR) (LIST '|mapSignature| 'CADAR) + (LIST '|mapTarget| 'CAADAR) (LIST '|mapSource| 'CDADAR) + (LIST '|mapPredicate| 'CADR) (LIST '|mapImpl| 'CADDR) + (LIST '|mapKind| 'CAADDR) (LIST '|mode| 'CADR) (LIST '|op| 'CAR) + (LIST '|opcode| 'CADR) (LIST '|opSig| 'CADR) (LIST 'CDR 'CDR) + (LIST '|sig| 'CDDR) (LIST '|source| 'CDR) + (LIST '|streamCode| 'CADDDR) (LIST '|streamDef| 'CADDR) + (LIST '|streamName| 'CADR) (LIST '|target| 'CAR))) (|i| NIL)) (LOOP (COND |