From ae1c8a6b70153b86b7ff1ec972ba5f7ce7e818f6 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 9 May 2010 05:18:19 +0000
Subject: 	* interp/cattable.boot: Replace call to CONS with bracket
 syntax. 	* interp/clammed.boot: Likewise. 	* interp/cparse.boot:
 Likewise. 	* interp/dq.boot: Likewise. 	* interp/fortcall.boot:
 Likewise. 	* interp/g-boot.boot: Likewise. 	*
 interp/i-coerce.boot: Likewise. 	* interp/i-coerfn.boot: Likewise. 
 * interp/i-funsel.boot: Likewise. 	* interp/i-object.boot: Likewise. 
 * interp/i-output.boot: Likewise. 	* interp/i-resolv.boot: Likewise. 
 * interp/i-spec1.boot: Likewise. 	* interp/i-spec2.boot: Likewise. 
 * interp/i-syscmd.boot: Likewise. 	* interp/incl.boot: Likewise. 	*
 interp/interop.boot: Likewise. 	* interp/lisplib.boot: Likewise. 
 * interp/msgdb.boot: Likewise. 	* interp/newfort.boot: Likewise. 
 * interp/nruncomp.boot: Likewise. 	* interp/nrunopt.boot: Likewise. 
 * interp/rulesets.boot: Likewise. 	* interp/scan.boot: Likewise. 	*
 interp/termrw.boot: Likewise. 	* interp/wi2.boot: Likewise.

---
 src/interp/termrw.boot | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/interp/termrw.boot')

diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot
index e46a08d0..243812b7 100644
--- a/src/interp/termrw.boot
+++ b/src/interp/termrw.boot
@@ -50,7 +50,7 @@ termRW1(t,R) ==
   tt1:= termRW1(t1,R)
   tt2:= t2 and termRW1(t2,R)
   EQ(t1,tt1) and EQ(t2,tt2) => t
-  CONS(tt1,tt2)
+  [tt1,:tt2]
  
 term1RW(t,R) ==
   -- tries to reduce t at the top node
@@ -74,7 +74,7 @@ termMatch(tp,t,SL,vars) ==
   atom tp =>
     MEMQ(tp,vars) =>
       p:= ASSOC(tp,SL) => ( rest p=t )
-      CONS(CONS(tp,t),SL)
+      [[tp,:t],:SL]
     'failed
   atom t => 'failed
   [tp1,:tp2]:= tp
@@ -98,10 +98,10 @@ termMatch(tp,t,SL,vars) ==
 augmentSub(v,t,SL) ==
   -- destructively adds the pair (v,t) to the substitution list SL
   -- t doesn't contain any of the variables of SL
-  q:= CONS(v,t)
+  q := [v,:t]
   null SL => [q]
 --  for p in SL repeat p.rest := SUBSTQ(t,v,rest p)
-  CONS(q,SL)
+  [q,:SL]
  
 mergeSubs(S1,S2) ==
   -- augments S2 by each pair of S1
@@ -128,9 +128,9 @@ subCopyOrNil(t,SL) ==
   atom t => NIL
   [t1,:t2]:= t
   t0:= subCopyOrNil(t1,SL) =>
-    t2 => CONS(t, CONS(rest t0, subCopy0(t2,SL)))
-    CONS(t,CONS(rest t0,t2))
-  t2 and ( t0:= subCopyOrNil(t2,SL) ) => CONS(t, CONS(t1,rest t0))
+    t2 => [t, :[rest t0,:subCopy0(t2,SL)]]
+    [t,:[rest t0,:t2]]
+  t2 and ( t0:= subCopyOrNil(t2,SL) ) => [t, :[t1,:rest t0]]
   NIL
  
  
@@ -146,12 +146,12 @@ deepSubCopy0(t, SL) ==
   
 deepSubCopyOrNil(t,SL) ==
   -- the same as subCopy, but the result is NIL if nothing was copied
-  p:= ASSOC(t,SL) => CONS(t, deepSubCopy0(rest p, SL))
+  p:= ASSOC(t,SL) => [t,:deepSubCopy0(rest p, SL)]
   atom t => NIL
   [t1,:t2]:= t
   t0:= deepSubCopyOrNil(t1,SL) =>
-    t2 => CONS(t, CONS(rest t0, deepSubCopy0(t2,SL)))
-    CONS(t,CONS(rest t0,t2))
-  t2 and ( t0:= deepSubCopyOrNil(t2,SL) ) => CONS(t, CONS(t1,rest t0))
+    t2 => [t, :[rest t0,:deepSubCopy0(t2,SL)]]
+    [t,:[rest t0,:t2]]
+  t2 and ( t0:= deepSubCopyOrNil(t2,SL) ) => [t,:[t1,:rest t0]]
  
  
-- 
cgit v1.2.3