From ea6472c28f77c3ac8c9962bb1eeea81dfd6f536e Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Sun, 20 Sep 2015 12:56:06 +0300 Subject: [PATCH] rename field to parameter in parameter_list also field to field_def (wip) and lots of whitespace due to ws fix --- lib/parser/transform.rb | 4 +- test/cases/class_def/class_function.tst | 4 +- test/cases/class_def/class_if.tst | 2 +- test/cases/class_def/class_ops.tst | 30 +++---- .../function_definition/class_function.tst | 14 ++-- .../function_big_while.tst | 76 ++++++++--------- .../cases/function_definition/function_if.tst | 2 +- .../function_definition/function_ops.tst | 26 +++--- .../function_definition/function_return.tst | 2 +- .../function_return_if.tst | 2 +- .../function_return_while.tst | 38 ++++----- .../function_definition/function_two_args.tst | 16 ++-- .../function_definition/function_while.tst | 42 +++++----- .../function_definition/simplest_function.tst | 14 ++-- test/cases/module_def/module_function.tst | 30 +++---- test/cases/module_def/module_if.tst | 2 +- test/cases/module_def/module_ops.tst | 2 +- test/cases/root/double_root.tst | 26 +++--- test/cases/root/fibo1.tst | 84 +++++++++---------- test/cases/root/module_method.tst | 34 ++++---- 20 files changed, 225 insertions(+), 225 deletions(-) diff --git a/lib/parser/transform.rb b/lib/parser/transform.rb index eba20dc..3688ab0 100644 --- a/lib/parser/transform.rb +++ b/lib/parser/transform.rb @@ -14,7 +14,7 @@ module Parser rule(:nil => simple(:nil)) { s(:nil) } rule(:integer => simple(:value)) { s(:int ,value.to_i) } rule(:name => simple(:name)) { s(:name , name.to_sym) } - rule(:type => simple(:type), :name => simple(:name)) { s(:field , type.to_sym , name.to_sym) } + rule(:type => simple(:type), :name => simple(:name)) { s(:field_def , type.to_sym , name.to_sym) } rule(:module_name => simple(:module_name)) { s(:module,module_name.to_s) } @@ -61,7 +61,7 @@ module Parser s(:return , return_expression) end - rule(:parameter => simple(:parameter)) { parameter } + rule(:parameter => simple(:parameter)) { s(:parameter , *parameter) } # Also two rules for function definitions, unqualified and qualified rule(:type => simple(:type) , diff --git a/test/cases/class_def/class_function.tst b/test/cases/class_def/class_function.tst index d5627dc..e6aa448 100644 --- a/test/cases/class_def/class_function.tst +++ b/test/cases/class_def/class_function.tst @@ -17,8 +17,8 @@ s(:expressions, s(:function, :int, s(:name, :ofthen), s(:parameters, - s(:field, :int, :n), - s(:field, :ref, :m)), + s(:parameter, :int, :n), + s(:parameter, :ref, :m)), s(:expressions, s(:assign, s(:name, :n), diff --git a/test/cases/class_def/class_if.tst b/test/cases/class_def/class_if.tst index 07062b6..9654ce4 100644 --- a/test/cases/class_def/class_if.tst +++ b/test/cases/class_def/class_if.tst @@ -14,7 +14,7 @@ s(:expressions, s(:function, :int, s(:name, :ofthen), s(:parameters, - s(:field, :int, :n)), + s(:parameter, :int, :n)), s(:expressions, s(:if, s(:condition, diff --git a/test/cases/class_def/class_ops.tst b/test/cases/class_def/class_ops.tst index ea818f7..c18c831 100644 --- a/test/cases/class_def/class_ops.tst +++ b/test/cases/class_def/class_ops.tst @@ -5,18 +5,18 @@ class Opers end end -- -- -- -s(:expressions, - s(:class, :Opers, - s(:derives, nil), - s(:function, :int, - s(:name, :foo), - s(:parameters, - s(:field, :int, :x)), - s(:expressions, - s(:name, :int), - s(:assign, - s(:name, :abba), - s(:int, 5)), - s(:operator, "+", - s(:name, :abba), - s(:int, 5)))))) +s(:expressions, + s(:class, :Opers, + s(:derives, nil), + s(:function, :int, + s(:name, :foo), + s(:parameters, + s(:parameter, :int, :x)), + s(:expressions, + s(:name, :int), + s(:assign, + s(:name, :abba), + s(:int, 5)), + s(:operator, "+", + s(:name, :abba), + s(:int, 5)))))) diff --git a/test/cases/function_definition/class_function.tst b/test/cases/function_definition/class_function.tst index 749bc75..3d1ac0b 100644 --- a/test/cases/function_definition/class_function.tst +++ b/test/cases/function_definition/class_function.tst @@ -2,10 +2,10 @@ int length( ref x ) length end -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :length), - s(:parameters, - s(:field, :ref, :x)), - s(:expressions, - s(:name, :length)))) +s(:expressions, + s(:function, :int, + s(:name, :length), + s(:parameters, + s(:parameter, :ref, :x)), + s(:expressions, + s(:name, :length)))) diff --git a/test/cases/function_definition/function_big_while.tst b/test/cases/function_definition/function_big_while.tst index 78d2f37..3a252fe 100644 --- a/test/cases/function_definition/function_big_while.tst +++ b/test/cases/function_definition/function_big_while.tst @@ -10,41 +10,41 @@ int fibonaccit(int n) end end -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :fibonaccit), - s(:parameters, - s(:field, :int, :n)), - s(:expressions, - s(:assign, - s(:name, :a), - s(:int, 0)), - s(:assign, - s(:name, :b), - s(:int, 1)), - s(:while, - s(:condition, - s(:operator, ">", - s(:name, :n), - s(:int, 1))), - s(:expressions, - s(:assign, - s(:name, :tmp), - s(:name, :a)), - s(:assign, - s(:name, :a), - s(:name, :b)), - s(:assign, - s(:name, :b), - s(:operator, "+", - s(:name, :tmp), - s(:name, :b))), - s(:call, - s(:name, :puts), - s(:arguments, - s(:name, :b))), - s(:assign, - s(:name, :n), - s(:operator, "-", - s(:name, :n), - s(:int, 1)))))))) +s(:expressions, + s(:function, :int, + s(:name, :fibonaccit), + s(:parameters, + s(:parameter, :int, :n)), + s(:expressions, + s(:assign, + s(:name, :a), + s(:int, 0)), + s(:assign, + s(:name, :b), + s(:int, 1)), + s(:while, + s(:condition, + s(:operator, ">", + s(:name, :n), + s(:int, 1))), + s(:expressions, + s(:assign, + s(:name, :tmp), + s(:name, :a)), + s(:assign, + s(:name, :a), + s(:name, :b)), + s(:assign, + s(:name, :b), + s(:operator, "+", + s(:name, :tmp), + s(:name, :b))), + s(:call, + s(:name, :puts), + s(:arguments, + s(:name, :b))), + s(:assign, + s(:name, :n), + s(:operator, "-", + s(:name, :n), + s(:int, 1)))))))) diff --git a/test/cases/function_definition/function_if.tst b/test/cases/function_definition/function_if.tst index 001888f..d12f1c7 100644 --- a/test/cases/function_definition/function_if.tst +++ b/test/cases/function_definition/function_if.tst @@ -10,7 +10,7 @@ s(:expressions, s(:function, :ref, s(:name, :ofthen), s(:parameters, - s(:field, :int, :n)), + s(:parameter, :int, :n)), s(:expressions, s(:if, s(:condition, diff --git a/test/cases/function_definition/function_ops.tst b/test/cases/function_definition/function_ops.tst index 7d46c5d..ceab819 100644 --- a/test/cases/function_definition/function_ops.tst +++ b/test/cases/function_definition/function_ops.tst @@ -3,16 +3,16 @@ int foo(int x) abba + 5 end -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :foo), - s(:parameters, - s(:field, :int, :x)), - s(:expressions, - s(:name, :int), - s(:assign, - s(:name, :abba), - s(:int, 5)), - s(:operator, "+", - s(:name, :abba), - s(:int, 5))))) +s(:expressions, + s(:function, :int, + s(:name, :foo), + s(:parameters, + s(:parameter, :int, :x)), + s(:expressions, + s(:name, :int), + s(:assign, + s(:name, :abba), + s(:int, 5)), + s(:operator, "+", + s(:name, :abba), + s(:int, 5))))) diff --git a/test/cases/function_definition/function_return.tst b/test/cases/function_definition/function_return.tst index 81b8ae9..f4107c0 100644 --- a/test/cases/function_definition/function_return.tst +++ b/test/cases/function_definition/function_return.tst @@ -7,7 +7,7 @@ s(:expressions, s(:function, :int, s(:name, :retvar), s(:parameters, - s(:field, :ref, :n)), + s(:parameter, :ref, :n)), s(:expressions, s(:name, :int), s(:assign, diff --git a/test/cases/function_definition/function_return_if.tst b/test/cases/function_definition/function_return_if.tst index 2c8df5d..ce3d8a0 100644 --- a/test/cases/function_definition/function_return_if.tst +++ b/test/cases/function_definition/function_return_if.tst @@ -10,7 +10,7 @@ s(:expressions, s(:function, :int, s(:name, :retvar), s(:parameters, - s(:field, :int, :n)), + s(:parameter, :int, :n)), s(:expressions, s(:if, s(:condition, diff --git a/test/cases/function_definition/function_return_while.tst b/test/cases/function_definition/function_return_while.tst index f116ad5..9ca63b0 100644 --- a/test/cases/function_definition/function_return_while.tst +++ b/test/cases/function_definition/function_return_while.tst @@ -5,22 +5,22 @@ int retvar(int n ) end end -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :retvar), - s(:parameters, - s(:field, :int, :n)), - s(:expressions, - s(:while, - s(:condition, - s(:operator, ">", - s(:name, :n), - s(:int, 5))), - s(:expressions, - s(:assign, - s(:name, :n), - s(:operator, "+", - s(:name, :n), - s(:int, 1))), - s(:return, - s(:name, :n))))))) +s(:expressions, + s(:function, :int, + s(:name, :retvar), + s(:parameters, + s(:parameter, :int, :n)), + s(:expressions, + s(:while, + s(:condition, + s(:operator, ">", + s(:name, :n), + s(:int, 5))), + s(:expressions, + s(:assign, + s(:name, :n), + s(:operator, "+", + s(:name, :n), + s(:int, 1))), + s(:return, + s(:name, :n))))))) diff --git a/test/cases/function_definition/function_two_args.tst b/test/cases/function_definition/function_two_args.tst index 70a0d3f..59ec5a6 100644 --- a/test/cases/function_definition/function_two_args.tst +++ b/test/cases/function_definition/function_two_args.tst @@ -2,11 +2,11 @@ int foo( int n ,ref m) n end -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :foo), - s(:parameters, - s(:field, :int, :n), - s(:field, :ref, :m)), - s(:expressions, - s(:name, :n)))) +s(:expressions, + s(:function, :int, + s(:name, :foo), + s(:parameters, + s(:parameter, :int, :n), + s(:parameter, :ref, :m)), + s(:expressions, + s(:name, :n)))) diff --git a/test/cases/function_definition/function_while.tst b/test/cases/function_definition/function_while.tst index a5724f8..05fe506 100644 --- a/test/cases/function_definition/function_while.tst +++ b/test/cases/function_definition/function_while.tst @@ -6,24 +6,24 @@ ref fibonaccit(int n) end end -- -- -- -s(:expressions, - s(:function, :ref, - s(:name, :fibonaccit), - s(:parameters, - s(:field, :int, :n)), - s(:expressions, - s(:assign, - s(:name, :a), - s(:int, 0)), - s(:while, - s(:condition, - s(:name, :n)), - s(:expressions, - s(:assign, - s(:name, :some), - s(:int, 43)), - s(:assign, - s(:name, :other), - s(:operator, "*", - s(:name, :some), - s(:int, 4)))))))) +s(:expressions, + s(:function, :ref, + s(:name, :fibonaccit), + s(:parameters, + s(:parameter, :int, :n)), + s(:expressions, + s(:assign, + s(:name, :a), + s(:int, 0)), + s(:while, + s(:condition, + s(:name, :n)), + s(:expressions, + s(:assign, + s(:name, :some), + s(:int, 43)), + s(:assign, + s(:name, :other), + s(:operator, "*", + s(:name, :some), + s(:int, 4)))))))) diff --git a/test/cases/function_definition/simplest_function.tst b/test/cases/function_definition/simplest_function.tst index 3742a52..da3fb22 100644 --- a/test/cases/function_definition/simplest_function.tst +++ b/test/cases/function_definition/simplest_function.tst @@ -2,10 +2,10 @@ int foo(ref x) 5 end -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :foo), - s(:parameters, - s(:field, :ref, :x)), - s(:expressions, - s(:int, 5)))) +s(:expressions, + s(:function, :int, + s(:name, :foo), + s(:parameters, + s(:parameter, :ref, :x)), + s(:expressions, + s(:int, 5)))) diff --git a/test/cases/module_def/module_function.tst b/test/cases/module_def/module_function.tst index 3a46369..d1305d5 100644 --- a/test/cases/module_def/module_function.tst +++ b/test/cases/module_def/module_function.tst @@ -5,18 +5,18 @@ module Soho end end -- -- -- -s(:expressions, - s(:module, :Soho, - s(:call, - s(:name, :ofthen), - s(:arguments, - s(:int, 3), - s(:name, :var))), - s(:function, :int, - s(:name, :ofthen), - s(:parameters, - s(:field, :int, :n), - s(:field, :ref, :m)), - s(:expressions, - s(:return, - s(:int, 44)))))) +s(:expressions, + s(:module, :Soho, + s(:call, + s(:name, :ofthen), + s(:arguments, + s(:int, 3), + s(:name, :var))), + s(:function, :int, + s(:name, :ofthen), + s(:parameters, + s(:parameter, :int, :n), + s(:parameter, :ref, :m)), + s(:expressions, + s(:return, + s(:int, 44)))))) diff --git a/test/cases/module_def/module_if.tst b/test/cases/module_def/module_if.tst index b6492a1..800cf0b 100644 --- a/test/cases/module_def/module_if.tst +++ b/test/cases/module_def/module_if.tst @@ -13,7 +13,7 @@ s(:expressions, s(:function, :ref, s(:name, :ofthen), s(:parameters, - s(:field, :int, :n)), + s(:parameter, :int, :n)), s(:expressions, s(:if, s(:condition, diff --git a/test/cases/module_def/module_ops.tst b/test/cases/module_def/module_ops.tst index ac16217..ea4e4a7 100644 --- a/test/cases/module_def/module_ops.tst +++ b/test/cases/module_def/module_ops.tst @@ -10,7 +10,7 @@ s(:expressions, s(:function, :int, s(:name, :foo), s(:parameters, - s(:field, :int, :x)), + s(:parameter, :int, :x)), s(:expressions, s(:name, :int), s(:assign, diff --git a/test/cases/root/double_root.tst b/test/cases/root/double_root.tst index 2387a62..86b9734 100644 --- a/test/cases/root/double_root.tst +++ b/test/cases/root/double_root.tst @@ -4,16 +4,16 @@ end foo( 3 ) -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :foo), - s(:parameters, - s(:field, :ref, :x)), - s(:expressions, - s(:assign, - s(:name, :a), - s(:int, 5)))), - s(:call, - s(:name, :foo), - s(:arguments, - s(:int, 3)))) +s(:expressions, + s(:function, :int, + s(:name, :foo), + s(:parameters, + s(:parameter, :ref, :x)), + s(:expressions, + s(:assign, + s(:name, :a), + s(:int, 5)))), + s(:call, + s(:name, :foo), + s(:arguments, + s(:int, 3)))) diff --git a/test/cases/root/fibo1.tst b/test/cases/root/fibo1.tst index 2050d01..70f4c91 100644 --- a/test/cases/root/fibo1.tst +++ b/test/cases/root/fibo1.tst @@ -12,45 +12,45 @@ end fibonaccit( 10 ) -- -- -- -s(:expressions, - s(:function, :int, - s(:name, :fibonaccit), - s(:parameters, - s(:field, :int, :n)), - s(:expressions, - s(:assign, - s(:name, :a), - s(:int, 0)), - s(:assign, - s(:name, :b), - s(:int, 1)), - s(:while, - s(:condition, - s(:operator, ">", - s(:name, :n), - s(:int, 1))), - s(:expressions, - s(:assign, - s(:name, :tmp), - s(:name, :a)), - s(:assign, - s(:name, :a), - s(:name, :b)), - s(:assign, - s(:name, :b), - s(:operator, "+", - s(:name, :tmp), - s(:name, :b))), - s(:call, - s(:name, :puts), - s(:arguments, - s(:name, :b))), - s(:assign, - s(:name, :n), - s(:operator, "-", - s(:name, :n), - s(:int, 1))))))), - s(:call, - s(:name, :fibonaccit), - s(:arguments, - s(:int, 10)))) +s(:expressions, + s(:function, :int, + s(:name, :fibonaccit), + s(:parameters, + s(:parameter, :int, :n)), + s(:expressions, + s(:assign, + s(:name, :a), + s(:int, 0)), + s(:assign, + s(:name, :b), + s(:int, 1)), + s(:while, + s(:condition, + s(:operator, ">", + s(:name, :n), + s(:int, 1))), + s(:expressions, + s(:assign, + s(:name, :tmp), + s(:name, :a)), + s(:assign, + s(:name, :a), + s(:name, :b)), + s(:assign, + s(:name, :b), + s(:operator, "+", + s(:name, :tmp), + s(:name, :b))), + s(:call, + s(:name, :puts), + s(:arguments, + s(:name, :b))), + s(:assign, + s(:name, :n), + s(:operator, "-", + s(:name, :n), + s(:int, 1))))))), + s(:call, + s(:name, :fibonaccit), + s(:arguments, + s(:int, 10)))) diff --git a/test/cases/root/module_method.tst b/test/cases/root/module_method.tst index f191df3..b9bfed2 100644 --- a/test/cases/root/module_method.tst +++ b/test/cases/root/module_method.tst @@ -8,20 +8,20 @@ module Fibo end -- -- -- -s(:expressions, - s(:module, :Fibo, - s(:function, :int, - s(:name, :fibonaccit), - s(:parameters, - s(:field, :int, :n)), - s(:expressions, - s(:name, :int), - s(:assign, - s(:name, :a), - s(:int, 0)), - s(:return, - s(:name, :a)))), - s(:call, - s(:name, :fibonaccit), - s(:arguments, - s(:int, 10))))) +s(:expressions, + s(:module, :Fibo, + s(:function, :int, + s(:name, :fibonaccit), + s(:parameters, + s(:parameter, :int, :n)), + s(:expressions, + s(:name, :int), + s(:assign, + s(:name, :a), + s(:int, 0)), + s(:return, + s(:name, :a)))), + s(:call, + s(:name, :fibonaccit), + s(:arguments, + s(:int, 10)))))