X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=e2ae422917e969aa13f4e13b495f28ffa7f58ebe;hp=c807a7a0041f2833fce5387e4f4bfa280ad10708;hb=526da96dd06e152d194ec92c9ef9df6085a1251b;hpb=6470b3188790f3461508a9f290d70c344c6fedf2

diff --git a/tests/regression.tc b/tests/regression.tc
index c807a7a..e2ae422 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -24,8 +24,8 @@ testcase {
     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 +45,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 +60,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 +90,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,40 +247,53 @@ testcase {
 }
 
 testcase {
+  input "aa bb";
+  output "{q:{{a a}} q:{{b b}}}";
+
+  s  ::= q */ ws
+  ws ::= " "*
+  q  ::= [a-z]++ => "q"
+}
+
+testcase {
 
     input "
 
 
+
  while x>0
-   while y>0
-    foo()
-     bar()
+    while y>0
+       foo()
+          bar()
+
 
  while x>0
-   while y>0
-    foo()
-   bar()
+    while y>0
+          foo()
+        bar()
+
 
 
 ";
-    output "smt:{while:{>:{{x} {0}} while:{>:{{y} {0}} sbb:{{f o o} {b a r}}}}}";
-    output "smt:{while:{>:{{x} {0}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}}}";
+  output "smt:{while:{>:{{x} {0}} while:{>:{{y} {0}} sbb:{{f o o} {b a r}}}} while:{>:{{x} {0}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}}}";
 
 indent  !::= ww
 outdent !::= " "  outdent " "
-           | " "  ([~]*)  "\n"
+           | " "  (~[]*)  "\n"
+
+w        !::= " " | "\n" | "\r"
+ws       !::= w*
+ww       !::= sp*
+sp       !::= " "
+any      !::= ~[]*
 
-any      !::= [~]*
-s         ::= !any "\n\n" !ww statement !ww "\n\n" !any => smt
-ww        ::= sp*
-ws       !::= sp**
-sp        ::= " "
+s         ::= ws statement ws statement ws => smt
 
-block     ::= "\n" !indent  blockBody
-           &~ "\n" outdent [~\ ] [~]*
+block     ::= "\n" indent  blockBody
+           &~ "\n" outdent ~[\ ] ~[]*
 
 blockBody ::= statement
-            > statement blockBody /ws => "sbb"
+            > statement ws blockBody => "sbb"
 
 statement ::= call
             | ^"while" expr block /ws
@@ -296,8 +310,6 @@ num       ::= [0-9]++
 ident     ::= [a-z]++ &~ keyword
 keyword   ::= "if" | "then" | "else" | "while"
 
-w         ::= " " | "\n" | "\r"
-ws        ::= w*
 
 
 }