X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=6bc40cba9004457b875c25935e34f84fe35ee5ba;hb=d8407db8126bfc5070fc2e76e936a62c7443b033;hp=2433cce68593ee7f01153beec063927f4259b05f;hpb=6a546ea265d0ee30152298463e9e7b7c2f53b3b0;p=ocean diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc index 2433cce..6bc40cb 100644 --- a/csrc/oceani-tests.mdc +++ b/csrc/oceani-tests.mdc @@ -78,10 +78,6 @@ 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} \ - END {printf "coverage: %6.2f%%\n", ran * 100 / (ran + skip); \ - if (ran < (ran + skip) *0.948) exit(1) }' \ - coverage/oceani.mdc.gcov @rm -f .tmp* @[ -n "$$SKIP_VALGRIND" ] || for T in $(oceani_tests); do \ @@ -96,6 +92,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 + @[ -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 coverage_oceani: oceani.c $(CC) $(CFLAGS) --coverage -fprofile-dir=coverage -o coverage_oceani oceani.c $(LDLIBS) @@ -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 ab, a>=b, a 0 and b > 0: while a != b: if a < b: @@ -378,6 +385,7 @@ Here I break it into two parts, keeping the array code separate. Hello World, what lovely oceans you have! Is 55 bigger than 33 ? yes double 33 is 66 + still yes GCD of 55 and 33 is 11 Fibonacci: 1 1 2 3 5 8 13 21 34 55 89 144 hello was the str @@ -387,6 +395,7 @@ Here I break it into two parts, keeping the array code separate. Hello World, what lovely oceans you have! Is 12 bigger than 60 ? no double 60 is 120 + still no 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 @@ -602,6 +611,78 @@ 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 func_ret_type + +###### 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: 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 Syntax errors aren't handled well yet - the result is almost always a @@ -770,7 +851,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: @@ -807,7 +887,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 @@ -822,7 +902,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 @@ -845,9 +925,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 @@ -868,6 +949,88 @@ 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 + + func test4(a:number):string + use a * a + + func test5(a:number):string + print a + +###### output: func_err_args + .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 + .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