diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-01 12:47:50 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-01 12:47:50 +0000 |
| commit | ad548d86891fc4587d27061c6b79ee66bd467274 (patch) | |
| tree | bed654835811c4ecc3f2992323d78969411f7b78 /src/interp | |
| parent | f0d35b6faab7983de66e2127af4f4a67dc6acd59 (diff) | |
| download | open-axiom-ad548d86891fc4587d27061c6b79ee66bd467274.tar.gz | |
* interp/compiler.boot (compList): Use %nil form, not NIL.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/compiler.boot | 8 | ||||
| -rw-r--r-- | src/interp/define.boot | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index ae9671d0..5df5091d 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -883,8 +883,8 @@ setqMultiple(nameList,val,m,e) == assignList:= [([.,.,e]:= compSetq1(x,["elt",g,y],z,e) or return "failed").expr for x in nameList for [y,:z] in selectorModePairs] - if assignList="failed" then NIL - else [mkpf([x,:assignList,g],'PROGN),m',e] + assignList="failed" => nil + [mkpf([x,:assignList,g],'PROGN),m',e] setqMultipleExplicit(nameList,valList,m,e) == #nameList~=#valList => @@ -979,7 +979,7 @@ compQuote(expr,m,e) == compList: (%Form,%Mode,%Env) -> %Maybe %Triple compList(l,m is ["List",mUnder],e) == - null l => [NIL,m,e] + null l => ['%nil,m,e] Tl:= [[.,mUnder,e]:= comp(x,mUnder,e) or return "failed" for x in l] Tl="failed" => nil T:= [['%listlit,:[T.expr for T in Tl]],["List",mUnder],e] @@ -1035,7 +1035,7 @@ compSeq1(l,$exitModeStack,e) == c:= [([.,.,e]:= --this used to be compOrCroak-- but changed so we can back out - ($insideExpressionIfTrue:= NIL; compSeqItem(x,$NoValueMode,e) or return + ($insideExpressionIfTrue:= false; compSeqItem(x,$NoValueMode,e) or return "failed")).expr for x in l] if c="failed" then return nil catchTag:= MKQ gensym() diff --git a/src/interp/define.boot b/src/interp/define.boot index 1aca96d0..c9948720 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1456,7 +1456,7 @@ compSingleCapsuleItem(item,$predl,$e) == ++ subroutine of doIt. Called to generate runtime noop insn. mutateToNothing item == item.op := 'PROGN - item.rest := NIL + item.rest := nil doIt(item,$predl) == $GENNO: local:= 0 @@ -1572,7 +1572,7 @@ doItIf(item is [.,p,x,y],$predl,$e) == item.op := "COND" item.rest := [[p',x,:x'],['%true,y,:y']] where localExtras(oldFLP) == - EQ(oldFLP,$functorLocalParameters) => NIL + EQ(oldFLP,$functorLocalParameters) => nil flp1:=$functorLocalParameters oldFLP':=oldFLP n:=0 |