diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-25 08:43:20 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-25 08:43:20 +0000 |
| commit | e2e6e0d0acb2655634e475f214958e612dddb7c1 (patch) | |
| tree | 210a86c0483a0bf5622d80a0f1884ea85125a1e3 /src/boot/strap/parser.clisp | |
| parent | 9852c96d425eaad7f299ed36558930514a0487d3 (diff) | |
| download | open-axiom-e2e6e0d0acb2655634e475f214958e612dddb7c1.tar.gz | |
* boot/translator.boot (inAllContexts): New.
(translateToplevel): Use it.
* boot/parser.boot (bpImport): Accept namespace import.
Diffstat (limited to 'src/boot/strap/parser.clisp')
| -rw-r--r-- | src/boot/strap/parser.clisp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp index 7cf584dd..00b784f7 100644 --- a/src/boot/strap/parser.clisp +++ b/src/boot/strap/parser.clisp @@ -484,15 +484,18 @@ (PROG (|a|) (RETURN (COND - ((|bpEqKey| 'IMPORT) (SETQ |a| (|bpState|)) - (OR (|bpName|) (|bpTrap|)) + ((|bpEqKey| 'IMPORT) (COND - ((|bpEqPeek| 'COLON) (|bpRestore| |a|) - (AND (OR (|bpSignature|) (|bpTrap|)) - (OR (|bpEqKey| 'FOR) (|bpTrap|)) - (OR (|bpName|) (|bpTrap|)) - (|bpPush| (|%ImportSignature| (|bpPop1|) (|bpPop1|))))) - (T (|bpPush| (|%Import| (|bpPop1|)))))) + ((|bpNamespace|) (|bpPush| (|%Import| (|bpPop1|)))) + (T (SETQ |a| (|bpState|)) (OR (|bpName|) (|bpTrap|)) + (COND + ((|bpEqPeek| 'COLON) (|bpRestore| |a|) + (AND (OR (|bpSignature|) (|bpTrap|)) + (OR (|bpEqKey| 'FOR) (|bpTrap|)) + (OR (|bpName|) (|bpTrap|)) + (|bpPush| + (|%ImportSignature| (|bpPop1|) (|bpPop1|))))) + (T (|bpPush| (|%Import| (|bpPop1|)))))))) (T NIL))))) (DEFUN |bpNamespace| () |