From b71fd7a811c516e8ca2a8a3f4ad578e9f637596b Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 25 Feb 2011 05:13:53 +0000 Subject: * boot/tokens.boot: makeSymbol is not a builtin function. * boot/ast.boot: Use makeSymbol in place of INTERN. * boot/parser.boot: Likewise. * boot/scanner.boot: Likewise. * boot/translator.boot: Likewise. * interp/alql.boot: Likewise. * interp/as.boot: Likewise. * interp/ax.boot: Likewise. * interp/bc-matrix.boot: Likewise. * interp/bc-solve.boot: Likewise. * interp/br-con.boot: Likewise. * interp/br-data.boot: Likewise. * interp/br-op2.boot: Likewise. * interp/br-prof.boot: Likewise. * interp/br-search.boot: Likewise. * interp/c-doc.boot: Likewise. * interp/c-util.boot: Likewise. * interp/clam.boot: Likewise. * interp/compiler.boot: Likewise. * interp/define.boot: Likewise. * interp/format.boot: Likewise. * interp/fortcall.boot: Likewise. * interp/i-syscmd.boot: Likewise. * interp/i-spec1.boot: Likewise. * interp/i-output.boot: Likewise. * interp/i-coerce.boot: Likewise. * interp/i-map.boot: Likewise. * interp/htsetvar.boot: Likewise. * interp/ht-util.boot: Likewise. * interp/g-util.boot: Likewise. * interp/functor.boot: Likewise. * interp/pspad1.boot: Likewise. * interp/pspad2.boot: Likewise. * interp/postpar.boot: Likewise. * interp/pf2sex.boot: Likewise. * interp/parse.boot: Likewise. * interp/packtran.boot: Likewise. * interp/nrunopt.boot: Likewise. * interp/nruncomp.boot: Likewise. * interp/newfort.boot: Likewise. * interp/msgdb.boot: Likewise. * interp/modemap.boot: Likewise. * interp/mark.boot: Likewise. * interp/intfile.boot: Likewise. * interp/interop.boot: Likewise. * interp/incl.boot: Likewise. * interp/word.boot: Likewise. * interp/wi2.boot: Likewise. * interp/wi1.boot: Likewise. * interp/trace.boot: Likewise. * interp/topics.boot: Likewise. * interp/sys-constants.boot: Likewise. * interp/showimp.boot: Likewise. * interp/scan.boot: Likewise. --- src/algebra/strap/BOOLEAN.lsp | 18 ++++++++---------- src/algebra/strap/CHAR.lsp | 20 ++++++++------------ src/algebra/strap/DFLOAT.lsp | 22 ++++++++++------------ src/algebra/strap/ILIST.lsp | 24 +++++++++++------------- src/algebra/strap/INT.lsp | 18 ++++++++---------- src/algebra/strap/ISTRING.lsp | 22 ++++++++++------------ src/algebra/strap/LIST.lsp | 19 ++++++++----------- src/algebra/strap/NNI.lsp | 27 ++++++++++++--------------- src/algebra/strap/OUTFORM.lsp | 21 +++++++++------------ src/algebra/strap/PI.lsp | 23 ++++++++++------------- src/algebra/strap/SINT.lsp | 22 ++++++++++------------ src/algebra/strap/SYMBOL.lsp | 18 ++++++++---------- src/algebra/strap/VECTOR.lsp | 20 +++++++++----------- 13 files changed, 121 insertions(+), 153 deletions(-) (limited to 'src/algebra/strap') diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp index c6cbc624..360d36ef 100644 --- a/src/algebra/strap/BOOLEAN.lsp +++ b/src/algebra/strap/BOOLEAN.lsp @@ -150,16 +150,14 @@ (DEFUN |Boolean| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1399) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|Boolean|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean| - (LIST (CONS NIL (CONS 1 (|Boolean;|)))))) - (SETQ #0# T)) - (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|))))))))) + (LET ((#0=#:G1399 (HGET |$ConstructorCache| '|Boolean|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean| + (LIST (CONS NIL (CONS 1 (|Boolean;|)))))) + (SETQ #0# T)) + (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|)))))))) (DEFUN |Boolean;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 70fb8abb..8df1f121 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -249,18 +249,14 @@ (DEFUN |Character| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1408) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|Character|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Character| - (LIST (CONS NIL - (CONS 1 (|Character;|)))))) - (SETQ #0# T)) - (COND - ((NOT #0#) (HREM |$ConstructorCache| '|Character|))))))))) + (LET ((#0=#:G1408 (HGET |$ConstructorCache| '|Character|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Character| + (LIST (CONS NIL (CONS 1 (|Character;|)))))) + (SETQ #0# T)) + (COND ((NOT #0#) (HREM |$ConstructorCache| '|Character|)))))))) (DEFUN |Character;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 2d0a6877..91085f61 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -896,18 +896,16 @@ (DEFUN |DoubleFloat| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1556) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|DoubleFloat|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|DoubleFloat| - (LIST (CONS NIL - (CONS 1 (|DoubleFloat;|)))))) - (SETQ #0# T)) - (COND - ((NOT #0#) (HREM |$ConstructorCache| '|DoubleFloat|))))))))) + (LET ((#0=#:G1556 (HGET |$ConstructorCache| '|DoubleFloat|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|DoubleFloat| + (LIST (CONS NIL + (CONS 1 (|DoubleFloat;|)))))) + (SETQ #0# T)) + (COND + ((NOT #0#) (HREM |$ConstructorCache| '|DoubleFloat|)))))))) (DEFUN |DoubleFloat;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index 259e43d0..5eb94cfe 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -406,19 +406,17 @@ (DEFUN |IndexedList| (&REST #0=#:G1499 &AUX #1=#:G1497) (DECLARE (SPECIAL |$ConstructorCache|)) (DSETQ #1# #0#) - (PROG (#2=#:G1498) - (RETURN - (COND - ((SETQ #2# - (|lassocShiftWithFunction| (|devaluateList| #1#) - (HGET |$ConstructorCache| '|IndexedList|) - '|domainEqualList|)) - (|CDRwithIncrement| #2#)) - (T (UNWIND-PROTECT - (PROG1 (APPLY (|function| |IndexedList;|) #1#) - (SETQ #2# T)) - (COND - ((NOT #2#) (HREM |$ConstructorCache| '|IndexedList|))))))))) + (LET ((#2=#:G1498 + (|lassocShiftWithFunction| (|devaluateList| #1#) + (HGET |$ConstructorCache| '|IndexedList|) + '|domainEqualList|))) + (COND + (#2# (|CDRwithIncrement| #2#)) + (T (UNWIND-PROTECT + (PROG1 (APPLY (|function| |IndexedList;|) #1#) + (SETQ #2# T)) + (COND + ((NOT #2#) (HREM |$ConstructorCache| '|IndexedList|)))))))) (DEFUN |IndexedList;| (|#1| |#2|) (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp index c206c7d8..ae8740a7 100644 --- a/src/algebra/strap/INT.lsp +++ b/src/algebra/strap/INT.lsp @@ -494,16 +494,14 @@ (DEFUN |Integer| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1511) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|Integer|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Integer| - (LIST (CONS NIL (CONS 1 (|Integer;|)))))) - (SETQ #0# T)) - (COND ((NOT #0#) (HREM |$ConstructorCache| '|Integer|))))))))) + (LET ((#0=#:G1511 (HGET |$ConstructorCache| '|Integer|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Integer| + (LIST (CONS NIL (CONS 1 (|Integer;|)))))) + (SETQ #0# T)) + (COND ((NOT #0#) (HREM |$ConstructorCache| '|Integer|)))))))) (DEFUN |Integer;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp index f9ef1671..7cbede50 100644 --- a/src/algebra/strap/ISTRING.lsp +++ b/src/algebra/strap/ISTRING.lsp @@ -635,18 +635,16 @@ (DEFUN |IndexedString| (#0=#:G1519) (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#1=#:G1520) - (RETURN - (COND - ((SETQ #1# - (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) - (HGET |$ConstructorCache| '|IndexedString|) - '|domainEqualList|)) - (|CDRwithIncrement| #1#)) - (T (UNWIND-PROTECT - (PROG1 (|IndexedString;| #0#) (SETQ #1# T)) - (COND - ((NOT #1#) (HREM |$ConstructorCache| '|IndexedString|))))))))) + (LET ((#1=#:G1520 + (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) + (HGET |$ConstructorCache| '|IndexedString|) + '|domainEqualList|))) + (COND + (#1# (|CDRwithIncrement| #1#)) + (T (UNWIND-PROTECT + (PROG1 (|IndexedString;| #0#) (SETQ #1# T)) + (COND + ((NOT #1#) (HREM |$ConstructorCache| '|IndexedString|)))))))) (DEFUN |IndexedString;| (|#1|) (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index 6c4ca272..f224231a 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -162,17 +162,14 @@ (DEFUN |List| (#0=#:G1421) (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#1=#:G1422) - (RETURN - (COND - ((SETQ #1# - (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) - (HGET |$ConstructorCache| '|List|) - '|domainEqualList|)) - (|CDRwithIncrement| #1#)) - (T (UNWIND-PROTECT - (PROG1 (|List;| #0#) (SETQ #1# T)) - (COND ((NOT #1#) (HREM |$ConstructorCache| '|List|))))))))) + (LET ((#1=#:G1422 + (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) + (HGET |$ConstructorCache| '|List|) '|domainEqualList|))) + (COND + (#1# (|CDRwithIncrement| #1#)) + (T (UNWIND-PROTECT + (PROG1 (|List;| #0#) (SETQ #1# T)) + (COND ((NOT #1#) (HREM |$ConstructorCache| '|List|)))))))) (DEFUN |List;| (|#1|) (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/NNI.lsp b/src/algebra/strap/NNI.lsp index ffcb6f5b..0419b586 100644 --- a/src/algebra/strap/NNI.lsp +++ b/src/algebra/strap/NNI.lsp @@ -40,21 +40,18 @@ (DEFUN |NonNegativeInteger| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1384) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|NonNegativeInteger|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| - '|NonNegativeInteger| - (LIST (CONS NIL - (CONS 1 - (|NonNegativeInteger;|)))))) - (SETQ #0# T)) - (COND - ((NOT #0#) - (HREM |$ConstructorCache| '|NonNegativeInteger|))))))))) + (LET ((#0=#:G1384 (HGET |$ConstructorCache| '|NonNegativeInteger|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| + '|NonNegativeInteger| + (LIST (CONS NIL + (CONS 1 (|NonNegativeInteger;|)))))) + (SETQ #0# T)) + (COND + ((NOT #0#) + (HREM |$ConstructorCache| '|NonNegativeInteger|)))))))) (DEFUN |NonNegativeInteger;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 36423f85..7a8ffae9 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -969,18 +969,15 @@ (DEFUN |OutputForm| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1532) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|OutputForm|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|OutputForm| - (LIST (CONS NIL - (CONS 1 (|OutputForm;|)))))) - (SETQ #0# T)) - (COND - ((NOT #0#) (HREM |$ConstructorCache| '|OutputForm|))))))))) + (LET ((#0=#:G1532 (HGET |$ConstructorCache| '|OutputForm|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|OutputForm| + (LIST (CONS NIL + (CONS 1 (|OutputForm;|)))))) + (SETQ #0# T)) + (COND ((NOT #0#) (HREM |$ConstructorCache| '|OutputForm|)))))))) (DEFUN |OutputForm;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/PI.lsp b/src/algebra/strap/PI.lsp index c6f9420d..109f6a2a 100644 --- a/src/algebra/strap/PI.lsp +++ b/src/algebra/strap/PI.lsp @@ -6,19 +6,16 @@ (DEFUN |PositiveInteger| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1376) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|PositiveInteger|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|PositiveInteger| - (LIST (CONS NIL - (CONS 1 (|PositiveInteger;|)))))) - (SETQ #0# T)) - (COND - ((NOT #0#) - (HREM |$ConstructorCache| '|PositiveInteger|))))))))) + (LET ((#0=#:G1376 (HGET |$ConstructorCache| '|PositiveInteger|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|PositiveInteger| + (LIST (CONS NIL + (CONS 1 (|PositiveInteger;|)))))) + (SETQ #0# T)) + (COND + ((NOT #0#) (HREM |$ConstructorCache| '|PositiveInteger|)))))))) (DEFUN |PositiveInteger;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp index 683dbae2..87b00200 100644 --- a/src/algebra/strap/SINT.lsp +++ b/src/algebra/strap/SINT.lsp @@ -506,18 +506,16 @@ (DEFUN |SingleInteger| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1478) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|SingleInteger|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|SingleInteger| - (LIST (CONS NIL - (CONS 1 (|SingleInteger;|)))))) - (SETQ #0# T)) - (COND - ((NOT #0#) (HREM |$ConstructorCache| '|SingleInteger|))))))))) + (LET ((#0=#:G1478 (HGET |$ConstructorCache| '|SingleInteger|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|SingleInteger| + (LIST (CONS NIL + (CONS 1 (|SingleInteger;|)))))) + (SETQ #0# T)) + (COND + ((NOT #0#) (HREM |$ConstructorCache| '|SingleInteger|)))))))) (DEFUN |SingleInteger;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp index 5191e56c..298cb495 100644 --- a/src/algebra/strap/SYMBOL.lsp +++ b/src/algebra/strap/SYMBOL.lsp @@ -595,16 +595,14 @@ (DEFUN |Symbol| () (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#0=#:G1531) - (RETURN - (COND - ((SETQ #0# (HGET |$ConstructorCache| '|Symbol|)) - (|CDRwithIncrement| (CDAR #0#))) - (T (UNWIND-PROTECT - (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Symbol| - (LIST (CONS NIL (CONS 1 (|Symbol;|)))))) - (SETQ #0# T)) - (COND ((NOT #0#) (HREM |$ConstructorCache| '|Symbol|))))))))) + (LET ((#0=#:G1531 (HGET |$ConstructorCache| '|Symbol|))) + (COND + (#0# (|CDRwithIncrement| (CDAR #0#))) + (T (UNWIND-PROTECT + (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Symbol| + (LIST (CONS NIL (CONS 1 (|Symbol;|)))))) + (SETQ #0# T)) + (COND ((NOT #0#) (HREM |$ConstructorCache| '|Symbol|)))))))) (DEFUN |Symbol;| () (DECLARE (SPECIAL |$ConstructorCache|)) diff --git a/src/algebra/strap/VECTOR.lsp b/src/algebra/strap/VECTOR.lsp index fa232c7d..2c8e5eac 100644 --- a/src/algebra/strap/VECTOR.lsp +++ b/src/algebra/strap/VECTOR.lsp @@ -28,17 +28,15 @@ (DEFUN |Vector| (#0=#:G1383) (DECLARE (SPECIAL |$ConstructorCache|)) - (PROG (#1=#:G1384) - (RETURN - (COND - ((SETQ #1# - (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) - (HGET |$ConstructorCache| '|Vector|) - '|domainEqualList|)) - (|CDRwithIncrement| #1#)) - (T (UNWIND-PROTECT - (PROG1 (|Vector;| #0#) (SETQ #1# T)) - (COND ((NOT #1#) (HREM |$ConstructorCache| '|Vector|))))))))) + (LET ((#1=#:G1384 + (|lassocShiftWithFunction| (LIST (|devaluate| #0#)) + (HGET |$ConstructorCache| '|Vector|) + '|domainEqualList|))) + (COND + (#1# (|CDRwithIncrement| #1#)) + (T (UNWIND-PROTECT + (PROG1 (|Vector;| #0#) (SETQ #1# T)) + (COND ((NOT #1#) (HREM |$ConstructorCache| '|Vector|)))))))) (DEFUN |Vector;| (|#1|) (DECLARE (SPECIAL |$ConstructorCache|)) -- cgit v1.2.3