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

get parameter lists to work again (no more ifs as function arguments:-)

Browse Source
This commit is contained in:
Torsten Ruger 2014-05-08 19:41:27 +03:00
parent eaf097752a
commit b82c2241b7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/parser/composed.rb
View File

@ -19,7 +19,8 @@ module Parser
rule(:argument_list) {
left_parenthesis >>
((expression.as(:argument) >> (comma >> expression.as(:argument)).repeat(0)).repeat(0,1)).as(:argument_list) >>
( (simple_expression.as(:argument) >>
(comma >> simple_expression.as(:argument)).repeat(0)).repeat(0,1)).as(:argument_list) >>
right_parenthesis
}
@ -27,7 +28,9 @@ module Parser
rule(:assignment) { name.as(:asignee) >> equal_sign >> expression.as(:asigned) }
#| (name >> space? >> equal_sign.absent?)
rule(:expression) { conditional | function_call | integer | string }
rule(:simple_expression) { function_call | integer | string | name }
rule(:expression) { conditional | simple_expression }
def delimited_expressions( delimit )
( (delimit.absent? >> (assignment | expression)).repeat(1)).as(:expressions) >> delimit