Cleanup.

5 files changed, 12 insertions, 47 deletions

diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 6a92bd8d..2842cf8a 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -5,6 +5,8 @@
 
 (PROVIDE "ast")
 
+(EVAL-WHEN (:COMPILE-TOPLEVEL :LOAD-TOPLEVEL :EXECUTE) (EXPORT '|quote|))
+
 (DEFPARAMETER |$bfClamming| NIL)
 
 (DEFPARAMETER |$constantIdentifiers| NIL)
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp
index 28ade94d..a5beae8e 100644
--- a/src/boot/strap/includer.clisp
+++ b/src/boot/strap/includer.clisp
@@ -182,38 +182,6 @@
 
 (DEFUN |shoeLine?| (|s|) (|shoePrefix?| ")line" |s|))
 
-(DEFUN |shoeBiteOff| (|x|)
-  (PROG (|n1| |n|)
-    (RETURN
-     (PROGN
-      (SETQ |n| (|firstNonblankPosition| |x| 0))
-      (COND ((NULL |n|) NIL)
-            (T (SETQ |n1| (|firstBlankPosittion| |x| |n|))
-             (COND ((NULL |n1|) (LIST (|subString| |x| |n|) ""))
-                   (T
-                    (LIST (|subString| |x| |n| (- |n1| |n|))
-                          (|subString| |x| |n1|))))))))))
-
-(DEFUN |shoeFileName| (|x|)
-  (PROG (|c| |a|)
-    (RETURN
-     (PROGN
-      (SETQ |a| (|shoeBiteOff| |x|))
-      (COND ((NULL |a|) "")
-            (T (SETQ |c| (|shoeBiteOff| (CADR |a|)))
-             (COND ((NULL |c|) (CAR |a|))
-                   (T (CONCAT (CAR |a|) "." (CAR |c|))))))))))
-
-(DEFUN |shoeFnFileName| (|x|)
-  (PROG (|c| |a|)
-    (RETURN
-     (PROGN
-      (SETQ |a| (|shoeBiteOff| |x|))
-      (COND ((NULL |a|) (LIST "" ""))
-            (T (SETQ |c| (|shoeFileName| (CADR |a|)))
-             (COND ((NULL |c|) (LIST (CAR |a|) ""))
-                   (T (LIST (CAR |a|) |c|)))))))))
-
 (DEFUN |shoeInclude| (|s|) (|bDelay| #'|shoeInclude1| (LIST |s|)))
 
 (DEFUN |shoeInclude1| (|s|)
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp
index 166a9dce..1df760be 100644
--- a/src/boot/strap/scanner.clisp
+++ b/src/boot/strap/scanner.clisp
@@ -9,8 +9,6 @@
 
 (DEFCONSTANT |shoeTAB| (CODE-CHAR 9))
 
-(DEFUN |double| (|x|) (FLOAT |x| 1.0))
-
 (DEFUN |dqUnit| (|s|)
   (PROG (|a|) (RETURN (PROGN (SETQ |a| (LIST |s|)) (CONS |a| |a|)))))
 
@@ -24,16 +22,17 @@
 
 (DEFUN |dqToList| (|s|) (COND ((NULL |s|) NIL) (T (CAR |s|))))
 
+(DEFUN |shoeTokConstruct| (|x| |y| |z|) (CONS |x| (CONS |y| |z|)))
+
 (DEFUN |shoeConstructToken| (|lp| |b| |n|)
-  (CONS (ELT |b| 0) (CONS (ELT |b| 1) (CONS |lp| |n|))))
+  (|shoeTokConstruct| (ELT |b| 0) (ELT |b| 1) (CONS |lp| |n|)))
 
 (DEFUN |shoeTokType| (|x|) (CAR |x|))
 
 (DEFUN |shoeTokPart| (|x|) (CADR |x|))
 
-(DEFUN |shoeTokPosn| (|x|) (CDDR |x|))
-
-(DEFUN |shoeTokConstruct| (|x| |y| |z|) (CONS |x| (CONS |y| |z|)))
+(DEFUN |shoeTokPosn| (|x|)
+  (PROG (|p|) (RETURN (PROGN (SETQ |p| (CDDR |x|)) |p|))))
 
 (DEFUN |shoeNextLine| (|s|)
   (PROG (|s1| |a|)
@@ -406,7 +405,7 @@
       (LET ((|bfVar#1| (- |ns| 1)) (|i| 0))
         (LOOP
          (COND ((> |i| |bfVar#1|) (RETURN NIL))
-               (T (SETQ |d| (|shoeOrdToNum| (SCHAR |s| |i|)))
+               (T (SETQ |d| (DIGIT-CHAR-P (SCHAR |s| |i|)))
                 (SETQ |ival| (+ (* 10 |ival|) |d|))))
          (SETQ |i| (+ |i| 1))))
       |ival|))))
@@ -468,8 +467,6 @@
                                " is not a Boot character"))
       (|shoeLeafError| (SCHAR |$ln| |n|))))))
 
-(DEFUN |shoeOrdToNum| (|x|) (DIGIT-CHAR-P |x|))
-
 (DEFUN |shoeKeyWord| (|st|) (|tableValue| |shoeKeyTable| |st|))
 
 (DEFUN |shoeKeyWordP| (|st|) (|tableValue| |shoeKeyTable| |st|))
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index c39dcf5b..2f87cc64 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -599,8 +599,6 @@
                                (AND (CONSP |ISTMP#2|) (NULL (CDR |ISTMP#2|))
                                     (EQ (CAR |ISTMP#2|) '|Foreign|))))))
                    (COND ((|%hasFeature| :SBCL) 'SB-ALIEN)
-                         ((|%hasFeature| :CLISP) 'FFI)
-                         ((|%hasFeature| :CLOZURE) 'CCL)
                          ((|%hasFeature| :ECL) 'FFI) (T (RETURN NIL))))
                   ((|ident?| |ns|) |ns|) (T (|bpTrap|))))
          (CONS 'USE-PACKAGE (CONS (SYMBOL-NAME |z|) |user|)))))
@@ -877,7 +875,7 @@
          (COND
           ((OR (NOT (CONSP |bfVar#5|)) (PROGN (SETQ |i| (CAR |bfVar#5|)) NIL))
            (RETURN NIL))
-          (T (SETQ |b| (CONCAT (PNAME |i|) " is used in "))
+          (T (SETQ |b| (CONCAT (SYMBOL-NAME |i|) " is used in "))
            (|bootOutLines| (SSORT (|tableValue| |$bootUsed| |i|)) |stream|
                            |b|)))
          (SETQ |bfVar#5| (CDR |bfVar#5|))))))))
@@ -1131,7 +1129,7 @@
          (COND
           ((OR (NOT (CONSP |bfVar#3|)) (PROGN (SETQ |i| (CAR |bfVar#3|)) NIL))
            (RETURN NIL))
-          (T (SETQ |a| (CONCAT (PNAME |i|) " is used in "))
+          (T (SETQ |a| (CONCAT (SYMBOL-NAME |i|) " is used in "))
            (|bootOutLines| (SSORT (|tableValue| |$bootUsed| |i|)) |stream|
                            |a|)))
          (SETQ |bfVar#3| (CDR |bfVar#3|))))))))
diff --git a/src/boot/strap/utility.clisp b/src/boot/strap/utility.clisp
index 7125bd09..c42cc8f2 100644
--- a/src/boot/strap/utility.clisp
+++ b/src/boot/strap/utility.clisp
@@ -19,8 +19,8 @@
                      |scalarMember?| |listMember?| |reverse| |reverse!|
                      |lastNode| |append| |append!| |copyList| |substitute|
                      |substitute!| |setDifference| |setUnion| |setIntersection|
-                     |applySubst| |applySubst!| |applySubstNQ| |remove|
-                     |removeSymbol| |atomic?| |finishLine|)))
+                     |applySubst| |applySubst!| |applySubstNQ| |objectAssoc|
+                     |remove| |removeSymbol| |atomic?| |finishLine|)))
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%Thing|) |substitute|))