diff options
Diffstat (limited to 'src/boot/strap/parser.clisp')
| -rw-r--r-- | src/boot/strap/parser.clisp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp index 9a9c2cf7..f7139d25 100644 --- a/src/boot/strap/parser.clisp +++ b/src/boot/strap/parser.clisp @@ -1,4 +1,4 @@ -(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "boot-parser")) +(EVAL-WHEN (:COMPILE-TOPLEVEL) (PROVIDE "parser")) (IMPORT-MODULE "includer") @@ -443,19 +443,20 @@ ('T (|bpString|)))) (DEFUN |bpModule| () - (COND - ((|bpEqKey| 'MODULE) - (AND (|bpConstTok|) (|bpPush| (|Module| (|bpPop1|))))) - ('T NIL))) + (AND (|bpEqKey| 'MODULE) (OR (|bpName|) (|bpTrap|)) + (|bpPush| (|%Module| (|bpPop1|))))) (DEFUN |bpImport| () (COND ((|bpEqKey| 'IMPORT) - (OR (AND (|bpName|) (OR (|bpEqKey| 'FOR) (|bpTrap|)) - (|bpSignature|) - (|bpPush| (|ImportSignature| (|bpPop2|) (|bpPop1|)))) - (AND (|bpConstTok|) (|bpPush| (|Import| (|bpPop1|)))))) - ('T NIL))) + (PROGN + (OR (|bpName|) (|bpTrap|)) + (COND + ((|bpEqKey| 'FOR) + (AND (OR (|bpSignature|) (|bpTrap|)) + (|bpPush| (|ImportSignature| (|bpPop2|) (|bpPop1|))))) + (#0='T (|bpPush| (|Import| (|bpPop1|))))))) + (#0# NIL))) (DEFUN |bpTypeAliasDefition| () (AND (OR (|bpTerm|) (|bpTrap|)) (|bpEqKey| 'TDEF) (|bpLogical|) |