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

diff --git a/tests/regression.tc b/tests/regression.tc
index 2aba4b1..863b62e 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     | ()
@@ -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"
@@ -182,11 +199,11 @@ testcase {
     input "a+(b*c)";
     output "+:{{a} *:{{b} {c}}}";
 
-    s   ::= R
-    R   ::= id
-          | R ^"*" R
-          | R ^"+" R
-          | "(" R ")"
+    s   ::= r
+    r   ::= id
+          | r ^"*" r
+          | r ^"+" r
+          | "(" r ")"
     id  ::= [a-z]++
 }
 
@@ -197,17 +214,16 @@ testcase {
     output "plus:{stringify:{{a}} times:{minus:{stringify:{{b}} stringify:{{d}}} stringify:{{c}}}}";
     output "times:{minus:{plus:{stringify:{{a}} stringify:{{b}}} stringify:{{d}}} stringify:{{c}}}";
     output "minus:{plus:{stringify:{{a}} stringify:{{b}}} times:{stringify:{{d}} stringify:{{c}}}}";
-    s  ::= S
     w  ::= " "
-    L  ::= id
-    S  ::= L "=" Q  => "assign"
-         | Q
-    Q  ::= id
-         | L "=" Q       => "assign"
-         | Q "-" Q       => "minus"
-         | Q "+" Q       => "plus"
-         | Q "*" Q       => "times"
-         | "(" Q ")"
+    l  ::= id
+    s  ::= l "=" q  => "assign"
+         | q
+    q  ::= id
+         | l "=" q       => "assign"
+         | q "-" q       => "minus"
+         | q "+" q       => "plus"
+         | q "*" q       => "times"
+         | "(" q ")"
     id   ::= idl++       => "stringify"
     idl  ::= [a-d]
 }
@@ -215,17 +231,16 @@ testcase {
 testcase {
     input "a*b*c";
     output "times:{stringify:{{a}} times:{stringify:{{b}} stringify:{{c}}}}";
-    s  ::= S
     w  ::= " "
-    L  ::= id
-    S  ::= L "=" R  => "assign"
-         | R
-    R  ::= L
-         | L "=" R       => "assign"
-         | R "+" R       => "plus"
-         | (R) "*" R       => "times"
-         | "(" R ")"
-         | R R           => "times"
+    l  ::= id
+    s  ::= l "=" r  => "assign"
+         | r
+    r  ::= l
+         | l "=" r       => "assign"
+         | r "+" r       => "plus"
+         | (r) "*" r       => "times"
+         | "(" r ")"
+         | r r           => "times"
     id   ::= idl++       => "stringify"
     idl  ::= [a-d]
 }
@@ -233,17 +248,16 @@ testcase {
 testcase {
     input "a+b*c";
     output "plus:{stringify:{{a}} times:{stringify:{{b}} stringify:{{c}}}}";
-    s  ::= S
     w  ::= " "
-    L  ::= id
-    S  ::= L "=" R  => "assign"
-         | R
-    R  ::= L
-         | L "=" R       => "assign"
-         | R "+" R       => "plus"
-         > R "*" R       => "times"
-         | "(" R ")"
-         | R R           => "times"
+    l  ::= id
+    s  ::= l "=" r  => "assign"
+         | r
+    r  ::= l
+         | l "=" r       => "assign"
+         | r "+" r       => "plus"
+         > r "*" r       => "times"
+         | "(" r ")"
+         | r r           => "times"
     id   ::= idl++       => "stringify"
     idl  ::= [a-d]
 }
@@ -270,28 +284,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 => "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]++
 
@@ -303,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