Clean up

17 files changed, 29 insertions, 24 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bcfbebda..7d7e91d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-09  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/vmlisp.lisp (reclaim): Remove duplicate.
+
+2010-12-09  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/pile.boot: Clean up.
 
 2010-12-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index bf66a8a0..5d1d5771 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -621,7 +621,7 @@ listTruncate(l,n) ==
 lassocShift(x,l) ==
   y:= l
   while cons? y repeat
-    EQUAL(x,first first y) => return (result := first y)
+    x = first first y => return (result := first y)
     y:= rest y
   result =>
     if not EQ(y,l) then
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 6045f211..10e65a79 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -50,7 +50,7 @@ makeFort(name,args,decls,results,returnType,aspInfo) ==
   -- and a stub Axiom function to process its arguments.
   -- the following is a list of objects for which values need not be
   -- passed by the user.
-  dummies := [second(u) for u in args | EQUAL(first u,0)]
+  dummies := [second(u) for u in args | first u = 0]
   args := [untangle2(u) for u in args] -- lose spad Union representation
     where untangle2 u ==
       atom (v := rest(u)) => v
@@ -150,8 +150,8 @@ writeStringLengths(fortranArgs,decls,fp) ==
     if isString?(a,decls) then wt(['",&",a,'"__length"],fp)
 
 isString?(u,decls) ==
-  EQUAL(ty := getFortranType(u,decls),"character") or
-    LISTP(ty) and EQUAL(first ty,"character")
+  (ty := getFortranType(u,decls)) = "character" or
+    LISTP(ty) and first ty = "character"
 
 isPointer?(u,decls) ==
   ty := getFortranType(u,decls)
@@ -218,7 +218,7 @@ writeXDR(v,str,fp) ==
   underscore := STRING CHAR('"__:",0) -- to avoid a compiler bug which won't
                                      -- parse " ... __" properly.
   wt(['"    CHECK(xdr",underscore, XDRFun(v), '"(", str, '",&", first(v)],fp)
-  if (LISTP (ty :=second v)) and not EQUAL(first ty,'"char") then
+  if (LISTP (ty :=second v)) and first ty ~= '"char" then
     wt(['",&",first(v),'"__length,MAX__ARRAY(",first(v),'"__length),"],fp)
     wt(['"sizeof(",first(ty),'"),xdr",underscore,first ty],fp)
   wl(['"));"],fp)
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 9de4e082..786ab65d 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -137,7 +137,7 @@ pushTimedName name ==
 startTimingProcess name ==
   updateTimedName peekTimedName()
   pushTimedName name
-  if EQ(name, 'load) then          statRecordLoadEvent()
+  if name = 'load then          statRecordLoadEvent()
  
 stopTimingProcess name ==
   (name ~= peekTimedName()) and not $InteractiveMode =>
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index a7b879da..de699da9 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -755,7 +755,7 @@ coerceInteractive(triple,t2) ==
     if $compilingMap then clearDependentMaps($mapName,nil)
     throwKeyedMsg("S2IC0009",[t2,$mapName])
   $insideCoerceInteractive: local := true
-  expr2 := EQUAL(t2,$OutputForm)
+  expr2 := t2 = $OutputForm
   if expr2 then startTimingProcess 'print
   else startTimingProcess 'coercion
   -- next 2 lines handle cases like '"failed"
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index b25ec177..5602b11e 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1249,7 +1249,7 @@ PushMatrix m ==
     --Adds the matrix to the look-aside list, and returns a name for it
   name:=
     for v in $MatrixList repeat
-        EQUAL(m,rest v) => return first v
+        m = rest v => return first v
   name => name
   name:=INTERNL('"matrix",STRINGIMAGE($MatrixCount:=$MatrixCount+1))
   $MatrixList:=[[name,:m],:$MatrixList]
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot
index 012a4b2e..da007339 100644
--- a/src/interp/i-resolv.boot
+++ b/src/interp/i-resolv.boot
@@ -441,10 +441,10 @@ matchUpToPatternVars(pat,form,patAlist) ==
   -- against expressions in form. If one is found, it is checked
   -- against the patAlist to make sure we are using the same expression
   -- each time.
-  EQUAL(pat,form) => true
+  pat = form => true
   isSharpVarWithNum(pat) =>
     -- see is pattern variable is in alist
-    (p := assoc(pat,patAlist)) => EQUAL(form,rest p)
+    (p := assoc(pat,patAlist)) => form = rest p
     patAlist := [[pat,:form],:patAlist]
     true
   cons?(pat) =>
@@ -580,7 +580,7 @@ resolveTMEq(t,m) ==
     b :=
       c =>
         SL := resolveTMEq1(ct,cm)
-        not EQ(SL,'failed)
+        SL ~= 'failed
       ct=cm
     not b =>
       TL := [ct,argt,:TL]
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 74a658d7..81fee035 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1136,7 +1136,7 @@ interpFunctionDepAlists() ==
 
 fixObjectForPrinting(v) ==
     v' := object2Identifier v
-    EQ(v',"%") => '"\%"
+    v' = "%" => '"\%"
     member(v',$msgdbPrims) => strconc('"\",PNAME v')
     v
 
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 2c1cb0ed..000c96fe 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -312,7 +312,7 @@ ncloopDQlines (dq,stream)==
 streamChop(n,s)==
     if StreamNull s
     then [nil,nil]
-    else if EQL(n,0)
+    else if n = 0
          then [nil,s]
          else
             [a,b]:= streamChop(n-1,rest s)
diff --git a/src/interp/match.boot b/src/interp/match.boot
index 23b0924c..775049c4 100644
--- a/src/interp/match.boot
+++ b/src/interp/match.boot
@@ -75,7 +75,7 @@ stringPosition(s,t,startpos) ==
   if startpos < 0 or startpos > n then error '"index out of range"
   if SIZE s = 0 then return startpos -- bug in STRPOS
   r := STRPOS(s,t,startpos,NIL)
-  if EQ(r,NIL) then n else r
+  if r = nil then n else r
 
 superMatch?(opattern,subject) ==  --subject assumed to be DOWNCASEd
   $wildCard : local := char "*"
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index a0adc6f7..07651a6b 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -659,7 +659,7 @@ brightPrintHighlight(x, out == $OutputStream) ==
   key = '"%t"  => $MARG := $MARG + tabber rst
   sayString('"(",out)
   brightPrint1(key,out)
-  if EQ(key,'TAGGEDreturn) then
+  if key = 'TAGGEDreturn then
     rst:=[first rst,second rst,third rst, '"environment (omitted)"]
   for y in rst repeat
     sayString('" ",out)
@@ -686,7 +686,7 @@ brightPrintHighlightAsTeX(x, out == $OutputStream) ==
   -- unhandled junk (print verbatim(ish)
   sayString('"(",out)
   brightPrint1(key,out)
-  if EQ(key,'TAGGEDreturn) then
+  if key = 'TAGGEDreturn then
     rst:=[first rst,second rst,third rst, '"environment (omitted)"]
   for y in rst repeat
     sayString('" ",out)
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index cb79c32c..a5c73202 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -265,7 +265,7 @@ exp2FortOptimizeArray e ==
       $exprStack := [[op,var,['AGGLST,:exp2FortOptimizeArray elts]],
         :$exprStack]
       var
-  EQ(op1,'MATRIX) =>
+  op1 = 'MATRIX =>
     -- var := newFortranTempVar()
     var := $fortName
     -- args looks like [NIL,[ROW,...],[ROW,...]]
diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot
index b2094b83..590bf246 100644
--- a/src/interp/nrungo.boot
+++ b/src/interp/nrungo.boot
@@ -284,7 +284,7 @@ lazyCompareSigEqual(s,tslot,dollar,domain) ==
 
 
 compareSigEqual(s,t,dollar,domain) ==
-  EQUAL(s,t) => true
+  s = t => true
   atom t =>
     u :=
       t='$ => dollar
@@ -295,7 +295,7 @@ compareSigEqual(s,t,dollar,domain) ==
       nil
     s = '$ => compareSigEqual(dollar,u,dollar,domain)
     u => compareSigEqual(s,u,dollar,domain)
-    EQUAL(s,u)
+    s = u
   s='$ => compareSigEqual(dollar,t,dollar,domain)
   atom s => nil
   #s ~= #t => nil
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index a4e2e806..663881a3 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -196,7 +196,8 @@ isSpecialBufferItem item ==
   item = "; " or string? item => true
   false
 
-isCloseDelimiter item ==   EQ(item,")") or EQ(item,"]") or EQ(item,"}") 
+isCloseDelimiter item ==
+  item = ")" or item = "]" or item = "}" 
 
 --======================================================================
 --               Formatting/Line Control Functions
diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index 3cda5b55..c39ea640 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -339,9 +339,9 @@ lfkey x ==
 
 lfinteger x==
            ["integer",x]
---     if EQUAL(x,'"0")
+--     if x = '"0"
 --     then ["id",INTERN x]
---     else if EQUAL(x,'"1")
+--     else if x = '"1"
 --          then ["id",INTERN x]
 --          else ["integer",x]
 
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index f91bea41..82d234c6 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -253,7 +253,7 @@ assocCircular(x,al) ==  --like ASSOC except that al is circular
   forwardPointer:= al
   val:= nil
   until EQ(forwardPointer,al) repeat
-    EQUAL(CAAR forwardPointer,x) => return (val:= first forwardPointer)
+    CAAR forwardPointer = x => return (val:= first forwardPointer)
     forwardPointer:= rest forwardPointer
   val
  
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 608f23ba..04079a7a 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -142,7 +142,7 @@ CONTAINED(x,y) == main where
     atom y => EQ(x,y)
     eq(x, first y) or eq(x, rest y)
   equal(x,y) ==
-    atom y => EQUAL(x,y)
+    atom y => x = y
     equal(x, first y) or equal(x, rest y)
 
 ++ Returns all the keys of association list `x'