@@ -34,7 +34,7 @@ object InterpreterTests extends TestSuite {
34
34
test(" declare uninitialized" ) {
35
35
val main = newFun(
36
36
List (
37
- S .Declare (getId(), " empty" , E .Type .Integer , None ,1 )
37
+ S .Declare (getId(), " empty" , E .Type .Integer , None , " 1 " )
38
38
)
39
39
)
40
40
@@ -54,12 +54,12 @@ object InterpreterTests extends TestSuite {
54
54
test(" declare initialized" ) {
55
55
val main = newFun(
56
56
List (
57
- S .Declare (getId(), " integer" , E .Type .Integer , Some (" 5" ),1 ),
58
- S .Declare (getId(), " neg_integer" , E .Type .Integer , Some (" -123" ),1 ),
59
- S .Declare (getId(), " real" , E .Type .Real , Some (" 12.345" ),1 ),
60
- S .Declare (getId(), " string" , E .Type .String , Some (" \" abc\" " ),1 ),
61
- S .Declare (getId(), " boolean" , E .Type .Boolean , Some (" false" ),1 ),
62
- S .Declare (getId(), " neg_boolean" , E .Type .Boolean , Some (" !false" ),1 )
57
+ S .Declare (getId(), " integer" , E .Type .Integer , Some (" 5" ), " 1 " ),
58
+ S .Declare (getId(), " neg_integer" , E .Type .Integer , Some (" -123" ), " 1 " ),
59
+ S .Declare (getId(), " real" , E .Type .Real , Some (" 12.345" ), " 1 " ),
60
+ S .Declare (getId(), " string" , E .Type .String , Some (" \" abc\" " ), " 1 " ),
61
+ S .Declare (getId(), " boolean" , E .Type .Boolean , Some (" false" ), " 1 " ),
62
+ S .Declare (getId(), " neg_boolean" , E .Type .Boolean , Some (" !false" ), " 1 " )
63
63
)
64
64
)
65
65
val flowrunChannel = Channel [FlowRun .Event ]
@@ -82,7 +82,7 @@ object InterpreterTests extends TestSuite {
82
82
test(" assign" ) {
83
83
val main = newFun(
84
84
List (
85
- S .Declare (getId(), " x" , E .Type .Integer , None ,1 ),
85
+ S .Declare (getId(), " x" , E .Type .Integer , None , " 1 " ),
86
86
S .Assign (getId(), " x" , " 6" ),
87
87
S .Output (getId(), " x" , true )
88
88
)
@@ -101,12 +101,12 @@ object InterpreterTests extends TestSuite {
101
101
test(" arithmetic - integers" ) {
102
102
val main = newFun(
103
103
List (
104
- S .Declare (getId(), " a" , E .Type .Integer , Some (" 5 + 3 * 2" ),1 ),
105
- S .Declare (getId(), " b" , E .Type .Integer , Some (" 15 / 3 - 2" ),1 ),
106
- S .Declare (getId(), " c" , E .Type .Integer , Some (" 15 % (2 + 2)" ),1 ),
107
- S .Declare (getId(), " d" , E .Type .Boolean , Some (" 1 == 1" ),1 ),
108
- S .Declare (getId(), " e" , E .Type .Boolean , Some (" 2 >= 1" ),1 ),
109
- S .Declare (getId(), " f" , E .Type .Boolean , Some (" 2 <= 1" ),1 )
104
+ S .Declare (getId(), " a" , E .Type .Integer , Some (" 5 + 3 * 2" ), " 1 " ),
105
+ S .Declare (getId(), " b" , E .Type .Integer , Some (" 15 / 3 - 2" ), " 1 " ),
106
+ S .Declare (getId(), " c" , E .Type .Integer , Some (" 15 % (2 + 2)" ), " 1 " ),
107
+ S .Declare (getId(), " d" , E .Type .Boolean , Some (" 1 == 1" ), " 1 " ),
108
+ S .Declare (getId(), " e" , E .Type .Boolean , Some (" 2 >= 1" ), " 1 " ),
109
+ S .Declare (getId(), " f" , E .Type .Boolean , Some (" 2 <= 1" ), " 1 " )
110
110
)
111
111
)
112
112
val flowrunChannel = Channel [FlowRun .Event ]
@@ -127,13 +127,13 @@ object InterpreterTests extends TestSuite {
127
127
test(" arithmetic - reals" ) {
128
128
val main = newFun(
129
129
List (
130
- S .Declare (getId(), " a" , E .Type .Real , Some (" 5.1 + 3.0 * 2.0" ),1 ),
131
- S .Declare (getId(), " b" , E .Type .Real , Some (" 15.0 / 3.0 - 2.5" ),1 ),
132
- S .Declare (getId(), " c" , E .Type .Real , Some (" 15.0 % 4.5" ),1 ),
133
- S .Declare (getId(), " d" , E .Type .Boolean , Some (" 1.0 == 1.0" ),1 ),
134
- S .Declare (getId(), " e" , E .Type .Boolean , Some (" 2.0 >= 1.0" ),1 ),
135
- S .Declare (getId(), " f" , E .Type .Boolean , Some (" 2.0 <= 1.0" ),1 ),
136
- S .Declare (getId(), " g" , E .Type .Real , Some (" 5.0 / 2.0" ),1 )
130
+ S .Declare (getId(), " a" , E .Type .Real , Some (" 5.1 + 3.0 * 2.0" ), " 1 " ),
131
+ S .Declare (getId(), " b" , E .Type .Real , Some (" 15.0 / 3.0 - 2.5" ), " 1 " ),
132
+ S .Declare (getId(), " c" , E .Type .Real , Some (" 15.0 % 4.5" ), " 1 " ),
133
+ S .Declare (getId(), " d" , E .Type .Boolean , Some (" 1.0 == 1.0" ), " 1 " ),
134
+ S .Declare (getId(), " e" , E .Type .Boolean , Some (" 2.0 >= 1.0" ), " 1 " ),
135
+ S .Declare (getId(), " f" , E .Type .Boolean , Some (" 2.0 <= 1.0" ), " 1 " ),
136
+ S .Declare (getId(), " g" , E .Type .Real , Some (" 5.0 / 2.0" ), 1 )
137
137
)
138
138
)
139
139
val flowrunChannel = Channel [FlowRun .Event ]
@@ -156,7 +156,7 @@ object InterpreterTests extends TestSuite {
156
156
test(" if-else" ) {
157
157
val main = newFun(
158
158
List (
159
- S .Declare (getId(), " x" , E .Type .Integer , None ,1 ),
159
+ S .Declare (getId(), " x" , E .Type .Integer , None , " 1 " ),
160
160
S .If (
161
161
getId(),
162
162
" true" ,
0 commit comments