Replace more occurences of LIST with %listlit.

12 files changed, 41 insertions, 41 deletions

diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 8702d880..bebe6a5d 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -980,7 +980,7 @@ evalDomainOpPred(dom,pred) == process(dom,pred) where
     systemError nil
   convertCatArg p ==
     atom p or #p = 1 => MKQ p
-    ['LIST,MKQ first p,:[convertCatArg x for x in rest p]]
+    ['%listlit,MKQ first p,:[convertCatArg x for x in rest p]]
   evpred(dom,pred) ==
     k := POSN1(pred,$predicateList) => testBitVector(dom.3,k + 1)
     evpred1(dom,pred)
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index a20f39c1..298af29a 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -178,7 +178,7 @@ htPred2English(x,:options) ==
 
 unMkEvalable u ==
  u is ['QUOTE,a] => a
- u is ['LIST,:r] => [unMkEvalable x for x in r]
+ u is ['%listlit,:r] => [unMkEvalable x for x in r]
  u
 
 lisp2HT u == ['"_'",:fn u] where fn u ==
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 635e4879..a4067f8d 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -492,7 +492,7 @@ compArgumentsAndTryAgain(form is [.,:argl],m,e) ==
 outputComp(x,e) ==
   u:=comp(['_:_:,x,$OutputForm],$OutputForm,e) => u
   x is ['construct,:argl] =>
-    [['LIST,:[([.,.,e]:=outputComp(x,e)).expr for x in argl]],$OutputForm,e]
+    [['%listlit,:[([.,.,e]:=outputComp(x,e)).expr for x in argl]],$OutputForm,e]
   (v:= get(x,"value",e)) and (v.mode is ['Union,:l]) =>
     [['coerceUn2E,x,v.mode],$OutputForm,e]
   [x,$OutputForm,e]
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 0e62db1d..3d813c18 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -507,9 +507,9 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
       for u in $extraParms repeat
         formals:=[first u,:formals]
         actuals:=[MKQ rest u,:actuals]
-      body := ['sublisV,['PAIR,['QUOTE,formals],['LIST,:actuals]],body]
+      body := ['sublisV,['PAIR,['QUOTE,formals],['%listlit,:actuals]],body]
     if argl then body:=  -- always subst for args after extraparms
-        ['sublisV,['PAIR,['QUOTE,sargl],['LIST,:
+        ['sublisV,['PAIR,['QUOTE,sargl],['%listlit,:
           [['devaluate,u] for u in sargl]]],body]
     body:=
       ["%bind",[[g:= gensym(),body]],
@@ -554,7 +554,7 @@ mkConstructor: %Form -> %Form
 mkConstructor form ==
   atom form => ['devaluate,form]
   null form.args => ['QUOTE,[form.op]]
-  ['LIST,MKQ form.op,:[mkConstructor x for x in form.args]]
+  ['%listlit,MKQ form.op,:[mkConstructor x for x in form.args]]
  
 compDefineCategory(df,m,e,prefix,fal) ==
   $domainShell: local := nil -- holds the category of the object being compiled
@@ -855,8 +855,8 @@ genDomainOps(viewName,dom,cat) ==
   siglist:= [sig for [sig,:.] in oplist]
   oplist:= substNames(dom,viewName,dom,oplist)
   cd:=
-    ["%LET",viewName,['mkOpVec,dom,['LIST,:
-      [['LIST,MKQ op,['LIST,:[mkTypeForm mode for mode in sig]]]
+    ["%LET",viewName,['mkOpVec,dom,['%listlit,:
+      [['%listlit,MKQ op,['%listlit,:[mkTypeForm mode for mode in sig]]]
         for [op,sig] in siglist]]]]
   $getDomainCode:= [cd,:$getDomainCode]
   for [opsig,cond,:.] in oplist for i in 0.. repeat
@@ -1344,7 +1344,7 @@ bootStrapError(functorForm,sourceFile) ==
   ['COND, _
     ['$bootStrapMode, _
         ['VECTOR,mkTypeForm functorForm,nil,nil,nil,nil,nil]],
-    [''T, ['systemError,['LIST,'"%b",MKQ functorForm.op,'"%d",'"from", _
+    [''T, ['systemError,['%listlit,'"%b",MKQ functorForm.op,'"%d",'"from", _
       '"%b",MKQ namestring sourceFile,'"%d",'"needs to be compiled"]]]]
 
 registerInlinableDomain(x,e) ==
@@ -1367,7 +1367,7 @@ compAdd(['add,$addForm,capsule],m,e) ==
     [['COND, _
        ['$bootStrapMode, _
            code],_
-       [''T, ['systemError,['LIST,'"%b",MKQ $functorForm.op,'"%d",'"from", _
+       [''T, ['systemError,['%listlit,'"%b",MKQ $functorForm.op,'"%d",'"from", _
          '"%b",MKQ namestring _/EDITFILE,'"%d",'"needs to be compiled"]]]],m,e]
   $addFormLhs: local:= $addForm
   if $addForm is ["SubDomain",domainForm,predicate] then
@@ -1653,8 +1653,8 @@ wrapDomainSub(parameters,x) ==
  
 mkExplicitCategoryFunction(domainOrPackage,sigList,atList) ==
   body:=
-    ["mkCategory",MKQ domainOrPackage,['LIST,:reverse sigList],
-      ['LIST,:reverse atList],MKQ domList,nil] where
+    ["mkCategory",MKQ domainOrPackage,['%listlit,:reverse sigList],
+      ['%listlit,:reverse atList],MKQ domList,nil] where
         domList() ==
           ("union"/[fn sig for ["QUOTE",[[.,sig,:.],:.]] in sigList]) where
             fn sig == [D for D in sig | mustInstantiate D]
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 6dee53d3..fdc02087 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -497,12 +497,12 @@ formatJoinKey(r,key) ==
   key = 'mkCategory =>
     r is [opPart,catPart,:.] =>
       opString :=
-        opPart is ['LIST,:u] =>
+        opPart is ['%listlit,:u] =>
           "append"/[concat("%l",formatOpSignature(op,sig),formatIf pred)
             for ['QUOTE,[[op,sig],pred]] in u]
         nil
       catString :=
-        catPart is ['LIST,:u] =>
+        catPart is ['%listlit,:u] =>
           "append"/[concat("%l",'" ",form2StringLocal con,formatIf pred)
             for ['QUOTE,[con,pred]] in u]
         nil
@@ -689,7 +689,7 @@ formatIf pred ==
 
 formatPredParts s ==
   s is ['QUOTE,s1] => formatPredParts s1
-  s is ['LIST,:s1] => [formatPredParts s2 for s2 in s1]
+  s is ['%listlit,:s1] => [formatPredParts s2 for s2 in s1]
   s is ['devaluate,s1] => formatPredParts s1
   s is ['getDomainView,s1,.] => formatPredParts s1
   s is ['SUBST,a,b,c] =>    -- this is a signature
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 595ed5e8..64b66e7d 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -165,8 +165,8 @@ mkDevaluate a ==
   null a => nil
   a is ['QUOTE,a'] => (a' => a; nil)
   a='$ => MKQ '$
-  a is ['LIST] => nil
-  a is ['LIST,:.] => a
+  a is ['%listlit] => nil
+  a is ['%listlit,:.] => a
   ['devaluate,a]
  
 getDomainView(domain,catform) ==
@@ -187,7 +187,7 @@ getPrincipalView domain ==
  
 CategoriesFromGDC x ==
   atom x => nil
-  x is ['LIST,a,:b] and a is ['QUOTE,a'] =>
+  x is ['%listlit,a,:b] and a is ['QUOTE,a'] =>
     union(LIST LIST a',"union"/[CategoriesFromGDC u for u in b])
   x is ['QUOTE,a] and a is [b] => [a]
  
@@ -241,13 +241,13 @@ optFunctorBody x ==
   x is ['QUOTE,:l] => x
   x is ['DomainSubstitutionMacro,parms,body] =>
     optFunctorBody DomainSubstitutionFunction(parms,body)
-  x is ['LIST,:l] =>
+  x is ['%listlit,:l] =>
     null l => nil
     l:= [optFunctorBody u for u in l]
     and/[optFunctorBodyQuotable u for u in l] =>
       ['QUOTE,[optFunctorBodyRequote u for u in l]]
     l=rest x => x --CONS-saving hack
-    ['LIST,:l]
+    ['%listlit,:l]
   x is ['PROGN,:l] => ['PROGN,:optFunctorPROGN l]
   x is ['COND,:l] =>
     l:=
@@ -290,7 +290,7 @@ optFunctorPROGN l ==
 worthlessCode x ==
   x is ['COND,:l] and (and/[x is [.,y] and worthlessCode y for x in l]) => true
   x is ['PROGN,:l] => (null (l':= optFunctorPROGN l) => true; false)
-  x is ['LIST] => true
+  x is ['%listlit] => true
   null x => true
   false
  
@@ -323,7 +323,7 @@ setVector12 args ==
   freeof($domainShell.1,args1) and
       freeof($domainShell.2,args1) and
           freeof($domainShell.4,args1) => nil  
-  [['SetDomainSlots124,'$,['QUOTE,args1],['LIST,:args2]]]
+  [['SetDomainSlots124,'$,['QUOTE,args1],['%listlit,:args2]]]
  where freeof(a,b) ==
          atom a => null MEMQ(a,b)
          freeof(first a,b) => freeof(rest a,b)
@@ -379,20 +379,20 @@ mkDomainFormer x ==
 mkTypeForm x ==
   atom x => mkDevaluate x
   x is ['Join] => nil
-  x is ['LIST] => nil
+  x is ['%listlit] => nil
   x is ['CATEGORY,:.] => MKQ x
   x is ['mkCategory,:.] => MKQ x
   x is ['_:,selector,dom] =>
-    ['LIST,MKQ '_:,MKQ selector,mkTypeForm dom]
+    ['%listlit,MKQ '_:,MKQ selector,mkTypeForm dom]
   x is ['Record,:argl] =>
-    ['LIST,MKQ 'Record,:[mkTypeForm y for y in argl]]
+    ['%listlit,MKQ 'Record,:[mkTypeForm y for y in argl]]
   x is ['Join,:argl] =>
-    ['LIST,MKQ 'Join,:[mkTypeForm y for y in argl]]
+    ['%listlit,MKQ 'Join,:[mkTypeForm y for y in argl]]
   x is ['%call,:argl] => ['MKQ, optCall x]
         --The previous line added JHD/BMT 20/3/84
         --Necessary for proper compilation of DPOLY SPAD
   x is [op] => MKQ x
-  x is [op,:argl] => ['LIST,MKQ op,:[mkTypeForm a for a in argl]]
+  x is [op,:argl] => ['%listlit,MKQ op,:[mkTypeForm a for a in argl]]
  
 PrepareConditional u == u
  
@@ -558,9 +558,9 @@ DescendCode(code,flag,viewAssoc,EnvToPass) ==
       $ConstantAssignments:= [u,:$ConstantAssignments]
       nil
     u
-  code is ['_:,:.] => (code.first := 'LIST; code.rest := NIL)
+  code is ['_:,:.] => (code.first := '%listlit; code.rest := NIL)
       --Yes, I know that's a hack, but how else do you kill a line?
-  code is ['LIST,:.] => nil
+  code is ['%listlit,:.] => nil
   code is ['devaluate,:.] => nil
   code is ['MDEF,:.] => nil
   code is ['%call,:.] => code
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index b0211eb4..1a2fa576 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -606,7 +606,7 @@ optTry form ==
   e
 
 optListlit form ==
-  form is ['%listlit] => nil
+  form is ['%listlit] => '%nil
   form
 
 optCollectVector form ==
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index a5a52d2c..41693905 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -517,7 +517,7 @@ outputTran x ==
   x is ['matrix,['construct,c]] and
     c is ['COLLECT,:m,d] and d is ['construct,e] and e is ['COLLECT,:.] =>
       outputTran ['COLLECT,:m,e]
-  x is ['LIST,:l] => outputTran ['BRACKET,['AGGLST,:l]]
+  x is ['%listlit,:l] => outputTran ['BRACKET,['AGGLST,:l]]
   x is ["%Map",:l] => outputMapTran l
   x is ['brace, :l]    =>
     ['BRACE,  ['AGGLST,:[outputTran y for y in l]]]
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 8674d9b8..2d2a0184 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -333,7 +333,7 @@ consDomainName(x,dc) ==
   x is [op,:argl] =>
     (op = 'Record) or (op = 'Union and argl is [[":",:.],:.])  =>
        mkList [MKQ op,
-         :[['LIST,MKQ '_:,MKQ tag,consDomainName(dom,dc)]
+         :[['%listlit,MKQ '_:,MKQ tag,consDomainName(dom,dc)]
                    for [.,tag,dom] in argl]]
     isFunctor op or op = 'Mapping or constructor? op =>
          -- call to constructor? needed if op was compiled in $bootStrapMode
@@ -364,10 +364,10 @@ consDomainForm(x,dc) ==
 ++ of compiled functions
 NRTdescendCodeTran(u,condList) ==
   null u => nil
-  u is ['LIST] => nil
+  u is ['%listlit] => nil
   u is [op,.,i,a] and op in '(setShellEntry QSETREFV) =>
     null condList and a is ['CONS,fn,:.] =>
-      u.first := 'LIST
+      u.first := '%listlit
       u.rest := nil
       $template.i :=
         fn = 'IDENTITY => a
@@ -486,7 +486,7 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) ==
                  createViewCode,createPredVecCode] where
     devaluateCode:= [[b,["devaluate",a]] for [a,:b] in $devaluateList]
     createDomainCode:=
-      [domname,['LIST,MKQ name,:ASSOCRIGHT $devaluateList]]
+      [domname,['%listlit,MKQ name,:ASSOCRIGHT $devaluateList]]
     createViewCode:= ["$",["newShell", $NRTbase + $NRTdeltaLength]]
     createPredVecCode := ["pv$",predBitVectorCode1]
 
@@ -610,7 +610,7 @@ NRToptimizeHas u ==
 NRTaddToSlam([name,:argnames],shell) ==
   $mutableDomain => return nil
   null argnames => addToConstructorCache(name,nil,shell)
-  args:= ['LIST,:ASSOCRIGHT $devaluateList]
+  args:= ['%listlit,:ASSOCRIGHT $devaluateList]
   addToConstructorCache(name,args,shell)
 
 changeDirectoryInSlot1() ==  --called by buildFunctor
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index 12a0d9df..635937a6 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -266,7 +266,7 @@ makePredicateBitVector pl ==   --called by buildFunctor
   [$lisplibPredicates,firstCode,:lastCode]  --$pairlis set by compDefineFunctor1
 
 augmentPredCode(n,lastPl) ==
-  ['LIST,:pl] := mungeAddGensyms(lastPl,$predGensymAlist)
+  ['%listlit,:pl] := mungeAddGensyms(lastPl,$predGensymAlist)
   delta := 2 ** n
   l := [(u := MKPF([x,['augmentPredVector,"$",delta]],'AND); 
          delta:=2 * delta; u) for x in pl]
@@ -308,7 +308,7 @@ transHasCode x ==
   [transHasCode y for y in x]
  
 mungeAddGensyms(u,gal) ==
-  ['LIST,:[fn(x,gal,0) for x in u]] where fn(x,gal,n) ==
+  ['%listlit,:[fn(x,gal,0) for x in u]] where fn(x,gal,n) ==
     atom x => x
     g := LASSOC(x,gal) =>
       n = 0 => ["%LET",g,x]
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index ce9c4ad4..7289b9d3 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -262,7 +262,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
   extraArgumentCode :=
     extraArguments := [x for x in argl | x ~= sharpArg] =>
       extraArguments is [x] => x
-      ['LIST,:extraArguments]
+      ['%listlit,:extraArguments]
     nil
   g:= gensym()
   gIndex:= gensym()
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 88fd76ce..120500d4 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -1211,9 +1211,9 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
       for u in $extraParms repeat
         formals:=[first u,:formals]
         actuals:=[MKQ rest u,:actuals]
-      body := ['sublisV,['PAIR,['QUOTE,formals],['LIST,:actuals]],body]
+      body := ['sublisV,['PAIR,['QUOTE,formals],['%listlit,:actuals]],body]
     if argl then body:=  -- always subst for args after extraparms
-        ['sublisV,['PAIR,['QUOTE,sargl],['LIST,:
+        ['sublisV,['PAIR,['QUOTE,sargl],['%listlit,:
           [['devaluate,u] for u in sargl]]],body]
     body:=
       ['PROG1,["%LET",g:= gensym(),body],