[nrx] Reimplement grammars

sorear · Sep 5, 2010 · 5ceab02 · 5ceab02
1 parent 9cf770c
commit 5ceab02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/Niecza/Actions.pm b/src/Niecza/Actions.pm
@@ -370,7 +370,6 @@ sub regex_def { my ($cl, $M) = @_;
         $ast = RxOp::ProtoRedis->new(name => $name);
     }
 
-    my ($cn, $op) = $ast->term_rx;
     $M->{_ast} = Op::SubDef->new(
         var  => $var,
         method_too => ($scope eq 'has' ? $name : undef),
@@ -379,8 +378,8 @@ sub regex_def { my ($cl, $M) = @_;
             ltm   => $ast->lad,
             class => 'Regex',
             type  => 'regex',
-            signature => $sig->for_regex($cn),
-            do => $op));
+            signature => $sig->for_regex,
+            do => Op::RegexBody->new(rxop => $ast)));
 }
 
 sub regex_declarator { my ($cl, $M) = @_;

diff --git a/test2.pl b/test2.pl
@@ -34,14 +34,14 @@
     ok !("adc" ~~ /ab+c/), "plus cannot match other";
     ok !("ac" ~~ /ab+c/), "plus cannot match none";
 
-    #grammar Bob {
-    #    rule TOP {ab*c}
-    #}
+    grammar Bob {
+        regex TOP {ab*c}
+    }
 
-    #ok Bob.parse("abbc"), "grammars work (1)";
-    #ok !Bob.parse("adc"), "grammars work (2)";
-    #ok !Bob.parse("xac"), "grammars anchor (1)";
-    #ok !Bob.parse("acx"), "grammars anchor (2)";
+    ok Bob.parse("abbc"), "grammars work (1)";
+    ok !Bob.parse("adc"), "grammars work (2)";
+    ok !Bob.parse("xac"), "grammars anchor (1)";
+    ok !Bob.parse("acx"), "grammars anchor (2)";
 }
 
 # {