X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=c13a9d173a5f0d876a500791f05fe2630023f073;hb=e4967da39aff091cd9dfa187cf77c84ba8643293;hp=fbc5a2f085e3af5f9ad2b2eaa4a928f24579e9fe;hpb=b880d8942e1539875d8209e18bf3d21011220ff8;p=ocean

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index fbc5a2f..c13a9d1 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -94,9 +94,10 @@ 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.968) exit(1) }' \
+		         if (ran < (ran + skip) *0.972) exit(1) }' \
 		        coverage/oceani.mdc.gcov
 
 	coverage_oceani: oceani.c
@@ -135,7 +136,7 @@ calculations on them.
 
 ###### output: valvar
 
-	23 12 35 11 276 1.91667 11
+	23 12 35 11 276 1.916666667 11
 	False False True True False False True
 	23 12 12 -23 -12 12
 	False True True False False False
@@ -157,7 +158,7 @@ Next we change the value of variables
 		print a, a/a
 
 ###### output: setvar
-	1.07374e+09 1
+	1073741824 1
 
 Now some contants
 
@@ -166,6 +167,7 @@ Now some contants
 
 ###### test: consts
 	const
+		tau ::= pi * 2
 		pi ::= 3.141 592 653
 		four ::= 2 + 2 ; five ::= 10/2
 	const pie ::= "I like Pie";
@@ -175,12 +177,12 @@ Now some contants
 	func main()
 		print "Hello World, what lovely oceans you have!"
 		print "are there", five, "?"
-		print pi, pie, "but", cake
+		print pi, pie, "but", cake, "Tau is", tau
 
 ###### output: consts
 	Hello World, what lovely oceans you have!
 	are there 5 ?
-	3.14159 I like Pie but The cake is a lie
+	3.141592653 I like Pie but The cake is a lie Tau is 6.283185306
 
 Test merging of variables from multiple cases
 
@@ -279,13 +281,13 @@ Now we need to test if/else and some different loops
 	Success
 	 1 2 4 8 16 32 64
 	0 1.5
-	1 1.41667
-	2 1.41422
-	3 1.41421
-	error is  -4.51095e-12
+	1 1.416666667
+	2 1.414215686
+	3 1.414213562
+	error is  -4.510950445e-12
 	I won't calculate 20 / 0
-	20 / 3  = 6.66667
-	20 / 6  = 3.33333
+	20 / 3  = 6.666666667
+	20 / 6  = 3.333333333
 	I won't calculate 20 / 9
 	Close enough
 	higher
@@ -391,7 +393,7 @@ Here I break it into two parts, keeping the array code separate.
 	GCD of 55 and 33 is 11
 	Fibonacci: 1 1 2 3 5 8 13 21 34 55 89 144
 	hello was the str
-	Closest I found was 77.3438
+	Closest I found was 77.34375
 
 ###### output: sayhello,12,60,there,False
 	Hello World, what lovely oceans you have!
@@ -401,7 +403,7 @@ Here I break it into two parts, keeping the array code separate.
 	GCD of 12 and 60 is 12
 	Fibonacci: 1 1 2 3 5 8 13 21 34 55 89 144
 	I found the str over there
-	Closest I found was 77.3438
+	Closest I found was 77.34375
 
 ###### test list
 	oceani_tests += "insert_sort"
@@ -646,9 +648,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
@@ -656,6 +670,7 @@ 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
 
@@ -907,7 +922,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 bad_main
+	oceani_failing_tests += type_err_const type_err_const1 type_err_const2 missing_program bad_main
 
 ###### test: type_err_const
 	const
@@ -925,7 +940,6 @@ various places that `type_err()` are called.
 		print bar, foo
 
 ###### output: type_err_const
-	.tmp.code:4:16: error: expected number found string
 	.tmp.code:6:8: error: name already declared: bar
 	.tmp.code:4:8: info: this is where 'bar' was first declared
 	.tmp.code:8:8: error: variable 'foo' redeclared
@@ -934,6 +948,7 @@ various places that `type_err()` are called.
 	.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:4:16: error: expected number found string
 
 ###### test: type_err_const1
 	const
@@ -947,6 +962,15 @@ various places that `type_err()` are called.
 	.tmp.code:3:12: Syntax error in constant: :
 	.tmp.code:4:12: Syntax error in constant: :
 
+###### test: type_err_const2
+	const
+		four ::= two + two
+		two ::= four / 2
+	
+###### output: type_err_const2
+	.tmp.code:3:8: error: const four cannot be resolved.
+	.tmp.code:4:8: error: const two cannot be resolved.
+
 ###### test: missing_program
 	const
 		foo::="bar"
@@ -959,7 +983,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.
 
@@ -998,7 +1022,17 @@ Test for type errors with functions
 	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.
@@ -1010,8 +1044,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.
@@ -1057,6 +1091,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"