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

at least basic tests work again

Browse Source
This commit is contained in:
Torsten Ruger 2014-05-08 18:42:24 +03:00
parent 034ae4f7ca
commit 9c2dfe79da
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/parser/basic_types.rb
View File

@ -19,13 +19,13 @@ module Parser
rule(:plus) { str('+') } rule(:plus) { str('+') }
rule(:equal_sign) { str('=') >> space?} rule(:equal_sign) { str('=') >> space?}
rule(:sign) { plus | minus } rule(:sign) { plus | minus }
rule(:dot) { str('.') } rule(:dot) { str('.') }
rule(:digit) { match('[0-9]') } rule(:digit) { match('[0-9]') }
rule(:exponent) { (str('e')| str('E')) } rule(:exponent) { (str('e')| str('E')) }
rule(:true) { str('true').as(:true) >> space?} rule(:true) { str('true').as(:true) >> space?}
rule(:false) { str('false').as(:false) >> space?} rule(:false){ str('false').as(:false) >> space?}
rule(:nil) { str('null').as(:nil) >> space?} rule(:nil) { str('null').as(:nil) >> space?}
# identifier must start with lower case # identifier must start with lower case
rule(:name) { (match['a-z'] >> match['a-zA-Z0-9'].repeat).as(:name) >> space? } rule(:name) { (match['a-z'] >> match['a-zA-Z0-9'].repeat).as(:name) >> space? }

6
lib/parser/composed.rb
View File

@ -26,11 +26,11 @@ 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) } rule(:assignment) { name.as(:asignee) >> equal_sign >> expression.as(:asigned) }
#| (name >> space? >> equal_sign.absent?)
rule(:expression) { conditional | function_call | integer | string | (name >> space? >> equal_sign.absent?) } rule(:expression) { conditional | function_call | integer | string }
def delimited_expressions( delimit ) def delimited_expressions( delimit )
( space? >> (delimit.absent? >> (assignment | expression)).repeat(1)).as(:expressions) >> delimit ( (delimit.absent? >> (assignment | expression)).repeat(1)).as(:expressions) >> delimit
end end
rule(:conditional) { rule(:conditional) {

4
test/parser/test_basic.rb
View File

@ -26,9 +26,7 @@ class TestBasic < MiniTest::Test
end end
def test_string def test_string
@string_input = <<HERE @string_input = "\"hello\""
"hello"
HERE
@parse_output = {:string=>"hello"} @parse_output = {:string=>"hello"}
@transform_output = Ast::StringExpression.new('hello') @transform_output = Ast::StringExpression.new('hello')
@parser = @parser.string @parser = @parser.string