diff options
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/ast.clisp | 28 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 70 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 8 |
3 files changed, 6 insertions, 100 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 0d4a44e8..dd410a65 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -1182,34 +1182,10 @@ ((|bfTupleP| |bfarg|) (CONS |bfop| (CDR |bfarg|))) ('T (CONS |bfop| (LIST |bfarg|))))) -(DEFUN |bfGetOldBootName| (|x|) - (PROG (|a|) - (RETURN - (COND ((SETQ |a| (GET |x| 'OLD-BOOT)) (CAR |a|)) ('T |x|))))) - -(DEFUN |bfSameMeaning| (|x|) (GET |x| 'RENAME-OK)) - (DEFUN |bfReName| (|x|) - (PROG (|oldName| |newName| |a|) - (DECLARE (SPECIAL |$stok| |$translatingOldBoot|)) + (PROG (|a|) (RETURN - (PROGN - (SETQ |newName| - (COND - ((SETQ |a| (GET |x| 'SHOERENAME)) (CAR |a|)) - (#0='T |x|))) - (COND - ((AND |$translatingOldBoot| (NOT (|bfSameMeaning| |x|))) - (PROGN - (SETQ |oldName| (|bfGetOldBootName| |x|)) - (COND - ((NOT (EQUAL |newName| |oldName|)) - (|warn| (LIST (PNAME |x|) " as `" (PNAME |newName|) - "' differs from Old Boot `" - (PNAME |oldName|) "' at " - (|diagnosticLocation| |$stok|))))) - |oldName|)) - (#0# |newName|)))))) + (COND ((SETQ |a| (GET |x| 'SHOERENAME)) (CAR |a|)) ('T |x|))))) (DEFUN |bfInfApplication| (|op| |left| |right|) (COND diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 9e45927d..4c982be4 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -241,71 +241,7 @@ (SETQ |bfVar#9| (CDR |bfVar#9|))))) (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) - (LET ((|bfVar#10| (LIST (LIST 'PLUS 'PLUS) (LIST '|and| 'AND) - (LIST '|append| 'APPEND) - (LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM) - (LIST '|brace| 'REMDUP) (LIST '|car| 'CAR) - (LIST '|cdr| 'CDR) (LIST '|cons| 'CONS) - (LIST '|copy| 'COPY) (LIST '|croak| 'CROAK) - (LIST '|drop| 'DROP) (LIST '|exit| 'EXIT) - (LIST '|false| 'NIL) (LIST '|first| 'CAR) - (LIST '|genvar| 'GENVAR) - (LIST '|in| '|member|) (LIST '|is| 'IS) - (LIST '|lastNode| 'LASTNODE) - (LIST '|list| 'LIST) (LIST '|mkpf| 'MKPF) - (LIST '|nconc| 'NCONC) (LIST '|nil| 'NIL) - (LIST '|not| 'NOT) - (LIST '|nreverse| 'NREVERSE) - (LIST '|null| 'NULL) (LIST '|or| 'OR) - (LIST '|otherwise| 'T) - (LIST '|removeDuplicates| 'REMDUP) - (LIST '|rest| 'CDR) (LIST '|return| 'RETURN) - (LIST '|reverse| 'REVERSE) - (LIST '|setDifference| 'SETDIFFERENCE) - (LIST '|setIntersection| '|intersection|) - (LIST '|setPart| 'SETELT) - (LIST '|setUnion| '|union|) - (LIST '|size| 'SIZE) - (LIST '|strconc| 'STRCONC) - (LIST '|substitute| 'MSUBST) - (LIST 'SUBST 'MSUBST) (LIST '|take| 'TAKE) - (LIST '|true| 'T) (LIST '|where| 'WHERE) - (LIST 'TIMES 'TIMES) (LIST 'POWER 'EXPT) - (LIST 'SHOENE 'NEQUAL) - (LIST 'MINUS 'SPADDIFFERENCE) - (LIST 'SLASH 'QUOTIENT) (LIST '= 'EQUAL) - (LIST 'SHOEEQ 'EQUAL) (LIST 'ASSOC '|assoc|) - (LIST 'DELETE '|delete|) (LIST 'GET 'GETL) - (LIST 'INTERSECTION '|intersection|) - (LIST 'LAST '|last|) (LIST 'MEMBER '|member|) - (LIST 'RASSOC '|rassoc|) (LIST 'READ 'VMREAD) - (LIST 'READ-LINE '|read-line|) - (LIST 'REDUCE 'SPADREDUCE) - (LIST 'REMOVE '|remove|) - (LIST 'BAR 'SUCHTHAT) (LIST 'T 'T$) - (LIST 'IN '|member|) (LIST 'UNION '|union|))) - (|i| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#10|) (PROGN (SETQ |i| (CAR |bfVar#10|)) NIL)) - (RETURN NIL)) - ('T (SETF (GET (CAR |i|) 'OLD-BOOT) (CDR |i|)))) - (SETQ |bfVar#10| (CDR |bfVar#10|))))) - -(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) - (LET ((|bfVar#11| - (LIST 'LT 'LE 'GT 'GE 'SHOENE 'TIMES 'PLUS 'MINUS - '|function| 'PAIRP)) - (|i| NIL)) - (LOOP - (COND - ((OR (ATOM |bfVar#11|) (PROGN (SETQ |i| (CAR |bfVar#11|)) NIL)) - (RETURN NIL)) - ('T (SETF (GET |i| 'RENAME-OK) T))) - (SETQ |bfVar#11| (CDR |bfVar#11|))))) - -(EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) - (LET ((|bfVar#12| (LIST (LIST '|setName| 0) (LIST '|setLabel| 1) + (LET ((|bfVar#10| (LIST (LIST '|setName| 0) (LIST '|setLabel| 1) (LIST '|setLevel| 2) (LIST '|setType| 3) (LIST '|setVar| 4) (LIST '|setLeaf| 5) (LIST '|setDef| 6) (LIST '|aGeneral| 4) @@ -333,8 +269,8 @@ (|i| NIL)) (LOOP (COND - ((OR (ATOM |bfVar#12|) (PROGN (SETQ |i| (CAR |bfVar#12|)) NIL)) + ((OR (ATOM |bfVar#10|) (PROGN (SETQ |i| (CAR |bfVar#10|)) NIL)) (RETURN NIL)) ('T (SETF (GET (CAR |i|) 'SHOESELFUNCTION) (CADR |i|)))) - (SETQ |bfVar#12| (CDR |bfVar#12|))))) + (SETQ |bfVar#10| (CDR |bfVar#10|))))) diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index fe895323..41158639 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -89,10 +89,7 @@ (LIST 'QUOTE (CONS 'OPTIMIZE |$LispOptimizeOptions|))) |stream|)) -(DEFPARAMETER |$translatingOldBoot| NIL) - (DEFUN |AxiomCore|::|%sysInit| () - (DECLARE (SPECIAL |$translatingOldBoot|)) (PROGN (SETQ *LOAD-VERBOSE* NIL) (COND @@ -106,10 +103,7 @@ NIL) (SETF (SYMBOL-VALUE (|bfColonColon| 'COMPILER 'SUPPRESS-COMPILER-NOTES*)) - T))) - (COND - ((EQUAL (CDR (ASSOC (|Option| "boot") (|%systemOptions|))) "old") - (SETQ |$translatingOldBoot| T))))) + T))))) (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Thing|) |setCurrentPackage|)) |