oceani: improve test coverage

[ocean] / csrc / oceani-tests.mdc

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 958575c63cb4e1860d4fb88d1501df726b8fc8a7..6d513487e619bc695ed3b25fd6048c789971a745 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -97,7 +97,7 @@ arguments separated from the name by commas.  For each test, there is a section
                ## valgrind test code
                @[ -n "$$SKIP_COVERAGE_CHECK" ] || awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
                    END {printf "coverage: %6.2f%%\n", ran * 100 / (ran + skip); \
-                        if (ran < (ran + skip) *0.972) exit(1) }' \
+                        if (ran < (ran + skip) *0.98) exit(1) }' \
                        coverage/oceani.mdc.gcov
 
        coverage_oceani: oceani.c
@@ -113,7 +113,7 @@ calculations on them.
 
 ###### test: valvar
 
-       func main(argv:[argc::]string)
+       func main(argv:[]string)
                a := 23; b:=12 ; b1 := -b
                print a, b, a+b, a-b, a*b, a/b, a%b
                print a<b, a<=b, a>b, a>=b, a<a, a==b, a==a
@@ -142,6 +142,9 @@ calculations on them.
                        print "z??False", z??False, "w??False", w??False
                if ?w:
                        print "Weird?"
+               print $"-34.56", $"not-a-number"
+               print $"4i"
+               if True { pass; pass }
 
 ###### output: valvar
 
@@ -154,6 +157,9 @@ calculations on them.
        w??z True
        z??w True
        z??False True w??False False
+       -34.56 0
+       Unsupported suffix: 4i
+       4
 
 Next we change the value of variables
 
@@ -271,6 +277,7 @@ Now we need to test if/else and some different loops
                if 355/113 == pi or else +(pi - 355/113) < 0.001:
                        print "Close enough"
                print "lower" if 355/113 < pi else "higher"
+               print "higher" if 355/113 > pi else "lower"
 
                if pi > 3 then print "pi exceeds three"; else print "need more pie"
                if (pi < 3) { print "not enough pi" } else { print "pi sufficient" }
@@ -303,6 +310,7 @@ Now we need to test if/else and some different loops
        I won't calculate 20 / 9
        Close enough
        higher
+       higher
        pi exceeds three
        pi sufficient
        sum 1..10 is 55
@@ -319,10 +327,11 @@ Here I break it into two parts, keeping the array code separate.
 
 ###### test: sayhello
 
-       func main(av:[ac::number]string)
+       func main(av:[]string)
                A := $av[1]; B := $av[2]
                astr := av[3]
-               bbool := av[ac-1] == "True"
+               l := av[]
+               bbool := av[l-1] == "True"
                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.
@@ -596,7 +605,7 @@ Time to test if structure declarations and accesses work correctly.
        const three ::= 3
        struct foo
                size:[three]number
-               name:string
+               name:string = "Hello"
                thing:baz
                active:Boolean = True
 
@@ -749,12 +758,12 @@ A simple linked list example
                        freelist(lp)
                        @free = list.next
 
-       func main(argv:[ac::]string)
+       func main(argv:[]string)
                list : linkage
 
                insert(list, "@start");
                insert(list, "~end")
-               for i:=1; then i=i+1; while i < ac:
+               for i:=1; then i=i+1; while i < argv[]:
                        insert(list, argv[i])
                insert(list, "Hello!")
                printlist(list)
@@ -948,6 +957,9 @@ various places that `type_err()` are called.
                while 1 if True else False:
                        print
                case 2: print "two"
+               print "one" ++ a4[], c[]
+
+               x:Boolean = $"42"
 
 ###### output: type_err3
        .tmp.code:8:12: error: expected number but variable 'c' is string
@@ -983,6 +995,10 @@ various places that `type_err()` are called.
        .tmp.code:34:14: error: cannot find requested field in foo
        .tmp.code:35:17: error: have string but need number
        .tmp.code:38:29: error: expected number found Boolean
+       .tmp.code:41:23: error: have number but need string
+       .tmp.code:41:29: error: string cannot provide length
+       .tmp.code:43:21: error: Can only convert string to number, not Boolean
+       .tmp.code:43:8: info: variable 'x' was set as Boolean here.
        oceani: type error in program - not running.
 
 ###### test: type_err4