diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/g-opt.boot | 6 | ||||
| -rw-r--r-- | src/interp/g-util.boot | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b82acad7..fd8f184a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2011-12-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/g-util.boot (prefixWalk!): New. + * interp/g-opt.boot (cleanLoop!): Rename from removeLoopExitTag!. + Adjust caller. Rewrite as a prefix walk. + +2011-12-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/g-opt.boot (removeLoopExitTag!): New. (optimize!): Run it first. * interp/compiler.boot (nullifyTargetingLeaves): Remove. diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 37087c9b..2dc0dd72 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -345,10 +345,10 @@ removeLeave! x == walkWith!(x,function f) where x is ['%leave,.,y] and y is ['%return,:.] => resetTo(x,y) x -removeLoopExitTag! x == walkWith!(x,function f) where +cleanLoop! x == prefixWalk!(x,function f) where f x == x is ['%scope,tag,['%repeat,:itl,body,val]] => - resetTo(x,['%repeat,:itl,g(body,tag),g(val,tag)]) + resetTo(x,f ['%repeat,:itl,g(body,tag),g(val,tag)]) x g(x,tag) == atomic? x => x @@ -364,7 +364,7 @@ removeLoopExitTag! x == walkWith!(x,function f) where ++ a lower intermediate form, applying several transformations ++ generaly intended to improve quality and efficiency. optimize! x == - x := spliceSeq! packWhen! transformIF! removeLeave! removeLoopExitTag! x + x := spliceSeq! packWhen! transformIF! removeLeave! cleanLoop! x changeVariableDefinitionToStore(x,nil) simplifyVMForm cancelScopeLeave! spliceSeq! packWhen! inlineLocals! groupTranscients! cancelScopeLeave! removeJunk! reduceXLAM! x diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 8c741420..4404d105 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -137,6 +137,14 @@ walkWith!(x,f) == ys.first := walkWith!(first ys,f) apply(f,x,nil) +prefixWalk!(x,f) == + atomic? x => x + x := apply(f,x,nil) + atomic? x => x + for xs in tails x | not atomic? first xs repeat + xs.first := prefixWalk!(first xs,f) + x + listify x == x is [.,:.] => x [x] |