delocalise apply-memo-rule

2008-04-05 02:07:17 +13:00 · 2008-04-05 02:07:17 +13:00 · 72dbac6a29
parent a4700e072e
commit 72dbac6a29
1 changed files with 6 additions and 7 deletions
--- a/extra/peg/peg.factor
+++ b/extra/peg/peg.factor
@ -179,14 +179,13 @@ C: <head> peg-head
    ] if
  ] ; inline

-:: apply-memo-rule ( r m -- ast )
-  m pos>> pos set 
-  m ans>> left-recursion? [ 
-    r m ans>> setup-lr
-    m ans>> seed>>
+: apply-memo-rule ( r m -- ast )
+  [ ans>> ] [ pos>> ] bi pos set
+  dup left-recursion? [ 
+    [ setup-lr ] keep seed>>
  ] [
-    m ans>>
-  ] if ;
+    nip
+  ] if ; inline

 : apply-rule ( r p -- ast )
   2dup recall [