X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=863b62ec262e8087af237093c78926bac62324e9;hp=90dd6ee1468622b7000bbcd0329ca0965bdc1405;hb=242a8711e98cbd3ed6d05271bf910fde38e9be9a;hpb=0907ad8065e0d123e46fd00d87189a2fa9f10bf4

diff --git a/tests/regression.tc b/tests/regression.tc
index 90dd6ee..863b62e 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -25,22 +25,24 @@ tibcase {
   hello 
     there
     how
-     { are }
+      { are }
 ";
+    output "yep:{are}";
 
-    s        ::= { Hello }
+    s        ::= { Hello } => "yep"
     w        ::= " " | "\n"
     ws      !::= w**
-    Hello    ::= "hello" ws { "there" ws "how" ws { { "are" } ws } }
+    Hello    ::= "hello" ws { "there" "how" { "are" } }
 }
 
+
 testcase {
     input "ab c";
     output "1:{{a b} {c}}";
 
     s   ::= ids
-    ids ::= id (" " ids &~ id [~]*) => "1"
-          | id (    ids &~ id [~]*) => "2"
+    ids ::= id (" " ids &~ id ~[]*) => "1"
+          | id (    ids &~ id ~[]*) => "2"
           | id
     id  ::= [a-z]++
 }
@@ -60,11 +62,11 @@ testcase {
 
 testcase {
     input "aaabbbccc";
-    output "";
+    output "ab";
 
     s   ::= ab & dc
-    ab  ::= a b
-    dc  ::= d c
+    ab  ::= a b       => ab
+    dc  ::= d c       => dc
     a   ::= "a" a     | ()
     b   ::= "b" b "c" | ()
     c   ::= "c" c     | ()
@@ -75,8 +77,8 @@ testcase {
     input "aaabbbbccc";
 
     s   ::= ab & dc
-    ab !::= a b
-    dc !::= d c
+    ab !::= a b       => ab
+    dc !::= d c       => dc
     a   ::= "a" a     | ()
     b   ::= "b" b "c" | ()
     c   ::= "c" c     | ()
@@ -106,7 +108,7 @@ testcase {
 
 testcase {
     input  "xbambambam";
-    output "bam:{a bam:{a bam:{a x}}}";
+    output "bam:{a bam:{a bam:{a x:{x}}}}";
 
     s ::= a s ^"bam"
     s ::= ^"x"
@@ -282,16 +284,16 @@ testcase {
 
 indent  !::= ww
 outdent !::= " "  outdent " "
-           | " "  ([~]*)  "\n"
+           | " "  (~[]*)  "\n"
 
-any      !::= [~]*
-s         ::= !any "\n\n" !ww statement !ww "\n\n" !any => smt
-ww        ::= sp*
+any      !::= ~[]*
+s         ::= any "\n\n" ww statement ww "\n\n" any => smt
+ww       !::= sp*
 ws       !::= sp**
 sp        ::= " "
 
-block     ::= "\n" !indent  blockBody
-           &~ "\n" outdent [~\ ] [~]*
+block     ::= "\n" indent  blockBody
+           &~ "\n" outdent ~[\ ] ~[]*
 
 blockBody ::= statement
             > statement blockBody /ws => "sbb"
@@ -316,3 +318,12 @@ ws        ::= w*
 
 
 }
+
+testcase {
+  input "aa bb";
+  output "{q:{{a a}} q:{{b b}}}";
+
+  s  ::= q */ ws
+  ws ::= " "*
+  q  ::= [a-z]++ => "q"
+}
\ No newline at end of file