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

diff --git a/tests/regression.tc b/tests/regression.tc
index c2206ee..2537fb9 100644
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -19,23 +19,6 @@
 //    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}}";
@@ -77,8 +60,8 @@ testcase {
     input "aaabbbbccc";
 
     s   ::= ab & dc
-    ab !::= a b       => ab
-    dc !::= d c       => dc
+    ab  ::= a b       => ab
+    dc  ::= d c       => dc
     a   ::= "a" a     | ()
     b   ::= "b" b "c" | ()
     c   ::= "c" c     | ()
@@ -86,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}}";
@@ -229,22 +222,22 @@ 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 "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";
@@ -263,41 +256,54 @@ testcase {
     idl  ::= [a-d]
 }
 
+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()
+//    while y>0
+//       foo()
+//          bar()
+//
 //
 // while x>0
-//   while y>0
-//    foo()
-//   bar()
+//    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}}}}";
+//  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"
 //
-//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 ~[\ ] ~[]*
 //
 //blockBody ::= statement
-//            > statement blockBody /ws => "sbb"
+//            > statement ws blockBody => "sbb"
 //
 //statement ::= call
 //            | ^"while" expr block /ws
@@ -314,17 +320,23 @@ testcase {
 //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}}}";
+    input "abc                         ";
 
-  s  ::= q */ ws
-  ws ::= " "*
-  q  ::= [a-z]++ => "q"
-}
\ No newline at end of file
+    s   ::= q " "* => s
+    q   ::= [a-z] [a-z] [a-z] => a3
+         &~ ~[] "b" ~[]*
+}
+
+testcase {
+    input "abc                         ";
+    output "s:{a b c}";
+
+    s   ::= [a-z] [a-z] [a-z] " "* => s
+}