aboutsummaryrefslogtreecommitdiff
path: root/src/boot/strap
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2012-06-10 01:31:02 +0000
committerdos-reis <gdr@axiomatics.org>2012-06-10 01:31:02 +0000
commita016645fb84079852fb1464d770252af687d57f5 (patch)
treebac0396954ac21db96d6ed464df783d99d02b49f /src/boot/strap
parent85a46b94c83297511b221180f7391cd777f252a0 (diff)
downloadopen-axiom-a016645fb84079852fb1464d770252af687d57f5.tar.gz
* interp/preparse.lisp: Remove.
* interp/spad-parser.boot: Do not include. Import lexing instead. * interp/Makefile.in: Adjust.
Diffstat (limited to 'src/boot/strap')
-rw-r--r--src/boot/strap/ast.clisp6
-rw-r--r--src/boot/strap/parser.clisp6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 9c271751..eea10d77 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -1895,7 +1895,11 @@
(CONS |l| (|deref| |locVars|)))))
|x|)))
(T |x|)))))
- ((EQ U '|%Leave|) (RPLACA |x| 'RETURN) |x|)
+ ((EQ U '|%Leave|) (RPLACA |x| 'RETURN)
+ (RPLACD |x|
+ (|shoeCompTran1| (CDR |x|) |fluidVars| |locVars|
+ |dollarVars|))
+ |x|)
((|symbolMember?| U '(PROG LAMBDA)) (SETQ |newbindings| NIL)
(LET ((|bfVar#1| (CADR |x|)) (|y| NIL))
(LOOP
diff --git a/src/boot/strap/parser.clisp b/src/boot/strap/parser.clisp
index 1b05fd82..985611d3 100644
--- a/src/boot/strap/parser.clisp
+++ b/src/boot/strap/parser.clisp
@@ -502,7 +502,7 @@
((|bpEqPeek| |ps| 'COLON) (|bpRestore| |ps| |a|)
(|bpRequire| |ps| #'|bpSignature|)
(OR (|bpExportItemTail| |ps|) T))
- (T (|bpRestore| |ps| |a|) (|bpTypeAliasDefition| |ps|))))
+ (T (|bpRestore| |ps| |a|) (|bpTypeAliasDefinition| |ps|))))
(T NIL))))))
(DEFUN |bpExportItemList| (|ps|) (|bpListAndRecover| |ps| #'|bpExportItem|))
@@ -555,7 +555,7 @@
(AND (|bpEqKey| |ps| 'NAMESPACE) (OR (|bpName| |ps|) (|bpDot| |ps|))
(|bpPush| |ps| (|bfNamespace| (|bpPop1| |ps|)))))
-(DEFUN |bpTypeAliasDefition| (|ps|)
+(DEFUN |bpTypeAliasDefinition| (|ps|)
(AND (|bpTypeName| |ps|) (|bpEqKey| |ps| 'TDEF) (|bpLogical| |ps|)
(|bpPush| |ps| (|%TypeAlias| (|bpPop2| |ps|) (|bpPop1| |ps|)))))
@@ -1024,7 +1024,7 @@
((|bpExit| |ps|)
(COND ((|bpEqPeek| |ps| 'DEF) (|bpRestore| |ps| |a|) (|bpDef| |ps|))
((|bpEqPeek| |ps| 'TDEF) (|bpRestore| |ps| |a|)
- (|bpTypeAliasDefition| |ps|))
+ (|bpTypeAliasDefinition| |ps|))
(T T)))
(T (|bpRestore| |ps| |a|) NIL))))))