X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=8f10b89324aa7d7dbee42bdfeff3dac4664ba3bf;hb=bc126aadf03e4e64710f2ad7d76d1247090219d5;hp=dccfb2a47bc2bdb50f7f3a39e7c3adf09ccf1b01;hpb=84f4783c47a0fcb74b7f46d3ff96fe8a3ad1b278;p=ocean

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index dccfb2a..8f10b89 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -78,9 +78,9 @@ arguments separated from the name by commas.  For each test, there is a section
 		@for i in coverage/#*.gcda; do mv $$i coverage/$${i##*#}; done
 		@gcov -o coverage oceani.mdc > /dev/null 2> /dev/null
 		@mv *.gcov coverage ; [ -f .gcov ] && mv .gcov coverage || true
-		@ awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
+		@[ -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.959) exit(1) }' \
+		         if (ran < (ran + skip) *0.968) exit(1) }' \
 		        coverage/oceani.mdc.gcov
 		@rm -f .tmp*
 
@@ -110,9 +110,7 @@ calculations on them.
 
 ###### test: valvar
 
-	func main
-		argv:[argc::]string
-	do
+	func main(argv:[argc::]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
@@ -613,6 +611,50 @@ Time to test if structure declarations and accesses work correctly.
 	peter False 4
 	janine False 9
 
+## Functions
+
+Test functions.  They don't return anything, so we need to get them to print
+
+###### test list
+	oceani_tests += functions
+
+###### test: functions
+
+	func test1
+		t: Boolean
+	do
+		if t:
+			print "true"
+
+	func noarg
+	do
+		pass
+
+	func twoarg
+		a:number
+		b:string
+	do
+		while a > 0:
+			print b
+			a = a - 1
+
+	func test(n:number; s:string)
+		if n >= 1:
+			print n,s,
+			test(n-1, "."++s)
+		else
+			print "done"
+	func main()
+		for i:=0; then i = i + 1; while i < 5:
+			test(i, " ")
+
+###### output: functions
+	done
+	1  done
+	2  1 . done
+	3  2 . 1 .. done
+	4  3 . 2 .. 1 ... done
+
 ## Test code with syntax errors
 
 Syntax errors aren't handled well yet - the result is almost always a
@@ -781,7 +823,6 @@ various places that `type_err()` are called.
 		print c.foo
 		print bar.c
 		print bar.b + 42
-		
 
 		// trigger 'labels not permitted' error message
 		while 1 if True else False:
@@ -818,7 +859,7 @@ various places that `type_err()` are called.
 	.tmp.code:33:14: error: field reference attempted on string, not a struct
 	.tmp.code:34:14: error: cannot find requested field in foo
 	.tmp.code:35:17: error: have string but need number
-	.tmp.code:39:29: error: expected number (labels not permitted) found Boolean
+	.tmp.code:38:29: error: expected number (labels not permitted) found Boolean
 	oceani: type error in program - not running.
 
 ###### test: type_err4
@@ -833,7 +874,7 @@ various places that `type_err()` are called.
 	oceani: type error in program - not running.
 
 ###### test list
-	oceani_failing_tests += type_err_const type_err_const1 missing_program
+	oceani_failing_tests += type_err_const type_err_const1 missing_program bad_main
 
 ###### test: type_err_const
 	const
@@ -856,9 +897,10 @@ various places that `type_err()` are called.
 	.tmp.code:4:8: info: this is where 'bar' was first declared
 	.tmp.code:8:8: error: variable 'foo' redeclared
 	.tmp.code:3:8: info: this is where 'foo' was first declared
+	.tmp.code:12:5: error: function 'main' redeclared
+	.tmp.code:7:5: info: this is where 'main' was first declared
 	.tmp.code:13:8: error: variable 'foo' redeclared
 	.tmp.code:3:8: info: this is where 'foo' was first declared
-	.tmp.code:13:8: "main" defined a second time
 
 ###### test: type_err_const1
 	const
@@ -879,6 +921,80 @@ various places that `type_err()` are called.
 ###### output: missing_program
 	oceani: no main function found.
 
+###### test: bad_main
+	func main(foo:string)
+		print foo
+
+###### output: bad_main
+	.tmp.code:??:??: error: expected  argv but variable 'foo' is string
+	.tmp.code:??:??: info: this is where 'NOTVAR' was set to string
+	oceani: main has wrong type.
+
+Test for type errors with functions
+
+###### test list
+	oceani_failing_tests += func_err_args func_err_redeclare
+
+###### test: func_err_args
+
+	func test1(a:number; b:string; c:[3]Boolean)
+		print a, b, c[1]
+
+	func test2(a:number; b:string; c:[3]Boolean)
+		print a, b, c[1]
+
+	func test3()
+		# use undefined names
+		print a, z
+
+	func main()
+		truth:[3]Boolean
+		truth[1] = True
+		test1(1,"hello")
+		test1("hello",1)
+		test1(1, "two", truth)
+		test1(1, 2, truth)
+		test1(1, "lo", truth, 4)
+		print test(), test1(1,2,3)
+		if test1 == test2:
+			pass
+
+###### output: func_err_args
+	.tmp.code:15:14: error: insufficient arguments to function.
+	.tmp.code:16:14: error: expected number found string
+	.tmp.code:16:22: error: expected string found number
+	.tmp.code:16:14: error: insufficient arguments to function.
+	.tmp.code:18:17: error: expected string found number
+	.tmp.code:19:14: error: too many arguments to function.
+	.tmp.code:20:14: error: attempt to call a non-function.
+	.tmp.code:20:32: error: expected string found number
+	.tmp.code:20:28: error: insufficient arguments to function.
+	.tmp.code:21:20: error: expected  func but variable 'test2' is  func
+	.tmp.code:??:??: info: this is where 'NOTVAR' was set to  func
+	.tmp.code:10:14: error: variable used but not declared: a
+	.tmp.code:10:17: error: variable used but not declared: z
+	oceani: type error in program - not running.
+
+###### test: func_err_redeclare
+
+	func test1(a:number; b:string; c:[3]Boolean)
+		print a, b, c[1]
+
+	func test1
+	do
+		pass
+
+	func test1
+		b:Boolean
+	do
+		pass
+
+###### output: func_err_redeclare
+	.tmp.code:5:5: error: function 'test1' redeclared
+	.tmp.code:2:5: info: this is where 'test1' was first declared
+	.tmp.code:9:5: error: function 'test1' redeclared
+	.tmp.code:2:5: info: this is where 'test1' was first declared
+
 ## Test erroneous command line args
 
 To improve coverage, we want to test correct handling of strange command