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

fix while and if statements

This commit is contained in:
Torsten Ruger 2015-10-09 17:28:13 +03:00
parent 7f2f64c713
commit 48a6dfabff
8 changed files with 120 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/parser/control.rb
View File

@ -1,24 +1,25 @@
module Parser module Parser
module Control module Control
include Parslet include Parslet
rule(:conditional) do rule(:while_statement) do
keyword_while >> left_parenthesis >> r_value.as(:condition) >>
right_parenthesis >> statements_end.as(:body)
end
rule(:if_statement) do
keyword_if >> keyword_if >>
left_parenthesis >> (operator_expression|r_value).as(:conditional) >> right_parenthesis >> left_parenthesis >> r_value.as(:conditional) >> right_parenthesis >>
expressions_else.as(:if_true) >> expressions_end.as(:if_false) statements_else.as(:true_statements) >> statements_end.as(:false_statements)
end end
rule(:small_conditional) do rule(:small_conditional) do
keyword_if >> keyword_if >>
left_parenthesis >> (operator_expression|r_value).as(:conditional) >> right_parenthesis >> left_parenthesis >> r_value.as(:conditional) >> right_parenthesis >>
expressions_end.as(:if_true) statements_end.as(:true_statements)
end end
rule(:while_do) do rule(:return_statement) do
keyword_while >> left_parenthesis >> (operator_expression|r_value).as(:while_cond) >> keyword_return >> r_value.as(:return_statement)
right_parenthesis >> expressions_end.as(:body)
end
rule(:simple_return) do
keyword_return >> (operator_expression|r_value).as(:return_expression)
end end
end end
end end

23
test/cases/if_statement/if_else.tst
View File

@ -1,14 +1,17 @@
if(0) if(0)
42 fourty = 10
else else
667 twenty = 5
end end
-- -- -- -- -- --
s(:expressions, s(:if_statement,
s(:if, s(:condition,
s(:condition, s(:int, 0)),
s(:int, 0)), s(:true_statements,
s(:if_true, s(:assignment,
s(:int, 42)), s(:name, :fourty),
s(:if_false, s(:int, 10))),
s(:int, 667)))) s(:false_statements,
s(:assignment,
s(:name, :twenty),
s(:int, 5))))

38
test/cases/if_statement/if_else_expressions.tst
View File

@ -4,22 +4,22 @@ else
var.new(33) var.new(33)
end end
-- -- -- -- -- --
s(:expressions, s(:if_statement,
s(:if, s(:condition,
s(:condition, s(:operator_value, :>,
s(:operator, ">", s(:int, 3),
s(:int, 3), s(:name, :var))),
s(:name, :var))), s(:true_statements,
s(:if_true, s(:call,
s(:call, s(:name, :initialize),
s(:name, :initialize), s(:arguments,
s(:arguments, s(:int, 3)),
s(:int, 3)), s(:receiver,
s(:receiver, s(:class_name, :Object)))),
s(:module, "Object")))), s(:false_statements,
s(:if_false, s(:call, s(:call,
s(:name, :new), s(:name, :new),
s(:arguments, s(:arguments,
s(:int, 33)), s(:int, 33)),
s(:receiver, s(:receiver,
s(:name, :var)))))) s(:name, :var)))))

17
test/cases/small_conditional/if_end.tst
View File

@ -1,11 +1,12 @@
if(0) if(0)
42 four = 42
end end
-- -- -- -- -- --
s(:expressions, s(:if_statement,
s(:if, s(:condition,
s(:condition, s(:int, 0)),
s(:int, 0)), s(:true_statements,
s(:if_true, s(:assignment,
s(:int, 42)), s(:name, :four),
s(:if_false, nil))) s(:int, 42))),
s(:false_statements, nil))

27
test/cases/small_conditional/if_end_expressions.tst
View File

@ -2,17 +2,16 @@ if(3 > var)
Object.initialize(3) Object.initialize(3)
end end
-- -- -- -- -- --
s(:expressions, s(:if_statement,
s(:if, s(:condition,
s(:condition, s(:operator_value, :>,
s(:operator, ">", s(:int, 3),
s(:int, 3), s(:name, :var))),
s(:name, :var))), s(:true_statements,
s(:if_true, s(:call,
s(:call, s(:name, :initialize),
s(:name, :initialize), s(:arguments,
s(:arguments, s(:int, 3)),
s(:int, 3)), s(:receiver,
s(:receiver, s(:class_name, :Object)))),
s(:module, "Object")))), s(:false_statements, nil))
s(:if_false, nil)))

53
test/cases/while_statement/big_while.tst
View File

@ -6,30 +6,29 @@ while( n > 1)
n = n - 1 n = n - 1
end end
-- -- -- -- -- --
s(:expressions, s(:while_statement,
s(:while, s(:condition,
s(:condition, s(:operator_value, :>,
s(:operator, ">", s(:name, :n),
s(:name, :n), s(:int, 1))),
s(:int, 1))), s(:statements,
s(:expressions, s(:assignment,
s(:assign, s(:name, :tmp),
s(:name, :tmp), s(:name, :a)),
s(:name, :a)), s(:assignment,
s(:assign, s(:name, :a),
s(:name, :a), s(:name, :b)),
s(:name, :b)), s(:assignment,
s(:assign, s(:name, :b),
s(:name, :b), s(:operator_value, :+,
s(:operator, "+", s(:name, :tmp),
s(:name, :tmp), s(:name, :b))),
s(:name, :b))), s(:call,
s(:call, s(:name, :puts),
s(:name, :puts), s(:arguments,
s(:arguments, s(:name, :b))),
s(:name, :b))), s(:assignment,
s(:assign, s(:name, :n),
s(:name, :n), s(:operator_value, :-,
s(:operator, "-", s(:name, :n),
s(:name, :n), s(:int, 1)))))
s(:int, 1))))))

23
test/cases/while_statement/while.tst
View File

@ -3,15 +3,14 @@ while(1)
puts(b) puts(b)
end end
-- -- -- -- -- --
s(:expressions, s(:while_statement,
s(:while, s(:condition,
s(:condition, s(:int, 1)),
s(:int, 1)), s(:statements,
s(:expressions, s(:assignment,
s(:assign, s(:name, :tmp),
s(:name, :tmp), s(:name, :a)),
s(:name, :a)), s(:call,
s(:call, s(:name, :puts),
s(:name, :puts), s(:arguments,
s(:arguments, s(:name, :b)))))
s(:name, :b))))))

35
test/cases/while_statement/while_method.tst
View File

@ -3,21 +3,20 @@ while(1)
tmp.puts(i) tmp.puts(i)
end end
-- -- -- -- -- --
s(:expressions, s(:while_statement,
s(:while, s(:condition,
s(:condition, s(:int, 1)),
s(:int, 1)), s(:statements,
s(:expressions, s(:assignment,
s(:assign, s(:name, :tmp),
s(:name, :tmp), s(:call,
s(:call, s(:name, :new),
s(:name, :new), s(:arguments),
s(:arguments), s(:receiver,
s(:receiver, s(:class_name, :String)))),
s(:module, "String")))), s(:call,
s(:call, s(:name, :puts),
s(:name, :puts), s(:arguments,
s(:arguments, s(:name, :i)),
s(:name, :i)), s(:receiver,
s(:receiver, s(:name, :tmp)))))
s(:name, :tmp))))))