oceani: add more syntax error handling.

[ocean] / csrc / oceani-tests.mdc

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 5be4c5aa89d488467463974cb5a7c28f5a76c495..a10d0271fab3291f8251de230891ad1c3312b07e 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -38,8 +38,10 @@ arguments separated from the name by commas.  For each test, there is a section
 
        tests:: oceani_test_suite
        oceani_test_suite: oceani coverage_oceani
-               @./parsergen --report --LR1 --tag Parser oceani.mdc | grep " - no conflicts" > /dev/null || \
-                   { echo "Grammar container conflicts, please review" ; exit 1; }
+               @echo -n Checking grammar ...
+               @./parsergen --report --LALR --tag Parser oceani.mdc | grep " - no conflicts" > /dev/null || \
+                   { echo "Grammar contains conflicts, please review" ; exit 1; }
+               @echo ok
                @rm -rf coverage; mkdir -p coverage
                @cp *.gcno coverage
                @for T in $(oceani_tests); do \
@@ -70,7 +72,7 @@ arguments separated from the name by commas.  For each test, there is a section
                @mv *.gcov coverage ; [ -f .gcov ] && mv .gcov coverage
                @ awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
                    END {printf "coverage: %6.2f%%\n", ran * 100 / (ran + skip); \
-                        if (ran < (ran + skip) *0.93) exit(1) }' \
+                        if (ran < (ran + skip) *0.94) exit(1) }' \
                        coverage/oceani.mdc.gcov
                @rm -f .tmp*
 
@@ -98,7 +100,6 @@ calculations on them.
 ###### test list
        oceani_tests += "valvar"
 
-
 ###### test: valvar
 
        program:
@@ -115,6 +116,13 @@ calculations on them.
 
                aconst :: string = "unchanging"
 
+               // Check wrapping
+               print
+                 a + b
+                 + (a*2)
+                 + b1
+                 + b
+
 ###### output: valvar
 
        23 12 35 11 276 1.91667 11
@@ -122,6 +130,7 @@ calculations on them.
        23 12 12 -23 -12 12
        False True True False False False
        This is a string  field theory This is a string field theory
+       81
 
 Next we change the value of variables
 
@@ -147,7 +156,7 @@ Now some contants
 
 ###### test: consts
        const:
-               pi ::= 3.1415926
+               pi ::= 3.141 592 653
                four ::= 2 + 2 ; five ::= 10/2
        const pie ::= "I like Pie";
                cake ::= "The cake is"
@@ -247,12 +256,12 @@ The demonstration code presented in the interpreted is suitable for the test sui
 Here I break it into two parts, keeping the array code separate.
 
 ###### test list
-       oceani_tests += "sayhello,55,33"
-       oceani_tests += "sayhello,12,60"
+       oceani_tests += "sayhello,55,33,hello,True"
+       oceani_tests += "sayhello,12,60,there,False"
 
 ###### test: sayhello
 
-       program A B:
+       program A B astr bbool:
                print "Hello World, what lovely oceans you have!"
                /* When a variable is defined in both branches of an 'if',
                 * and used afterwards, the variables are merged.
@@ -299,6 +308,11 @@ Here I break it into two parts, keeping the array code separate.
                        f2 = f3
                print ""
 
+               if bbool:
+                       print astr ++ " was the str"
+               else:
+                       print "I found the str over " ++ astr
+
                /* Binary search... */
                for:
                        lo:= 0; hi := 100
@@ -320,20 +334,22 @@ Here I break it into two parts, keeping the array code separate.
                case GiveUp:
                        print "Closest I found was", mid
 
-###### output: sayhello,55,33
+###### output: sayhello,55,33,hello,True
        Hello World, what lovely oceans you have!
        Is 55 bigger than 33 ?  yes
        double 33 is 66
        GCD of 55 and 33 is 11
        Fibonacci: 1 1 2 3 5 8 13 21 34 55 89 144
+       hello was the str
        Closest I found was 77.3438
 
-###### output: sayhello,12,60
+###### output: sayhello,12,60,there,False
        Hello World, what lovely oceans you have!
        Is 12 bigger than 60 ?  no
        double 60 is 120
        GCD of 12 and 60 is 12
        Fibonacci: 1 1 2 3 5 8 13 21 34 55 89 144
+       I found the str over there
        Closest I found was 77.3438
 
 ###### test list
@@ -342,7 +358,7 @@ Here I break it into two parts, keeping the array code separate.
        program:
                size::=55
                list:[size]number
-               list[0] = 1234
+               list[0] = 1_234
                for i:=1; then i = i + 1; while i < size:
                        n := list[i-1] * list[i-1]
                        list[i] = (n / 100) % 10000
@@ -579,8 +595,7 @@ separate file first, then run from there.
                if then else while do
 
 ###### output: syn1
-       .tmp.code:3:11: error: unhandled parse error: then
-       oceani: no program found.
+       .tmp.code:3:11: Syntax error in statement: then
 
 ###### test: tokerr
        program:
@@ -779,9 +794,8 @@ various places that `type_err()` are called.
                print foo, bar
 
 ###### output: type_err_const1
-       .tmp.code:3:12: error: unhandled parse error: :
-       oceani: no program found.
-
+       .tmp.code:3:12: Syntax error in constant: :
+       .tmp.code:4:8: Syntax error in constant: bar
 
 ## Test erroneous command line args
 
@@ -805,7 +819,6 @@ command list possible.
            ./coverage_oceani $${1+"$$@"} > /dev/null 2>&1 ;\
        done || true
 
-
 ###### test list
        oceani_special_tests += "cmd"
        oceani_special_tests += "cmd,-zyx"