diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-11 13:35:58 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-11 13:35:58 +0000 |
| commit | b5dac99efed153300270e86203655b0233543bf8 (patch) | |
| tree | b028fa3394a837dc5326cbfdf709ed716dd265ea | |
| parent | 9f51e802fd65c7f078c71db9827ffd27995dd78d (diff) | |
| download | open-axiom-b5dac99efed153300270e86203655b0233543bf8.tar.gz | |
* interp/buildom.boot (mkNewUnionFunList): Use %bind, not PROG2.
(mkUnionFunList): Likewise.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/buildom.boot | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9d15d4de..6bb8f63b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-06-11 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/buildom.boot (mkNewUnionFunList): Use %bind, not PROG2. + (mkUnionFunList): Likewise. + 2010-06-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/tree.spad.pamphlet (map!Tree): Don't forget the return diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot index 20078c36..1b38217d 100644 --- a/src/interp/buildom.boot +++ b/src/interp/buildom.boot @@ -356,8 +356,10 @@ mkNewUnionFunList(name,form is ["Union",:listOfEntries],e) == $InteractiveMode => ["XLAM",["#1"],["PROG1",["%tail","#1"], ["check-union",['%ieq,['%head,"#1"],i],type,"#1"]]] - ["XLAM",["#1"],["PROG2",["%LET",gg,"#1"],["%tail",gg], - ["check-union",['%ieq,['%head,gg],i],type,gg]]] + ["XLAM",["#1"], + ['%bind,[[gg,"#1"]], + ["check-union",['%ieq,['%head,gg],i],type,gg], + ["%tail",gg]]] [cList,e] mkEnumerationFunList(nam,["Enumeration",:SL],e) == @@ -401,8 +403,8 @@ mkUnionFunList(op,form is ["Union",:listOfEntries],e) == else ref:=gg q:= substitute(gg,"#1",p) - ["XLAM",["#1"],["PROG2",["%LET",gg,"#1"],ref, - ["check-union",q,t,gg]]] + ["XLAM",["#1"], + ['%bind,[[gg,"#1"]],["check-union",q,t,gg],ref]] downFun() == p is ['%ieq,['%head,x],.] => ["XLAM",["#1"],["%tail","#1"]] |