rename function_call to call_site in all levels to avoid confusion

This commit is contained in:
Torsten Ruger
2014-05-13 21:15:02 +03:00
parent 04af367bc0
commit 46ea1df51e
17 changed files with 73 additions and 70 deletions

View File

@ -1,5 +1,5 @@
module Parser
module FunctionCall
module CallSite
include Parslet
rule(:argument_list) {
@ -9,7 +9,7 @@ module Parser
space? >> right_parenthesis
}
rule(:function_call) { name.as(:function_call) >> argument_list }
rule(:call_site) { name.as(:call_site) >> argument_list }
end

View File

@ -4,7 +4,7 @@ require_relative "tokens"
require_relative "keywords"
require_relative "control"
require_relative "expression"
require_relative "function_call"
require_relative "call_site"
require_relative "function_definition"
require_relative "operators"
@ -25,10 +25,10 @@ module Parser
include Keywords
include Control
include Expression
include FunctionCall
include CallSite
include FunctionDefinition
include Operators
rule(:root){ (function_definition | expression | operator_expression | function_call).repeat }
rule(:root){ (function_definition | expression | operator_expression | call_site).repeat }
end
end

View File

@ -2,9 +2,9 @@ module Parser
module Expression
include Parslet
rule(:value_expression) { function_call | basic_type }
rule(:value_expression) { call_site | basic_type }
rule(:expression) { (while_do | conditional | operator_expression | function_call ) >> newline }
rule(:expression) { (while_do | conditional | operator_expression | call_site ) >> newline }
def delimited_expressions( delimit )
( (delimit.absent? >> expression).repeat(1)).as(:expressions) >> delimit

View File

@ -19,9 +19,9 @@ module Parser
rule(:argument => simple(:argument)) { argument }
rule(:argument_list => sequence(:argument_list)) { argument_list }
rule( :function_call => simple(:function_call),
rule( :call_site => simple(:call_site),
:argument_list => sequence(:argument_list)) do
Ast::FuncallExpression.new(function_call.name, argument_list)
Ast::CallSiteExpression.new(call_site.name, argument_list)
end
rule(:if => simple(:if), :conditional => simple(:conditional),