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

space and order fiddling (gets assignments to work better)

Browse Source
This commit is contained in:
Torsten Ruger 2014-04-28 22:07:13 +03:00
parent 92a9372dcc
commit 129f9f5c57
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/parser/composed.rb
View File

@ -25,12 +25,12 @@ module Parser
rule(:function_call) { name.as(:function_call) >> argument_list } rule(:function_call) { name.as(:function_call) >> argument_list }
rule(:assignment) { name.as(:asignee) >> equal_sign >> expression.as(:asigned) >> eol } rule(:assignment) { name.as(:asignee) >> equal_sign >> expression.as(:asigned) }
rule(:expression) { conditional | function_call | integer | name } rule(:expression) { conditional | function_call | integer | (name >> space? >> equal_sign.absent?) }
def delimited_expressions( delimit ) def delimited_expressions( delimit )
((delimit.absent? >> expression).repeat(1)).as(:expressions) >> delimit ( space? >> (delimit.absent? >> (assignment | expression)).repeat(1)).as(:expressions) >> delimit
end end
rule(:conditional) { rule(:conditional) {
@ -42,8 +42,6 @@ module Parser
rule(:expressions_else) { delimited_expressions(keyword_else) } rule(:expressions_else) { delimited_expressions(keyword_else) }
rule(:expressions_end) { delimited_expressions(keyword_end) } rule(:expressions_end) { delimited_expressions(keyword_end) }
# rule(:expressions_end) { ((keyword_end.absent? >> expression).repeat(1)).as(:expressions) >> keyword_end }
rule(:function_definition) { rule(:function_definition) {
keyword_def >> name.as(:function_definition) >> parmeter_list >> expressions_end keyword_def >> name.as(:function_definition) >> parmeter_list >> expressions_end
} }