moved nodes to parser (one more layer) and fixed tests. also adds assignment

This commit is contained in:
Torsten Ruger
2014-04-28 21:21:12 +03:00
parent c1a6003704
commit 92a9372dcc
8 changed files with 74 additions and 84 deletions

View File

@@ -1,10 +1,10 @@
require 'parslet'
require 'vm/nodes'
require_relative 'nodes'
module Parser
class Transform < Parslet::Transform
rule(:integer => simple(:value)) { Vm::IntegerExpression.new(value.to_i) }
rule(:name => simple(:name)) { Vm::NameExpression.new(name.to_s) }
rule(:integer => simple(:value)) { IntegerExpression.new(value.to_i) }
rule(:name => simple(:name)) { NameExpression.new(name.to_s) }
rule(:argument => simple(:argument)) { argument }
rule(:argument_list => sequence(:argument_list)) { argument_list }
@@ -12,17 +12,17 @@ module Parser
# need TWO transform rules, for one/many arguments (see the[] wrapping in the first)
rule(:function_call => simple(:function_call),
:argument_list => simple(:argument)) do
Vm::FuncallExpression.new(function_call.name, [argument])
FuncallExpression.new(function_call.name, [argument])
end
rule( :function_call => simple(:function_call),
:argument_list => sequence(:argument_list)) do
Vm::FuncallExpression.new(function_call.name, argument_list)
FuncallExpression.new(function_call.name, argument_list)
end
rule(:conditional => simple(:conditional),
:if_true => {:expressions => sequence(:if_true)},
:if_false => {:expressions => sequence(:if_false)}) do
Vm::ConditionalExpression.new(conditional, if_true, if_false)
ConditionalExpression.new(conditional, if_true, if_false)
end
rule(:parmeter => simple(:parmeter)) { parmeter }
@@ -32,15 +32,18 @@ module Parser
rule(:function_definition => simple(:function_definition),
:parmeter_list => simple(:parmeter),
:expressions => sequence(:expressions)) do
Vm::FunctionExpression.new(function_definition.name, [parmeter], expressions)
FunctionExpression.new(function_definition.name, [parmeter], expressions)
end
rule(:function_definition => simple(:function_definition),
:parmeter_list => sequence(:parmeter_list),
:expressions => sequence(:expressions)) do
Vm::FunctionExpression.new(function_definition.name, parmeter_list, expressions)
FunctionExpression.new(function_definition.name, parmeter_list, expressions)
end
rule(:asignee => simple(:left) , :asigned => simple(:right) ) do
AssignmentExpression.new(left.name, right )
end
#shortcut to get the ast tree for a given string
# optional second arguement specifies a rule that will be parsed (mainly for testing)
def self.ast string , rule = :root