aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ChangeLog26
-rw-r--r--src/interp/br-data.boot4
-rw-r--r--src/interp/br-op1.boot2
-rw-r--r--src/interp/br-saturn.boot8
-rw-r--r--src/interp/c-util.boot6
-rw-r--r--src/interp/category.boot8
-rw-r--r--src/interp/clam.boot14
-rw-r--r--src/interp/database.boot4
-rw-r--r--src/interp/functor.boot2
-rw-r--r--src/interp/g-cndata.boot4
-rw-r--r--src/interp/g-util.boot42
-rw-r--r--src/interp/guess.boot4
-rw-r--r--src/interp/i-coerce.boot2
-rw-r--r--src/interp/i-funsel.boot12
-rw-r--r--src/interp/i-intern.boot2
-rw-r--r--src/interp/i-syscmd.boot16
-rw-r--r--src/interp/interop.boot10
-rw-r--r--src/interp/newfort.boot14
-rw-r--r--src/interp/nruncomp.boot4
-rw-r--r--src/interp/nrunfast.boot20
-rw-r--r--src/interp/nrunopt.boot4
-rw-r--r--src/interp/setvars.boot8
-rw-r--r--src/interp/slam.boot2
-rw-r--r--src/interp/topics.boot2
24 files changed, 123 insertions, 97 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f56ddc92..0334cd71 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,31 @@
2010-06-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/br-con.boot: More cleanup.
+ * interp/br-op1.boot: Likewise.
+ * interp/br-saturn.boot: Likewise.
+ * interp/c-util.boot: Likewise.
+ * interp/category.boot: Likewise.
+ * interp/clam.boot: Likewise.
+ * interp/database.boot: Likewise.
+ * interp/functor.boot: Likewise.
+ * interp/g-cndata.boot: Likewise.
+ * interp/g-util.boot: Likewise.
+ * interp/guess.boot: Likewise.
+ * interp/i-coerce.boot: Likewise.
+ * interp/i-funsel.boot: Likewise.
+ * interp/i-intern.boot: Likewise.
+ * interp/i-syscmd.boot: Likewise.
+ * interp/interop.boot: Likewise.
+ * interp/newfort.boot: Likewise.
+ * interp/nruncomp.boot: Likewise.
+ * interp/nrunfast.boot: Likewise.
+ * interp/nrunopt.boot: Likewise.
+ * interp/setvars.boot: Likewise.
+ * interp/slam.boot: Likewise.
+ * interp/topics.boot: Likewise.
+
+2010-06-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/buildom.boot: Clean up QEQCAR uses.
2010-06-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index ba28aa18..0518b21a 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -741,8 +741,8 @@ sublisFormal(args,exp,:options) == main where
acc := nil
y := x
while null atom y repeat
- acc := [sublisFormal1(args,QCAR y,n),:acc]
- y := QCDR y
+ acc := [sublisFormal1(args,first y,n),:acc]
+ y := rest y
r := nreverse acc
if y then
nd := LASTNODE r
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 7291dd8a..16c769a7 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -737,7 +737,7 @@ reduceOpAlistForDomain(opAlist,domform,conform) ==
pair.rest := [test for item in rest pair | test] where test() ==
[head,:tail] := item
first tail = true => item
- pred := simpHasPred SUBLISLIS(form1,form2,QCAR tail)
+ pred := simpHasPred SUBLISLIS(form1,form2,first tail)
null pred => false
item.rest := [pred]
item
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 72256e19..c7972406 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -1646,7 +1646,7 @@ bcConform1 form == main where
$bcMultipleNames =>
satTypeDownLink(s, ['"(|conPageChoose| '|",s,'"|)"])
satTypeDownLink(s, ["(|conPage| '|",s,'"|)"])
- (head := QCAR form) = 'QUOTE =>
+ (head := form.op) = 'QUOTE =>
htSay('"'")
hd second form
head = 'SIGNATURE =>
@@ -1657,11 +1657,11 @@ bcConform1 form == main where
hd second form
htSay '": "
hd third form
- QCDR form and dbEvalableConstructor? form
+ form.args and dbEvalableConstructor? form
=> bcConstructor(form,head)
hd head
- null (r := QCDR form) => nil
- tl QCDR form
+ null (r := form.args) => nil
+ tl form.args
mapping [target,:source] ==
tuple source
bcHt
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 1e0f57ff..6090497d 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -923,9 +923,9 @@ sublisV(p,e) ==
-- no need to descend vectors unless they are categories
isCategory e => LIST2VEC [suba(p,e.i) for i in 0..MAXINDEX e]
atom e => (y:= ASSQ(e,p) => rest y; e)
- u:= suba(p,QCAR e)
- v:= suba(p,QCDR e)
- EQ(QCAR e,u) and EQ(QCDR e,v) => e
+ u:= suba(p,first e)
+ v:= suba(p,rest e)
+ EQ(first e,u) and EQ(rest e,v) => e
[u,:v]
--% DEBUGGING PRINT ROUTINES used in breaks
diff --git a/src/interp/category.boot b/src/interp/category.boot
index c927d69f..b7a301b6 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -171,7 +171,7 @@ SigListUnion(extra,original) ==
--same signature and same predicate
opred = true => extra:= delete(x,extra)
-- PRETTYPRINT ("we ought to subsume",x,o)
- not MachineLevelSubsume(QCAR o,QCAR x) =>
+ not MachineLevelSubsume(first o,first x) =>
'"Source level subsumption not implemented"
extra:= delete(x,extra)
for e in extra repeat
@@ -179,7 +179,7 @@ SigListUnion(extra,original) ==
eimplem:=[]
for x in SigListOpSubsume(e,original) repeat
--PRETTYPRINT(LIST("SigListOpSubsume",e,x))
- not MachineLevelSubsume(QCAR e,QCAR x) =>
+ not MachineLevelSubsume(first e,first x) =>
--systemError '"Source level subsumption not implemented"
original:= [e,:original]
return nil -- this exits from the innermost for loop
@@ -406,9 +406,9 @@ JoinInner(l,$e) ==
if atom at2 then at2:=[at2]
-- the variable $Attributes is built globally, so that true
-- attributes can be detected without calling isCategoryForm
- QMEMQ(QCAR at2,$Attributes) => nil
+ QMEMQ(first at2,$Attributes) => nil
null isCategoryForm(at2,$e) =>
- $Attributes:=[QCAR at2,:$Attributes]
+ $Attributes:=[first at2,:$Attributes]
nil
pred:= second at
-- The predicate under which this category is conditional
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 71073268..e23456be 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -612,7 +612,7 @@ listTruncate(l,n) ==
n:= QSSUB1 n
while n ~= 0 and null atom u repeat
n:= QSSUB1 n
- u:= QCDR u
+ u:= rest u
if null atom u then
if null atom rest u and $reportInstantiations = true then
recordInstantiation($op,CAADR u,true)
@@ -622,25 +622,25 @@ listTruncate(l,n) ==
lassocShift(x,l) ==
y:= l
while not atom y repeat
- EQUAL(x,first QCAR y) => return (result := QCAR y)
- y:= QCDR y
+ EQUAL(x,first first y) => return (result := first y)
+ y:= rest y
result =>
if not EQ(y,l) then
y.first := first l
l.first := result
- QCDR result
+ rest result
nil
lassocShiftWithFunction(x,l,fn) ==
y:= l
while not atom y repeat
- FUNCALL(fn,x,first QCAR y) => return (result := QCAR y)
- y:= QCDR y
+ FUNCALL(fn,x,first first y) => return (result := first y)
+ y:= rest y
result =>
if not EQ(y,l) then
y.first := first l
l.first := result
- QCDR result
+ rest result
nil
lassocShiftQ(x,l) ==
diff --git a/src/interp/database.boot b/src/interp/database.boot
index b1885fe2..036f536c 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -576,7 +576,7 @@ getSystemModemaps(op,nargs) ==
mml:= getOperationFromDB op =>
mms := NIL
for (x := [[.,:sig],.]) in mml repeat
- (NUMBERP nargs) and (nargs ~= #QCDR sig) => 'iterate
+ (NUMBERP nargs) and (nargs ~= # sig.source) => 'iterate
$getUnexposedOperations or isFreeFunctionFromMm(x) or
isExposedConstructor(getDomainFromMm(x)) => mms := [x,:mms]
'iterate
@@ -700,7 +700,7 @@ getOperationAlistFromLisplib x ==
if s is [.,:t] then
if t is [.] then nil
else s.rest := QCDDR f
- else r.rest := QCDR f
+ else r.rest := rest f
else items.first.rest := f
items.first := addConsDB first items
u and markUnique u
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index b18b7ce6..f2c028c0 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -529,7 +529,7 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) ==
if update(u,copyvec,[]) then code:=delete(u,code))
where update(code,copyvec,sofar) ==
atom code =>nil
- QCAR code in '(getShellEntry ELT QREFELT) =>
+ code.op in '(getShellEntry ELT QREFELT) =>
copyvec.(third code):=union(copyvec.(third code), sofar)
true
code is [x,name,number,u'] and x in '(setShellEntry QSETREFV) =>
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 8717259c..80c26f33 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -254,7 +254,7 @@ isConstructorName op ==
nAssocQ(x,l,n) ==
repeat
if atom l then return nil
- if EQ(x,(QCAR l).n) then return QCAR l
- l:= QCDR l
+ if EQ(x,first(l).n) then return first l
+ l:= rest l
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 3e86213c..05abd896 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -476,8 +476,8 @@ ScanOrPairVec(f, ob) ==
HGET($seen, ob) => nil
cons? ob =>
HPUT($seen, ob, true)
- ScanOrInner(f, QCAR ob)
- ScanOrInner(f, QCDR ob)
+ ScanOrInner(f, first ob)
+ ScanOrInner(f, rest ob)
nil
VECP ob =>
HPUT($seen, ob, true)
@@ -499,15 +499,15 @@ get(x,prop,e) ==
get1(x,prop,e)
get0(x,prop,e) ==
- not atom x => get(QCAR x,prop,e)
- u:= QLASSQ(x,first QCAR e) => QLASSQ(prop,u)
- (tail:= rest QCAR e) and (u:= fastSearchCurrentEnv(x,tail)) =>
+ not atom x => get(x.op,prop,e)
+ u:= QLASSQ(x,first first e) => QLASSQ(prop,u)
+ (tail:= rest first e) and (u:= fastSearchCurrentEnv(x,tail)) =>
QLASSQ(prop,u)
nil
get1(x,prop,e) ==
--this is the old get
- not atom x => get(QCAR x,prop,e)
+ not atom x => get(x.op,prop,e)
prop="modemap" and $insideCapsuleFunctionIfTrue=true =>
LASSOC("modemap",getProplist(x,$CapsuleModemapFrame))
or get2(x,prop)
@@ -655,9 +655,9 @@ getUnionOrRecordTags u ==
Identity x == x
-length1? l == cons? l and not cons? QCDR l
+length1? l == cons? l and not cons? rest l
-length2? l == cons? l and cons? (l := QCDR l) and not cons? QCDR l
+length2? l == cons? l and cons? (l := rest l) and not cons? rest l
pairList(u,v) == [[x,:y] for x in u for y in v]
@@ -689,7 +689,7 @@ REMALIST(alist,prop) ==
p = prop =>
ok := NIL
l.rest := r
- if null (l := QCDR l) or null rest l then ok := NIL
+ if null (l := rest l) or null rest l then ok := NIL
alist
deleteLassoc(x,y) ==
@@ -893,27 +893,27 @@ mergeInPlace(f,g,p,q) ==
-- merge the two sorted lists p and q
if null p then return p
if null q then return q
- if FUNCALL(f,FUNCALL(g, QCAR p),FUNCALL(g, QCAR q))
- then (r := t := p; p := QCDR p)
- else (r := t := q; q := QCDR q)
+ if FUNCALL(f,FUNCALL(g, first p),FUNCALL(g, first q))
+ then (r := t := p; p := rest p)
+ else (r := t := q; q := rest q)
while not null p and not null q repeat
- if FUNCALL(f,FUNCALL(g,QCAR p),FUNCALL(g,QCAR q))
- then (t.rest := p; t := p; p := QCDR p)
- else (t.rest := q; t := q; q := QCDR q)
+ if FUNCALL(f,FUNCALL(g,first p),FUNCALL(g,first q))
+ then (t.rest := p; t := p; p := rest p)
+ else (t.rest := q; t := q; q := rest q)
if null p then t.rest := q else t.rest := p
r
mergeSort(f,g,p,n) ==
- if n=2 and FUNCALL(f,FUNCALL(g,QCADR p),FUNCALL(g,QCAR p)) then
+ if n=2 and FUNCALL(f,FUNCALL(g,second p),FUNCALL(g,first p)) then
t := p
- p := QCDR p
+ p := rest p
p.rest := t
t.rest := NIL
if QSLESSP(n,3) then return p
-- split the list p into p and q of equal length
l := QSQUOTIENT(n,2)
t := p
- for i in 1..l-1 repeat t := QCDR t
+ for i in 1..l-1 repeat t := rest t
q := rest t
t.rest := NIL
p := mergeSort(f,g,p,l)
@@ -938,7 +938,7 @@ formatUnabbreviatedSig sig ==
[target,:args] := dollarPercentTran sig
target := formatUnabbreviated target
null args => ['"() -> ",:target]
- null rest args => [:formatUnabbreviated QCAR args,'" -> ",:target]
+ null rest args => [:formatUnabbreviated first args,'" -> ",:target]
args := formatUnabbreviatedTuple args
['"(",:args,'") -> ",:target]
@@ -946,9 +946,9 @@ formatUnabbreviatedTuple t ==
-- t is a list of types
null t => t
atom t => [t]
- t0 := formatUnabbreviated QCAR t
+ t0 := formatUnabbreviated t.op
null rest t => t0
- [:t0,'",",:formatUnabbreviatedTuple QCDR t]
+ [:t0,'",",:formatUnabbreviatedTuple rest t]
formatUnabbreviated t ==
null t =>
diff --git a/src/interp/guess.boot b/src/interp/guess.boot
index 30c4e96c..096bacc1 100644
--- a/src/interp/guess.boot
+++ b/src/interp/guess.boot
@@ -267,9 +267,9 @@ findApproxSimple(words,wordList,threshold) ==
rotateWordList u ==
v := u
p := first v
- while QCDR v repeat
+ while rest v repeat
v.first := second v
- v := QCDR v
+ v := rest v
v.first := p
u
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index c051c1c0..6a1821d8 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -1238,7 +1238,7 @@ decomposeTypeIntoTower t ==
d := deconstructT t
null rest d => [t]
rd := reverse t
- [reverse QCDR rd,:decomposeTypeIntoTower QCAR rd]
+ [reverse rest rd,:decomposeTypeIntoTower first rd]
reassembleTowerIntoType tower ==
atom tower => tower
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index b75f710a..b46ef322 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -272,7 +272,7 @@ defaultTarget(opNode,op,nargs,args) ==
a1 := first args
atom a1 => target
- a1f := QCAR a1
+ a1f := first a1
nargs = 1 =>
op = 'kernel =>
@@ -443,8 +443,8 @@ defaultTarget(opNode,op,nargs,args) ==
mkRationalFunction D == ['Fraction, ['Polynomial, D]]
defaultTargetFE(a,:options) ==
- a is ['Variable,.] or a = $RationalNumber or MEMQ(QCAR a,
- [QCAR $Symbol, 'RationalRadicals,
+ a is ['Variable,.] or a = $RationalNumber or MEMQ(a.op,
+ [$Symbol.op, 'RationalRadicals,
'Pi]) or typeIsASmallInteger(a) or isEqualOrSubDomain(a, $Integer) or
a = '(AlgebraicNumber) =>
IFCAR options => [$FunctionalExpression, ['Complex, $Integer]]
@@ -1037,7 +1037,7 @@ selectMmsGen(op,tar,args1,args2) ==
for a in removeDuplicates args repeat
a =>
atom a => nil
- fa := QCAR a
+ fa := a.op
fa in '(Record Union) => NIL
conNames := insert(STRINGIMAGE fa, conNames)
@@ -1421,14 +1421,14 @@ hasCateSpecial(v,dom,cat,SL) ==
-- to be used in $newSystem only
hasCateSpecialNew(v,dom,cat,SL) ==
- fe := member(QCAR cat, '(ElementaryFunctionCategory
+ fe := member(cat.op, '(ElementaryFunctionCategory
TrigonometricFunctionCategory ArcTrigonometricFunctionCategory
HyperbolicFunctionCategory ArcHyperbolicFunctionCategory
PrimitiveFunctionCategory SpecialFunctionCategory Evalable
CombinatorialOpsCategory TranscendentalFunctionCategory
AlgebraicallyClosedFunctionSpace ExpressionSpace
LiouvillianFunctionCategory FunctionSpace))
- alg := member(QCAR cat, '(RadicalCategory AlgebraicallyClosedField))
+ alg := member(cat.op, '(RadicalCategory AlgebraicallyClosedField))
fefull := fe or alg or cat = $CombinatorialFunctionCategory
partialResult :=
dom is ["Variable",:.] or dom = $Symbol =>
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index 2f5c3290..3c16a7e0 100644
--- a/src/interp/i-intern.boot
+++ b/src/interp/i-intern.boot
@@ -450,7 +450,7 @@ remprop(x,prop,e) ==
fastSearchCurrentEnv(x,currentEnv) ==
u:= QLASSQ(x,first currentEnv) => u
- while (currentEnv:= QCDR currentEnv) repeat
+ while (currentEnv:= rest currentEnv) repeat
u:= QLASSQ(x,first currentEnv) => u
transformCollect [:itrl,body] ==
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 6f46b0c0..835e627c 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1990,7 +1990,7 @@ readHiFi(n) ==
then
pair := assoc(n,$internalHistoryTable)
atom pair => keyedSystemError("S2IH0034",NIL)
- vec := QCDR pair
+ vec := rest pair
else
HiFi:= RDEFIOSTREAM ['(MODE . INPUT),['FILE,:histFileName()]]
vec:= SPADRREAD(object2Identifier n,HiFi)
@@ -2055,10 +2055,10 @@ writify ob ==
(e := HGET($seen, ob)) => e
cons? ob =>
- qcar := QCAR ob
- qcdr := QCDR ob
+ qcar := first ob
+ qcdr := rest ob
(name := spadClosure? ob) =>
- d := writifyInner QCDR ob
+ d := writifyInner rest ob
nob := ['WRITIFIED_!_!, 'SPADCLOSURE, d, name]
HPUT($seen, ob, nob)
HPUT($seen, nob, nob)
@@ -2144,9 +2144,9 @@ writifyComplain s ==
sayKeyedMsg("S2IH0027",[s])
spadClosure? ob ==
- fun := QCAR ob
+ fun := first ob
not (name := BPINAME fun) => nil
- vec := QCDR ob
+ vec := rest ob
not VECP vec => nil
name
@@ -2214,8 +2214,8 @@ dewritify ob ==
error '"Unknown type to de-writify."
cons? ob =>
- qcar := QCAR ob
- qcdr := QCDR ob
+ qcar := first ob
+ qcdr := rest ob
nob := [qcar,:qcdr]
HPUT($seen, ob, nob)
HPUT($seen, nob, nob)
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 1ca2f5a4..110c35c2 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -439,11 +439,11 @@ hashNewLookupInTable(op,sig,dollar,[domain,opvec],flag) ==
nil
slot := domain.loc
null atom slot =>
- QCAR slot = 'newGoGet => someMatch:=true
+ slot.op = 'newGoGet => someMatch:=true
--treat as if operation were not there
--if EQ(QCAR slot,'newGoGet) then
-- UNWIND_-PROTECT --break infinite recursion
- -- ((SETELT(domain,loc,'skip); slot := replaceGoGetSlot QCDR slot),
+ -- ((SETELT(domain,loc,'skip); slot := replaceGoGetSlot rest slot),
-- if domain.loc = 'skip then domain.loc := slot)
return (success := slot)
slot = 'skip => --recursive call from above 'replaceGoGetSlot
@@ -470,7 +470,7 @@ hashNewLookupInCategories(op,sig,dom,dollar) ==
if $monitorNewWorld = true then sayBrightly concat('"----->",
form2String devaluate dom,'"-----> searching default packages for ",op)
predvec := dom.3
- packageVec := QCAR slot4
+ packageVec := first slot4
--the next three lines can go away with new category world
varList := ['$,:$FormalMapVariableList]
valueList := [dom,:[dom.(5+i) for i in 1..(# rest dom.0)]]
@@ -499,9 +499,9 @@ hashNewLookupInCategories(op,sig,dom,dollar) ==
endPos :=
code+2 > max => SIZE byteVector
opvec.(code+2)
- --not nrunNumArgCheck(#(QCDR sig),byteVector,opvec.code,endPos) => nil
+ --not nrunNumArgCheck(#sig.source,byteVector,opvec.code,endPos) => nil
--numOfArgs := byteVector.(opvec.code)
- --numOfArgs ~= #(QCDR sig) => nil
+ --numOfArgs ~= #sig.source => nil
packageForm := [entry,'$,:rest cat]
package := evalSlotDomain(packageForm,dom)
packageVec.i := package
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index c27a4d1f..fa9aa373 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -204,7 +204,7 @@ beenHere(e,n) ==
fun = 'CAR =>
loc.first := var
fun = 'CDR =>
- if cons? QCDR loc
+ if cons? rest loc
then loc.rest := [var]
else loc.rest := var
SAY '"whoops"
@@ -218,7 +218,7 @@ exp2FortOptimizeCS1 e ==
e is [op,arg] and object2Identifier op = "-" and atom arg => e
-- see if we have been here before
- not (object2Identifier QCAR e in '(ROW AGGLST)) and
+ not (object2Identifier first e in '(ROW AGGLST)) and
(n := HGET($fortCsHash,e)) => beenHere(e,n) -- where
-- descend sucessive CARs of CDRs of e
@@ -227,11 +227,11 @@ exp2FortOptimizeCS1 e ==
pushCsStacks(f,'CAR) where pushCsStacks(x,y) ==
$fortCsExprStack := [x,:$fortCsExprStack]
$fortCsFuncStack := [y,:$fortCsFuncStack]
- f.first := exp2FortOptimizeCS1 QCAR f
+ f.first := exp2FortOptimizeCS1 first f
popCsStacks(0) where popCsStacks(x) ==
- $fortCsFuncStack := QCDR $fortCsFuncStack
- $fortCsExprStack := QCDR $fortCsExprStack
- g := QCDR f
+ $fortCsFuncStack := rest $fortCsFuncStack
+ $fortCsExprStack := rest $fortCsExprStack
+ g := rest f
-- check to see of we have an non-NIL atomic CDR
g and atom g =>
pushCsStacks(f,'CDR)
@@ -240,7 +240,7 @@ exp2FortOptimizeCS1 e ==
f := NIL
f := g
- MEMQ(object2Identifier QCAR e,'(ROW AGGLST)) => e
+ MEMQ(object2Identifier first e,'(ROW AGGLST)) => e
-- see if we have already seen this expression
n := HGET($fortCsHash,e)
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index d7407da3..7d24c275 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -610,8 +610,8 @@ NRTsetVector4Part2(uncondList,condList) ==
mergeAppend(l1,l2) ==
atom l1 => l2
- member(QCAR l1,l2) => mergeAppend(QCDR l1, l2)
- [QCAR l1, :mergeAppend(QCDR l1, l2)]
+ member(first l1,l2) => mergeAppend(rest l1, l2)
+ [first l1, :mergeAppend(rest l1, l2)]
catList2catPackageList u ==
--converts ((Set) (Module R) ...) to ((Set& $) (Module& $ R)...)
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 9a09fce0..86b9751a 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -217,11 +217,11 @@ newLookupInTable(op,sig,dollar,[domain,opvec],flag) ==
nil
slot := domain.loc
null atom slot =>
- QCAR slot='newGoGet => someMatch:=true
+ slot.op = 'newGoGet => someMatch:=true
--treat as if operation were not there
--if EQ(QCAR slot,'newGoGet) then
-- UNWIND_-PROTECT --break infinite recursion
- -- ((SETELT(domain,loc,'skip); slot := replaceGoGetSlot QCDR slot),
+ -- ((SETELT(domain,loc,'skip); slot := replaceGoGetSlot rest slot),
-- if domain.loc = 'skip then domain.loc := slot)
return (success := slot)
slot = 'skip => --recursive call from above 'replaceGoGetSlot
@@ -280,7 +280,7 @@ newLookupInCategories(op,sig,dom,dollar) ==
if $monitorNewWorld = true then sayBrightly concat('"----->",
form2String devaluate dom,'"-----> searching default packages for ",op)
predvec := dom.3
- packageVec := QCAR slot4
+ packageVec := first slot4
--the next three lines can go away with new category world
varList := ['$,:$FormalMapVariableList]
valueList := [dom,:[dom.(5+i) for i in 1..(# rest dom.0)]]
@@ -309,9 +309,9 @@ newLookupInCategories(op,sig,dom,dollar) ==
endPos :=
code+2 > max => SIZE byteVector
opvec.(code+2)
- not nrunNumArgCheck(#(QCDR sig),byteVector,opvec.code,endPos) => nil
+ not nrunNumArgCheck(#sig.source,byteVector,opvec.code,endPos) => nil
--numOfArgs := byteVector.(opvec.code)
- --numOfArgs ~= #(QCDR sig) => nil
+ --numOfArgs ~= #sig.source => nil
packageForm := [entry,'$,:rest cat]
package := evalSlotDomain(packageForm,dom)
packageVec.i := package
@@ -358,7 +358,7 @@ newLookupInCategories1(op,sig,dom,dollar) ==
predvec := dom.3
slot4 := dom.4
packageVec := first slot4
- catVec := first QCDR slot4
+ catVec := first rest slot4
--the next three lines can go away with new category world
varList := ['$,:$FormalMapVariableList]
valueList := [dom,:[dom.(5+i) for i in 1..(# rest dom.0)]]
@@ -373,7 +373,7 @@ newLookupInCategories1(op,sig,dom,dollar) ==
sayLooking1('"already instantiated cat package",entry)
entry
IDENTP entry =>
- cat := QCAR node
+ cat := first node
packageForm := nil
if not GETL(entry,'LOADED) then loadLib entry
infovec := GETL(entry,'infovec)
@@ -385,7 +385,7 @@ newLookupInCategories1(op,sig,dom,dollar) ==
null code => nil
byteVector := CDDR infovec.3
numOfArgs := byteVector.(opvec.code)
- numOfArgs ~= #(QCDR sig) => nil
+ numOfArgs ~= #sig.source => nil
packageForm := [entry,'$,:rest cat]
package := evalSlotDomain(packageForm,dom)
packageVec.i := package
@@ -445,7 +445,7 @@ lazyMatchArg2(s,a,dollar,domain,typeFlag) ==
VECP (d := domainVal(dollar,domain,a)) =>
s = d.0 => true
domainArg := ($isDefaultingPackage => domain.6.0; domain.0)
- KAR s = QCAR d.0 and
+ KAR s = first d.0 and
lazyMatchArgDollarCheck(replaceSharpCalls s,d.0,dollar.0,domainArg)
--VECP first d => lazyMatch(s,CDDR d,dollar,domain) --old style (erase)
lazyMatch(replaceSharpCalls s,d,dollar,domain) --new style
@@ -679,7 +679,7 @@ lazyMatchAssocV(x,auxvec,catvec,domain) == --new style slot4
lazyMatchAssocV1(x,vec,domain) == --old style slot4
n := MAXINDEX vec
xop := first x
- or/[QCDR QVELT(vec,i) for i in 0..n |
+ or/[rest QVELT(vec,i) for i in 0..n |
xop = first (lazyt := first QVELT(vec,i)) and lazyMatch(x,lazyt,domain,domain)]
--=======================================================
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index a18db852..3d93d870 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -302,7 +302,7 @@ removeAttributePredicates pl ==
transHasCode x ==
atom x => x
- op := QCAR x
+ op := x.op
op in '(HasCategory HasAttribute) => x
op="has" => compHasFormat x
[transHasCode y for y in x]
@@ -330,7 +330,7 @@ orderByContainment pl ==
buildBitTable(:l) == fn(reverse l,0) where fn(l,n) ==
null l => n
n := n + n
- if QCAR l then n := n + 1
+ if first l then n := n + 1
fn(rest l,n)
buildPredVector(init,n,l) == fn(init,2 ** n,l) where fn(acc,n,l) ==
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index 6aaa0602..c5932545 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -523,7 +523,7 @@ setExposeAddGroup arg ==
sayAsManyPerLineAsPossible [object2String first x for x in
$globalExposureGroupAlist]
for x in arg repeat
- if cons? x then x := QCAR x
+ if cons? x then x := first x
x = 'all =>
$localExposureData.0 :=[first x for x in $globalExposureGroupAlist]
$localExposureData.1 :=NIL
@@ -551,7 +551,7 @@ setExposeAddConstr arg ==
displayExposedConstructors()
for x in arg repeat
x := unabbrev x
- if cons? x then x := QCAR x
+ if cons? x then x := first x
-- if the constructor is known, we know what type it is
null getConstructorKindFromDB x =>
sayKeyedMsg("S2IZ0049J",[x])
@@ -587,7 +587,7 @@ setExposeDropGroup arg ==
sayMSG '" "
displayExposedGroups()
for x in arg repeat
- if cons? x then x := QCAR x
+ if cons? x then x := first x
x = 'all =>
$localExposureData.0 := NIL
$localExposureData.1 := NIL
@@ -618,7 +618,7 @@ setExposeDropConstr arg ==
displayHiddenConstructors()
for x in arg repeat
x := unabbrev x
- if cons? x then x := QCAR x
+ if cons? x then x := first x
-- if the constructor is known, we know what type it is
null getConstructorKindFromDB x =>
sayKeyedMsg("S2IZ0049J",[x])
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index a6466db1..c0256b97 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -246,7 +246,7 @@ countCircularAlist(cal,n) ==
+/[nodeCount x for x in cal for i in 1..n]
predCircular(al,n) ==
- for i in 1..QSSUB1 n repeat al:= QCDR al
+ for i in 1..QSSUB1 n repeat al:= rest al
al
assocCircular(x,al) == --like ASSOC except that al is circular
diff --git a/src/interp/topics.boot b/src/interp/topics.boot
index de87df49..6310986c 100644
--- a/src/interp/topics.boot
+++ b/src/interp/topics.boot
@@ -239,7 +239,7 @@ transferClassCodes(conform,opAlist) ==
transferCodeCon(con,opAlist) ==
for pair in getConstructorDocumentationFromDB con
| FIXP (code := myLastAtom pair) repeat
- u := ASSOC(QCAR pair,opAlist) => lastNode(u).rest := code
+ u := ASSOC(pair.op,opAlist) => lastNode(u).rest := code
--=======================================================================
-- Filter Operation by Topic
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 03:58:21 +0000