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/i-coerfn.boot | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/interp/i-coerfn.boot')

diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot
index 3def27de..ff642d94 100644
--- a/src/interp/i-coerfn.boot
+++ b/src/interp/i-coerfn.boot
@@ -1533,13 +1533,13 @@ Un2E(x,source,target) ==
 --% Variable
 
 Var2OV(u,source,target is [.,vl]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => member(sym,vl)
   member(sym,vl) => position1(sym,vl)
   coercionFailure()
 
 Var2Dmp(u,source,target is [dmp,vl,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => member(sym,vl) or canCoerce(source,S)
 
   len := #vl
@@ -1550,7 +1550,7 @@ Var2Dmp(u,source,target is [dmp,vl,S]) ==
   [[Zeros len,:objValUnwrap u]]
 
 Var2Gdmp(u,source,target is [dmp,vl,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => member(sym,vl) or canCoerce(source,S)
 
   len := #vl
@@ -1561,7 +1561,7 @@ Var2Gdmp(u,source,target is [dmp,vl,S]) ==
   [[Zeros len,:objValUnwrap u]]
 
 Var2Mp(u,source,target is [mp,vl,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => member(sym,vl) or canCoerce(source,S)
   (n:= position1(u,vl)) ~= 0 =>
     [1,n,[1,0,:getConstantFromDomain('(One),S)]]
@@ -1569,7 +1569,7 @@ Var2Mp(u,source,target is [mp,vl,S]) ==
   [0,:objValUnwrap u]
 
 Var2NDmp(u,source,target is [ndmp,vl,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => member(sym,vl) or canCoerce(source,S)
 
   len:= #vl
@@ -1580,7 +1580,7 @@ Var2NDmp(u,source,target is [ndmp,vl,S]) ==
   [[Zeros len,:objValUnwrap(u)]]
 
 Var2P(u,source,target is [poly,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => true
 
   -- first try to get it into an underdomain
@@ -1594,7 +1594,7 @@ Var2QF(u,source,target is [qf,S]) ==
   u = '_$fromCoerceable_$ => canCoerce(source,S)
 
   S = $Integer => coercionFailure()
-  sym := CADR source
+  sym := second source
   (u' := coerceInt(objNewWrap(u,source),S)) or coercionFailure()
   [objValUnwrap u',:getConstantFromDomain('(One),S)]
 
@@ -1606,7 +1606,7 @@ Var2FS(u,source,target is [fs,S]) ==
   objValUnwrap v
 
 Var2Up(u,source,target is [up,x,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => (sym = x) or canCoerce(source,S)
 
   x=sym => [[1,:getConstantFromDomain('(One),S)]]
@@ -1614,7 +1614,7 @@ Var2Up(u,source,target is [up,x,S]) ==
   [[0,:objValUnwrap u]]
 
 Var2SUP(u,source,target is [sup,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => (sym = "?") or canCoerce(source,S)
 
   sym = "?" => [[1,:getConstantFromDomain('(One),S)]]
@@ -1622,7 +1622,7 @@ Var2SUP(u,source,target is [sup,S]) ==
   [[0,:objValUnwrap u]]
 
 Var2UpS(u,source,target is [ups,x,S]) ==
-  sym := CADR source
+  sym := second source
   u = '_$fromCoerceable_$ => (sym = x) or canCoerce(source,S)
 
   mid := ['UnivariatePolynomial,x,S]
@@ -1635,7 +1635,7 @@ Var2UpS(u,source,target is [ups,x,S]) ==
   objValUnwrap u
 
 Var2OtherPS(u,source,target is [.,x,S]) ==
-  sym := CADR source
+  sym := second source
   mid := ['UnivariatePowerSeries,x,S]
   u = '_$fromCoerceable_$ =>
     (sym = x) or (canCoerce(source,mid) and canCoerce(mid,target))
-- 
cgit v1.2.3