X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=c2206eecd9762327bd76ed8aa212579a9f877ebd;hp=0d4b8d405e17e6b071beec1d48d00f87a2e82c58;hb=6c2a17e674b32389d281261796e9e962e9d9380c;hpb=ad0974ef59fc62ab06a78795a65e68238426edd0

diff --git a/tests/regression.tc b/tests/regression.tc
index 0d4b8d4..c2206ee 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -27,7 +27,7 @@ tibcase {
     how
       { are }
 ";
-    output "yep";
+    output "yep:{are}";
 
     s        ::= { Hello } => "yep"
     w        ::= " " | "\n"
@@ -35,13 +35,14 @@ tibcase {
     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]++
 }
@@ -61,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     | ()
@@ -76,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     | ()
@@ -106,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"
 }
 
@@ -261,59 +263,68 @@ testcase {
     idl  ::= [a-d]
 }
 
-testcase {
-
-    input "
-
-
- while x>0
-   while y>0
-    foo()
-     bar()
-
- while x>0
-   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}}}}";
-
-indent  !::= ww
-outdent !::= " "  outdent " "
-           | " "  ([~]*)  "\n"
-
-any      !::= [~]*
-s         ::= any "\n\n" ww statement ww "\n\n" any => smt
-ww       !::= sp*
-ws       !::= sp**
-sp        ::= " "
-
-block     ::= "\n" indent  blockBody
-           &~ "\n" outdent [~\ ] [~]*
-
-blockBody ::= statement
-            > statement blockBody /ws => "sbb"
-
-statement ::= call
-            | ^"while" expr block /ws
-
-expr      ::= ident
-            | call
-            | expr ^">" expr   /ws
-            | num
-
-call      ::= expr "()"        /ws
-
-num       ::= [0-9]++
-
-ident     ::= [a-z]++ &~ keyword
-keyword   ::= "if" | "then" | "else" | "while"
-
-w         ::= " " | "\n" | "\r"
-ws        ::= w*
+//testcase {
+//
+//    input "
+//
+//
+// while x>0
+//   while y>0
+//    foo()
+//     bar()
+//
+// while x>0
+//   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}}}}";
+//
+//indent  !::= ww
+//outdent !::= " "  outdent " "
+//           | " "  (~[]*)  "\n"
+//
+//any      !::= ~[]*
+//s         ::= any "\n\n" ww statement ww "\n\n" any => smt
+//ww       !::= sp*
+//ws       !::= sp**
+//sp        ::= " "
+//
+//block     ::= "\n" indent  blockBody
+//           &~ "\n" outdent ~[\ ] ~[]*
+//
+//blockBody ::= statement
+//            > statement blockBody /ws => "sbb"
+//
+//statement ::= call
+//            | ^"while" expr block /ws
+//
+//expr      ::= ident
+//            | call
+//            | expr ^">" expr   /ws
+//            | num
+//
+//call      ::= expr "()"        /ws
+//
+//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]++ => "q"
+}
\ No newline at end of file