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

diff --git a/tests/regression.tc b/tests/regression.tc
index 0dd4853..ae452e9 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     | ()
@@ -69,6 +69,16 @@ testcase {
 }
 
 testcase {
+    input "aabb";
+    output "xbx:{abab:{a b}}";
+
+    x  !::= ~[]
+    s   ::= x* b x* => xbx
+    b   ::= [ab][ab] => abab
+         &~ ( "aa" | "bb" )
+}
+
+testcase {
     input "12111211";
     output "ac:{{2 1 2 1}}";
     //output "a:{{2 1 2 1}}";
@@ -90,11 +100,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"
 }
 
@@ -218,7 +229,7 @@ testcase {
     l  ::= id
     s  ::= l "=" r  => "assign"
          | r
-    R  ::= l
+    r  ::= l
          | l "=" r       => "assign"
          | r "+" r       => "plus"
          | (r) "*" r       => "times"
@@ -246,57 +257,70 @@ testcase {
 }
 
 testcase {
+  input "aa bb";
+  output "{q:{{a a}} q:{{b b}}}";
 
-    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*
-sp        ::= " "
-
-block     ::= "\n" !indent  BlockBody
-           &~ "\n" outdent [~\ ] [~]*
-
-BlockBody ::= Statement
-            > Statement BlockBody => "sbb"
-
-Statement ::= Call
-            | ^"while" Expr block
-
-Expr      ::= ident
-            | Call
-            | Expr ^">" Expr
-            | num
-
-Call      ::= Expr "()"
-
-num       ::= [0-9]++
-
-ident     ::= [a-z]++ &~ keyword
-keyword   ::= "if" | "then" | "else" | "while"
-
-w         ::= " " | "\n" | "\r"
-ws        ::= w*
-
-
+  s  ::= q */ ws
+  ws ::= " "*
+  q  ::= [a-z]++ => "q"
 }
+
+//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}}}} while:{>:{{x} {0}} sbb:{while:{>:{{y} {0}} {f o o}} {b a r}}}}";
+//
+//indent  !::= ww
+//outdent !::= " "  outdent " "
+//           | " "  (~[]*)  "\n"
+//
+//w        !::= " " | "\n" | "\r"
+//ws       !::= w*
+//ww       !::= sp*
+//sp       !::= " "
+//any      !::= ~[]*
+//
+//s         ::= ws statement ws statement ws => smt
+//
+//block     ::= "\n" indent  blockBody
+//           &~ "\n" outdent ~[\ ] ~[]*
+//
+//blockBody ::= statement
+//            > statement ws blockBody => "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"
+//
+//
+//
+//}
+//
\ No newline at end of file