From f51563e99b84d19088d8d2a6730bf9fdab9fdb8a Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Sun, 20 Sep 2015 14:25:06 +0300 Subject: [PATCH] restrict root_body a bit, but add to function --- lib/parser/expression.rb | 3 ++- lib/parser/salama.rb | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/parser/expression.rb b/lib/parser/expression.rb index 4637b95..de67f28 100644 --- a/lib/parser/expression.rb +++ b/lib/parser/expression.rb @@ -4,7 +4,8 @@ module Parser rule(:value_expression) { call_site | field_access |basic_type } - rule(:expression) { (simple_return | while_do | small_conditional | conditional | operator_expression | call_site ) } + rule(:expression) { (simple_return | while_do | small_conditional | conditional | + operator_expression | call_site | field | hash_constant | array_constant) } def delimited_expressions( delimit ) ( (delimit.absent? >> expression).repeat(1)).as(:expressions) >> delimit diff --git a/lib/parser/salama.rb b/lib/parser/salama.rb index d167593..9405c6a 100644 --- a/lib/parser/salama.rb +++ b/lib/parser/salama.rb @@ -32,8 +32,7 @@ module Parser include ModuleDef rule(:root_body) {(module_definition | class_definition | function_definition | - expression | operator_expression | call_site | field_access | - basic_type | hash_constant | array_constant )} + expression | operator_expression | call_site )} rule(:root) { root_body.repeat.as(:expression_list) } end end