ruby-x/soml-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename field to parameter in parameter_list

Browse Source 
also field to field_def (wip)
and lots of whitespace due to ws fix
This commit is contained in:
Torsten Ruger 2015-09-20 12:56:06 +03:00
parent be444bc687
commit ea6472c28f
20 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/parser/transform.rb
View File

@ -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) ,

4
test/cases/class_def/class_function.tst
View File

@ -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),

2
test/cases/class_def/class_if.tst
View File

@ -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,

30
test/cases/class_def/class_ops.tst
View File

@ -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))))))

14
test/cases/function_definition/class_function.tst
View File

@ -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))))

76
test/cases/function_definition/function_big_while.tst
View File

@ -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))))))))

2
test/cases/function_definition/function_if.tst
View File

@ -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,

26
test/cases/function_definition/function_ops.tst
View File

@ -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)))))

2
test/cases/function_definition/function_return.tst
View File

@ -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,

2
test/cases/function_definition/function_return_if.tst
View File

@ -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,

38
test/cases/function_definition/function_return_while.tst
View File

@ -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)))))))

16
test/cases/function_definition/function_two_args.tst
View File

@ -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))))

42
test/cases/function_definition/function_while.tst
View File

@ -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))))))))

14
test/cases/function_definition/simplest_function.tst
View File

@ -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))))

30
test/cases/module_def/module_function.tst
View File

@ -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))))))

2
test/cases/module_def/module_if.tst
View File

@ -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,

2
test/cases/module_def/module_ops.tst
View File

@ -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,

26
test/cases/root/double_root.tst
View File

@ -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))))

84
test/cases/root/fibo1.tst
View File

@ -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))))

34
test/cases/root/module_method.tst
View File

@ -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)))))