diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-04 02:43:19 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-04 02:43:19 +0000 |
| commit | 2504b96ac76f31c60ab32979509e6f3b4b7a8b10 (patch) | |
| tree | 303bcf51784f4c93fb5154d2f31632566920c347 /src/interp | |
| parent | b043245231dca601a9a11ae6ddf4e89cc97c3d6c (diff) | |
| download | open-axiom-2504b96ac76f31c60ab32979509e6f3b4b7a8b10.tar.gz | |
* interp/buildom.boot: Clean up QEQCAR uses.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/buildom.boot | 10 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot index d9fb9e15..b76c110a 100644 --- a/src/interp/buildom.boot +++ b/src/interp/buildom.boot @@ -349,15 +349,15 @@ mkNewUnionFunList(name,form is ["Union",:listOfEntries],e) == [[["construct",[name,type],["XLAM",["#1"],["%makepair",i,"#1"]]], ["elt",[type,name,tag],cdownFun], ["case",[$Boolean,name,tag], - ["XLAM",["#1"],["QEQCAR","#1",i]]]] + ["XLAM",["#1"],['%ieq,['%head,"#1"],i]]]] for [.,tag,type] in listOfEntries for i in 0..])] where cdownFun() == gg:=gensym() $InteractiveMode => ["XLAM",["#1"],["PROG1",["%tail","#1"], - ["check-union",["QEQCAR","#1",i],type,"#1"]]] + ["check-union",['%ieq,['%head,"#1"],i],type,"#1"]]] ["XLAM",["#1"],["PROG2",["%LET",gg,"#1"],["%tail",gg], - ["check-union",["QEQCAR",gg,i],type,gg]]] + ["check-union",['%ieq,['%head,gg],i],type,gg]]] [cList,e] mkEnumerationFunList(nam,["Enumeration",:SL],e) == @@ -396,7 +396,7 @@ mkUnionFunList(op,form is ["Union",:listOfEntries],e) == gg:=gensym() if p is ["EQCAR",x,n] then ref:=["%tail",gg] - q:= ["QEQCAR", gg, n] + q:= ['%ieq,['%head,gg],n] else ref:=gg q:= substitute(gg,"#1",p) @@ -408,7 +408,7 @@ mkUnionFunList(op,form is ["Union",:listOfEntries],e) == ["XLAM",["#1"],"#1"] typeFun() == p is ["EQCAR",x,n] => - ["XLAM",["#1"],["QEQCAR",x,n]] + ["XLAM",["#1"],['%ieq,['%head,x],n]] ["XLAM",["#1"],p] cList:= substitute(dollarIfRepHack op,g,cList) [cList,e] diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index c6410bb7..467605ff 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1975,7 +1975,7 @@ compRetractGuard(x,t,sn,sm,e) == -- the condition and the body of the alternative, so just use -- assignment here and let the rest of the compiler deal with it. z := gensym() - caseCode := ["PROGN",["%LET",z,retractCode],["QEQCAR",z,0]] + caseCode := ["PROGN",["%LET",z,retractCode],['%ieq,['%head,z],0]] restrictCode := ["QCDR",z] -- 1.3. Everything else failed; nice try. else return stackAndThrow('"%1bp is not retractable to %2bp",[sm,t]) |