diff options
| -rw-r--r-- | src/interp/compiler.boot | 4 | ||||
| -rw-r--r-- | src/interp/nrunopt.boot | 3 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 436b984c..485b40e1 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -625,7 +625,7 @@ compFormWithModemap(form,m,e,modemap) == (c1 is [":",=(second argl),=m] or EQ(c1,second argl) ) => -- first is a full tag, as placed by getInverseEnvironment -- second is what getSuccessEnvironment will place there - ["CDR",z] + ['%tail,z] ["%Call",:form'] e':= Tl => (LAST Tl).env @@ -2000,7 +2000,7 @@ compRecoverDomain(x,t,sn,e) == [.,.,e] := compMakeDeclaration(x,t,e) or return nil e := put(x,"value",[genSomeVariable(),t,$noEnv],e) -- 3. Assemble the result - [caseCode,[[x,["CDR",sn]]],e,originalEnv] + [caseCode,[[x,['%tail,sn]]],e,originalEnv] ++ Subroutine of compAlternativeGuardItem, responsible for ++ compiling a guad item of the form diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot index 3d93d870..9457e2e4 100644 --- a/src/interp/nrunopt.boot +++ b/src/interp/nrunopt.boot @@ -391,7 +391,8 @@ hasDefaultPackage catname == --======================================================================= -- Generate Category Level Alist --======================================================================= -orderCatAnc x == nreverse ASSOCLEFT SORTBY('CDR,rest depthAssoc x) +orderCatAnc x == + nreverse ASSOCLEFT SORTBY(function rest,rest depthAssoc x) depthAssocList u == u := delete('DomainSubstitutionMacro,u) --hack by RDJ 8/90 diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 3b14c17d..25cd03d1 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -490,7 +490,7 @@ compFormWithModemap1(form,m,e,modemap,Rep2Dollar?) == (c1 is ['_:,=(second argl),=m] or EQ(c1,second argl) ) => -- first is a full tag, as placed by getInverseEnvironment -- second is what getSuccessEnvironment will place there - ["CDR",z] + ['%tail,z] markTran(form,form',markMap,e') qt(18,T) convert(T,m) |