X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=f0815a8971ed8f9766b9685c74315898f0a29fb8;hp=32e8a59273fc1b5d5a51d079ee7c0f83a9924b94;hb=f33c05adc5aa3dd324c5352cdbd6f4b55359acad;hpb=6f3b1ab733a3081bdd6a99cb1f9fd9e7c8dfeea9

diff --git a/tests/regression.tc b/tests/regression.tc
index 32e8a59..f0815a8 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -19,13 +19,30 @@
 //    s ::= ()       => s0
 //}
 
+tibcase {
+    input 
+"
+  hello 
+    there
+    how
+      { are }
+";
+    output "yep:{are}";
+
+    s        ::= { Hello } => "yep"
+    w        ::= " " | "\n"
+    ws      !::= w**
+    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]++
 }
@@ -45,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     | ()
@@ -60,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     | ()
@@ -90,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"
 }
 
@@ -246,6 +264,15 @@ testcase {
 }
 
 testcase {
+  input "aa bb";
+  output "{q:{{a a}} q:{{b b}}}";
+
+  s  ::= q */ ws
+  ws ::= " "*
+  q  ::= [a-z]++ => "q"
+}
+
+testcase {
 
     input "
 
@@ -267,29 +294,29 @@ 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"
+blockBody ::= statement
+            > statement blockBody /ws => "sbb"
 
-Statement ::= Call
-            | ^"while" Expr block
+statement ::= call
+            | ^"while" expr block /ws
 
-Expr      ::= ident
-            | Call
-            | Expr ^">" Expr
+expr      ::= ident
+            | call
+            | expr ^">" expr   /ws
             | num
 
-Call      ::= Expr "()"
+call      ::= expr "()"        /ws
 
 num       ::= [0-9]++