cleanup

5 files changed, 18 insertions, 15 deletions

diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 90c9eab9..6aeeec23 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -1571,7 +1571,7 @@
     (RETURN
       (PROGN
         (SETQ |margs| (|bfGenSymbol|))
-        (SETQ |innerfunc| (INTERN (CONCAT (SYMBOL-NAME |op|) '|,LAM|)))
+        (SETQ |innerfunc| (INTERN (CONCAT (SYMBOL-NAME |op|) ",LAM")))
         (LIST (LIST |innerfunc| (LIST 'LAMBDA |args| |body|))
               (LIST |op|
                     (LIST 'MLAMBDA (LIST '&REST |margs|)
@@ -3433,7 +3433,7 @@
             (SETQ |bfVar#228| (CDR |bfVar#228|))
             (SETQ |bfVar#229| (CDR |bfVar#229|))))
         (COND
-          ((|%hasFeature| :DARWIN) (SETQ |op'| (CONCAT '_ |op'|))))
+          ((|%hasFeature| :DARWIN) (SETQ |op'| (CONCAT "_" |op'|))))
         (SETQ |call|
               (CONS (|bfColonColon| 'CCL 'EXTERNAL-CALL)
                     (CONS (STRING |op'|)
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp
index 57079461..ad66a280 100644
--- a/src/boot/strap/includer.clisp
+++ b/src/boot/strap/includer.clisp
@@ -22,7 +22,7 @@
         (COND
           ((NOT (< |n| |l|)) NIL)
           (T (READ-FROM-STRING
-                 (CONCAT '|(| (|subString| |s| |n| (- |l| |n|)) '|)|))))))))
+                 (CONCAT "(" (|subString| |s| |n| (- |l| |n|)) ")"))))))))
 
 (DEFUN |shoeReadLine| (|stream|) (READ-LINE |stream| NIL NIL))
 
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp
index 208c588a..1d06b54d 100644
--- a/src/boot/strap/scanner.clisp
+++ b/src/boot/strap/scanner.clisp
@@ -54,7 +54,7 @@
              ((CHAR= (SCHAR |$ln| |$n|) |shoeTAB|)
               (SETQ |a|
                     (|makeString| (- 7 (REM |$n| 8)) (|char| '| |)))
-              (SETF (ELT |$ln| |$n|) (|char| '| |))
+              (SETF (SCHAR |$ln| |$n|) (|char| '| |))
               (SETQ |$ln| (CONCAT |a| |$ln|))
               (SETQ |s1| (CONS (CONS |$ln| (CDR |$f|)) |$r|))
               (|shoeNextLine| |s1|))
@@ -517,9 +517,9 @@
 
 (DEFUN |shoeOrdToNum| (|x|) (DIGIT-CHAR-P |x|))
 
-(DEFUN |shoeKeyWord| (|st|) (GETHASH |st| |shoeKeyTable|))
+(DEFUN |shoeKeyWord| (|st|) (|tableValue| |shoeKeyTable| |st|))
 
-(DEFUN |shoeKeyWordP| (|st|) (GETHASH |st| |shoeKeyTable|))
+(DEFUN |shoeKeyWordP| (|st|) (|tableValue| |shoeKeyTable| |st|))
 
 (DEFUN |shoeMatch| (|l| |i|)
   (|shoeSubStringMatch| |l| |shoeDict| |i|))
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 8080f322..b8eae135 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -249,7 +249,9 @@
                   (LIST '|string?| 'STRINGP)
                   (LIST '|stringEq?| 'STRING=)
                   (LIST '|stringUpcase| 'STRING-UPCASE)
-                  (LIST '|subSequence| 'SUBSEQ) (LIST '|symbolEq?| 'EQ)
+                  (LIST '|subSequence| 'SUBSEQ)
+                  (LIST '|symbolScope| 'SYMBOL-PACKAGE)
+                  (LIST '|symbolEq?| 'EQ)
                   (LIST '|symbolFunction| 'SYMBOL-FUNCTION)
                   (LIST '|symbolName| 'SYMBOL-NAME)
                   (LIST '|symbolValue| 'SYMBOL-VALUE)
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index 312bca9e..dc23cc1f 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -34,7 +34,7 @@
            (T (SETQ |init|
                     (CONS 'DEFUN
                           (CONS (INTERN (CONCAT |$currentModuleName|
-                                         '|InitCLispFFI|))
+                                         "InitCLispFFI"))
                                 (CONS NIL
                                       (CONS
                                        (LIST 'MAPC
@@ -871,7 +871,7 @@
                     ((OR (ATOM |bfVar#21|)
                          (PROGN (SETQ |i| (CAR |bfVar#21|)) NIL))
                      (RETURN |bfVar#22|))
-                    (T (AND (NOT (GETHASH |i| |$bootUsed|))
+                    (T (AND (NOT (|tableValue| |$bootUsed| |i|))
                             (COND
                               ((NULL |bfVar#22|)
                                (SETQ |bfVar#22| #0=(CONS |i| NIL))
@@ -893,7 +893,7 @@
                     ((OR (ATOM |bfVar#24|)
                          (PROGN (SETQ |i| (CAR |bfVar#24|)) NIL))
                      (RETURN |bfVar#25|))
-                    (T (AND (NOT (GETHASH |i| |$bootDefined|))
+                    (T (AND (NOT (|tableValue| |$bootDefined| |i|))
                             (COND
                               ((NULL |bfVar#25|)
                                (SETQ |bfVar#25| #1=(CONS |i| NIL))
@@ -908,7 +908,7 @@
                    (PROGN (SETQ |i| (CAR |bfVar#27|)) NIL))
                (RETURN NIL))
               (T (SETQ |b| (CONCAT (PNAME |i|) " is used in "))
-                 (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|))
+                 (|bootOutLines| (SSORT (|tableValue| |$bootUsed| |i|))
                      |stream| |b|)))
             (SETQ |bfVar#27| (CDR |bfVar#27|))))))))
 
@@ -999,7 +999,7 @@
         (SETQ |nee| (CAR |LETTMP#1|))
         (SETQ |niens| (CADR |LETTMP#1|))
         (COND
-          ((GETHASH |nee| |$bootDefined|)
+          ((|tableValue| |$bootDefined| |nee|)
            (SETQ |$bootDefinedTwice|
                  (COND
                    ((EQ |nee| 'TOP-LEVEL) |$bootDefinedTwice|)
@@ -1100,7 +1100,7 @@
 
 (DEFUN |defusebuiltin| (|x|)
   (DECLARE (SPECIAL |$lispWordTable|))
-  (GETHASH |x| |$lispWordTable|))
+  (|tableValue| |$lispWordTable| |x|))
 
 (DEFUN |bootOut| (|l| |outfn|)
   (LET ((|bfVar#31| |l|) (|i| NIL))
@@ -1173,7 +1173,7 @@
                    (PROGN (SETQ |i| (CAR |bfVar#32|)) NIL))
                (RETURN NIL))
               (T (SETQ |a| (CONCAT (PNAME |i|) " is used in "))
-                 (|bootOutLines| (SSORT (GETHASH |i| |$bootUsed|))
+                 (|bootOutLines| (SSORT (|tableValue| |$bootUsed| |i|))
                      |stream| |a|)))
             (SETQ |bfVar#32| (CDR |bfVar#32|))))))))
 
@@ -1206,7 +1206,8 @@
      (COND
        ((SYMBOLP |x|)
         (COND
-          ((EQUAL (SYMBOL-PACKAGE |x|) |bt|) (INTERN (PNAME |x|) |pk|))
+          ((EQUAL (SYMBOL-PACKAGE |x|) |bt|)
+           (INTERN (SYMBOL-NAME |x|) |pk|))
           (T |x|)))
        (T |x|)))
     (T (CONS (|stripm| (CAR |x|) |pk| |bt|)