X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=182c77c8367b2e553c6619f410e2eee512a671cb;hp=6d513487e619bc695ed3b25fd6048c789971a745;hb=d58f04dc62ec58ed72c00db43b80122fbdfc0925;hpb=454d1b434bdcc76d33d3eb5eace74a3de2fd1aa3

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 6d51348..182c77c 100644
--- 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
@@ -904,6 +947,7 @@ various places that `type_err()` are called.
 		a:number = 4
 		a ::number = 5
 		c:
+		d:number = 02
 
 ###### output: type_err2
 	.tmp.code:4:8: error: variable 'a' redeclared
@@ -915,12 +959,13 @@ various places that `type_err()` are called.
 	.tmp.code:7:8: error: variable 'a' redeclared
 	.tmp.code:3:8: info: this is where 'a' was first declared
 	.tmp.code:8:8: Variable declared with no type or value: c
+	.tmp.code:9:19: error: unsupported number format: 02
 
 ###### test: type_err3
 
 	struct foo
 		a: number
-		b:string = "hello"
+		b:string = "hello"; d:Boolean
 
 	func main()
 		c := "hello"
@@ -961,6 +1006,12 @@ various places that `type_err()` are called.
 
 		x:Boolean = $"42"
 
+		five ::= 5
+		four ::= 4
+		x1:[five]number
+		x2:[four]number
+		x1 = x2
+
 ###### output: type_err3
 	.tmp.code:8:12: error: expected number but variable 'c' is string
 	.tmp.code:7:8: info: this is where 'c' was set to string
@@ -999,6 +1050,10 @@ various places that `type_err()` are called.
 	.tmp.code:41:29: error: string cannot provide length
 	.tmp.code:43:21: error: Can only convert string to number, not Boolean
 	.tmp.code:43:8: info: variable 'x' was set as Boolean here.
+	.tmp.code:49:13: error: expected [five]number but variable 'x2' is [four]number
+	.tmp.code:48:8: info: this is where 'x2' was set to [four]number
+	.tmp.code:49:8: error: cannot assign value of type [five]number
+	.tmp.code:47:8: info: variable 'x1' was set as [five]number here.
 	oceani: type error in program - not running.
 
 ###### test: type_err4
@@ -1021,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: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