X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=33510182e1d2dcc8e10c45aafebbc3f63db2f897;hp=77af77193dc5646ba29fd34aa5764dd1124cd636;hb=a8478f5ddfbfbc8d910d09f27163cbd55752d3b6;hpb=474037fe8463b96dfaf0209be157cbf5223a0910

diff --git a/tests/regression.tc b/tests/regression.tc
index 77af771..3351018 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -1,6 +1,6 @@
 //testcase {
 //    input  "x";
-//    output "a1:{x}";
+//    output "a:{x}";
 //
 //    s   = a1:: a
 //    a   = s1:: s
@@ -20,12 +20,28 @@
 //}
 
 testcase {
+    input "aaaaa";
+    s = A
+    A = "a" s &~ "a" A
+      | "a" A &~ "a" s
+}
+
+//testcase {
+//    input  "a";
+//    output "yes:{}";
+//    s = A
+//    A = "a" s &~ "a" A
+//      | "a" A &~ "a" s
+//      | ()
+//}
+
+testcase {
     input "ab c";
     output "1:{{a b} {c}}";
 
     s     = ids
-    ids   = "1":: id (" " ids &~ id ~[]*)
-          | "2":: id (    ids &~ id ~[]*)
+    ids   = "1":: id (" " ids &~ id ((~[])*)!)
+          | "2":: id (    ids &~ id ((~[])*)!)
           | id
     id    = [a-z]++
 }
@@ -79,33 +95,12 @@ testcase {
 }
 
 testcase {
-    input "12111211";
-    output "ac:{{2 1 2 1}}";
-    //output "a:{{2 1 2 1}}";
-    //output "c:{{c:{1 1} c:{1 1}}}";
-
-    s   = ab:: ab
-        | ac:: ac
-        | bc:: bc
-        //| a  =>  "a"
-        //| b  =>  "b"
-        //| c  =>  "c"
-    ab   = a & b
-    ac   = a & c
-    bc   = b & c
-    a   = ("1" x)*
-    b   = ("b":: x "2")*
-    c   = ("c":: x "2" x "1")*
-    x   = [123]
-}
-
-testcase {
     input  "qxbambambam";
-    output "bam:{a bam:{a bam:{a x:{x}}}}";
+    output "bam:{a bam:{a bam:{a x}}}";
 
     s   = "q" z
     z   = a z ^"bam"
-    z   = ^"x"
+        | ^"x"
     a   = a:: ()
 }
 
@@ -127,7 +122,7 @@ testcase {
 
     s   = ^"q" x "q"
     x   = ^"a" a
-    x   = epsilon:: ()
+        | epsilon:: ()
     a   = s1:: x
 }
 
@@ -174,7 +169,7 @@ testcase {
     output "s:{aa:{aa:{a b} b}}";
     s   = s:: "b" a
     a   = aa:: "a" a b
-    a   = a:: ()
+        | a:: ()
     b   = b:: ()
 }
 
@@ -182,10 +177,10 @@ testcase {
     input "aaab";
     output "sx:{b aa:{aa:{b b} b}}";
     s   = sx:: b d "a" "b"
-    s   = sy:: "a" d "a" d
+        | sy:: "a" d "a" d
     d   = aa:: "a" a b
     a   = aa:: "a" b b
-    a   = a::  ()
+        | a::  ()
     b   = b::  ()
 }
 
@@ -289,18 +284,18 @@ testcase {
 
 indent    = ww
 outdent   = " "  outdent " "
-          | " "  (~[]*)  "\n"
+          | " "  ((~[])*)  "\n"
 
 w          = " " | "\n" | "\r"
 ws         = w*
 ww         = sp*
 sp         = " "
-any        = ~[]*
+any        = (~[])*
 
-s          = smt:: !ws statement !ws statement !ws
+s          = smt:: ws! statement ws! statement ws!
 
-block       =        !"\n" !indent  blockBody
-           &~        !"\n" !outdent !(~[\ ]) !(~[]*)
+block       =        "\n"! indent!  blockBody
+           &~        "\n"! (" " outdent! " ") (~[\ ])! ((~[])*)!
 
 blockBody   =       statement
             > sbb:: statement ws blockBody
@@ -331,7 +326,7 @@ testcase {
 
     s     = s2:: q " "*
     q     = a3:: [a-z] [a-z] [a-z]
-         &~ ~[] "b" ~[]*
+         &~ (~[])! "b" ((~[])*)!
 }
 
 testcase {
@@ -356,6 +351,7 @@ testcase {
 testcase {
     input "aaaaa";
     output "top:{a q:{{a a a}} a}";
+
     s = top:: z (q::"a"*) z
     z = a:: "a"
 }
@@ -368,7 +364,78 @@ testcase {
     Expr   = if::     "if" "(" Expr ")" IfBody     /ws
            | ident::  [a-z]++
     IfBody = else::   Expr            "else"  Expr /ws
-           | then::   Expr &~   (~[]* "else" !Expr /ws)
+           | then::   Expr &~   ((~[])* "else" Expr! /ws)
     ws     = [ ]**
 }
 
+
+testcase {
+    input "12111211";
+    output "ac:{{2 1 2 1}}";
+    //output "a:{{2 1 2 1}}";
+    //output "c:{{c:{1 1} c:{1 1}}}";
+
+    s   = ab:: ab
+        | ac:: ac
+        | bc:: bc
+        //| a  =>  "a"
+        //| b  =>  "b"
+        //| c  =>  "c"
+    ab   = a & b
+    ac   = a & c
+    bc   = b & c
+    a   = ("1" x)*
+    b   = ("b":: x "2")*
+    c   = ("c":: x "2" x "1")*
+    x   = [123]
+}
+
+
+//testcase {
+//    input "ab";
+//    
+//    s = a:"a" b:"b"
+//}
+
+
+testcase {
+    input "a c";
+    s = first::  A WSA B? WSB C
+    A = "a"
+    B = "b"
+    C = "c"
+  WSA = WSA:: " "**
+  WSB = () -> ~" "
+      | WSB:: " "++
+}
+
+//testcase {
+//    input "aaaaaXaaaa";
+//    output "";
+//          s = ManyA &~ EndsWithZ
+//  EndsWithZ = Anything "Z"
+//      ManyA = () | "a" ManyA
+//   Anything = () | ("a" | "X" | "Z") Anything
+//}
+
+testcase {
+    input "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    output "";
+          s = ManyA
+      ManyA = ()
+            | A ManyA! & ManyAB
+          A = "a"
+     ManyAB = ()
+            | "a" ManyAB
+            | "b" ManyAB
+}
+
+testcase {
+  input "aaaaaaaa";
+  output "";
+  s = As & AAs
+  As = () | As "a"
+  AAs = () | AAs "aa"
+}
+
+