Oceani - Cataract Creek version

[ocean] / csrc / oceani-tests.mdc

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index b613ffe484133dd040753b3fa27c129635c37839..49274ebd20be61d88b0eff106f868cc6cc40156a 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -66,6 +66,12 @@ arguments separated from the name by commas.  For each test, there is a section
                    ./oceani --noexec --print .tmp.code1a >> .tmp.code2a || exit 1;\
                    if ! cmp -s .tmp.code1 .tmp.code2a; then \
                       echo " Failed"; diff -u .tmp.code1 .tmp.code2a; exit 1; fi ; \
+                   echo -n "brackets.. "; \
+                   echo '``````' > .tmp.code2b ; echo '``````' > .tmp.code2c ;\
+                   ./oceani --noexec --print --brackets .tmp.code1 >> .tmp.code2b || exit 1; \
+                   ./oceani -npb .tmp.code2b >> .tmp.code2c || exit 1 ; \
+                   if ! cmp -s .tmp.code2b .tmp.code2c; then \
+                       echo " Failed"; diff -u .tmp.code2b .tmp.code2c; exit 1; fi; \
                    echo -n "exec-after-print.. "; \
                    ./oceani .tmp.code1 $${1+"$$@"} > .tmp.have ; \
                    if ! cmp -s .tmp.want .tmp.have; then \
@@ -97,7 +103,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.98) exit(1) }' \
+                        if (ran < (ran + skip) *0.99) exit(1) }' \
                        coverage/oceani.mdc.gcov
 
        coverage_oceani: oceani.c
@@ -221,12 +227,11 @@ Test merging of variables from multiple cases
                print
 
                for i:=0; then i=i+1; while i < 5:
-                       switch i:
-                               case 0: num:="zero"
-                               case 1: num:="one"
-                               case 2: num:="two"
-                               case 3: num:="three"
-                               else    num:="many"
+                       switch { use i }
+                               case 0: num:="zero" ;
+                               case 1: num:="one" ;
+                               case 2 { num:="two" } case 3 { num:="three" }
+                               else  num:="many"
                        // re-declare a CondScope variable
                        num := i*i
                        print num,", ",
@@ -269,12 +274,12 @@ Now we need to test if/else and some different loops
                print "error is ", target - guess * guess
 
                for j:=0; then j = j+3 ; while j < 10:
-                       if j != 0 and then 20 / j > 3:
+                       if j != 0 and 20 / j > 3:
                                print "20 /", j," =", 20 / j
                        else
                                print "I won't calculate 20 /", j
                pi ::= 3.1415926535897
-               if 355/113 == pi or else +(pi - 355/113) < 0.001:
+               if 355/113 == pi or +(pi - 355/113) < 0.001:
                        print "Close enough"
                print "lower" if 355/113 < pi else "higher"
                print "higher" if 355/113 > pi else "lower"
@@ -296,6 +301,19 @@ Now we need to test if/else and some different loops
                else
                        print 'larger'
 
+               // different parsing options
+               for {
+                       x:=1; sum := 0
+               } then {
+                       x = x + 1
+               } while {
+                       use x < 10 
+               } do {
+                       sum = sum + x
+               } case 1 {
+                       print "impossible"
+               }
+
 ###### output: cond_loop
        Success
         1 2 4 8 16 32 64
@@ -610,6 +628,11 @@ Time to test if structure declarations and accesses work correctly.
                active:Boolean = True
 
        struct baz { a:number; b:Boolean; }
+       struct bat {
+               a:string
+               b:Boolean
+       }
+       struct bat2 a:string; b:Boolean
 
        func main
        do
@@ -630,6 +653,8 @@ Time to test if structure declarations and accesses work correctly.
                for i:=0; then i=i+1; while i < 4:
                        print info[i].name, info[i].active, info[i].size[0]
                info[0].thing.b = True
+               x:bat
+               x.a = "Hello"
 
 ###### output: structs
 
@@ -687,6 +712,22 @@ Test functions.  They don't return anything, so we need to get them to print
                angular := to_polar(32, 23)
                print angular.rho, angular.theta
 
+       func test2(n:number; s:string;) : (ret:number)
+               ret = n + $s
+
+       func random
+       return
+               n:number
+       do
+               n = 4 // xkcd:221
+
+       // exercise the parsing options
+       func t1 (a:number) {
+               print "t1"
+       }
+       func t2 (a:string) {print "string"}
+       func t3() print "t3"
+
 ###### output: functions
        done
        1  done
@@ -740,7 +781,7 @@ A simple linked list example
 
        func insert(list:@linkage; new:string)
                p:=list
-               while ?p.next and then p.next.this < new:
+               while ?p.next and p.next.this < new:
                        p = p.next.list
                t:@node = @new()
                t.list.next = p.next
@@ -876,7 +917,7 @@ various places that `type_err()` are called.
 
        func main()
                print "hello" ++ 5, 5 ++ "hello"
-
+               hello := "there"; print 4+hello
                b ::= 3
                b = b + 1
 
@@ -887,6 +928,8 @@ various places that `type_err()` are called.
 ###### output: type_err1
        .tmp.code:3:25: error: expected string found number
        .tmp.code:3:28: error: expected string found number
+       .tmp.code:4:34: error: expected number but variable 'hello' is string
+       .tmp.code:4:8: info: this is where 'hello' was set to string
        .tmp.code:6:8: error: Cannot assign to a constant: b
        .tmp.code:5:8: info: name was defined as a constant here
        .tmp.code:8:11: error: Arithmetic returns number but Boolean expected
@@ -922,7 +965,7 @@ various places that `type_err()` are called.
 
        struct foo
                a: number
-               b:string = "hello"
+               b:string = "hello"; d:Boolean
 
        func main()
                c := "hello"
@@ -1033,10 +1076,12 @@ various places that `type_err()` are called.
                b:string
        struct foo
                c:number
+               x:[5]:string
 
 ###### output: type_err5
        .tmp.code:8:7: error: type already declared: foo
-       .tmp.code:2:7: info: this is location of declartion: foo
+       .tmp.code:2:7: info: this is location of declaration: foo
+       .tmp.code:10:13: Syntax error in struct field: :
        .tmp.code:5:7: error: type has recursive definition: baz
        .tmp.code:2:7: error: type has recursive definition: foo