diff options
Diffstat (limited to 'src/interp/functor.boot')
| -rw-r--r-- | src/interp/functor.boot | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 6430f17f..d539cef6 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -135,7 +135,7 @@ PacPrint v == $Sublis:= [first Sublis,:$Sublis] $WhereList:= [[name,:vv.j],:$WhereList] vv.j:= name - if CONSP vv.j and REFVECP(u:=CDR vv.j) then + if CONSP vv.j and REFVECP(u:=rest vv.j) then l:= ASSQ(keyItem u,Sublis) if l then name:= rest l @@ -211,7 +211,7 @@ compCategories u == pp rest v -- the next line "fixes" a bad modemap which sometimes appears .... -- - if rest v and NULL CAAAR v then v:=CDR v + if rest v and NULL CAAAR v then v:=rest v v:= CDDAAR v v:=resolvePatternVars(v, rest u) -- replaces #n forms -- select the modemap part of the first entry, and skip result etc. @@ -295,7 +295,7 @@ worthlessCode x == false cons5(p,l) == - l and (CAAR l = CAR p) => [p,: rest l] + l and (CAAR l = first p) => [p,: rest l] LENGTH l < 5 => [p,:l] RPLACD(QCDDDDR l,nil) [p,:l] @@ -340,15 +340,15 @@ setVector12 args == --DomainSubstitutionFunction, would be (gensym) cons --(category parameter), e.g. DirectProduct(length vl,NNI) --as in DistributedMultivariatePolynomial - args1:=[CAR u,:args1] - args2:=[CDR u,:args2] + args1:=[first u,:args1] + args2:=[rest u,:args2] freeof($domainShell.1,args1) and freeof($domainShell.2,args1) and freeof($domainShell.4,args1) => nil [['SetDomainSlots124,'$,['QUOTE,args1],['LIST,:args2]]] where freeof(a,b) == ATOM a => NULL MEMQ(a,b) - freeof(CAR a,b) => freeof(CDR a,b) + freeof(first a,b) => freeof(rest a,b) false SetDomainSlots124(vec,names,vals) == @@ -611,7 +611,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) == while (c and (LAST c is [c1] or LAST c is [c1,[]]) and (c1 = '(QUOTE T) or c1 is ['HasAttribute,:.])) repeat --strip out some worthless junk at the end - c:=NREVERSE CDR NREVERSE c + c:=NREVERSE rest NREVERSE c null c => '(LIST) ['COND,:c] code is ["%LET",name,body,:.] => @@ -787,7 +787,7 @@ InvestigateConditions catvecListMaker == --Rather like eval, but quotes parameters first for u in second principal'.4 repeat if not TruthP(cond:=second u) then - new:=['CATEGORY,'domain,['IF,cond,['ATTRIBUTE,CAR u], '%noBranch]] + new:=['CATEGORY,'domain,['IF,cond,['ATTRIBUTE,first u], '%noBranch]] $principal is ['Join,:l] => not member(new,l) => $principal:=['Join,:l,new] @@ -803,15 +803,15 @@ InvestigateConditions catvecListMaker == [pessimise first a,:pessimise rest a] null $Conditions => [true,:[true for u in secondaries]] PrincipalSecondaries:= getViewsConditions principal' - MinimalPrimary:= CAR first PrincipalSecondaries + MinimalPrimary:= first first PrincipalSecondaries MaximalPrimary:= CAAR $domainShell.4 necessarySecondaries:= [first u for u in PrincipalSecondaries | rest u=true] and/[member(u,necessarySecondaries) for u in secondaries] => [true,:[true for u in secondaries]] $HackSlot4:= MinimalPrimary=MaximalPrimary => nil - MaximalPrimaries:=[MaximalPrimary,:CAR (CatEval MaximalPrimary).4] - MinimalPrimaries:=[MinimalPrimary,:CAR (CatEval MinimalPrimary).4] + MaximalPrimaries:=[MaximalPrimary,:first (CatEval MaximalPrimary).4] + MinimalPrimaries:=[MinimalPrimary,:first (CatEval MinimalPrimary).4] MaximalPrimaries:=S_-(MaximalPrimaries,MinimalPrimaries) [[x] for x in MaximalPrimaries] ($Conditions:= Conds($principal,nil)) where @@ -843,7 +843,7 @@ InvestigateConditions catvecListMaker == LENGTH u=1 => first u ['AND,:u] for [v,:.] in newS repeat - for v' in [v,:CAR (CatEval v).4] repeat + for v' in [v,:first (CatEval v).4] repeat if (w:=assoc(v',$HackSlot4)) then RPLAC(rest w,if rest w then mkOr(u,rest w) else u) (list:= update(list,u,secondaries,newS)) where @@ -938,7 +938,7 @@ getPossibleViews u == null vec.0 => [CAAR vec.4,:views] --* [vec.0,:views] --* --the two lines marked ensure that the principal view comes first - --if you don't want it, CDR it off + --if you don't want it, rest it off getViewsConditions u == @@ -948,14 +948,14 @@ getViewsConditions u == systemErrorHere ["getViewsConditions",u] views:= [[first u,:second u] for u in second vec.4] null vec.0 => - null CAR vec.4 => views + null first vec.4 => views [[CAAR vec.4,:true],:views] --* [[vec.0,:true],:views] --* --the two lines marked ensure that the principal view comes first - --if you don't want it, CDR it off + --if you don't want it, rest it off DescendCodeVarAdd(base,flag) == - princview := CAR $catvecList + princview := first $catvecList [SetFunctionSlots(sig,substitute('ELT,'CONST,implem),flag,'adding) repeat for i in 6..MAXINDEX princview | princview.i is [sig:=[op,types],:.] and @@ -970,7 +970,7 @@ resolvePatternVars(p,args) == -- atom p => -- isSharpVarWithNum p => args.(position(p,$FormalMapVariableList)) -- p --- [resolvePatternVars(CAR p,args),:resolvePatternVars(CDR p,args)] +-- [resolvePatternVars(first p,args),:resolvePatternVars(rest p,args)] -- Mysterious JENKS definition follows: --DescendCodeVarAdd(base,flag) == |