Pass on NFA from wrapper, fixing LTM issues.

jnthn · Feb 2, 2017 · 51c3ca2 · 51c3ca2
1 parent 833ebe2
commit 51c3ca2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/Grammar/Debugger/WrapCache.pm6 b/lib/Grammar/Debugger/WrapCache.pm6
@@ -6,7 +6,16 @@ role Grammar::Debugger::WrapCache {
         unwrapped
     }
 
-    method !cache-wrapped(Str $name, \wrapped) {
+    method !cache-wrapped(Str $name, Mu \orig, \wrapped) {
+        my role Forward {
+            has Mu $.NFA;
+            method SET-ORIG(Mu \orig --> Nil) {
+                my Mu $raw-meth = orig.^lookup('NFA');
+                $!NFA := $raw-meth(orig);
+            }
+        }
+        wrapped does Forward;
+        wrapped.SET-ORIG(orig);
         %!cache{$name} := wrapped;
         wrapped
     }

diff --git a/lib/Grammar/Tracer.pm6 b/lib/Grammar/Tracer.pm6
@@ -16,7 +16,7 @@ my class TracedGrammarHOW is Metamodel::GrammarHOW does Grammar::Debugger::WrapC
             self!cache-unwrapped: $name, $meth;
         }
         else {
-            self!cache-wrapped: $name, -> $c, |args {
+            self!cache-wrapped: $name, $meth, -> $c, |args {
                 # Method name.
                 say ('|  ' x $indent) ~ BOLD() ~ $name ~ RESET();
 

diff --git a/t/ltm.t b/t/ltm.t
@@ -30,5 +30,4 @@ my $outcome = do {
     my $*OUT = class { method say(*@x) { }; method print(*@x) { }; method flush(*@x) { } }
 	MyGrammar.parse('aa', :rule<test>, :actions(MyActions)).made
 }
-todo 'Grammar::Tracer busts LTM';
 is $outcome, 'correct', 'Picked longest token';