diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-19 13:18:04 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-19 13:18:04 +0000 |
| commit | b893a938b4051bc30a9c44bdcf6000bff11969c4 (patch) | |
| tree | e015989876cff9b1b185cc00a55bfc92be277961 /src/boot/strap/parser.clisp | |
| parent | c6179efd4a1f1770d4d31415582eabebbe2ab6a0 (diff) | |
| download | open-axiom-b893a938b4051bc30a9c44bdcf6000bff11969c4.tar.gz | |
* interp/newfort.boot: Likewise.
* interp/define.boot (orderBySubsumption): Fix thinko.
* interp/boot-pkg.lisp: Use BOOTTRAN package. Don't import names
individually.
* boot/utility.boot: New.
* boot/translator.boot (exportNames): Fix thinko.
* boot/tokens.boot: Add charEq? and scalarEq? builtiin functions.
* boot/ast.boot (bfMember): Generate call to symbolMember? for
membership tests for symbols.
Diffstat (limited to 'src/boot/strap/parser.clisp')
| -rw-r--r-- | src/boot/strap/parser.clisp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp index 89cb3dee..afed4d9f 100644 --- a/src/boot/strap/parser.clisp +++ b/src/boot/strap/parser.clisp @@ -426,8 +426,8 @@ (DEFUN |bpConstTok| () (DECLARE (SPECIAL |$ttok| |$stok|)) (COND - ((MEMQ (|shoeTokType| |$stok|) '(INTEGER FLOAT)) (|bpPush| |$ttok|) - (|bpNext|)) + ((|symbolMember?| (|shoeTokType| |$stok|) '(INTEGER FLOAT)) + (|bpPush| |$ttok|) (|bpNext|)) ((AND (CONSP |$stok|) (EQ (CAR |$stok|) 'LISP)) (AND (|bpPush| (|%Lisp| |$ttok|)) (|bpNext|))) ((AND (CONSP |$stok|) (EQ (CAR |$stok|) 'LISPEXP)) @@ -576,7 +576,8 @@ (|bpTrap|)) (|bpPush| (- |$ttok|)) (|bpNext|)) (|bpSexpKey|) - (AND (MEMQ (|shoeTokType| |$stok|) '(ID INTEGER STRING FLOAT)) + (AND (|symbolMember?| (|shoeTokType| |$stok|) + '(ID INTEGER STRING FLOAT)) (|bpPush| |$ttok|) (|bpNext|)))) (DEFUN |bpSexp| () |