11 files changed, 21 insertions, 25 deletions

diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index c8f52c79..46d5a589 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -751,7 +751,8 @@ bfSmintable x==
   integer? x or cons? x and first x in '(SIZE LENGTH QENUM)
 
 bfString? x ==
-  string? x or cons? x and first x in '(charString symbolName toString)
+  string? x
+    or cons? x and first x in '(charString symbolName toString subString)
 
 bfQ(l,r)==
   bfChar? l or bfChar? r => ["CHAR=",l,r]
@@ -767,6 +768,7 @@ bfLessp(l,r)==
   l = 0 => ["PLUSP",r]
   r = 0 => ["MINUSP", l]
   bfChar? l or bfChar? r => ["CHAR<",l,r]
+  bfString? l or bfString? r => ["STRING<",l,r]
   ["<",l,r]
 
 bfLambda(vars,body) ==
diff --git a/src/boot/initial-env.lisp b/src/boot/initial-env.lisp
index b5e9d869..5a1041cb 100644
--- a/src/boot/initial-env.lisp
+++ b/src/boot/initial-env.lisp
@@ -119,11 +119,6 @@
 (defun |shoePLACEP| (item) 
   (eq item nil))
 
-(defun substring (cvec start length)
-  (if length 
-      (subseq cvec start (+ start length))
-    (subseq cvec start)))
-
 (defun MAKE-HASHTABLE (id1)
   (let ((test (case id1
                     ((EQ ID) #'eq)
diff --git a/src/interp/alql.boot b/src/interp/alql.boot
index 0ab02f07..242425a1 100644
--- a/src/interp/alql.boot
+++ b/src/interp/alql.boot
@@ -53,7 +53,7 @@ alqlGetOrigin(x) ==
 alqlGetParams(x) ==
   field :=dbPart(x,5,1)
   k := charPosition(char '_(,field,2)
-  subString(field,k,nil)
+  subString(field,k)
 
 
 
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 3807efaa..106a2070 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -454,7 +454,7 @@ saturnTranText x ==
   error nil
 
 isMenuItemStyle? s ==
-  15 = STRING_<('"\menuitemstyle{", s) => subString(s,15,(MAXINDEX s) - 15)
+  15 = ('"\menuitemstyle{" < s) => subString(s,15,(MAXINDEX s) - 15)
   nil
 
 getCallBack callTail ==
@@ -1499,7 +1499,7 @@ unTab s ==
   [unTab1 first s, :rest s]
 
 unTab1 s ==
-  STRING_<('"\tab{", s) = 5 and (k := charPosition(char '_}, s, 4)) =>
+  ('"\tab{" < s) = 5 and (k := charPosition(char '_}, s, 4)) =>
       subString(s, k + 1)
   s
 
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 4e4460fc..bda050c0 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -633,7 +633,7 @@ newWordFrom(l,i,m) ==
   while i <= m and not done repeat
     ch := l.i
     ch = $charBlank or ch = $charFauxNewline => done := true
-    buf := strconc(buf, STRING ch)
+    buf := strconc(buf, charString ch)
     i := i + 1
   [buf,i]
 
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 147323e2..42c6ba4d 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -215,8 +215,7 @@ printDec(type,dec,asps,fp) ==
 writeXDR(v,str,fp) ==
   -- Generate the calls to the filters which will read from the temp
   -- file.  The CHECK macro ensures that the translation worked.
-  underscore := STRING CHAR('"__:",0) -- to avoid a compiler bug which won't
-                                     -- parse " ... __" properly.
+  underscore := '"__"
   wt(['"    CHECK(xdr",underscore, XDRFun(v), '"(", str, '",&", first(v)],fp)
   if (LISTP (ty :=second v)) and first ty ~= '"char" then
     wt(['",&",first(v),'"__length,MAX__ARRAY(",first(v),'"__length),"],fp)
diff --git a/src/interp/hashcode.boot b/src/interp/hashcode.boot
index 1b49d977..414ad5fa 100644
--- a/src/interp/hashcode.boot
+++ b/src/interp/hashcode.boot
@@ -67,7 +67,7 @@ hashType(type, percentHash) ==
                 hashCombine(retCode, hash)
         op = 'Enumeration =>
                 for arg in args repeat
-                        hash := hashCombine(hashString(STRING arg), hash)
+                  hash := hashCombine(hashString(symbolName arg), hash)
                 hash
         op in $DomainsWithoutLisplibs =>
                 for arg in args repeat
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index ccb4c3f3..0db29cdc 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -230,11 +230,11 @@ basicStringize s ==
     s = '"{\em $}" => '"{\em \%}"
     s
   s = '_$ => '"\%"
-  PRINC_-TO_-STRING s
+  toString s
 
 stringize s ==
   string? s => s
-  PRINC_-TO_-STRING s
+  toString s
 
 htQuote s ==
 -- wrap quotes around a piece of hyperTeX
@@ -396,7 +396,7 @@ htMakeTemplates(templateList, numLabels) ==
   [[substLabel(i, template) for template in templateList]
     for i in 1..numLabels] where substLabel(i, template) ==
       cons? template =>
-        INTERN strconc(first template, PRINC_-TO_-STRING i, rest template)
+        INTERN strconc(first template, toString i, rest template)
       template
 
 templateParts template ==
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 3618d556..2f7a46f2 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -3192,7 +3192,7 @@ tokTran tok ==
   string? tok =>
     #tok = 0 => nil
     isIntegerString tok => READ_-FROM_-STRING tok
-    STRING tok.0 = '"_"" =>
+    tok.0 = char "_"" =>
       subSequence(tok, 1, #tok-1)
     INTERN tok
   tok
@@ -3209,13 +3209,13 @@ splitIntoOptionBlocks str ==
   blockStart := 0
   parenCount := 0
   for i in 0..#str-1 repeat
-    STRING str.i = '"_"" =>
+    str.i = char "_"" =>
       inString := not inString
-    if STRING str.i = '"(" and not inString
+    if str.i = char "(" and not inString
     then parenCount := parenCount + 1
-    if STRING str.i = '")" and not inString
+    if str.i = char ")" and not inString
     then parenCount := parenCount - 1
-    STRING str.i = '")" and not inString and parenCount = -1 =>
+    str.i = char ")" and not inString and parenCount = -1 =>
       block := stripSpaces subSequence(str, blockStart, i)
       blockList := [block, :blockList]
       blockStart := i+1
@@ -3230,10 +3230,10 @@ dumbTokenize str ==
   tokenStart := 0
   previousSpace := false
   for i in 0..#str-1 repeat
-    STRING str.i = '"_"" =>
+    str.i = char "_"" =>
       inString := not inString
       previousSpace := false
-    STRING str.i = '" " and not inString =>
+    str.i = char " " and not inString =>
       previousSpace => nil
       token := stripSpaces subSequence(str, tokenStart, i)
       tokenList := [token, :tokenList]
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 2270cbaf..8d87c008 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -721,7 +721,7 @@ compDefineExports(form,ops,sig,e) ==
             entry.rest.rest.first := [op,a,nil]
     ops := listSort(function GGREATERP, ops, function first)
   libName := getConstructorAbbreviation op
-  exportsFile := strconc(STRING libName,'".sig")
+  exportsFile := strconc(symbolName libName,'".sig")
   removeFile exportsFile
   withOutputFile(s,exportsFile, 
     PRETTYPRINT(
diff --git a/src/interp/packtran.boot b/src/interp/packtran.boot
index 52f34d7c..a49da1f2 100644
--- a/src/interp/packtran.boot
+++ b/src/interp/packtran.boot
@@ -44,7 +44,7 @@ packageTran sex ==
 -- current package
   symbol? sex =>
     EQ(_*PACKAGE_*, SYMBOL_-PACKAGE sex) => sex
-    INTERN STRING sex
+    INTERN symbolName sex
   cons? sex =>
     sex.first := packageTran first sex
     sex.rest := packageTran rest sex