From 6710567af979b0b367245c16a0c6af260675bc71 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Mon, 19 Oct 2015 15:21:23 +0300 Subject: [PATCH] fix test after syntax changes --- test/cases/class_definition/big_class.tst | 16 ++++++++-------- test/cases/class_definition/class_if.tst | 2 +- .../function_definition/function_big_while.tst | 10 ++++------ test/cases/function_definition/function_if.tst | 2 +- .../function_definition/function_return_if.tst | 4 ++-- .../function_return_while.tst | 8 ++++---- .../cases/function_definition/function_while.tst | 6 +++--- test/cases/if_statement/if_else.tst | 2 +- test/cases/if_statement/if_else_expressions.tst | 2 +- test/cases/root/fibo1.tst | 10 ++++------ test/cases/small_conditional/if_end.tst | 2 +- .../small_conditional/if_end_expressions.tst | 6 +++--- test/cases/while_statement/big_while.tst | 6 +++--- test/cases/while_statement/while.tst | 6 +++--- test/cases/while_statement/while_method.tst | 6 +++--- 15 files changed, 42 insertions(+), 46 deletions(-) diff --git a/test/cases/class_definition/big_class.tst b/test/cases/class_definition/big_class.tst index bce4ce9..c407950 100644 --- a/test/cases/class_definition/big_class.tst +++ b/test/cases/class_definition/big_class.tst @@ -15,13 +15,13 @@ class String my_length = str_len + my_length new_string = self.new_string(my_length ) i = 0 - while( i < my_length) + while_plus( i - my_length) char = get(i) new_string.set(i , char) i = i + 1 end i = 0 - while( i < str_len) + while_plus( i - str_len) char = str.get(i) len = i + my_length new_string.set( len , char) @@ -99,9 +99,9 @@ s(:statements, s(:assignment, s(:name, :i), s(:int, 0)), - s(:while_statement, - s(:condition, - s(:operator_value, :<, + s(:while_statement, :plus, + s(:conditional, + s(:operator_value, :-, s(:name, :i), s(:name, :my_length))), s(:statements, @@ -126,9 +126,9 @@ s(:statements, s(:assignment, s(:name, :i), s(:int, 0)), - s(:while_statement, - s(:condition, - s(:operator_value, :<, + s(:while_statement, :plus, + s(:conditional, + s(:operator_value, :-, s(:name, :i), s(:name, :str_len))), s(:statements, diff --git a/test/cases/class_definition/class_if.tst b/test/cases/class_definition/class_if.tst index ef71a4c..bbeaef1 100644 --- a/test/cases/class_definition/class_if.tst +++ b/test/cases/class_definition/class_if.tst @@ -17,7 +17,7 @@ s(:statements, s(:parameters, s(:parameter, :Integer, :n)), s(:statements, - s(:if_statement, + s(:if_statement, :zero, s(:condition, s(:int, 0)), s(:true_statements, diff --git a/test/cases/function_definition/function_big_while.tst b/test/cases/function_definition/function_big_while.tst index 0616032..456da7b 100644 --- a/test/cases/function_definition/function_big_while.tst +++ b/test/cases/function_definition/function_big_while.tst @@ -1,7 +1,7 @@ int fibonaccit(int n) a = 0 b = 1 - while( n > 1 ) + while_positive( n ) tmp = a a = b b = tmp + b @@ -22,11 +22,9 @@ s(:statements, s(:assignment, s(:name, :b), s(:int, 1)), - s(:while_statement, - s(:condition, - s(:operator_value, :>, - s(:name, :n), - s(:int, 1))), + s(:while_statement, :positive, + s(:conditional, + s(:name, :n)), s(:statements, s(:assignment, s(:name, :tmp), diff --git a/test/cases/function_definition/function_if.tst b/test/cases/function_definition/function_if.tst index 68027ac..76e8a10 100644 --- a/test/cases/function_definition/function_if.tst +++ b/test/cases/function_definition/function_if.tst @@ -12,7 +12,7 @@ s(:statements, s(:parameters, s(:parameter, :Integer, :n)), s(:statements, - s(:if_statement, + s(:if_statement, :plus, s(:condition, s(:int, 0)), s(:true_statements, diff --git a/test/cases/function_definition/function_return_if.tst b/test/cases/function_definition/function_return_if.tst index 314ab7b..d2a4951 100644 --- a/test/cases/function_definition/function_return_if.tst +++ b/test/cases/function_definition/function_return_if.tst @@ -12,9 +12,9 @@ s(:statements, s(:parameters, s(:parameter, :Integer, :n)), s(:statements, - s(:if_statement, + s(:if_statement, :positive, s(:condition, - s(:operator_value, :>, + s(:operator_value, :-, s(:name, :n), s(:int, 5))), s(:true_statements, diff --git a/test/cases/function_definition/function_return_while.tst b/test/cases/function_definition/function_return_while.tst index 18edd34..f708cab 100644 --- a/test/cases/function_definition/function_return_while.tst +++ b/test/cases/function_definition/function_return_while.tst @@ -1,5 +1,5 @@ int retvar(int n ) - while( n > 5) + while_positive( n - 5) n = n + 1 return n end @@ -11,9 +11,9 @@ s(:statements, s(:parameters, s(:parameter, :Integer, :n)), s(:statements, - s(:while_statement, - s(:condition, - s(:operator_value, :>, + s(:while_statement, :positive, + s(:conditional, + s(:operator_value, :-, s(:name, :n), s(:int, 5))), s(:statements, diff --git a/test/cases/function_definition/function_while.tst b/test/cases/function_definition/function_while.tst index d5f042f..6f04bbd 100644 --- a/test/cases/function_definition/function_while.tst +++ b/test/cases/function_definition/function_while.tst @@ -1,6 +1,6 @@ Biggie fibonaccit(int n) a = 0 - while(n) + while_ok(n) some = 43 other = some * 4 end @@ -15,8 +15,8 @@ s(:statements, s(:assignment, s(:name, :a), s(:int, 0)), - s(:while_statement, - s(:condition, + s(:while_statement, :ok, + s(:conditional, s(:name, :n)), s(:statements, s(:assignment, diff --git a/test/cases/if_statement/if_else.tst b/test/cases/if_statement/if_else.tst index cdf8a98..2a6a772 100644 --- a/test/cases/if_statement/if_else.tst +++ b/test/cases/if_statement/if_else.tst @@ -4,7 +4,7 @@ else twenty = 5 end -- -- -- -s(:if_statement, +s(:if_statement, :true, s(:condition, s(:int, 0)), s(:true_statements, diff --git a/test/cases/if_statement/if_else_expressions.tst b/test/cases/if_statement/if_else_expressions.tst index a1fdb85..ddbb327 100644 --- a/test/cases/if_statement/if_else_expressions.tst +++ b/test/cases/if_statement/if_else_expressions.tst @@ -4,7 +4,7 @@ else var.new(33) end -- -- -- -s(:if_statement, +s(:if_statement, :yes, s(:condition, s(:operator_value, :>, s(:int, 3), diff --git a/test/cases/root/fibo1.tst b/test/cases/root/fibo1.tst index f35d223..c397dd6 100644 --- a/test/cases/root/fibo1.tst +++ b/test/cases/root/fibo1.tst @@ -2,7 +2,7 @@ class Object int fibonaccit(int n) a = 0 b = 1 - while( n > 1 ) + while_plus( n ) tmp = a a = b b = tmp + b @@ -31,11 +31,9 @@ s(:statements, s(:assignment, s(:name, :b), s(:int, 1)), - s(:while_statement, - s(:condition, - s(:operator_value, :>, - s(:name, :n), - s(:int, 1))), + s(:while_statement, :plus, + s(:conditional, + s(:name, :n)), s(:statements, s(:assignment, s(:name, :tmp), diff --git a/test/cases/small_conditional/if_end.tst b/test/cases/small_conditional/if_end.tst index 58ff24e..a3eadbf 100644 --- a/test/cases/small_conditional/if_end.tst +++ b/test/cases/small_conditional/if_end.tst @@ -2,7 +2,7 @@ if_zero(0) four = 42 end -- -- -- -s(:if_statement, +s(:if_statement, :zero, s(:condition, s(:int, 0)), s(:true_statements, diff --git a/test/cases/small_conditional/if_end_expressions.tst b/test/cases/small_conditional/if_end_expressions.tst index 915a0e2..62c6042 100644 --- a/test/cases/small_conditional/if_end_expressions.tst +++ b/test/cases/small_conditional/if_end_expressions.tst @@ -2,11 +2,11 @@ if_overflow(3 + 100000 ) Object.initialize(3) end -- -- -- -s(:if_statement, +s(:if_statement, :overflow, s(:condition, - s(:operator_value, :>, + s(:operator_value, :+, s(:int, 3), - s(:name, :var))), + s(:int, 100000))), s(:true_statements, s(:call, s(:name, :initialize), diff --git a/test/cases/while_statement/big_while.tst b/test/cases/while_statement/big_while.tst index e339769..b90bde7 100644 --- a/test/cases/while_statement/big_while.tst +++ b/test/cases/while_statement/big_while.tst @@ -1,4 +1,4 @@ -while( n > 1) +while_allgood( n > 1) tmp = a a = b b = tmp + b @@ -6,8 +6,8 @@ while( n > 1) n = n - 1 end -- -- -- -s(:while_statement, - s(:condition, +s(:while_statement, :allgood, + s(:conditional, s(:operator_value, :>, s(:name, :n), s(:int, 1))), diff --git a/test/cases/while_statement/while.tst b/test/cases/while_statement/while.tst index 4b1be18..725c978 100644 --- a/test/cases/while_statement/while.tst +++ b/test/cases/while_statement/while.tst @@ -1,10 +1,10 @@ -while(1) +while_false(1) tmp = a puts(b) end -- -- -- -s(:while_statement, - s(:condition, +s(:while_statement, :false, + s(:conditional, s(:int, 1)), s(:statements, s(:assignment, diff --git a/test/cases/while_statement/while_method.tst b/test/cases/while_statement/while_method.tst index 3fd2348..cdea076 100644 --- a/test/cases/while_statement/while_method.tst +++ b/test/cases/while_statement/while_method.tst @@ -1,10 +1,10 @@ -while(1) +while_true(1) tmp = String.new() tmp.puts(i) end -- -- -- -s(:while_statement, - s(:condition, +s(:while_statement, :true, + s(:conditional, s(:int, 1)), s(:statements, s(:assignment,