X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=37a302e5a506e87654448ed5a50c630295b8d4c1;hp=c359fa8bd598cf64ca696666ff172414ab95a3cf;hb=ceca07b4020b5dd051e0d01767a35842dec2ca74;hpb=56319e11eb20cb67c4221b0d7a2567ec3b2df002

diff --git a/tests/regression.tc b/tests/regression.tc
index c359fa8..37a302e 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -19,30 +19,13 @@
 //    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]++
 }
@@ -107,11 +90,12 @@ testcase {
 }
 
 testcase {
-    input  "xbambambam";
+    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"
 }
 
@@ -263,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()
+   bar()
 
  while x>0
    while y>0
     foo()
-   bar()
+     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}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}} 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}}} while:{>:{{x} {0}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}}}";
 
 indent  !::= ww
 outdent !::= " "  outdent " "
-           | " "  ([~]*)  "\n"
+           | " "  (~[]*)  "\n"
 
-any      !::= [~]*
-s         ::= any "\n\n" ww statement ww "\n\n" any => smt
+w        !::= " " | "\n" | "\r"
+ws       !::= w*
 ww       !::= sp*
-ws       !::= sp**
-sp        ::= " "
+sp       !::= " "
+any      !::= ~[]*
+
+s         ::= ws statement ws statement ws => smt
 
 block     ::= "\n" indent  blockBody
-           &~ "\n" outdent [~\ ] [~]*
+           &~ "\n" outdent ~[\ ] ~[]*
 
 blockBody ::= statement
-            > statement blockBody /ws => "sbb"
+            | statement ws blockBody => "sbb"
 
 statement ::= call
             | ^"while" expr block /ws
@@ -313,17 +310,6 @@ num       ::= [0-9]++
 ident     ::= [a-z]++ &~ keyword
 keyword   ::= "if" | "then" | "else" | "while"
 
-w         ::= " " | "\n" | "\r"
-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