From f7dcf2a2ff31d33844b55869122eab3a84fe76a1 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Fri, 9 Oct 2015 17:21:15 +0300 Subject: [PATCH] renameing to match expressions --- lib/parser/{expression.rb => statement.rb} | 0 test/cases/{compound => array_constant}/array_list.tst | 0 test/cases/{compound => array_constant}/array_ops.tst | 0 test/cases/{compound => array_constant}/one_array.tst | 0 .../{expressions => assignment}/assignment_instance.tst | 0 .../{basic/module_name.tst => basic_type/class_name.tst} | 0 test/cases/{basic => basic_type}/name.tst | 0 .../{basic => basic_type}/name_underscode_middle.tst | 0 .../cases/{basic => basic_type}/name_underscode_start.tst | 0 test/cases/{basic => basic_type}/number.tst | 0 test/cases/{basic => basic_type}/string.tst | 0 test/cases/{basic => basic_type}/string_escapes.tst | 0 test/cases/{class_def => class_definition}/big_class.tst | 0 .../{class_def => class_definition}/class_derived.tst | 0 .../{class_def => class_definition}/class_function.tst | 0 test/cases/{class_def => class_definition}/class_if.tst | 0 .../{class_def => class_definition}/class_method.tst | 0 test/cases/{class_def => class_definition}/class_ops.tst | 0 .../{class_def => class_definition}/simplest_class.tst | 0 test/cases/expressions/assignment.tst | 6 ------ test/cases/expressions/two_different_ops.tst | 8 -------- test/cases/expressions/two_different_ops_order.tst | 8 -------- test/cases/expressions/two_same_ops.tst | 8 -------- test/cases/{compound => hash_constant}/hash.tst | 0 test/cases/{compound => hash_constant}/hash2.tst | 0 test/cases/{compound => hash_constant}/hash_list.tst | 0 test/cases/{conditional => if_statement}/if_else.tst | 0 .../{conditional => if_statement}/if_else_expressions.tst | 0 .../{expressions => operator_value}/op_two_variable.tst | 0 .../cases/{expressions => operator_value}/op_variable.tst | 0 .../op_variable_string.tst | 0 .../{expressions => operator_value}/op_variable_true.tst | 0 .../{expressions => operator_value}/simple_devide.tst | 0 .../{expressions => operator_value}/simple_greater.tst | 0 .../{expressions => operator_value}/simple_minus.tst | 0 .../{expressions => operator_value}/simple_multiply.tst | 0 .../cases/{expressions => operator_value}/simple_plus.tst | 0 .../{expressions => operator_value}/simple_smaller.tst | 0 test/cases/{return => return_statement}/return_int.tst | 0 test/cases/{return => return_statement}/return_string.tst | 0 .../{return => return_statement}/return_variable.tst | 0 test/cases/{conditional => small_conditional}/if_end.tst | 0 .../if_end_expressions.tst | 0 test/cases/{while => while_statement}/big_while.tst | 0 test/cases/{while => while_statement}/while.tst | 0 test/cases/{while => while_statement}/while_method.tst | 0 46 files changed, 30 deletions(-) rename lib/parser/{expression.rb => statement.rb} (100%) rename test/cases/{compound => array_constant}/array_list.tst (100%) rename test/cases/{compound => array_constant}/array_ops.tst (100%) rename test/cases/{compound => array_constant}/one_array.tst (100%) rename test/cases/{expressions => assignment}/assignment_instance.tst (100%) rename test/cases/{basic/module_name.tst => basic_type/class_name.tst} (100%) rename test/cases/{basic => basic_type}/name.tst (100%) rename test/cases/{basic => basic_type}/name_underscode_middle.tst (100%) rename test/cases/{basic => basic_type}/name_underscode_start.tst (100%) rename test/cases/{basic => basic_type}/number.tst (100%) rename test/cases/{basic => basic_type}/string.tst (100%) rename test/cases/{basic => basic_type}/string_escapes.tst (100%) rename test/cases/{class_def => class_definition}/big_class.tst (100%) rename test/cases/{class_def => class_definition}/class_derived.tst (100%) rename test/cases/{class_def => class_definition}/class_function.tst (100%) rename test/cases/{class_def => class_definition}/class_if.tst (100%) rename test/cases/{class_def => class_definition}/class_method.tst (100%) rename test/cases/{class_def => class_definition}/class_ops.tst (100%) rename test/cases/{class_def => class_definition}/simplest_class.tst (100%) delete mode 100644 test/cases/expressions/assignment.tst delete mode 100644 test/cases/expressions/two_different_ops.tst delete mode 100644 test/cases/expressions/two_different_ops_order.tst delete mode 100644 test/cases/expressions/two_same_ops.tst rename test/cases/{compound => hash_constant}/hash.tst (100%) rename test/cases/{compound => hash_constant}/hash2.tst (100%) rename test/cases/{compound => hash_constant}/hash_list.tst (100%) rename test/cases/{conditional => if_statement}/if_else.tst (100%) rename test/cases/{conditional => if_statement}/if_else_expressions.tst (100%) rename test/cases/{expressions => operator_value}/op_two_variable.tst (100%) rename test/cases/{expressions => operator_value}/op_variable.tst (100%) rename test/cases/{expressions => operator_value}/op_variable_string.tst (100%) rename test/cases/{expressions => operator_value}/op_variable_true.tst (100%) rename test/cases/{expressions => operator_value}/simple_devide.tst (100%) rename test/cases/{expressions => operator_value}/simple_greater.tst (100%) rename test/cases/{expressions => operator_value}/simple_minus.tst (100%) rename test/cases/{expressions => operator_value}/simple_multiply.tst (100%) rename test/cases/{expressions => operator_value}/simple_plus.tst (100%) rename test/cases/{expressions => operator_value}/simple_smaller.tst (100%) rename test/cases/{return => return_statement}/return_int.tst (100%) rename test/cases/{return => return_statement}/return_string.tst (100%) rename test/cases/{return => return_statement}/return_variable.tst (100%) rename test/cases/{conditional => small_conditional}/if_end.tst (100%) rename test/cases/{conditional => small_conditional}/if_end_expressions.tst (100%) rename test/cases/{while => while_statement}/big_while.tst (100%) rename test/cases/{while => while_statement}/while.tst (100%) rename test/cases/{while => while_statement}/while_method.tst (100%) diff --git a/lib/parser/expression.rb b/lib/parser/statement.rb similarity index 100% rename from lib/parser/expression.rb rename to lib/parser/statement.rb diff --git a/test/cases/compound/array_list.tst b/test/cases/array_constant/array_list.tst similarity index 100% rename from test/cases/compound/array_list.tst rename to test/cases/array_constant/array_list.tst diff --git a/test/cases/compound/array_ops.tst b/test/cases/array_constant/array_ops.tst similarity index 100% rename from test/cases/compound/array_ops.tst rename to test/cases/array_constant/array_ops.tst diff --git a/test/cases/compound/one_array.tst b/test/cases/array_constant/one_array.tst similarity index 100% rename from test/cases/compound/one_array.tst rename to test/cases/array_constant/one_array.tst diff --git a/test/cases/expressions/assignment_instance.tst b/test/cases/assignment/assignment_instance.tst similarity index 100% rename from test/cases/expressions/assignment_instance.tst rename to test/cases/assignment/assignment_instance.tst diff --git a/test/cases/basic/module_name.tst b/test/cases/basic_type/class_name.tst similarity index 100% rename from test/cases/basic/module_name.tst rename to test/cases/basic_type/class_name.tst diff --git a/test/cases/basic/name.tst b/test/cases/basic_type/name.tst similarity index 100% rename from test/cases/basic/name.tst rename to test/cases/basic_type/name.tst diff --git a/test/cases/basic/name_underscode_middle.tst b/test/cases/basic_type/name_underscode_middle.tst similarity index 100% rename from test/cases/basic/name_underscode_middle.tst rename to test/cases/basic_type/name_underscode_middle.tst diff --git a/test/cases/basic/name_underscode_start.tst b/test/cases/basic_type/name_underscode_start.tst similarity index 100% rename from test/cases/basic/name_underscode_start.tst rename to test/cases/basic_type/name_underscode_start.tst diff --git a/test/cases/basic/number.tst b/test/cases/basic_type/number.tst similarity index 100% rename from test/cases/basic/number.tst rename to test/cases/basic_type/number.tst diff --git a/test/cases/basic/string.tst b/test/cases/basic_type/string.tst similarity index 100% rename from test/cases/basic/string.tst rename to test/cases/basic_type/string.tst diff --git a/test/cases/basic/string_escapes.tst b/test/cases/basic_type/string_escapes.tst similarity index 100% rename from test/cases/basic/string_escapes.tst rename to test/cases/basic_type/string_escapes.tst diff --git a/test/cases/class_def/big_class.tst b/test/cases/class_definition/big_class.tst similarity index 100% rename from test/cases/class_def/big_class.tst rename to test/cases/class_definition/big_class.tst diff --git a/test/cases/class_def/class_derived.tst b/test/cases/class_definition/class_derived.tst similarity index 100% rename from test/cases/class_def/class_derived.tst rename to test/cases/class_definition/class_derived.tst diff --git a/test/cases/class_def/class_function.tst b/test/cases/class_definition/class_function.tst similarity index 100% rename from test/cases/class_def/class_function.tst rename to test/cases/class_definition/class_function.tst diff --git a/test/cases/class_def/class_if.tst b/test/cases/class_definition/class_if.tst similarity index 100% rename from test/cases/class_def/class_if.tst rename to test/cases/class_definition/class_if.tst diff --git a/test/cases/class_def/class_method.tst b/test/cases/class_definition/class_method.tst similarity index 100% rename from test/cases/class_def/class_method.tst rename to test/cases/class_definition/class_method.tst diff --git a/test/cases/class_def/class_ops.tst b/test/cases/class_definition/class_ops.tst similarity index 100% rename from test/cases/class_def/class_ops.tst rename to test/cases/class_definition/class_ops.tst diff --git a/test/cases/class_def/simplest_class.tst b/test/cases/class_definition/simplest_class.tst similarity index 100% rename from test/cases/class_def/simplest_class.tst rename to test/cases/class_definition/simplest_class.tst diff --git a/test/cases/expressions/assignment.tst b/test/cases/expressions/assignment.tst deleted file mode 100644 index 395cd9f..0000000 --- a/test/cases/expressions/assignment.tst +++ /dev/null @@ -1,6 +0,0 @@ -a = 5 --- -- -- -s(:expressions, - s(:assign, - s(:name, :a), - s(:int, 5))) diff --git a/test/cases/expressions/two_different_ops.tst b/test/cases/expressions/two_different_ops.tst deleted file mode 100644 index df9b60e..0000000 --- a/test/cases/expressions/two_different_ops.tst +++ /dev/null @@ -1,8 +0,0 @@ -2 + 3 * 4 --- -- -- -s(:expressions, - s(:operator, "+", - s(:int, 2), - s(:operator, "*", - s(:int, 3), - s(:int, 4)))) diff --git a/test/cases/expressions/two_different_ops_order.tst b/test/cases/expressions/two_different_ops_order.tst deleted file mode 100644 index b04e05b..0000000 --- a/test/cases/expressions/two_different_ops_order.tst +++ /dev/null @@ -1,8 +0,0 @@ -2 * 3 + 4 --- -- -- -s(:expressions, - s(:operator, "+", - s(:operator, "*", - s(:int, 2), - s(:int, 3)), - s(:int, 4))) diff --git a/test/cases/expressions/two_same_ops.tst b/test/cases/expressions/two_same_ops.tst deleted file mode 100644 index a3ab390..0000000 --- a/test/cases/expressions/two_same_ops.tst +++ /dev/null @@ -1,8 +0,0 @@ -2 + 3 + 4 --- -- -- -s(:expressions, - s(:operator, "+", - s(:operator, "+", - s(:int, 2), - s(:int, 3)), - s(:int, 4))) diff --git a/test/cases/compound/hash.tst b/test/cases/hash_constant/hash.tst similarity index 100% rename from test/cases/compound/hash.tst rename to test/cases/hash_constant/hash.tst diff --git a/test/cases/compound/hash2.tst b/test/cases/hash_constant/hash2.tst similarity index 100% rename from test/cases/compound/hash2.tst rename to test/cases/hash_constant/hash2.tst diff --git a/test/cases/compound/hash_list.tst b/test/cases/hash_constant/hash_list.tst similarity index 100% rename from test/cases/compound/hash_list.tst rename to test/cases/hash_constant/hash_list.tst diff --git a/test/cases/conditional/if_else.tst b/test/cases/if_statement/if_else.tst similarity index 100% rename from test/cases/conditional/if_else.tst rename to test/cases/if_statement/if_else.tst diff --git a/test/cases/conditional/if_else_expressions.tst b/test/cases/if_statement/if_else_expressions.tst similarity index 100% rename from test/cases/conditional/if_else_expressions.tst rename to test/cases/if_statement/if_else_expressions.tst diff --git a/test/cases/expressions/op_two_variable.tst b/test/cases/operator_value/op_two_variable.tst similarity index 100% rename from test/cases/expressions/op_two_variable.tst rename to test/cases/operator_value/op_two_variable.tst diff --git a/test/cases/expressions/op_variable.tst b/test/cases/operator_value/op_variable.tst similarity index 100% rename from test/cases/expressions/op_variable.tst rename to test/cases/operator_value/op_variable.tst diff --git a/test/cases/expressions/op_variable_string.tst b/test/cases/operator_value/op_variable_string.tst similarity index 100% rename from test/cases/expressions/op_variable_string.tst rename to test/cases/operator_value/op_variable_string.tst diff --git a/test/cases/expressions/op_variable_true.tst b/test/cases/operator_value/op_variable_true.tst similarity index 100% rename from test/cases/expressions/op_variable_true.tst rename to test/cases/operator_value/op_variable_true.tst diff --git a/test/cases/expressions/simple_devide.tst b/test/cases/operator_value/simple_devide.tst similarity index 100% rename from test/cases/expressions/simple_devide.tst rename to test/cases/operator_value/simple_devide.tst diff --git a/test/cases/expressions/simple_greater.tst b/test/cases/operator_value/simple_greater.tst similarity index 100% rename from test/cases/expressions/simple_greater.tst rename to test/cases/operator_value/simple_greater.tst diff --git a/test/cases/expressions/simple_minus.tst b/test/cases/operator_value/simple_minus.tst similarity index 100% rename from test/cases/expressions/simple_minus.tst rename to test/cases/operator_value/simple_minus.tst diff --git a/test/cases/expressions/simple_multiply.tst b/test/cases/operator_value/simple_multiply.tst similarity index 100% rename from test/cases/expressions/simple_multiply.tst rename to test/cases/operator_value/simple_multiply.tst diff --git a/test/cases/expressions/simple_plus.tst b/test/cases/operator_value/simple_plus.tst similarity index 100% rename from test/cases/expressions/simple_plus.tst rename to test/cases/operator_value/simple_plus.tst diff --git a/test/cases/expressions/simple_smaller.tst b/test/cases/operator_value/simple_smaller.tst similarity index 100% rename from test/cases/expressions/simple_smaller.tst rename to test/cases/operator_value/simple_smaller.tst diff --git a/test/cases/return/return_int.tst b/test/cases/return_statement/return_int.tst similarity index 100% rename from test/cases/return/return_int.tst rename to test/cases/return_statement/return_int.tst diff --git a/test/cases/return/return_string.tst b/test/cases/return_statement/return_string.tst similarity index 100% rename from test/cases/return/return_string.tst rename to test/cases/return_statement/return_string.tst diff --git a/test/cases/return/return_variable.tst b/test/cases/return_statement/return_variable.tst similarity index 100% rename from test/cases/return/return_variable.tst rename to test/cases/return_statement/return_variable.tst diff --git a/test/cases/conditional/if_end.tst b/test/cases/small_conditional/if_end.tst similarity index 100% rename from test/cases/conditional/if_end.tst rename to test/cases/small_conditional/if_end.tst diff --git a/test/cases/conditional/if_end_expressions.tst b/test/cases/small_conditional/if_end_expressions.tst similarity index 100% rename from test/cases/conditional/if_end_expressions.tst rename to test/cases/small_conditional/if_end_expressions.tst diff --git a/test/cases/while/big_while.tst b/test/cases/while_statement/big_while.tst similarity index 100% rename from test/cases/while/big_while.tst rename to test/cases/while_statement/big_while.tst diff --git a/test/cases/while/while.tst b/test/cases/while_statement/while.tst similarity index 100% rename from test/cases/while/while.tst rename to test/cases/while_statement/while.tst diff --git a/test/cases/while/while_method.tst b/test/cases/while_statement/while_method.tst similarity index 100% rename from test/cases/while/while_method.tst rename to test/cases/while_statement/while_method.tst