X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=a713405e289e0959dffdb2a1dd76d2e4e184bb8f;hp=ce43a849d6efb8280361e4786bf4494d7e5cc234;hb=21740a3a499b34210969ad5f06a1b1dbd80145f3;hpb=6bee7f519f499a92a92a459fd2c903d85de0759c

diff --git a/tests/regression.tc b/tests/regression.tc
index ce43a84..a713405 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -25,23 +25,24 @@ tibcase {
   hello 
     there
     how
-     { are }
+      { are }
 ";
-    output "yep";
+    output "yep:{are}";
 
     s        ::= { Hello } => "yep"
     w        ::= " " | "\n"
     ws      !::= w**
-    Hello    ::= "hello" ws { "there" "how" { { "are" } } }
+    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]++
 }
@@ -61,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     | ()
@@ -76,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,11 +107,12 @@ testcase {
 }
 
 testcase {
-    input  "xbambambam";
-    output "bam:{a bam:{a bam:{a x}}}";
+    input  "qxbambambam";
+    output "bam:{a bam:{a bam:{a x:{x}}}}";
 
-    s ::= a s ^"bam"
-    s ::= ^"x"
+    s ::= "q" z
+    z ::= a z ^"bam"
+    z ::= ^"x"
     a ::= ()       => "a"
 }
 
@@ -283,16 +285,16 @@ testcase {
 
 indent  !::= ww
 outdent !::= " "  outdent " "
-           | " "  ([~]*)  "\n"
+           | " "  (~[]*)  "\n"
 
-any      !::= [~]*
+any      !::= ~[]*
 s         ::= any "\n\n" ww statement ww "\n\n" any => smt
 ww       !::= sp*
 ws       !::= sp**
 sp        ::= " "
 
 block     ::= "\n" indent  blockBody
-           &~ "\n" outdent [~\ ] [~]*
+           &~ "\n" outdent ~[\ ] ~[]*
 
 blockBody ::= statement
             > statement blockBody /ws => "sbb"
@@ -317,3 +319,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