aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-01-02 01:17:52 +0000
committerdos-reis <gdr@axiomatics.org>2011-01-02 01:17:52 +0000
commitb9a4e3cd1880e977a827a98b1cb69175e7ad1e74 (patch)
tree9b505483aa0d28ff9441b85231fc9f7d49553a2e
parentf6f972eda48c04d11d8790ee24b038d8762ba34b (diff)
downloadopen-axiom-b9a4e3cd1880e977a827a98b1cb69175e7ad1e74.tar.gz
Remove uses of SETF in Boot codes
-rw-r--r--src/boot/translator.boot9
-rw-r--r--src/interp/g-util.boot2
-rw-r--r--src/interp/i-syscmd.boot2
-rw-r--r--src/interp/interop.boot4
-rw-r--r--src/interp/intfile.boot2
-rw-r--r--src/interp/lisplib.boot6
-rw-r--r--src/interp/sfsfun.boot44
-rw-r--r--src/interp/sys-utility.boot2
-rw-r--r--src/interp/topics.boot26
9 files changed, 46 insertions, 51 deletions
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 3aa31def..c964f48f 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -67,12 +67,9 @@ genOptimizeOptions stream ==
AxiomCore::%sysInit() ==
SETQ(_*LOAD_-VERBOSE_*,false)
if %hasFeature KEYWORD::GCL then
- SETF(symbolValue
- bfColonColon("COMPILER","*COMPILE-VERBOSE*"),false)
- SETF(symbolValue
- bfColonColon("COMPILER","SUPPRESS-COMPILER-WARNINGS*"),false)
- SETF(symbolValue
- bfColonColon("COMPILER","SUPPRESS-COMPILER-NOTES*"),true)
+ symbolValue(bfColonColon("COMPILER","*COMPILE-VERBOSE*")) := false
+ symbolValue(bfColonColon("COMPILER","SUPPRESS-COMPILER-WARNINGS*")) := false
+ symbolValue(bfColonColon("COMPILER","SUPPRESS-COMPILER-NOTES*")) := true
++ Make x, the current package
setCurrentPackage: %Thing -> %Thing
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 98e834bb..e405f304 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -1439,7 +1439,7 @@ getShellEntry(s,i) ==
++ sets the nth nth entry of a domain shell to an item.
setShellEntry: (%Shell,%Short,%Thing) -> %Thing
setShellEntry(s,i,t) ==
- SETF(SVREF(s,i),t)
+ SVREF(s,i) := t
-- Push into the BOOT package when invoked in batch mode.
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index ebc9a534..9af626d0 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -368,7 +368,7 @@ clearCmdParts(l is [opt,:vl]) ==
prop:= first p2
recordOldValue(x,prop,rest p2)
recordNewValue(x,prop,NIL)
- SETF(CAAR $InteractiveFrame,deleteAssoc(x,CAAR $InteractiveFrame))
+ CAAR($InteractiveFrame) := deleteAssoc(x,CAAR $InteractiveFrame)
p2:= assoc(option,rest p1) =>
recordOldValue(x,option,rest p2)
recordNewValue(x,option,NIL)
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 4d0de75f..97f2e827 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -281,7 +281,7 @@ instantiate domenv ==
-- ofn := symbolFunction functor
-- loadFunctor functor
-- fn := symbolFunction functor
--- SETF(symbolFunction functor, ofn)
+-- symbolFunction(functor) := ofn
-- PUT(functor, 'instantiate, fn)
-- domvec := apply(fn, args)
domvec := apply(functor, args)
@@ -608,7 +608,7 @@ HasCategory(domain,catform') ==
--systemDependentMkAutoload(fn,cnam) ==
-- FBOUNDP(cnam) => "next"
--- SETF(symbolFunction cnam,mkAutoLoad(fn, cnam))
+-- symbolFunction(cnam) := mkAutoLoad(fn, cnam)
domainEqual(a,b) ==
vector? a and vector? b and a.0 = b.0
diff --git a/src/interp/intfile.boot b/src/interp/intfile.boot
index bb09a699..5bd0fdcb 100644
--- a/src/interp/intfile.boot
+++ b/src/interp/intfile.boot
@@ -48,7 +48,7 @@ shoeIntern (s)==
f.0=char " " =>shoeIntern rest s
a:=INTERN subString(f,0,8)
[b,c]:= shoeStrings rest s
- SETF(GET (a,"MSGS"),b)
+ GET(a,"MSGS") := b
shoeIntern c
shoeStrings (stream)==
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index d0a41d7c..f95cacdb 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -268,7 +268,7 @@ systemDependentMkAutoload(fn,cnam) ==
kind = 'category =>
ASHARPMKAUTOLOADCATEGORY(file, cnam, asharpName, cosig)
ASHARPMKAUTOLOADFUNCTOR(file, cnam, asharpName, cosig)
- SETF(symbolFunction cnam,mkAutoLoad(fn, cnam))
+ symbolFunction(cnam) := mkAutoLoad(fn, cnam)
autoLoad(abb,cname) ==
-- builtin constructors are always loaded. By definition, there
@@ -280,11 +280,11 @@ autoLoad(abb,cname) ==
setAutoLoadProperty(name) ==
-- abb := constructor? name
REMPROP(name,'LOADED)
- SETF(symbolFunction name,mkAutoLoad(constructor? name, name))
+ symbolFunction(name) := mkAutoLoad(constructor? name, name)
unloadOneConstructor(cnam,fn) ==
REMPROP(cnam,'LOADED)
- SETF(symbolFunction cnam,mkAutoLoad(fn, cnam))
+ symbolFunction(cnam) := mkAutoLoad(fn, cnam)
--% Compilation
diff --git a/src/interp/sfsfun.boot b/src/interp/sfsfun.boot
index 3f58d1ea..baacfff1 100644
--- a/src/interp/sfsfun.boot
+++ b/src/interp/sfsfun.boot
@@ -419,10 +419,10 @@ PsiIntpart(x) ==
cotdiffeval(n,z,skipit) ==
---skip=1 if arg z is known to be an exact multiple of Pi/2
a := MAKE_-ARRAY(n+2)
- SETF(AREF(a,0),0.0)
- SETF(AREF(a,1),1.0)
+ AREF(a,0) := 0.0
+ AREF(a,1) := 1.0
for i in 2..n repeat
- SETF(AREF(a,i),0.0)
+ AREF(a,i) := 0.0
for l in 1..n repeat
m := MOD(l+1,2)
for k in m..l+1 by 2 repeat
@@ -436,7 +436,7 @@ cotdiffeval(n,z,skipit) ==
t2 := 0
else
t2 := -AREF(a,k+1)*(k+1)
- SETF(AREF(a,k), t1+t2)
+ AREF(a,k) := t1+t2
--- evaluate d^N/dX^N cot(z) via Horner-like rule
v := COT(z)
sq := v**2
@@ -524,19 +524,18 @@ chebf01 (c,z) ==
z1 := four/w
ncount := n1
arr := MAKE_-ARRAY(n2)
- SETF(AREF(arr,ncount) , start) -- start off
+ AREF(arr,ncount) := start -- start off
x1 := n2
c1 := 1.0 - c
for ncount in n..0 by -1 repeat
divfac := 1.0/x1
x1 := x1 -1.0
- SETF(AREF(arr,ncount) ,_
- x1*((divfac+z1*(x1-c1))*a1 +_
- (1.0/x1 + z1*(x1+c1+1.0))*a2-divfac*a3))
+ AREF(arr,ncount) := x1*((divfac+z1*(x1-c1))*a1 +_
+ (1.0/x1 + z1*(x1+c1+1.0))*a2-divfac*a3)
a3 := a2
a2 := a1
a1 := AREF(arr,ncount)
- SETF(AREF(arr,0),AREF(arr,0)/2.0)
+ AREF(arr,0) := AREF(arr,0)/2.0
-- compute scale factor
rho := AREF(arr,0)
sum := rho
@@ -546,7 +545,7 @@ chebf01 (c,z) ==
sum := sum+AREF(arr,i)
p := -p
for l in 0..n1 repeat
- SETF(AREF(arr,l), AREF(arr,l)/rho)
+ AREF(arr,l) := AREF(arr,l)/rho
sum := sum/rho
--- Now evaluate array at argument
b := 0.0
@@ -618,19 +617,18 @@ chebf01coefmake (c,w,n) ==
z1 := four/w
ncount := n1
arr := MAKE_-ARRAY(n2)
- SETF(AREF(arr,ncount) , start) -- start off
+ AREF(arr,ncount) := start -- start off
x1 := n2
c1 := 1.0 - c
for ncount in n..0 by -1 repeat
divfac := 1.0/x1
x1 := x1 -1.0
- SETF(AREF(arr,ncount) ,_
- x1*((divfac+z1*(x1-c1))*a1 +_
- (1.0/x1 + z1*(x1+c1+1.0))*a2-divfac*a3))
+ AREF(arr,ncount) := x1*((divfac+z1*(x1-c1))*a1 +_
+ (1.0/x1 + z1*(x1+c1+1.0))*a2-divfac*a3)
a3 := a2
a2 := a1
a1 := AREF(arr,ncount)
- SETF(AREF(arr,0),AREF(arr,0)/2.0)
+ AREF(arr,0) := AREF(arr,0)/2.0
-- compute scale factor
rho := AREF(arr,0)
sum := rho
@@ -640,7 +638,7 @@ chebf01coefmake (c,w,n) ==
sum := sum+AREF(arr,i)
p := -p
for l in 0..n1 repeat
- SETF(AREF(arr,l), AREF(arr,l)/rho)
+ AREF(arr,l) := AREF(arr,l)/rho
sum := sum/rho
return([sum,arr])
@@ -769,10 +767,10 @@ BesselJRecur(v,z) ==
if abs(so)<abs(z) then so:=v+18.*SQRT(v)
m:= FLOOR(abs(so-v))+1
w := newVector m
- SETF(AREF(w,m-1),BesselJAsymptOrder(v+m-1,z))
- SETF(AREF(w,m-2),BesselJAsymptOrder(v+m-2,z))
+ AREF(w,m-1) := BesselJAsymptOrder(v+m-1,z)
+ AREF(w,m-2) := BesselJAsymptOrder(v+m-2,z)
for i in m-3 .. 0 by -1 repeat
- SETF(AREF(w,i), 2.0 * (v+i+1.0) * AREF(w,i+1) /z -AREF(w,i+2))
+ AREF(w,i) := 2.0 * (v+i+1.0) * AREF(w,i+1) /z -AREF(w,i+2)
AREF(w,0)
BesselI(v,z) ==
@@ -831,20 +829,20 @@ BesselIBackRecur(largev,argm,v,z,type,n) ==
z2 := two/z
m2 := n+3
w:=MAKE_-ARRAY(m2+1)
- SETF(AREF(w,m2), zero) --- start off
+ AREF(w,m2) := zero --- start off
if type = '"I"
then
val := one
else
val := -one
m1 := n+2
- SETF(AREF(w,m1), start)
+ AREF(w,m1) := start
m := n+1
xm := float(m)
ct1 := z2*(xm+v)
--- initialize
for m in (n+1)..1 by -1 repeat
- SETF(AREF(w,m), AREF(w,m+1)*ct1 + val*AREF(w,m+2))
+ AREF(w,m) := AREF(w,m+1)*ct1 + val*AREF(w,m+2)
ct1 := ct1 - z2
m := 1 + FLOOR(n/2)
m2 := m + m -1
@@ -866,7 +864,7 @@ BesselIBackRecur(largev,argm,v,z,type,n) ==
pn := AREF(w,1) - val * pn
m1 := n+2
for m in 1..m1 repeat
- SETF(AREF(w,m), AREF(w,m)/pn)
+ AREF(w,m) := AREF(w,m)/pn
AREF(w,argm+1)
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index adc91d83..1d82c00e 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -110,7 +110,7 @@ getVMType d ==
setDynamicBinding: (%Symbol,%Thing) -> %Thing
setDynamicBinding(s,v) ==
- SETF(symbolValue s,v)
+ symbolValue(s) := v
++ returns true if `f' is bound to a macro.
macrop: %Thing -> %Boolean
diff --git a/src/interp/topics.boot b/src/interp/topics.boot
index e02eeaee..c3b2daae 100644
--- a/src/interp/topics.boot
+++ b/src/interp/topics.boot
@@ -65,19 +65,19 @@ $topicSynonyms := '(
$groupAssoc := '((extended . 1) (basic . 2) (hidden . 4))
$topicHash := hashTable 'EQ
-SETF(GETHASH("basic",$topicHash),2)
-SETF(GETHASH("algebraic",$topicHash),4)
-SETF(GETHASH("miscellaneous",$topicHash),13)
-SETF(GETHASH("extraction",$topicHash),6)
-SETF(GETHASH("conversion",$topicHash),7)
-SETF(GETHASH("hidden",$topicHash),3)
-SETF(GETHASH("extended",$topicHash),1)
-SETF(GETHASH("destructive",$topicHash),5)
-SETF(GETHASH("transformation",$topicHash),10)
-SETF(GETHASH("hyperbolic",$topicHash),12)
-SETF(GETHASH("construct",$topicHash),9)
-SETF(GETHASH("predicate",$topicHash),8)
-SETF(GETHASH("trignometric",$topicHash),11)
+GETHASH("basic",$topicHash) := 2
+GETHASH("algebraic",$topicHash) := 4
+GETHASH("miscellaneous",$topicHash) := 13
+GETHASH("extraction",$topicHash) := 6
+GETHASH("conversion",$topicHash) := 7
+GETHASH("hidden",$topicHash) := 3
+GETHASH("extended",$topicHash) := 1
+GETHASH("destructive",$topicHash) := 5
+GETHASH("transformation",$topicHash) := 10
+GETHASH("hyperbolic",$topicHash) := 12
+GETHASH("construct",$topicHash) := 9
+GETHASH("predicate",$topicHash) := 8
+GETHASH("trignometric",$topicHash) := 11
--=======================================================================