From 20462739ac81a89fa81ff9576969c7a8d8952ea3 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 8 May 2010 16:42:11 +0000
Subject: 	* interp/as.boot: Replace uses of RPLACA and RPLACD with
 explicit 	assignment to first and rest fields. 	* interp/astr.boot:
 Likewise. 	* interp/br-con.boot: Likewise. 	* interp/br-data.boot:
 Likewise. 	* interp/br-op1.boot: Likewise. 	*
 interp/br-saturn.boot: Likewise. 	* interp/buildom.boot: Likewise. 
 * interp/c-doc.boot: Likewise. 	* interp/c-util.boot: Likewise. 
 * interp/cattable.boot: Likewise. 	* interp/clam.boot: Likewise. 	*
 interp/compiler.boot: Likewise. 	* interp/compress.boot: Likewise. 
 * interp/cparse.boot: Likewise. 	* interp/cstream.boot: Likewise. 
 * interp/database.boot: Likewise. 	* interp/define.boot: Likewise. 
 * interp/dq.boot: Likewise. 	* interp/functor.boot: Likewise. 	*
 interp/g-opt.boot: Likewise. 	* interp/g-util.boot: Likewise. 	*
 interp/guess.boot: Likewise. 	* interp/ht-util.boot: Likewise. 	*
 interp/i-analy.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/i-util.boot: Likewise. 
 * interp/interop.boot: Likewise. 	* interp/mark.boot: Likewise. 	*
 interp/modemap.boot: Likewise. 	* interp/msgdb.boot: Likewise. 	*
 interp/newfort.boot: Likewise. 	* interp/nruncomp.boot: Likewise. 
 * interp/nrunopt.boot: Likewise. 	* interp/packtran.boot: Likewise. 
 * interp/showimp.boot: Likewise. 	* interp/termrw.boot: Likewise. 
 * interp/topics.boot: Likewise. 	* interp/trace.boot: Likewise. 	*
 interp/wi2.boot: Likewise. 	* interp/word.boot: Likewise.

---
 src/interp/mark.boot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/interp/mark.boot b/src/interp/mark.boot
index 2ce85383..f67c7755 100644
--- a/src/interp/mark.boot
+++ b/src/interp/mark.boot
@@ -770,7 +770,7 @@ markInsertChanges(code,form,t,loc) ==
     if $hohum then pp [i, '" >>> ", x]
     SETQ($CHANGE,COPY x)
     if x is ['elt,:y] and r then x := y
-    RPLACA(x,markInsertChanges(code,first x,t,rest loc))
+    x.first := markInsertChanges(code,first x,t,rest loc)
     chk(x,100)
     form
 --  pp ['"Making change: ",code,form,t]
@@ -1307,7 +1307,7 @@ moveLinesAfter(alist, lines) ==
   acc := nil
   for i in 0..(n - 1) for x in lines repeat
     (p :=  ASSOC(i, alist)) and string? rest p => acc := [rest p, x, :acc]
-    (p :=  lookupRight(i, alist)) and (first p) > i => RPLACD(p, x)
+    (p :=  lookupRight(i, alist)) and (first p) > i => p.rest := x
     acc := [x, :acc]
   reverse acc  
   
@@ -1429,7 +1429,7 @@ combineDefinitions() ==
         item := [predl, :defs]
         op := opOf form
         oldAlist := HGET($hash,opOf form) 
-        pair := ASSOC(sig, oldAlist) => RPLACD(pair, [item,:rest pair])
+        pair := ASSOC(sig, oldAlist) => pair.rest := [item,:rest pair]
         HPUT($hash, op, [[sig, item], :oldAlist])
 --extract and combine multiple definitions
   Xdeflist := nil
@@ -1441,7 +1441,7 @@ combineDefinitions() ==
         ['DEF, form, :.] := def
         ops := PNAME op
         opName := INTERN(STRCONC(ops,'"X",STRINGIMAGE i))
-        RPLACA(form, opName)
+        form.first := opName
 --      rplacaSubst(op, opName, def)
         $acc := [[form,:predl], :$acc]
       Xdeflist := [buildNewDefinition(op,sig,$acc),:Xdeflist]
@@ -1450,7 +1450,7 @@ combineDefinitions() ==
 rplacaSubst(x, y, u) == (fn(x, y, u); u) where fn(x,y,u) ==
   atom u => nil
   while u is [p, :q] repeat
-    if EQ(p, x) then RPLACA(u, y)
+    if EQ(p, x) then u.first := y
     if null atom p then fn(x, y, p)
     u := q
     
-- 
cgit v1.2.3