X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=49274ebd20be61d88b0eff106f868cc6cc40156a;hp=655a2c95057a3cc686ddac87003acc10bbb88e91;hb=HEAD;hpb=6e9a6bc829c370f60148deb155c3952edc6895f2 diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc index 655a2c9..49274eb 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.972) exit(1) }' \ + if (ran < (ran + skip) *0.99) exit(1) }' \ coverage/oceani.mdc.gcov coverage_oceani: oceani.c @@ -113,7 +119,7 @@ calculations on them. ###### test: valvar - func main(argv:[argc::]string) + func main(argv:[]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 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" if pi > 3 then print "pi exceeds three"; else print "need more pie" if (pi < 3) { print "not enough pi" } else { print "pi sufficient" } @@ -289,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 @@ -303,6 +328,7 @@ Now we need to test if/else and some different loops I won't calculate 20 / 9 Close enough higher + higher pi exceeds three pi sufficient sum 1..10 is 55 @@ -319,10 +345,11 @@ Here I break it into two parts, keeping the array code separate. ###### test: sayhello - func main(av:[ac::number]string) + func main(av:[]string) A := $av[1]; B := $av[2] astr := av[3] - bbool := av[ac-1] == "True" + l := av[] + bbool := av[l-1] == "True" print "Hello World, what lovely oceans you have!" /* When a variable is defined in both branches of an 'if', * and used afterwards, the variables are merged. @@ -382,19 +409,19 @@ Here I break it into two parts, keeping the array code separate. while mid := (lo + hi) / 2 if mid == target: - use Found + use .Found if mid < target: lo = mid else hi = mid if hi - lo < 1: lo = mid - use GiveUp + use .GiveUp use True do pass - case Found: + case .Found: print "Yay, I found", target - case GiveUp: + case .GiveUp: print "Closest I found was", lo ###### output: sayhello,55,33,hello,True @@ -596,11 +623,16 @@ Time to test if structure declarations and accesses work correctly. const three ::= 3 struct foo size:[three]number - name:string + name:string = "Hello" thing:baz active:Boolean = True struct baz { a:number; b:Boolean; } + struct bat { + a:string + b:Boolean + } + struct bat2 a:string; b:Boolean func main do @@ -621,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 @@ -678,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 @@ -723,42 +773,40 @@ A simple linked list example ###### test: linked_list - struct node + struct linkage next: @node + struct node + list: linkage this: string - func insert(list:@node; new:string):@node + func insert(list:@linkage; new:string) p:=list - prev := @nil - while ?p and then p.this < new: - prev = p - p = p.next - if ?prev: - prev.next = @new() - prev.next.next = p - prev.next.this = new - else - list = @new() - list.next = p - list.this = new - use list - - func printlist(list:@node) - while ?list: - print list@.this - list = list@.next - - func freelist(list:@node) - if list != @nil: - freelist(list.next) - @free = list - - func main(argv:[ac::]string) - list := insert(@nil, "@start") - list = insert(list, "~end") - for i:=1; then i=i+1; while i < ac: - list = insert(list, argv[i]) - list = insert(list, "Hello!") + while ?p.next and p.next.this < new: + p = p.next.list + t:@node = @new() + t.list.next = p.next + t.this = new + p.next = t; + + func printlist(list:@linkage) + while ?list.next: + print list@.next.this + list = list@.next.list + + func freelist(list:@linkage) + if list.next != @nil: + lp:@linkage = list.next.list + freelist(lp) + @free = list.next + + func main(argv:[]string) + list : linkage + + insert(list, "@start"); + insert(list, "~end") + for i:=1; then i=i+1; while i < argv[]: + insert(list, argv[i]) + insert(list, "Hello!") printlist(list) freelist(list) @@ -869,20 +917,25 @@ various places that `type_err()` are called. func main() print "hello" ++ 5, 5 ++ "hello" - + hello := "there"; print 4+hello b ::= 3 b = b + 1 if 3 * 4 and not True: print "Weird" + d:number = .fred + (d + b) = 12 ###### output: type_err1 .tmp.code:3:25: error: expected string found number .tmp.code:3:28: error: expected string found number - .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: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 + .tmp.code:9:20: error: expected number found label + .tmp.code:9:8: info: variable 'd' was set as number here. + .tmp.code:10:8: error: cannot assign to an rval oceani: type error in program - not running. ###### test: type_err2 @@ -894,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 @@ -905,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" @@ -947,6 +1002,15 @@ various places that `type_err()` are called. while 1 if True else False: print case 2: print "two" + print "one" ++ a4[], c[] + + 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 @@ -954,6 +1018,7 @@ various places that `type_err()` are called. .tmp.code:8:12: error: Arithmetic returns number but string expected .tmp.code:7:8: info: variable 'c' was set as string here. .tmp.code:9:24: error: Boolean operation found where string expected + .tmp.code:7:8: info: variable 'c' was set as string here. .tmp.code:10:12: error: Comparison returns Boolean but string expected .tmp.code:7:8: info: variable 'c' was set as string here. .tmp.code:11:21: error: Concat returns string but number expected @@ -965,9 +1030,11 @@ various places that `type_err()` are called. .tmp.code:25:13: error: expected [5]number but variable 'a3' is [10]number .tmp.code:23:36: info: this is where 'a3' was set to [10]number .tmp.code:25:8: error: cannot assign value of type [5]number + .tmp.code:23:8: info: variable 'a1' was set as [5]number here. .tmp.code:26:13: error: expected [5]number but variable 'a4' is [5]string .tmp.code:23:51: info: this is where 'a4' was set to [5]string .tmp.code:26:8: error: cannot assign value of type [5]number + .tmp.code:23:8: info: variable 'a1' was set as [5]number here. .tmp.code:27:16: error: expected number found string .tmp.code:28:16: error: expected string found Boolean .tmp.code:29:12: error: have number but need string @@ -978,7 +1045,15 @@ various places that `type_err()` are called. .tmp.code:33:14: error: field reference on string is not supported .tmp.code:34:14: error: cannot find requested field in foo .tmp.code:35:17: error: have string but need number - .tmp.code:38:29: error: expected number (labels not permitted) found Boolean + .tmp.code:38:29: error: expected number found Boolean + .tmp.code:41:23: error: have number but need string + .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 @@ -1001,12 +1076,14 @@ 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:2:7: error: type has recursive definition: foo + .tmp.code:2:7: info: this is location of declaration: 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 ###### test: type_err6 @@ -1132,7 +1209,13 @@ Test for type errors with functions b.a = a use b + func test7(a:@number) + test7(45) + test7("45") + ###### output: func_err_args + .tmp.code:40:14: error: cannot pass rval when reference expected + .tmp.code:41:14: error: expected @number found string .tmp.code:34:5: error: function cannot return value of type foo .tmp.code:28:8: error: expected string, found none .tmp.code:25:8: error: expected string, found number @@ -1197,6 +1280,7 @@ Test for errors with references print num@ if num == @nil or ref == ref2 or ref == 2 or ref.foo: @free = num + ref = 1 ###### output: ref_err2 .tmp.code:5:22: error: @new() can only be used with references, not number @@ -1210,6 +1294,7 @@ Test for errors with references .tmp.code:7:56: error: have none but need Boolean .tmp.code:8:17: error: @free can only be assigned a reference, not number .tmp.code:8:17: error: @free can only be assigned a reference, not number + .tmp.code:9:8: error: Cannot assign an rval to a reference. oceani: type error in program - not running. ## Test erroneous command line args