Clean up

3 files changed, 16 insertions, 17 deletions

diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index 220253f9..280f58a3 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -163,7 +163,7 @@
   (DECLARE (SPECIAL |$GenVarCounter|))
   (PROGN
     (SETQ |$GenVarCounter| (+ |$GenVarCounter| 1))
-    (INTERN (CONCAT "bfVar#" (STRINGIMAGE |$GenVarCounter|)))))
+    (INTERN (CONCAT "bfVar#" (WRITE-TO-STRING |$GenVarCounter|)))))
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%List|) |bfColon|))
 
@@ -742,7 +742,7 @@
               (|bfMKPROGN| (CONS |l1| (APPEND |l2| (CONS |name| NIL)))))))
         (T (SETQ |g|
                  (INTERN (CONCAT "LETTMP#"
-                                 (STRINGIMAGE |$letGenVarCounter|))))
+                                 (WRITE-TO-STRING |$letGenVarCounter|))))
            (SETQ |$letGenVarCounter| (+ |$letGenVarCounter| 1))
            (SETQ |rhs1| (LIST 'L%T |g| |rhs|))
            (SETQ |let1| (|bfLET1| |lhs| |g|))
@@ -834,7 +834,7 @@
          (SETQ |rev| (LIST 'REVERSE |rhs|))
          (SETQ |g|
                (INTERN (CONCAT "LETTMP#"
-                               (STRINGIMAGE |$letGenVarCounter|))))
+                               (WRITE-TO-STRING |$letGenVarCounter|))))
          (SETQ |$letGenVarCounter| (+ |$letGenVarCounter| 1))
          (SETQ |l2| (|bfLET2| |patrev| |g|))
          (COND
@@ -982,7 +982,7 @@
         ((CONSP |lhs|)
          (SETQ |g|
                (INTERN (CONCAT "ISTMP#"
-                               (STRINGIMAGE |$isGenVarCounter|))))
+                               (WRITE-TO-STRING |$isGenVarCounter|))))
          (SETQ |$isGenVarCounter| (+ |$isGenVarCounter| 1))
          (|bfMKPROGN| (LIST (LIST 'L%T |g| |lhs|) (|bfIS1| |g| |rhs|))))
         ((AND (CONSP |rhs|) (EQ (CAR |rhs|) 'CONS)
@@ -1039,7 +1039,7 @@
          (SETQ |patrev| (|bfISReverse| |b| |a|))
          (SETQ |g|
                (INTERN (CONCAT "ISTMP#"
-                               (STRINGIMAGE |$isGenVarCounter|))))
+                               (WRITE-TO-STRING |$isGenVarCounter|))))
          (SETQ |$isGenVarCounter| (+ |$isGenVarCounter| 1))
          (SETQ |rev|
                (|bfAND| (LIST (LIST 'CONSP |lhs|)
@@ -2412,7 +2412,7 @@
                          (LIST |rettype| |cop|)))))))))
 
 (DEFUN |genGCLnativeTranslation,mkCArgName| (|i|)
-  (CONCAT "x" (STRINGIMAGE |i|)))
+  (CONCAT "x" (WRITE-TO-STRING |i|)))
 
 (DEFUN |genGCLnativeTranslation,cparm| (|x| |a|)
   (CONCAT (|genGCLnativeTranslation,gclTypeInC| (CAR |x|)) " "
@@ -2525,7 +2525,7 @@
   (COND
     ((EQL |i| 0)
      (CONCAT "(#0)" (|genECLnativeTranslation,selectDatum| |x|)))
-    (T (CONCAT "," "(#" (STRINGIMAGE |i|) ")"
+    (T (CONCAT "," "(#" (WRITE-TO-STRING |i|) ")"
                (|genECLnativeTranslation,selectDatum| |x|)))))
 
 (DEFUN |genECLnativeTranslation,selectDatum| (|x|)
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp
index f88bfa6f..4d4cd438 100644
--- a/src/boot/strap/includer.clisp
+++ b/src/boot/strap/includer.clisp
@@ -13,8 +13,6 @@
 
 (DEFUN |char| (|x|) (CHAR (PNAME |x|) 0))
 
-(DEFUN STRINGIMAGE (|x|) (WRITE-TO-STRING |x|))
-
 (DEFUN |shoeCLOSE| (|stream|) (CLOSE |stream|))
 
 (DEFUN |shoeNotFound| (|fn|)
@@ -41,12 +39,12 @@
     (RETURN
       (PROGN
         (SETQ |pos| (|shoeTokPosn| |tok|))
-        (CONCAT "line " (STRINGIMAGE (|lineNo| |pos|)) ", column "
-                (STRINGIMAGE (|lineCharacter| |pos|)))))))
+        (CONCAT "line " (WRITE-TO-STRING (|lineNo| |pos|)) ", column "
+                (WRITE-TO-STRING (|lineCharacter| |pos|)))))))
 
 (DEFUN |SoftShoeError| (|posn| |key|)
   (PROGN
-    (|coreError| (LIST "in line " (STRINGIMAGE (|lineNo| |posn|))))
+    (|coreError| (LIST "in line " (WRITE-TO-STRING (|lineNo| |posn|))))
     (|shoeConsole| (|lineString| |posn|))
     (|shoeConsole|
         (CONCAT (|shoeSpaces| (|lineCharacter| |posn|)) "|"))
@@ -68,13 +66,14 @@
 (DEFUN |bpIgnoredFromTo| (|pos1| |pos2|)
   (PROGN
     (|shoeConsole|
-        (CONCAT "ignored from line " (STRINGIMAGE (|lineNo| |pos1|))))
+        (CONCAT "ignored from line "
+                (WRITE-TO-STRING (|lineNo| |pos1|))))
     (|shoeConsole| (|lineString| |pos1|))
     (|shoeConsole|
         (CONCAT (|shoeSpaces| (|lineCharacter| |pos1|)) "|"))
     (|shoeConsole|
         (CONCAT "ignored through line "
-                (STRINGIMAGE (|lineNo| |pos2|))))
+                (WRITE-TO-STRING (|lineNo| |pos2|))))
     (|shoeConsole| (|lineString| |pos2|))
     (|shoeConsole|
         (CONCAT (|shoeSpaces| (|lineCharacter| |pos2|)) "|"))))
@@ -454,7 +453,7 @@
   (PROGN
     (|shoeConsole|
         (CONCAT "INCLUSION SYNTAX ERROR IN LINE "
-                (STRINGIMAGE (CDR |h|))))
+                (WRITE-TO-STRING (CDR |h|))))
     (|shoeConsole| (CAR |h|))
     (|shoeConsole| "LINE IGNORED")))
 
@@ -462,7 +461,7 @@
   (DECLARE (SPECIAL |$bStreamNil|))
   (PROGN
     (|shoeConsole|
-        (CONCAT "UNEXPECTED )fin IN LINE " (STRINGIMAGE (CDR |h|))))
+        (CONCAT "UNEXPECTED )fin IN LINE " (WRITE-TO-STRING (CDR |h|))))
     (|shoeConsole| (CAR |h|))
     (|shoeConsole| "REST OF FILE IGNORED")
     |$bStreamNil|))
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp
index 9fcb1bef..42cb92e3 100644
--- a/src/boot/strap/scanner.clisp
+++ b/src/boot/strap/scanner.clisp
@@ -526,7 +526,7 @@
         (SETQ |$n| (+ |$n| 1))
         (|SoftShoeError| (CONS |$linepos| |n|)
             (CONCAT "The character whose number is "
-                    (STRINGIMAGE (QENUM |$ln| |n|))
+                    (WRITE-TO-STRING (QENUM |$ln| |n|))
                     " is not a Boot character"))
         (|shoeLeafError| (ELT |$ln| |n|))))))