diff options
Diffstat (limited to 'src/interp/nrunopt.boot')
| -rw-r--r-- | src/interp/nrunopt.boot | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot index 7f225a6c..ca6dc01f 100644 --- a/src/interp/nrunopt.boot +++ b/src/interp/nrunopt.boot @@ -132,7 +132,7 @@ orderBySubsumption items == -- entry is be ignored (e.g. init: -> $ in ULS) while (u := assoc(b,subacc)) repeat b := second u u := assoc(b,acc) or systemError nil - if null second u then u := [CAR u,1] --mark as missing operation + if null second u then u := [first u,1] --mark as missing operation y := [[a,'Subsumed],u,:y] --makes subsuming signature follow one subsumed z := insert(b,z) --mark a signature as already present [:y,:[w for (w := [c,:.]) in acc | not member(c,z)]] --add those not subsuming @@ -163,9 +163,9 @@ stuffDomainSlots dollar == dollar.2 := infovec.2 proto4 := infovec.3 dollar.4 := - VECP CDDR proto4 => [COPY_-SEQ CAR proto4,:CDR proto4] --old style + VECP CDDR proto4 => [COPY_-SEQ first proto4,:rest proto4] --old style bitVector := dollar.3 - predvec := CAR proto4 + predvec := first proto4 packagevec := second proto4 auxvec := LIST2VEC [fn for i in 0..MAXINDEX predvec] where fn() == null testBitVector(bitVector,predvec.i) => nil @@ -277,7 +277,7 @@ augmentPredVector(dollar,value) == isHasDollarPred pred == pred is [op,:r] => op in '(AND and OR or NOT not) => or/[isHasDollarPred x for x in r] - op in '(HasCategory HasAttribute) => CAR r = '$ + op in '(HasCategory HasAttribute) => first r = '$ false stripOutNonDollarPreds pred == @@ -334,7 +334,7 @@ buildBitTable(:l) == fn(REVERSE l,0) where fn(l,n) == buildPredVector(init,n,l) == fn(init,2 ** n,l) where fn(acc,n,l) == null l => acc - if CAR l then acc := acc + n + if first l then acc := acc + n fn(acc,n + n,rest l) testBitVector(vec,i) == @@ -362,7 +362,7 @@ NRTmakeCategoryAlist() == sixEtc := [5 + i for i in 1..#$pairlis] formals := ASSOCRIGHT $pairlis for x in slot1 repeat - RPLACA(x,EQSUBSTLIST(CONS("$$",sixEtc),CONS('$,formals),CAR x)) + RPLACA(x,EQSUBSTLIST(CONS("$$",sixEtc),CONS('$,formals),first x)) -----------code to make a new style slot4 ----------------- predList := ASSOCRIGHT slot1 --is list of predicate indices maxPredList := "MAX"/predList @@ -391,7 +391,7 @@ hasDefaultPackage catname == --======================================================================= -- Generate Category Level Alist --======================================================================= -orderCatAnc x == NREVERSE ASSOCLEFT SORTBY('CDR,CDR depthAssoc x) +orderCatAnc x == NREVERSE ASSOCLEFT SORTBY('CDR,rest depthAssoc x) depthAssocList u == u := delete('DomainSubstitutionMacro,u) --hack by RDJ 8/90 @@ -507,7 +507,7 @@ getCodeVector() == proto4 := $infovec.3 u := CDDR proto4 VECP u => u --old style - CDR u --new style + rest u --new style formatSlotDomain x == x = 0 => ["$"] @@ -593,7 +593,7 @@ dcCats con == u := $infovec.3 VECP CDDR u => dcCats1 con --old style slot4 $predvec:= getConstructorPredicatesFromDB con - catpredvec := CAR u + catpredvec := first u catinfo := second u catvec := third u for i in 0..MAXINDEX catvec repeat @@ -613,7 +613,7 @@ dcCats1 con == $predvec:= getConstructorPredicatesFromDB con u := $infovec.3 catvec := second u - catinfo := CAR u + catinfo := first u for i in 0..MAXINDEX catvec repeat sayBrightlyNT bright i [form,:predNumber] := catvec.i @@ -632,7 +632,7 @@ dcData con == sayBrightly '"Operation data from slot 1" PRINT_-FULL $infovec.1 vec := getCodeVector() - vec := (CONSP vec => CDR vec; vec) + vec := (CONSP vec => rest vec; vec) sayBrightly ['"Information vector has ",SIZE vec,'" entries"] dcData1 vec @@ -677,7 +677,7 @@ dcSize(:options) == VECP CDDR slot4 => second slot4 third slot4 n := MAXINDEX catvec - cSize := sum(nodeSize(2),vectorSize(SIZE CAR slot4),vectorSize(n + 1), + cSize := sum(nodeSize(2),vectorSize(SIZE first slot4),vectorSize(n + 1), nodeSize(+/[numberOfNodes catvec.i for i in 0..n])) codeVector := VECP CDDR slot4 => CDDR slot4 @@ -870,7 +870,7 @@ catExtendsCat?(u,v,uvec) == u = v => true uvec := uvec or (compMakeCategoryObject(u,$EmptyEnvironment)).expr slot4 := uvec.4 - prinAncestorList := CAR slot4 + prinAncestorList := first slot4 member(v,prinAncestorList) => true vOp := KAR v if similarForm := assoc(vOp,prinAncestorList) then |