X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=9db8e9363a469d66beb43cdceae215136542a862;hb=2d3b3f67a78d853da192c5568a29710fb8898a6c;hp=fc26950189e93bdc61e11e590a4d29429f294c2b;hpb=3c9b656474122721e7e0d57ba3e95b407b7cd3ba;p=ocean

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index fc26950..9db8e93 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -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
@@ -319,10 +319,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.
@@ -723,42 +724,40 @@ 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
-
-	func main(argv:[ac::]string)
-		list := insert(@nil, "@start")
-		list = insert(list, "~end")
-		for i:=1; then i=i+1; while i < ac:
-			list = insert(list, argv[i])
-		list = insert(list, "Hello!")
+		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:[]string)
+		list : linkage
+
+		insert(list, "@start");
+		insert(list, "~end")
+		for i:=1; then i=i+1; while i < argv[]:
+			insert(list, argv[i])
+		insert(list, "Hello!")
 		printlist(list)
 		freelist(list)
 
@@ -875,17 +874,17 @@ various places that `type_err()` are called.
 
 		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
@@ -950,6 +949,7 @@ various places that `type_err()` are called.
 		while 1 if True else False:
 			print
 		case 2: print "two"
+		print "one" ++ a4[], c[]
 
 ###### output: type_err3
 	.tmp.code:8:12: error: expected number but variable 'c' is string
@@ -957,6 +957,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
@@ -968,9 +969,11 @@ 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
@@ -982,6 +985,8 @@ 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
 	oceani: type error in program - not running.
 
 ###### test: type_err4
@@ -1008,8 +1013,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
 
@@ -1135,7 +1140,13 @@ Test for type errors with functions
 		b.a = a
 		use b
 
+	func test7(a:@number)
+		test7(45)
+		test7("45")
+
 ###### output: func_err_args
+	.tmp.code:40:14: error: cannot pass rval when reference expected
+	.tmp.code:41:14: error: expected @number found string
 	.tmp.code:34:5: error: function cannot return value of type foo
 	.tmp.code:28:8: error: expected string, found none
 	.tmp.code:25:8: error: expected string, found number
@@ -1200,6 +1211,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
@@ -1213,6 +1225,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