X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=58fde75620d45c479b8840abea87fc5db643eca7;hp=78b458b3a455adf33dae58958dccea7e15fe40b1;hb=7b204b91b3e742371df976a01a4029f48aa3aa27;hpb=6a7ef05f3986dd8127b8c3bfaeeceb514a8beaa4

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 78b458b..58fde75 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -35,6 +35,8 @@ arguments separated from the name by commas.  For each test, there is a section
 
 	oceani_tests :=
 	## test list
+	oceani_valg_tests := $(oceani_tests)
+	## combine test lists
 
 	tests:: oceani_test_suite
 	oceani_test_suite: oceani coverage_oceani
@@ -78,17 +80,13 @@ 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
-		@[ -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.968) exit(1) }' \
-		        coverage/oceani.mdc.gcov
 		@rm -f .tmp*
 
-		@[ -n "$$SKIP_VALGRIND" ] || for T in $(oceani_tests); do \
+		@[ -n "$$SKIP_VALGRIND" ] || for T in $(oceani_valg_tests); do \
 		    echo -n "Valgrind $$T.. "; \
 		    i="$$IFS"; IFS=,; set $$T; IFS="$$i"; t=$$1; shift; \
-		    if ! valgrind --error-exitcode=1 --log-file=.tmp.valg ./oceani --section "test: $$t" oceani-tests.mdc $${1+"$$@"} \
-		         > /dev/null 2>&1 ; then \
+		    if valgrind --error-exitcode=42 --log-file=.tmp.valg ./oceani --section "test: $$t" oceani-tests.mdc $${1+"$$@"} \
+		         > /dev/null 2>&1 ; [ $$? -eq 42 ] ; then \
 		       echo "FAILED"; cat .tmp.valg; exit 1; fi ; \
 		    if grep 'LEAK SUMMARY' .tmp.valg > /dev/null; then \
 		       echo "valgrind found LEAKS"; cat .tmp.valg ; exit 1 ; fi; \
@@ -96,6 +94,11 @@ arguments separated from the name by commas.  For each test, there is a section
 		       echo "valgrind found memory in use at exit"; cat .tmp.valg ; exit 1 ; fi; \
 		    echo " passed"; \
 		done
+		## 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.972) exit(1) }' \
+		        coverage/oceani.mdc.gcov
 
 	coverage_oceani: oceani.c
 		$(CC) $(CFLAGS) --coverage -fprofile-dir=coverage -o coverage_oceani oceani.c $(LDLIBS)
@@ -616,7 +619,7 @@ Time to test if structure declarations and accesses work correctly.
 Test functions.  They don't return anything, so we need to get them to print
 
 ###### test list
-	oceani_tests += functions
+	oceani_tests += functions func_ret_type
 
 ###### test: functions
 
@@ -644,9 +647,21 @@ Test functions.  They don't return anything, so we need to get them to print
 			test(n-1, "."++s)
 		else
 			print "done"
+
+	func to_polar
+		x:number; y:number
+	return
+		rho:number
+		theta:number
+	do
+		rho = x + y
+		theta = x - y
+
 	func main()
 		for i:=0; then i = i + 1; while i < 5:
 			test(i, " ")
+		angular := to_polar(32, 23)
+		print angular.rho, angular.theta
 
 ###### output: functions
 	done
@@ -654,6 +669,35 @@ Test functions.  They don't return anything, so we need to get them to print
 	2  1 . done
 	3  2 . 1 .. done
 	4  3 . 2 .. 1 ... done
+	55 9
+
+###### test: func_ret_type
+
+	func double(n:number):number
+		use n+n
+
+	func answer
+		prefix:string
+		suffix:string
+	return string
+	do
+		use prefix ++ suffix
+
+	func noarg_returns
+	return Boolean
+	do
+		use 22/7 == 3.14159
+
+	func main()
+		for j:=10; then j = j - 3; while j > -5:
+			print answer("dou","ble"), j, "is", double(j)
+
+###### output: func_ret_type
+	double 10 is 20
+	double 7 is 14
+	double 4 is 8
+	double 1 is 2
+	double -2 is -4
 
 ## Test code with syntax errors
 
@@ -685,6 +729,9 @@ separate file first, then run from there.
 	    ./coverage_oceani --section "test: $$t" oceani-tests.mdc > /dev/null 2>&1 ;\
 	done || true
 
+###### combine test lists
+	oceani_valg_tests += $(oceani_failing_tests)
+
 ###### test list
 	oceani_failing_tests := syn1
 	oceani_failing_tests += tokerr
@@ -823,7 +870,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:
@@ -860,7 +906,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
@@ -927,7 +973,7 @@ various places that `type_err()` are called.
 		print foo
 
 ###### output: bad_main
-	.tmp.code:??:??: error: expected  argv but variable 'foo' is string
+	.tmp.code:??:??: error: expected []string but variable 'foo' is string
 	.tmp.code:??:??: info: this is where 'NOTVAR' was set to string
 	oceani: main has wrong type.
 
@@ -960,7 +1006,25 @@ Test for type errors with functions
 		if test1 == test2:
 			pass
 
+	func test4(a:number):string
+		use a * a
+
+	func test5(a:number):string
+		print a
+
+	struct foo
+		a: number
+		b:string = "hello"
+
+	func test6(a:number):foo
+		b:foo
+		b.a = a
+		use b
+
 ###### output: func_err_args
+	.tmp.code:34:5: error: function cannot return value of type foo
+	.tmp.code:28:14: error: expected string, found none
+	.tmp.code:25:8: error: expected string, found number
 	.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
@@ -970,8 +1034,8 @@ Test for type errors with functions
 	.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:21:20: error: expected *invalid*type* but variable 'test2' is *invalid*type*
+	.tmp.code:??:??: info: this is where 'NOTVAR' was set to *invalid*type*
 	.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.
@@ -1017,6 +1081,19 @@ command list possible.
 	    echo  "passed"; \
 	    ./coverage_oceani $${1+"$$@"} > /dev/null 2>&1 ;\
 	done || true
+###### valgrind test code
+	@[ -n "$$SKIP_VALGRIND" ] || for t in $(oceani_special_tests); do\
+	    echo -n "Valgrind $$t.. "; \
+	    i="$$IFS"; IFS=,; set $$t; IFS="$$i"; shift ;\
+	    if valgrind --error-exitcode=42 --log-file=.tmp.valg ./oceani $${1+"$$@"} > .tmp.have 2>&1 ;\
+	       [ $$? -eq 42 ]; then \
+		       echo "FAILED"; cat .tmp.valg; exit 1; fi ; \
+	    if grep 'LEAK SUMMARY' .tmp.valg > /dev/null; then \
+	       echo "valgrind found LEAKS"; cat .tmp.valg ; exit 1 ; fi; \
+	    if grep 'in use at exit [1-9]' .tmp.valg > /dev/null; then \
+	       echo "valgrind found memory in use at exit"; cat .tmp.valg ; exit 1 ; fi; \
+	    echo " passed"; \
+	done
 
 ###### test list
 	oceani_special_tests += "cmd"