X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=c359fa8bd598cf64ca696666ff172414ab95a3cf;hp=0dd485332e57f795ad3f092c039d19baff563aab;hb=18dfe61f848a447940ddc58852929f9d00948ab5;hpb=39179e9fe5c616bbe38282bc06ecfa6e15916346

diff --git a/tests/regression.tc b/tests/regression.tc
index 0dd4853..c359fa8 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -19,6 +19,23 @@
 //    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}}";
@@ -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     | ()
@@ -91,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"
@@ -218,7 +235,7 @@ testcase {
     l  ::= id
     s  ::= l "=" r  => "assign"
          | r
-    R  ::= l
+    r  ::= l
          | l "=" r       => "assign"
          | r "+" r       => "plus"
          | (r) "*" r       => "times"
@@ -267,28 +284,29 @@ testcase {
 
 indent  !::= ww
 outdent !::= " "  outdent " "
-           | " "  [~]*    "\n"
+           | " "  ([~]*)  "\n"
 
 any      !::= [~]*
-s         ::= !any "\n\n" !ww Statement !ww "\n\n" !any => smt
-ww        ::= sp*
+s         ::= any "\n\n" ww statement ww "\n\n" any => smt
+ww       !::= sp*
+ws       !::= sp**
 sp        ::= " "
 
-block     ::= "\n" !indent  BlockBody
+block     ::= "\n" indent  blockBody
            &~ "\n" outdent [~\ ] [~]*
 
-BlockBody ::= Statement
-            > Statement BlockBody => "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]++
 
@@ -300,3 +318,12 @@ ws        ::= w*
 
 
 }
+
+testcase {
+  input "aa bb";
+  output "{q:{{a a}} q:{{b b}}}";
+
+  s  ::= q */ ws
+  ws ::= " "*
+  q  ::= [a-z]+ !=> [a-z] => "q"
+}
\ No newline at end of file