X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=c990bad78a101383f5aa942537b5bbbecf96f4d0;hp=12116d4cbb5f40325d9fb1976663bb229183fbfa;hb=5c455fe9ef93d88b349bb25733d5ea20a8984050;hpb=b57589e699a72debfbbe6a29983dfe7ed707a148

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 12116d4..c990bad 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -382,19 +382,19 @@ Here I break it into two parts, keeping the array code separate.
 		while
 			mid := (lo + hi) / 2
 			if mid == target:
-				use Found
+				use .Found
 			if mid < target:
 				lo = mid
 			else
 				hi = mid
 			if hi - lo < 1:
 				lo = mid
-				use GiveUp
+				use .GiveUp
 			use True
 		do pass
-		case Found:
+		case .Found:
 			print "Yay, I found", target
-		case GiveUp:
+		case .GiveUp:
 			print "Closest I found was", lo
 
 ###### output: sayhello,55,33,hello,True
@@ -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
@@ -874,15 +873,18 @@ various places that `type_err()` are called.
 		b = b + 1
 
 		if 3 * 4 and not True: print "Weird"
+		d:number = .fred
+		(d + b) = 12
 
 ###### output: type_err1
 	.tmp.code:3:25: error: expected string found number
 	.tmp.code:3:28: error: expected string found number
 	.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: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
+	.tmp.code:9:20: error: expected number found label
+	.tmp.code:9:8: info: variable 'd' was set as number here.
+	.tmp.code:10:8: error: cannot assign to an rval
 	oceani: type error in program - not running.
 
 ###### test: type_err2
@@ -954,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
@@ -965,20 +968,22 @@ various places that `type_err()` are called.
 	.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: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: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
 	.tmp.code:7:8: info: variable 'c' was set as string here.
 	.tmp.code:32:8: error: variable used but not declared: foo
-	.tmp.code:32:8: error: field reference attempted on none, not a struct
+	.tmp.code:32:8: error: field reference on none is not supported
 	.tmp.code:32:16: error: expected none found number
-	.tmp.code:33:14: error: field reference attempted on string, not a struct
+	.tmp.code:33:14: error: field reference on string is not supported
 	.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 (labels not permitted) found Boolean
+	.tmp.code:38:29: error: expected number found Boolean
 	oceani: type error in program - not running.
 
 ###### test: type_err4
@@ -1005,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
 
@@ -1195,8 +1200,9 @@ Test for errors with references
 		ref2:@string
 		num:number = @new()
 		print num@
-		if num == @nil or ref == ref2 or ref == 2:
+		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
@@ -1206,8 +1212,11 @@ Test for errors with references
 	.tmp.code:7:33: error: expected @number but variable 'ref2' is @string
 	.tmp.code:4:8: info: this is where 'ref2' was set to @string
 	.tmp.code:7:48: error: expected @number found number
+	.tmp.code:7:53: error: field reference on number is not supported
+	.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