oceani: assignment to a pointer can take an address.

[ocean] / csrc / oceani-tests.mdc

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 1a36534abf4ba13b6079e4f80ecc22132ecc1b46..c990bad78a101383f5aa942537b5bbbecf96f4d0 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -723,44 +723,43 @@ A simple linked list example
 
 ###### test: linked_list
 
-       struct node
+       struct linkage
                next: @node
+       struct node
+               list: linkage
                this: string
 
-       func insert(list:@node; new:string):@node
+       func insert(list:@linkage; new:string)
                p:=list
-               prev := @nil
-               while ?p and then p.this < new:
-                       prev = p
-                       p = p.next
-               if ?prev:
-                       prev.next = @new()
-                       prev.next.next = p
-                       prev.next.this = new
-               else
-                       list = @new()
-                       list.next = p
-                       list.this = new
-               use list
-
-       func printlist(list:@node)
-               while ?list:
-                       print list@.this
-                       list = list@.next
-
-       func freelist(list:@node)
-               if list != @nil:
-                       freelist(list.next)
-                       @free = list
+               while ?p.next and then p.next.this < new:
+                       p = p.next.list
+               t:@node = @new()
+               t.list.next = p.next
+               t.this = new
+               p.next = t;
+
+       func printlist(list:@linkage)
+               while ?list.next:
+                       print list@.next.this
+                       list = list@.next.list
+
+       func freelist(list:@linkage)
+               if list.next != @nil:
+                       lp:@linkage = list.next.list
+                       freelist(lp)
+                       @free = list.next
 
        func main(argv:[ac::]string)
-               list := insert(@nil, "@start")
-               list = insert(list, "~end")
+               list : linkage
+               lp:@linkage = list
+
+               insert(lp, "@start");
+               insert(lp, "~end")
                for i:=1; then i=i+1; while i < ac:
-                       list = insert(list, argv[i])
-               list = insert(list, "Hello!")
-               printlist(list)
-               freelist(list)
+                       insert(lp, argv[i])
+               insert(lp, "Hello!")
+               printlist(lp)
+               freelist(lp)
 
 ###### output: linked_list,one,two,three,four
        @start
@@ -957,6 +956,7 @@ various places that `type_err()` are called.
        .tmp.code:8:12: error: Arithmetic returns number but string expected
        .tmp.code:7:8: info: variable 'c' was set as string here.
        .tmp.code:9:24: error: Boolean operation found where string expected
+       .tmp.code:7:8: info: variable 'c' was set as string here.
        .tmp.code:10:12: error: Comparison returns Boolean but string expected
        .tmp.code:7:8: info: variable 'c' was set as string here.
        .tmp.code:11:21: error: Concat returns string but number expected
@@ -967,12 +967,12 @@ various places that `type_err()` are called.
        .tmp.code:24:8: error: cannot assign value of type [5]number
        .tmp.code:25:13: error: expected [5]number but variable 'a3' is [10]number
        .tmp.code:23:36: info: this is where 'a3' was set to [10]number
-       .tmp.code:23:8: info: variable 'a1' was set as [5]number here.
        .tmp.code:25:8: error: cannot assign value of type [5]number
+       .tmp.code:23:8: info: variable 'a1' was set as [5]number here.
        .tmp.code:26:13: error: expected [5]number but variable 'a4' is [5]string
        .tmp.code:23:51: info: this is where 'a4' was set to [5]string
-       .tmp.code:23:8: info: variable 'a1' was set as [5]number here.
        .tmp.code:26:8: error: cannot assign value of type [5]number
+       .tmp.code:23:8: info: variable 'a1' was set as [5]number here.
        .tmp.code:27:16: error: expected number found string
        .tmp.code:28:16: error: expected string found Boolean
        .tmp.code:29:12: error: have number but need string
@@ -1010,8 +1010,8 @@ 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: error: type has recursive definition: foo
        .tmp.code:5:7: error: type has recursive definition: baz
+       .tmp.code:2:7: error: type has recursive definition: foo
 
 ###### test: type_err6
 
@@ -1202,6 +1202,7 @@ Test for errors with references
                print num@
                if num == @nil or ref == ref2 or ref == 2 or ref.foo:
                        @free = num
+               ref = 1
 
 ###### output: ref_err2
        .tmp.code:5:22: error: @new() can only be used with references, not number
@@ -1215,6 +1216,7 @@ Test for errors with references
        .tmp.code:7:56: error: have none but need Boolean
        .tmp.code:8:17: error: @free can only be assigned a reference, not number
        .tmp.code:8:17: error: @free can only be assigned a reference, not number
+       .tmp.code:9:8: error: Cannot assign an rval to a reference.
        oceani: type error in program - not running.
 
 ## Test erroneous command line args