oceani: allow global constants to be used before declared.

[ocean] / csrc / oceani-tests.mdc

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 3156b3d4bcd372babc885c6a658d9382e5d1d53f..c13a9d173a5f0d876a500791f05fe2630023f073 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -136,7 +136,7 @@ calculations on them.
 
 ###### output: valvar
 
 
 ###### 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
        False False True True False False True
        23 12 12 -23 -12 12
        False True True False False False


@@ -158,7 +158,7 @@ Next we change the value of variables
                print a, a/a
 
 ###### output: setvar
                print a, a/a
 
 ###### output: setvar

-       1.07374e+09 1
+       1073741824 1

 
 Now some contants
 
 
 Now some contants
 


@@ -167,6 +167,7 @@ Now some contants
 
 ###### test: consts
        const
 
 ###### test: consts
        const

+               tau ::= pi * 2

                pi ::= 3.141 592 653
                four ::= 2 + 2 ; five ::= 10/2
        const pie ::= "I like Pie";
                pi ::= 3.141 592 653
                four ::= 2 + 2 ; five ::= 10/2
        const pie ::= "I like Pie";


@@ -176,12 +177,12 @@ Now some contants
        func main()
                print "Hello World, what lovely oceans you have!"
                print "are there", five, "?"
        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 ?
 
 ###### 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
 
 
 Test merging of variables from multiple cases
 


@@ -280,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
        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
        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
        I won't calculate 20 / 9
        Close enough
        higher


@@ -392,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
        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!
 
 ###### output: sayhello,12,60,there,False
        Hello World, what lovely oceans you have!


@@ -402,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
        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"
 
 ###### test list
        oceani_tests += "insert_sort"


@@ -921,7 +922,7 @@ various places that `type_err()` are called.
        oceani: type error in program - not running.
 
 ###### test list
        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
 
 ###### test: type_err_const
        const


@@ -939,7 +940,6 @@ various places that `type_err()` are called.
                print bar, foo
 
 ###### output: type_err_const
                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
        .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


@@ -948,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: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
 
 ###### test: type_err_const1
        const


@@ -961,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: :
 
        .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"
 ###### test: missing_program
        const
                foo::="bar"


@@ -973,7 +983,7 @@ various places that `type_err()` are called.
                print foo
 
 ###### output: bad_main
                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.
 
        .tmp.code:??:??: info: this is where 'NOTVAR' was set to string
        oceani: main has wrong type.
 


@@ -1034,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: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.
        .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.