From 868f1d56a5bcd7d712855e98085e0e15d32a3264 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 26 Sep 2009 00:33:26 +0000
Subject: 	* interp/as.boot: Clean up. 	* interp/ax.boot: Likewise. 
 * interp/br-con.boot: Likewise. 	* interp/br-data.boot: Likewise. 
 * interp/br-op1.boot: Likewise. 	* interp/br-op2.boot: Likewise. 
 * interp/br-saturn.boot: Likewise. 	* interp/br-search.boot: Likewise. 
 * interp/c-util.boot: Likewise. 	* interp/category.boot: Likewise. 
 * interp/cattable.boot: Likewise. 	* interp/clam.boot: Likewise. 	*
 interp/compiler.boot: Likewise. 	* interp/cstream.boot: Likewise. 
 * interp/define.boot: Likewise. 	* interp/format.boot: Likewise. 
 * interp/fortcall.boot: Likewise. 	* interp/functor.boot: Likewise. 
 * interp/g-boot.boot: Likewise. 	* interp/g-opt.boot: Likewise. 	*
 interp/g-timer.boot: Likewise. 	* interp/guess.boot: Likewise. 	*
 interp/i-analy.boot: Likewise. 	* interp/i-coerce.boot: Likewise. 
 * interp/i-coerfn.boot: Likewise. 	* interp/i-eval.boot: Likewise. 
 * interp/i-funsel.boot: Likewise. 	* interp/i-intern.boot: Likewise. 
 * interp/i-map.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/int-top.boot: Likewise. 
 * interp/interop.boot: Likewise. 	* interp/lisplib.boot: Likewise. 
 * interp/mark.boot: Likewise. 	* interp/modemap.boot: Likewise. 	*
 interp/msg.boot: Likewise. 	* interp/msgdb.boot: Likewise. 	*
 interp/newfort.boot: Likewise. 	* interp/nrunfast.boot: Likewise. 
 * interp/nrungo.boot: Likewise. 	* interp/nrunopt.boot: Likewise. 
 * interp/pf2atree.boot: Likewise. 	* interp/pile.boot: Likewise. 	*
 interp/pspad1.boot: Likewise. 	* interp/ptrees.boot: Likewise. 	*
 interp/scan.boot: Likewise. 	* interp/sfsfun.boot: Likewise. 	*
 interp/showimp.boot: Likewise. 	* interp/slam.boot: Likewise. 	*
 interp/trace.boot: Likewise. 	* interp/wi1.boot: Likewise. 	*
 interp/word.boot: Likewise.

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

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

diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 4d0fadc7..e182ef82 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -264,18 +264,18 @@ compNoStacking(xOrig,m,e) ==
 
 markKillAllRecursive x ==
   x is [op,:r] =>
---->op = 'PART => markKillAllRecursive CADR r
-    op = 'PART => ['PART, CAR r, markKillAllRecursive CADR r]
+--->op = 'PART => markKillAllRecursive second r
+    op = 'PART => ['PART, CAR r, markKillAllRecursive second r]
 ----------------------------------------------------------94/10/11
     constructor? op => markKillAll x
     op = 'elt and constructor? opOf CAR r =>
-      ['elt,markKillAllRecursive CAR r,CADR r]
+      ['elt,markKillAllRecursive CAR r,second r]
     x
   x
 
 compNoStackingAux($partExpression,m,e) ==
 -----------------not used---------------------94/10/11
-  x := CADDR $partExpression
+  x := third $partExpression
   T := compNoStacking0(x,m,e) or return nil
   markParts($partExpression,T)
 
@@ -651,7 +651,7 @@ setqMultipleExplicit(nameList,valList,m,e) ==
 canReturn(expr,level,exitCount,ValueFlag) ==  --SPAD: exit and friends
   atom expr => ValueFlag and level=exitCount
   (op:= first expr)="QUOTE" => ValueFlag and level=exitCount
-  op in '(WI MI) => canReturn(CADDR expr,level,count,ValueFlag)
+  op in '(WI MI) => canReturn(third expr,level,count,ValueFlag)
   op="TAGGEDexit" =>
     expr is [.,count,data] => canReturn(data.expr,level,count,count=level)
   level=exitCount and not ValueFlag => nil
@@ -740,16 +740,16 @@ compConstruct(form,m,e) == (T := compConstruct1(form,m,e)) and markConstruct(for
   
 compConstruct1(form is ["construct",:l],m,e) ==
   y:= modeIsAggregateOf("List",m,e) =>
-    T:= compList(l,["List",CADR y],e) => convert(T,m)
+    T:= compList(l,["List",second y],e) => convert(T,m)
   y:= modeIsAggregateOf("Vector",m,e) =>
-    T:= compVector(l,["Vector",CADR y],e) => convert(T,m)
+    T:= compVector(l,["Vector",second y],e) => convert(T,m)
   T:= compForm(form,m,e) => T
   for D in getDomainsInScope e repeat
     (y:=modeIsAggregateOf("List",D,e)) and
-      (T:= compList(l,["List",CADR y],e)) and (T':= convert(T,m)) =>
+      (T:= compList(l,["List",second y],e)) and (T':= convert(T,m)) =>
          return T'
     (y:=modeIsAggregateOf("Vector",D,e)) and
-      (T:= compVector(l,["Vector",CADR y],e)) and (T':= convert(T,m)) =>
+      (T:= compVector(l,["Vector",second y],e)) and (T':= convert(T,m)) =>
          return T'
 
 compPretend(u := ["pretend",x,t],m,e) ==
@@ -811,7 +811,7 @@ coerce(T,m) ==
       '"function coerce called from the interpreter."])
 --==================> changes <======================
 --The following line is inappropriate for our needs:::
---rplac(CADR T,substitute("$",$Rep,CADR T))
+--rplac(second T,substitute("$",$Rep,second T))
   T' := coerce0(T,m) => T'
   T := [T.expr,fullSubstitute("$",$Representation,T.mode),T.env]
 --==================> changes <======================
-- 
cgit v1.2.3