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

leaving the name for field defs

Browse Source 
so we can reuse that expression
so we can highlight it in the debugger
This commit is contained in:
Torsten Ruger 2015-11-02 20:10:05 +02:00
parent 335a6b1e37
commit 6ae4b624b0
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/parser/transform.rb
View File

@ -25,9 +25,10 @@ module Parser
rule(:integer => simple(:value)) { s(:int ,value.to_i) } rule(:integer => simple(:value)) { s(:int ,value.to_i) }
rule(:name => simple(:name)) { s(:name , name.to_sym) } rule(:name => simple(:name)) { s(:name , name.to_sym) }
# local variables # local variables
rule(:type => simple(:type), :name => simple(:name)) { s(:field_def , type_sym(type) , name.to_sym) } rule(:type => simple(:type), :name => simple(:name)) {
s(:field_def , type_sym(type) , s(:name , name.to_sym)) }
rule(:type => simple(:type), :name => simple(:name) , :value => simple(:value)) { rule(:type => simple(:type), :name => simple(:name) , :value => simple(:value)) {
s(:field_def , type_sym(type) , name.to_sym , value ) } s(:field_def , type_sym(type) , s(:name , name.to_sym) , value ) }
# class field # class field
rule(:field => simple(:field) , :type => simple(:type), :name => simple(:name)) { rule(:field => simple(:field) , :type => simple(:type), :name => simple(:name)) {
s(:class_field , type_sym(type) , name.to_sym) } s(:class_field , type_sym(type) , name.to_sym) }
@ -88,7 +89,7 @@ module Parser
s(:return , return_statement) s(:return , return_statement)
end end
rule(:parameter => simple(:parameter)) { s(:parameter , *parameter) } rule(:parameter => simple(:parameter)) { s(:parameter , parameter.children[0] , parameter.children[1].children[0]) }
# Also two rules for function definitions, unqualified and qualified # Also two rules for function definitions, unqualified and qualified
rule(:type => simple(:type) , rule(:type => simple(:type) ,

3
test/cases/class_definition/class_ops.tst
View File

@ -14,7 +14,8 @@ s(:statements,
s(:parameters, s(:parameters,
s(:parameter, :Integer, :x)), s(:parameter, :Integer, :x)),
s(:statements, s(:statements,
s(:field_def, :Integer, :abba, s(:field_def, :Integer,
s(:name, :abba),
s(:int, 5)), s(:int, 5)),
s(:return, s(:return,
s(:operator_value, :+, s(:operator_value, :+,

3
test/cases/function_definition/function_foo2.tst
View File

@ -9,7 +9,8 @@ s(:statements,
s(:parameters, s(:parameters,
s(:parameter, :Integer, :x)), s(:parameter, :Integer, :x)),
s(:statements, s(:statements,
s(:field_def, :Integer, :a, s(:field_def, :Integer,
s(:name, :a),
s(:int, 5)), s(:int, 5)),
s(:return, s(:return,
s(:name, :a))))) s(:name, :a)))))

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

@ -9,7 +9,8 @@ s(:statements,
s(:parameters, s(:parameters,
s(:parameter, :Integer, :x)), s(:parameter, :Integer, :x)),
s(:statements, s(:statements,
s(:field_def, :Integer, :abba, s(:field_def, :Integer,
s(:name, :abba),
s(:int, 5)), s(:int, 5)),
s(:assignment, s(:assignment,
s(:name, :abba), s(:name, :abba),

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

@ -9,7 +9,8 @@ s(:statements,
s(:parameters, s(:parameters,
s(:parameter, :Object, :n)), s(:parameter, :Object, :n)),
s(:statements, s(:statements,
s(:field_def, :Integer, :i, s(:field_def, :Integer,
s(:name, :i),
s(:field_access, s(:field_access,
s(:receiver, s(:receiver,
s(:name, :n)), s(:name, :n)),