Oceani - Cataract Creek version

[ocean] / csrc / oceani-tests.mdc

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 6759c542d6d7dd72093a99babcbcd02fafb26173..49274ebd20be61d88b0eff106f868cc6cc40156a 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -274,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"
@@ -781,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
@@ -917,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
 
@@ -928,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
@@ -1078,7 +1080,7 @@ various places that `type_err()` are called.
 
 ###### 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