From 198a43cc8d9e099517b58c05011ce039eb206283 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Mon, 30 Jul 2018 14:44:14 +0300 Subject: [PATCH] rename callable to CallStatement Callable is the Method, whereas here we call the method --- lib/ruby.rb | 2 +- lib/ruby/assignment.rb | 4 ++-- lib/ruby/{callable.rb => call_statement.rb} | 2 +- lib/ruby/send_statement.rb | 2 +- lib/ruby/yield_statement.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename lib/ruby/{callable.rb => call_statement.rb} (96%) diff --git a/lib/ruby.rb b/lib/ruby.rb index 86fc7cfd..2882f077 100644 --- a/lib/ruby.rb +++ b/lib/ruby.rb @@ -22,7 +22,7 @@ require_relative "ruby/basic_values" require_relative "ruby/hash_statement" require_relative "ruby/method_statement" require_relative "ruby/ruby_compiler" -require_relative "ruby/callable" +require_relative "ruby/call_statement" require_relative "ruby/send_statement" require_relative "ruby/yield_statement" require_relative "ruby/variables" diff --git a/lib/ruby/assignment.rb b/lib/ruby/assignment.rb index eb5f4662..03556b1e 100644 --- a/lib/ruby/assignment.rb +++ b/lib/ruby/assignment.rb @@ -11,7 +11,7 @@ module Ruby case value when Variable , Constant return self.vool_brother.new(name,@value.to_vool) - when SendStatement + when SendStatement , YieldStatement return normalize_send when BlockStatement return normalize_block @@ -36,7 +36,7 @@ module Ruby # plain send def normalize_send statements = value.to_vool - return assignment( statements ) if statements.is_a?(Vool::SendStatement) + return assignment( statements ) if statements.is_a?(Vool::CallStatement) # send has hoisted assigns, so we make an assign out of the "pure" send statements << assignment(statements.statements.pop) statements diff --git a/lib/ruby/callable.rb b/lib/ruby/call_statement.rb similarity index 96% rename from lib/ruby/callable.rb rename to lib/ruby/call_statement.rb index 387950aa..dba42549 100644 --- a/lib/ruby/callable.rb +++ b/lib/ruby/call_statement.rb @@ -1,6 +1,6 @@ module Ruby - class Callable < Statement + class CallStatement < Statement attr_reader :name , :receiver , :arguments def initialize(name , receiver , arguments ) diff --git a/lib/ruby/send_statement.rb b/lib/ruby/send_statement.rb index 10698803..45d7348c 100644 --- a/lib/ruby/send_statement.rb +++ b/lib/ruby/send_statement.rb @@ -1,6 +1,6 @@ module Ruby - class SendStatement < Callable + class SendStatement < CallStatement def to_s "#{receiver}.#{name}(#{arguments.join(', ')})" end diff --git a/lib/ruby/yield_statement.rb b/lib/ruby/yield_statement.rb index b15fd11a..05d3c6ea 100644 --- a/lib/ruby/yield_statement.rb +++ b/lib/ruby/yield_statement.rb @@ -1,6 +1,6 @@ module Ruby - class YieldStatement < Callable + class YieldStatement < CallStatement def initialize(arguments) super("yield_#{object_id}".to_sym , SelfExpression.new , arguments)