X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=f13accf654f6c51ff79ee8af64f7d32a849357a3;hp=cdad8315c69aec0b073e782755d30ae295679df6;hb=22a2ca7685dcf29e9ddcc6e26443ea0277385fca;hpb=225993309e6183afa9a88fc13d39df56be54b992

diff --git a/tests/regression.tc b/tests/regression.tc
index cdad831..f13accf 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -1,38 +1,8 @@
-//testcase {
-//    input  "x";
-//    output "a1:{x}";
-//
-//    s   = a1:: a
-//    a   = s1:: s
-//    a   = ^"x"
-//}
-//
-//testcase {
-//    input  "x";
-//    output "x";
-//    output "s2:{s2:{s0 s0} x}";
-//    output "s2:{s0 x}";
-//
-//
-//    s   = s2:: s s
-//    s   = ^"x"
-//    s   = s0:: ()
-//}
-
 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
-      | ()
+      | "a" A &~ "a" s
 }
 
 testcase {
@@ -40,8 +10,8 @@ testcase {
     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]++
 }
@@ -91,37 +61,16 @@ testcase {
     x     = ~[]
     s     = xbx:: x* b x*
     b     = abab:: [ab][ab]
-         &~ ( "aa" | "bb" )
-}
-
-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]
+         &~ ("aa"|"bb")
 }
 
 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:: ()
 }
 
@@ -143,7 +92,7 @@ testcase {
 
     s   = ^"q" x "q"
     x   = ^"a" a
-    x   = epsilon:: ()
+        | epsilon:: ()
     a   = s1:: x
 }
 
@@ -190,7 +139,7 @@ testcase {
     output "s:{aa:{aa:{a b} b}}";
     s   = s:: "b" a
     a   = aa:: "a" a b
-    a   = a:: ()
+        | a:: ()
     b   = b:: ()
 }
 
@@ -198,10 +147,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::  ()
 }
 
@@ -238,23 +187,6 @@ testcase {
     idl    = [a-d]
 }
 
-//testcase {
-//    input "a*b*c";
-//    output "times:{stringify:{{a}} times:{stringify:{{b}} stringify:{{c}}}}";
-//    w    = " "
-//    l    = id
-//    s    = l "=" r  => "assign"
-//         | r
-//    r    = l
-//         | l "=" r       => "assign"
-//         | r "+" r       => "plus"
-//         | (r) "*" r       => "times"
-//         | "(" r ")"
-//         | r r           => "times"
-//    id     = idl++       => "stringify"
-//    idl    = [a-d]
-//}
-
 testcase {
     input "a+b*c";
     output "plus:{stringify:{{a}} times:{stringify:{{b}} stringify:{{c}}}}";
@@ -305,18 +237,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
@@ -340,14 +272,12 @@ keyword     = "if" | "then" | "else" | "while"
 
 }
 
-
-
 testcase {
     input "abc                         ";
 
     s     = s2:: q " "*
     q     = a3:: [a-z] [a-z] [a-z]
-         &~ ~[] "b" ~[]*
+         &~ (~[])! "b" ((~[])*)!
 }
 
 testcase {
@@ -372,6 +302,7 @@ testcase {
 testcase {
     input "aaaaa";
     output "top:{a q:{{a a a}} a}";
+
     s = top:: z (q::"a"*) z
     z = a:: "a"
 }
@@ -384,7 +315,81 @@ 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]
+}
+
+// make sure follow restrictions are honored
+// when a string matches the empty string
+testcase {
+  input "xxx";
+  s = x:: "x" A "x" C "x"
+  A = B
+  B = "y"
+    | () -> ~"x"
+  C = D -> ~"x"
+  D = ()
+}
+
+testcase {
+  input "axxxxxc";
+  output "q:{a {x x x x x} c}";
+  s  = q:: A ws B? ws C
+  ws = [x]**
+  A  = a:: "a"
+  B  = b:: "b"
+  C  = c:: "c"
+}
+
+testcase {
+  input "aaaaaaaaaaaaaaaaaaaa";
+  output "";
+  s = As & AAs
+  As = () | As "a"
+  AAs = () | AAs "aa"
+}
+
+// pathological O(n^2) behavior
+testcase {
+  input "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+  output "x";
+          s = x:: ManyA!
+     ManyA =  ()
+            | x:: A ManyA
+          A = ()! ("a" & ManyAB)
+    ManyAB = ()
+            | "a" ManyAB
+            | "b" ManyAB
+
+}
+
+// another O(n^2) example, tickles different epsilon behaviors
+testcase {
+  input "aaaa";
+  output "x:{x:{x:{x}}}";
+  s = x:: s A! | ()
+  A = "a" & B
+  B = () | B "a"
+}