More STRCONC cleanups

18 files changed, 40 insertions, 40 deletions

diff --git a/src/interp/as.boot b/src/interp/as.boot
index 3ba00e5e..beca8669 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -703,7 +703,7 @@ asyAbbreviation(id,n) ==  chk(id,main) where   --> n = number of arguments
     name := PNAME id
 --  #name < 8 => INTERN UPCASE name
     parts := asySplit(name,MAXINDEX name)
-    newname := "STRCONC"/[asyShorten x for x in parts]
+    newname := strconc/[asyShorten x for x in parts]
     #newname < 8 => INTERN newname
     tryname := SUBSTRING(name,0,7)
     not createAbbreviation tryname => INTERN UPCASE tryname
diff --git a/src/interp/bc-util.boot b/src/interp/bc-util.boot
index 6ee3f9b0..e542e9b3 100644
--- a/src/interp/bc-util.boot
+++ b/src/interp/bc-util.boot
@@ -47,7 +47,7 @@ bcFinish(name,arg,:args) == bcGen bcMkFunction(name,arg,args)
 
 bcMkFunction(name,arg,args) ==
   args := [x for x in args | x]
-  strconc(name,'"(",arg,"STRCONC"/[strconc('",", x) for x in args],'")")
+  strconc(name,'"(",arg,strconc/[strconc('",", x) for x in args],'")")
 
 bcString2HyString2 s ==
   (string? s) and (s.0 = char '_")  =>
@@ -132,7 +132,7 @@ htStringPad(n,w) ==
 
 stringList2String x ==
   null x => '"()"
-  strconc('"(",first x,"STRCONC"/[strconc('",",y) for y in rest x],'")")
+  strconc('"(",first x,strconc/[strconc('",",y) for y in rest x],'")")
 
 htMkName(s,n) == strconc(s,STRINGIMAGE n)
 
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 3349e6b1..20dd8c25 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -157,7 +157,7 @@ conPageConEntry entry ==
 conform2String u ==
   x := form2String u
   atom x => STRINGIMAGE x
-  "STRCONC"/[STRINGIMAGE y for y in x]
+  strconc/[STRINGIMAGE y for y in x]
 
 kxPage(htPage,name) == downlink name
 
@@ -649,8 +649,8 @@ kDomainName(htPage,kind,name,nargs) ==
   argString :=
     null args => '"()"
     argTailPart :=
-      "STRCONC"/["STRCONC"/ ['",",:x] for x in KDR args]
-    "STRCONC"/['"(",:first args,argTailPart,'")"]
+      strconc/[strconc/ ['",",:x] for x in KDR args]
+    strconc/['"(",:first args,argTailPart,'")"]
   typeForm := CATCH($SpadReaderTag, unabbrev mkConform(kind,name,argString)) or
     ['error,'invalidType,strconc(name,argString)]
   null (evaluatedTypeForm := kisValidType typeForm) =>
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index d585d1dc..d8668ed4 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -126,7 +126,7 @@ buildLibdbConEntry conname ==
 dbMkForm x == atom x and [x] or x
 
 buildLibdbString [x,:u] ==
-  strconc(STRINGIMAGE x,"STRCONC"/[strconc('"`",STRINGIMAGE y) for y in u])
+  strconc(STRINGIMAGE x,strconc/[strconc('"`",STRINGIMAGE y) for y in u])
 
 libConstructorSig [conname,:argl] ==
   [[.,:sig],:.] := getConstructorModemapFromDB conname
@@ -269,7 +269,7 @@ dbReadComments(n) ==
       x.(j := j + 1) = char '_- and x.(j := j + 1) = char '_- repeat
         xtralines := [SUBSTRING(x,j + 1,nil),:xtralines]
   SHUT instream
-  strconc(line, "STRCONC"/nreverse xtralines)
+  strconc(line, strconc/nreverse xtralines)
 
 dbSplitLibdb() ==
   instream := MAKE_-INSTREAM  '"olibdb.text"
@@ -359,7 +359,7 @@ buildGloss() ==  --called by buildDatabase (database.boot)
       PRINTEXP($tick,defstream)
       PRINTEXP(x,    defstream)
       TERPRI defstream
-    PRINTEXP("STRCONC"/lines,htstream)
+    PRINTEXP(strconc/lines,htstream)
     TERPRI htstream
   PRINTEXP('"\endmenu\endscroll",htstream)
   PRINTEXP('"\lispdownlink{Search}{(|htGloss| _"\stringvalue{pattern}_")} for glossary entry matching \inputstring{pattern}{24}{*}",htstream)
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 852d5153..943b7588 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -903,20 +903,20 @@ evalableConstructor2HtString domform ==
 mathform2HtString form == escapeString
   $fortInts2Floats: local := false
   form := niladicHack form
-  form is ['QUOTE,a] => strconc('"'","STRCONC"/fortexp0 a)
+  form is ['QUOTE,a] => strconc('"'",strconc/fortexp0 a)
   form is ['BRACKET,['AGGLST,:arg]] =>
     if arg is ['construct,:r] then arg := r
     arg :=
       atom arg => [arg]
       [y for x in arg | y := (x is ['QUOTE,a] => a; x)]
-    tailPart := "STRCONC"/[strconc('",",STRINGIMAGE x) for x in rest arg]
+    tailPart := strconc/[strconc('",",STRINGIMAGE x) for x in rest arg]
     strconc('"[",STRINGIMAGE first arg,tailPart,'"]")
   form is ['BRACKET,['AGGLST,'QUOTE,arg]] =>
     if atom arg then arg := [arg]
-    tailPart := "STRCONC"/[strconc('",",x) for x in rest arg]
+    tailPart := strconc/[strconc('",",x) for x in rest arg]
     strconc('"[",first arg,tailPart,'"]")
   atom form => form
-  "STRCONC"/fortexp0 form
+  strconc/fortexp0 form
 
 niladicHack form ==
   atom form => form
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 09f6e425..403d70ca 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -1488,7 +1488,7 @@ htSaySaturnAmpersand() == htSaySaturn $saturnAmpersand
 
 htBlank(:options) ==
   options is [n] =>
-    htSaySaturn("STRCONC"/['"\phantom{*}" for i in 1..n])
+    htSaySaturn(strconc/['"\phantom{*}" for i in 1..n])
     htSayStandard strconc('"\space{",STRINGIMAGE n,'"}")
   htSaySaturn '"\phantom{*}"
   htSayStandard '"\space{1}"
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index 42336d4f..68719adf 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -176,7 +176,7 @@ pmParseFromString s ==
   u := ncParseFromString pmPreparse s
   dnForm flatten u where flatten s ==
     s is [op,:argl] =>
-      string? op => strconc(op,"STRCONC"/[strconc('" ",x) for x in argl])
+      string? op => strconc(op,strconc/[strconc('" ",x) for x in argl])
       [op,:[flatten x for x in argl]]
     s
 
@@ -268,7 +268,7 @@ mkGrepPattern1(x,:options) == --called by mkGrepPattern (and grepConstructName?)
       if not ('w in $options) then
         if first res ~= '"" then res := ['"`",:res]
         else if res is [.,p,:r] and p = $wild1 then res := r
-      "STRCONC"/nreverse res
+      strconc/nreverse res
     remUnderscores s ==
       (k := charPosition(char $charUnderscore,s,0)) < MAXINDEX s =>
         strconc(SUBSTRING(s,0,k),'"[",s.(k + 1),'"]",
@@ -688,7 +688,7 @@ conSpecialString?(filter,:options) ==
   filter = '"Mapping" =>nil
   u := kisValidType form => u
   secondTime => false
-  u := "STRCONC"/[string2Constructor x for x in dbString2Words filter]
+  u := strconc/[string2Constructor x for x in dbString2Words filter]
   conSpecialString?(u, true)
 
 dbString2Words l ==
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 3b93a9f0..2ef2bca1 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -259,7 +259,7 @@ checkExtractItemList l ==  --items are separated by commas or end of line
     k <= m => return nil
     acc := [first l,:acc]
     l := rest l
-  "STRCONC"/[x for x in nreverse acc]
+  strconc/[x for x in nreverse acc]
 
 ++ Translate '%' in signature to '%%' for proper printing.
 escapePercent x ==
@@ -448,7 +448,7 @@ checkGetStringBeforeRightBrace u ==
   acc := nil
   while u repeat
     x := first u
-    x = $charRbrace => return "STRCONC"/(nreverse acc)
+    x = $charRbrace => return strconc/(nreverse acc)
     acc := [x,:acc]
     u := rest u
 
@@ -591,7 +591,7 @@ checkComments(nameSig,lines) == main where
     checkArguments u
     if $checkErrorFlag then u := checkFixCommonProblem u
     v := checkDecorate u
-    res := "STRCONC"/[y for y in v]
+    res := strconc/[y for y in v]
     res := checkAddPeriod res
     if $checkErrorFlag then pp res
     res
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 784562d7..bbc3e33c 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -280,7 +280,7 @@ formatAttributeArg x ==
   prefix2String0 x
 
 formatMapping sig ==
-  "STRCONC"/concat("Mapping(",formatSignature sig,")")
+  strconc/concat("Mapping(",formatSignature sig,")")
 
 dollarPercentTran x ==
     -- Translate $ to %. We actually return %% so that the message
@@ -327,7 +327,7 @@ formatSignatureArgs0(sml) ==
 
 expr2String x ==
   atom (u:= prefix2String0 x) => u
-  "STRCONC"/[atom2String y for y in u]
+  strconc/[atom2String y for y in u]
 
 -- exports (this is a badly named bit of sillyness)
 prefix2StringAsTeX form ==
@@ -364,7 +364,7 @@ form2StringWithPrens form ==
 formString u ==
   x := form2String u
   atom x => STRINGIMAGE x
-  "STRCONC"/[STRINGIMAGE y for y in x]
+  strconc/[STRINGIMAGE y for y in x]
 
 form2String u == 
   $formatSigAsTeX: local := 1
@@ -584,7 +584,7 @@ linearFormatForm(op,argl) ==
   s:= PNAME op
   indexList:= [PARSE_-INTEGER PNAME d for i in 1.. while
     (DIGITP (d:= s.(maxIndex:= i)))]
-  cleanOp:= INTERN ("STRCONC"/[PNAME s.i for i in maxIndex..MAXINDEX s])
+  cleanOp:= INTERN (strconc/[PNAME s.i for i in maxIndex..MAXINDEX s])
   fnArgs:=
     indexList.0 > 0 =>
       concat('"(",formatArgList take(-indexList.0,argl),'")")
@@ -601,7 +601,7 @@ linearFormatForm(op,argl) ==
     nil
   l := [(string? f => f; STRINGIMAGE f) for f in
        concat(cleanOp,scriptArgs,fnArgs)]
-  "STRCONC"/l
+  strconc/l
 
 formatArgList l ==
   null l => nil
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 72585c6e..c0bafcd1 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -925,7 +925,7 @@ encodeFunctionName(fun,package is [packageName,:arglist],signature,sep,count)
     signature':= MSUBST("$",package,signature)
     reducedSig:= mkRepititionAssoc [:rest signature',first signature']
     encodedSig:=
-      ("STRCONC"/[encodedPair for [n,:x] in reducedSig]) where
+      (strconc/[encodedPair for [n,:x] in reducedSig]) where
         encodedPair() ==
           n=1 => encodeItem x
           strconc(STRINGIMAGE n,encodeItem x)
@@ -977,7 +977,7 @@ getCaps x ==
   s:= STRINGIMAGE x
   clist:= [c for i in 0..MAXINDEX s | UPPER_-CASE_-P (c:= s.i)]
   null clist => '"__"
-  "STRCONC"/[first clist,:[L_-CASE u for u in rest clist]]
+  strconc/[first clist,:[L_-CASE u for u in rest clist]]
  
 --% abbreviation code
  
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot
index 4933bcd8..024d78e5 100644
--- a/src/interp/ht-root.boot
+++ b/src/interp/ht-root.boot
@@ -191,7 +191,7 @@ gatherGlossLines(results,defstream) ==
       (j := charPosition($tick,x,1)) and (nextPointer := SUBSTRING(x,0,j))
         and (nextPointer = pointer) repeat
           xtralines := [SUBSTRING(x,j + 1,nil),:xtralines]
-    acc := [strconc(keyAndTick,def, "STRCONC"/nreverse xtralines),:acc]
+    acc := [strconc(keyAndTick,def, strconc/nreverse xtralines),:acc]
   reverse acc
 
 htGlossSearch(htPage,junk) ==  htGloss htpLabelInputString(htPage,'filter)
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index 29fe5431..75f01be6 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -290,7 +290,7 @@ htCheckList(checker,value) ==
       n
   value in checker => value
   first checker
---  emlist := "STRCONC"/[strconc('" {\em ",PNAME x,'"} ") for x in checker]
+--  emlist := strconc/[strconc('" {\em ",PNAME x,'"} ") for x in checker]
 --  strconc('"Please enter one of: ",emlist)
 
 translateYesNoToTrueFalse x ==
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 80f8c09c..82731c18 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -411,7 +411,7 @@ obj2String o ==
     o = ")" => '")"
     o = "(" => '"("
     STRINGIMAGE o
-  apply('STRCONC,[obj2String o' for o' in o])
+  apply(function strconc,[obj2String o' for o' in o])
 
 APP(u,x,y,d) ==
   atom u => appChar(atom2String u,x,y,d)
@@ -732,11 +732,11 @@ mkSuperSub(op,argl) ==
   $linearFormatScripts => linearFormatForm(op,argl)
 --  l := [(string? f => f; STRINGIMAGE f)
 --    for f in linearFormatForm(op,argl)]
---  "STRCONC"/l
+--  strconc/l
   s:= PNAME op
   indexList:= [PARSE_-INTEGER PNAME d for i in 1.. while
     (DIGITP (d:= s.(maxIndex:= i)))]
-  cleanOp:= INTERN ("STRCONC"/[PNAME s.i for i in maxIndex..MAXINDEX s])
+  cleanOp:= INTERN (strconc/[PNAME s.i for i in maxIndex..MAXINDEX s])
   -- if there is just a subscript use the SUB special form
   #indexList=2 =>
     subPart:= ['SUB,cleanOp,:take(indexList.1,argl)]
@@ -1623,7 +1623,7 @@ outputDomainConstructor form ==
   if VECTORP form then form := devaluate form
   atom (u:= prefix2String form) => u
   v:= [object2String(x) for x in u]
-  return INTERNL eval ['STRCONC,:v]
+  return INTERNL apply(function strconc,v)
 
 getOutputAbbreviatedForm form ==
   form is [op,:argl] =>
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index e506ce05..58e048d3 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -439,7 +439,7 @@ exp2FortSpecial(op,args,nargs) ==
   --  called to get a linearized form for the browser
   op = "QUOTE" =>
     atom (arg := first args) => STRINGIMAGE arg
-    tailPart := "STRCONC"/[strconc('",",x) for x in rest arg]
+    tailPart := strconc/[strconc('",",x) for x in rest arg]
     strconc('"[",first arg,tailPart,'"]")
   op = "PAREN" =>
     args := first args
@@ -672,7 +672,7 @@ mkParameterList l ==
   [par2string(u) for u in l] where par2string u ==
       atom(u) => STRINGIMAGE u
       u := rest second u
-      apply('STRCONC,[STRINGIMAGE(first u),'"(",_
+      apply(function strconc,[STRINGIMAGE(first u),'"(",_
                :rest [:['",",:statement2Fortran(v)] for v in rest u],'")"])
 
 nameLen n ==>
@@ -722,7 +722,7 @@ fortFormatCharacterTypes(names) ==
     fortFormatTypes1('"CHARACTER",mkParameterList2 genuineArrays) where
        mkParameterList2 l ==
          [par2string(u) for u in l] where par2string u ==
-             apply('STRCONC,[STRINGIMAGE(first u),'"(",_
+             apply(function strconc,[STRINGIMAGE(first u),'"(",_
                       :rest [:['",",:statement2Fortran(v)] for v in rest u],'")"])
 
 fortFormatIntrinsics(l) ==
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 09837b26..99ef5eda 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -347,7 +347,7 @@ postTranScripts a ==
 decodeScripts: %ParseTree -> %ParseForm
 decodeScripts a ==
   a is ["PrefixSC",b] => strconc(STRINGIMAGE 0,decodeScripts b)
-  a is [";",:b] => APPLX('STRCONC,[decodeScripts x for x in b])
+  a is [";",:b] => APPLX(function strconc,[decodeScripts x for x in b])
   a is [",",:b] =>
     STRINGIMAGE fn a where fn a == (a is [",",:b] => +/[fn x for x in b]; 1)
   STRINGIMAGE 1
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index 055e9a65..21c48538 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -546,7 +546,7 @@ formatPileLine($m,x,newLineIfTrue) ==
 --======================================================================
 --                       Utility Functions
 --======================================================================
-nBlanks m == "STRCONC"/[char('_  ) for i in 1..m]
+nBlanks m == strconc/[char('_  ) for i in 1..m]
  
 isNewspadOperator op == GETL(op,"Led") or GETL(op,"Nud")
  
diff --git a/src/interp/record.boot b/src/interp/record.boot
index 98b75b32..a97b7111 100644
--- a/src/interp/record.boot
+++ b/src/interp/record.boot
@@ -135,7 +135,7 @@ hyperize(u,w) ==
   res := reverse $testOutputLineList
   null res => '""
   null rest res => first res
-  "STRCONC"/[first res,:[STRCONC("\newline ",x) for x in rest res]]
+  strconc/[first res,:[strconc("\newline ",x) for x in rest res]]
  
 verbatimize u ==
   u = '"" => u
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index b0dc70bd..399d7fd2 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -268,7 +268,7 @@ mkCacheVec(op,nam,kind,resetCode,countCode) ==
 -- op2String op ==
 --   u:= linearFormatName op
 --   atom u => PNAME u
---   "STRCONC"/u
+--   strconc/u
 --
 -- reportCacheStorePrint(op,kind,count) ==
 --   ops:= op2String op