aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/as.boot6
-rw-r--r--src/interp/br-con.boot2
-rw-r--r--src/interp/br-op1.boot2
-rw-r--r--src/interp/br-saturn.boot4
-rw-r--r--src/interp/br-util.boot6
-rw-r--r--src/interp/c-util.boot2
-rw-r--r--src/interp/category.boot6
-rw-r--r--src/interp/cattable.boot2
-rw-r--r--src/interp/compiler.boot2
-rw-r--r--src/interp/format.boot4
-rw-r--r--src/interp/fortcall.boot2
-rw-r--r--src/interp/functor.boot2
-rw-r--r--src/interp/i-funsel.boot2
-rw-r--r--src/interp/i-spec1.boot2
-rw-r--r--src/interp/i-syscmd.boot4
-rw-r--r--src/interp/interop.boot8
-rw-r--r--src/interp/newfort.boot16
-rw-r--r--src/interp/nruncomp.boot2
-rw-r--r--src/interp/nrunfast.boot2
-rw-r--r--src/interp/parse.boot2
-rw-r--r--src/interp/wi2.boot2
21 files changed, 40 insertions, 40 deletions
diff --git a/src/interp/as.boot b/src/interp/as.boot
index a167c97e..a4abbcc5 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -556,9 +556,9 @@ asytranApply(['Apply,name,:arglist],levels,local?) ==
[name,:[asytranApplySpecial(x, levels, local?) for x in arglist]]
null arglist => [name]
name is [ 'RestrictTo, :.] =>
- asytranApply(['Apply, first rest name,:arglist], levels, local?)
+ asytranApply(['Apply, second name,:arglist], levels, local?)
name is [ 'Qualify, :.] =>
- asytranApply(['Apply, first rest name,:arglist], levels, local?)
+ asytranApply(['Apply, second name,:arglist], levels, local?)
name is 'string => asytranLiteral first arglist
name is 'integer => asytranLiteral first arglist
name is 'float => asytranLiteral first arglist
@@ -569,7 +569,7 @@ asytranApply(['Apply,name,:arglist],levels,local?) ==
asytranFormSpecial(lastArg,levels,false)]
asytranLiteral(lit) ==
- first rest lit
+ second lit
asytranEnumItem arg ==
arg is ['Declare, name, :.] => name
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index b283b02b..93c91f7a 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -695,7 +695,7 @@ parseNoMacroFromString(s) ==
s := next(function ncloopParse,
next(function lineoftoks,incString s))
StreamNull s => nil
- pf2Sex first rest first s
+ pf2Sex second first s
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index eb827bd1..4dbb9742 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -846,7 +846,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) ==
domform := htpProperty(htPage,'domname) or htpProperty(htPage,'conform)
if isDefaultPackageName opOf domform then
catname := intern SUBSTRING(s := PNAME opOf domform,0,MAXINDEX s)
- packageSymbol := first rest domform
+ packageSymbol := second domform
domform := [catname,:rest rest domform] --skip first argument ($)
docTable:= dbDocTable domform
for [op,:alist] in opAlist repeat
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 21813a35..19a97e23 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -741,7 +741,7 @@ kPageContextMenuSaturn page ==
saturnExampleLink lname ==
htSay '"\docLink{\csname "
- htSay STRCONC(first(rest(lname)), '"\endcsname}{E&xamples}")
+ htSay STRCONC(second lname, '"\endcsname}{E&xamples}")
$exampleConstructors := nil
@@ -1380,7 +1380,7 @@ displayDomainOp(htPage,which,origin,op,sig,predicate,
htSaySaturnAmpersand()
htSayIndentRel(15)
htSay '"\spadref{"
- htSay first(rest(link))
+ htSay second link
htSay '"}"
htSayIndentRel(-15)
htSayStandard('"\newline{}")
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index 8ab7c4ec..f50af492 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -207,10 +207,10 @@ form2HtString(x,:options) ==
MEMQ(x,$emList) => STRCONC('"{\em ",u,'"}")
STRINGP x => STRCONC('"_"",u,'"_"")
u
- first x = 'QUOTE => STRCONC('"'",sexpr2HtString first rest x)
- first x = ":" => STRCONC(fn first rest x,'": ",fn first rest rest x)
+ first x = 'QUOTE => STRCONC('"'",sexpr2HtString second x)
+ first x = ":" => STRCONC(fn second x,'": ",fn third x)
first x = 'Mapping =>
- STRCONC(fnTail(rest rest x,'"()"),'"->",fn first rest x)
+ STRCONC(fnTail(rest rest x,'"()"),'"->",fn second x)
first x = 'construct => fnTail(rest x,'"[]")
tail := fnTail(rest x,'"()")
head := fn first x
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 863f6d38..bfb80379 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -237,7 +237,7 @@ mkErrorExpr level ==
atom a => a
a is [ =b,:c] => [$bright,b,$dim,:c]
[highlight1(b,first a),:highlight1(b,rest a)]
- substitute(bracket rest l,first rest l,first l)
+ substitute(bracket rest l,second l,first l)
compAndTrace [x,m,e] ==
SAY("tracing comp, compFormWithModemap of: ",x)
diff --git a/src/interp/category.boot b/src/interp/category.boot
index 4b370f0e..c01116fb 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -376,7 +376,7 @@ CondAncestorP(xname,leaves,condition) ==
u':=first u
ucond:=
null rest u => true
- first rest u
+ second u
xname = u' or member(xname,first (CatEval u').4) =>
PredImplies(ucond,condition) => return u'
@@ -410,7 +410,7 @@ JoinInner(l,$e) ==
null isCategoryForm(at2,$e) =>
$Attributes:=[QCAR at2,:$Attributes]
nil
- pred:= first rest at
+ pred:= second at
-- The predicate under which this category is conditional
member(pred,get("$Information","special",$e)) => l:= [:l,CatEval at2]
--It's true, so we add this as unconditional
@@ -534,7 +534,7 @@ JoinInner(l,$e) ==
S_+(b.2,attl)
globalDomains:= [:globalDomains,:S_-(b.5,globalDomains)]
for b in CondList repeat
- newpred:= first rest b
+ newpred:= second b
for u in (first b).2 repeat
v:= assoc(first u,attl)
null v =>
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index dab21ee3..07e04afd 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -95,7 +95,7 @@ simpHasPred(pred,:options) == main where
simp pred
simp pred ==
pred is [op,:r] =>
- op = "has" => simpHas(pred,first r,first rest r)
+ op = "has" => simpHas(pred,first r,second r)
op = 'HasCategory => simp ["has",first r,simpDevaluate second r]
op = 'HasSignature =>
[op,sig] := simpDevaluate second r
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 17ea9b84..808e57c3 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1161,7 +1161,7 @@ compElt(form,m,E) ==
[sig,[pred,val]]:= modemap
#sig ~= 2 and val isnt ["CONST",:.] => nil
val := genDeltaEntry [opOf anOp,:modemap]
- convert([["call",val],first rest sig,E], m)
+ convert([["call",val],second sig,E], m)
compForm(form,m,E)
--% HAS
diff --git a/src/interp/format.boot b/src/interp/format.boot
index e19ac004..d7618244 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -646,9 +646,9 @@ application2String(op,argl, linkInfo) ==
--op='MP =>concat("P",concat(argl.0,argl.1))
op='SEGMENT =>
null argl => '".."
- (null rest argl) or (null first rest argl) =>
+ (null rest argl) or (null second argl) =>
concat(first argl, '"..")
- concat(first argl, concat('"..", first rest argl))
+ concat(first argl, concat('"..", second argl))
concat(app2StringWrap(formWrapId op, linkInfo) ,
concat("_(",concat(tuple2String argl,"_)")))
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index efae972d..0f11e0ae 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -470,7 +470,7 @@ spadify(l,results,decls,names,actual) ==
:spadForms]
-- Result is a Boolean vector or array
LISTP(ty) and first(ty)="logical" and #ty=2 =>
- dim := getVal(first rest ty,names,actual)
+ dim := getVal(second ty,names,actual)
spadForms := [makeResultRecord(name,ty,_
[int2Bool ELT(fort,i) for i in 0..dim-1]), :spadForms]
LISTP(ty) and first(ty)="logical" =>
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index d539cef6..e7db218f 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -486,7 +486,7 @@ setVector5(catNames,locals) ==
if w:= assoc(u,generated)
then RPLACD(w,[uname,:rest w])
else generated:= [[u,uname],:generated]
- [(w:= mkVectorWithDeferral(first u,first rest u);
+ [(w:= mkVectorWithDeferral(first u,second u);
for v in rest u repeat
w:= ["setShellEntry",v,5,w];
w)
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 578f8729..70b596d2 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -609,7 +609,7 @@ mmCost0(name, sig,cond,tar,args1,args2) ==
-- try to favor homogeneous multiplication
---if name = "*" and 2 = #sigArgs and first sigArgs ~= first rest sigArgs then n := n + 1
+--if name = "*" and 2 = #sigArgs and first sigArgs ~= second sigArgs then n := n + 1
-- because of obscure problem in evalMm, sometimes we will have extra
-- modemaps with the wrong number of arguments if we want to the one
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 60eb4fe5..84cbc85f 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -72,7 +72,7 @@ upADEF t ==
-- we want everything to be declared or nothing. The exception is that
-- we do not require a target type since we will compute one anyway.
if null(m) and rest types then
- m := first rest types
+ m := second types
types' := rest rest types
else
types' := rest types
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index c473e2e1..33626e2e 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2769,7 +2769,7 @@ undoSteps(m,beforeOrAfter) ==
env := undoSingleStep(systemDelta,env) -- before command line
lastTailSeen := framelist
if beforeOrAfter = 'before then --do one additional undo for )before
- env := undoSingleStep(first rest lastTailSeen,env)
+ env := undoSingleStep(second lastTailSeen,env)
$frameRecord := rest $frameRecord --flush the effect of extra recordFrame
$InteractiveFrame := LIST LIST env
@@ -3279,7 +3279,7 @@ parseFromString(s) ==
s := next(function ncloopParse,
next(function lineoftoks,incString s))
StreamNull s => nil
- pf2Sex macroExpanded first rest first s
+ pf2Sex macroExpanded second first s
handleTokensizeSystemCommands(unabr, optionList) ==
optionList := [dumbTokenize opt for opt in optionList]
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 53b4001e..f54eff7e 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -64,13 +64,13 @@ DNameToSExpr1 dname ==
NULL dname => error "unexpected domain name"
first dname = DNameStringID =>
INTERN(CompStrToString rest dname)
- name0 := DNameToSExpr1 first rest dname
+ name0 := DNameToSExpr1 second dname
args := rest rest dname
name0 = '_-_> =>
froms := first args
froms := MAPCAR(function DNameToSExpr, rest froms)
- ret := first rest args -- a tuple
- ret := DNameToSExpr first rest ret -- contents
+ ret := second args -- a tuple
+ ret := DNameToSExpr second ret -- contents
CONS('Mapping, CONS(ret, froms))
name0 = 'Union or name0 = 'Record =>
sxs := MAPCAR(function DNameToSExpr, rest first args)
@@ -91,7 +91,7 @@ DNameFixEnum arg == CompStrToString rest arg
SExprToDName(sexpr, cosigVal) ==
-- is it a non-type valued object?
NOT cosigVal => [DNameOtherID, :sexpr]
- if first sexpr = '_: then sexpr := first rest rest sexpr
+ if first sexpr = '_: then sexpr := third sexpr
first sexpr = 'Mapping =>
args := [ SExprToDName(sx,true) for sx in rest sexpr]
[DNameApplyID,
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 81301b6d..c12f9e4d 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -130,7 +130,7 @@ exp2Fort2(e,prec,oldOp) ==
member(op,nonUnaryOps) =>
if nargs > 0 then arg1 := first args
nargs = 1 and member(op, '("+" "*")) => exp2Fort2(arg1,prec,op)
- if nargs > 1 then arg2 := first rest args
+ if nargs > 1 then arg2 := second args
p := position(op,binaryOps)
if p = -1
then
@@ -487,7 +487,7 @@ exp2FortSpecial(op,args,nargs) ==
mkMat(args) ==
$fortInts2Floats : fluid := nil
- mkFortFn(first rest args,rest rest args,#(rest rest args))
+ mkFortFn(second args,rest rest args,#(rest rest args))
mkFortFn(op,args,nargs) ==
@@ -597,7 +597,7 @@ fortFormatDo(var,lo,hi,incr,lab) ==
fortFormatIfGoto(switch,label) ==
changeExprLength(-8) -- Leave room for IF( ... )GOTO
$fortError : fluid := nil
- if first(switch) = "NULL" then switch := first rest switch
+ if first(switch) = "NULL" then switch := second switch
r := nreverse statement2Fortran switch
changeExprLength(8)
l := ['")GOTO ",STRINGIMAGE label]
@@ -609,7 +609,7 @@ fortFormatIfGoto(switch,label) ==
fortFormatLabelledIfGoto(switch,label1,label2) ==
changeExprLength(-8) -- Leave room for IF( ... )GOTO
$fortError : fluid := nil
- if LISTP(switch) and first(switch) = "NULL" then switch := first rest switch
+ if LISTP(switch) and first(switch) = "NULL" then switch := second switch
r := nreverse statement2Fortran switch
changeExprLength(8)
l := ['")GOTO ",STRINGIMAGE label2]
@@ -625,7 +625,7 @@ fortFormatLabelledIfGoto(switch,label1,label2) ==
fortFormatIf(switch) ==
changeExprLength(-8) -- Leave room for IF( ... )THEN
$fortError : fluid := nil
- if LISTP(switch) and first(switch) = "NULL" then switch := first rest switch
+ if LISTP(switch) and first(switch) = "NULL" then switch := second switch
r := nreverse statement2Fortran switch
changeExprLength(8)
l := ['")THEN"]
@@ -638,7 +638,7 @@ fortFormatElseIf(switch) ==
-- Leave room for IF( ... )THEN
changeExprLength(-12)
$fortError : fluid := nil
- if LISTP(switch) and first(switch) = "NULL" then switch := first rest switch
+ if LISTP(switch) and first(switch) = "NULL" then switch := second switch
r := nreverse statement2Fortran switch
changeExprLength(12)
l := ['")THEN"]
@@ -671,7 +671,7 @@ checkType ty ==
mkParameterList l ==
[par2string(u) for u in l] where par2string u ==
atom(u) => STRINGIMAGE u
- u := rest first rest u
+ u := rest second u
apply('STRCONC,[STRINGIMAGE(first u),'"(",_
:rest [:['",",:statement2Fortran(v)] for v in rest u],'")"])
@@ -807,7 +807,7 @@ fortPre1 e ==
["**", fortPre1 rand,fortPre1 exponent]
op = "ROOT" =>
#args = 1 => fortPreRoot ["sqrt", first args]
- [ "**" , fortPreRoot first args , [ "/" , fortPreRoot(1), fortPreRoot first rest args] ]
+ [ "**" , fortPreRoot first args , [ "/" , fortPreRoot(1), fortPreRoot second args] ]
if member(op,['"OVER", "OVER"]) then op := '"/"
specialOps := '(BRACKET BRACE SUB AGGLST SUPERSUB MATRIX SEGMENT ALTSUPERSUB
PAREN CONCAT CONCATB QUOTE STRING SIGMA STEP IN SIGMA2
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index f09552ea..b0159c7f 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -650,7 +650,7 @@ NRToptimizeHas u ==
a='HasCategory => LASSOC(u,$hasCategoryAlist) or
$hasCategoryAlist := [[u,:(y:=GENSYM())],:$hasCategoryAlist]
y
- a="has" => NRToptimizeHas ['HasCategory,first b,MKQ first rest b]
+ a="has" => NRToptimizeHas ['HasCategory,first b,MKQ second b]
a = 'QUOTE => u
[NRToptimizeHas a,:NRToptimizeHas b]
u
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index b6d41bde..13b2e83e 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -649,7 +649,7 @@ newHasTest(domform,catOrAtt) ==
pred = "has" =>
l is [ w1,['ATTRIBUTE,w2]] => newHasTest(w1,w2)
l is [ w1,['SIGNATURE,:w2]] => compiledLookup(first w2,second w2, eval mkEvalable w1)
- newHasTest(first l ,first rest l)
+ newHasTest(first l ,second l)
pred = 'OR => or/[evalCond i for i in l]
pred = 'AND => and/[evalCond i for i in l]
x
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index 1dc70709..64b97afb 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.boot
@@ -128,7 +128,7 @@ transIs1 u ==
u is ["append",x,y] =>
h:= [":",transIs x]
(v:= transIs1 y) is [":",z] => [h,z]
- v="nil" => first rest h
+ v="nil" => second h
atom v => [h,[":",v]]
[h,:v]
u is ["cons",x,y] =>
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 24db34d1..c272fedc 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -585,7 +585,7 @@ compElt(origForm,m,E) ==
--+
val := genDeltaEntry [opOf anOp,:modemap]
x := markTran(origForm,[val],sig,[E])
- [x,first rest sig,E] --implies fn calls used to access constants
+ [x,second sig,E] --implies fn calls used to access constants
compForm(origForm,m,E)
pause op == op