fixing import order

This commit is contained in:
Torsten Ruger 2014-10-03 14:33:06 +03:00
parent a083c03b1d
commit 1347a85eb7
6 changed files with 11 additions and 12 deletions

View File

@ -9,7 +9,7 @@ module Register
class CallImplementation class CallImplementation
def run block def run block
block.codes.dup.each do |code| block.codes.dup.each do |code|
next unless code.is_a? Virtual::FunctionCall next unless code.is_a? Register::FunctionCall
call = RegisterMachine.instance.call( code.method ) call = RegisterMachine.instance.call( code.method )
block.replace(code , call ) block.replace(code , call )
end end

View File

@ -17,7 +17,7 @@ module Builtin
me = Virtual::Self.new(Virtual::Reference) me = Virtual::Self.new(Virtual::Reference)
code = Virtual::Set.new(Virtual::Self.new(me.type), me) code = Virtual::Set.new(Virtual::Self.new(me.type), me)
function.add_code(code) function.add_code(code)
function.add_code Virtual::FunctionCall.new(method) function.add_code Register::FunctionCall.new(method)
return function return function
end end
def putstring context def putstring context

View File

@ -5,8 +5,8 @@ require_relative "parfait/hash"
require "elf/object_writer" require "elf/object_writer"
require 'salama-reader' require 'salama-reader'
require 'parser/transform' require 'parser/transform'
require "virtual/machine"
require "ast/all"
require "sof/all" require "sof/all"
require "register/register_machine" require "register/register_machine"
require "virtual/machine"
require "ast/all"
require_relative "stream_reader" require_relative "stream_reader"

View File

@ -1,9 +1,6 @@
module Sof module Sof
class Volotile class Volotile
@@mapping = { @@mapping = { }
Virtual::Block => [:method],
Virtual::CompiledMethod => [:current]
}
def self.attributes clazz def self.attributes clazz
@@mapping[clazz] || [] @@mapping[clazz] || []
end end

View File

@ -39,6 +39,6 @@ module Virtual
end end
require_relative "instructions/access.rb" require_relative "instructions/access"
require_relative "instructions/control.rb" require_relative "instructions/control"
require_relative "instructions/messaging.rb" require_relative "instructions/messaging"

View File

@ -74,7 +74,6 @@ module Virtual
end end
end end
#require_relative "list"
require_relative "instruction" require_relative "instruction"
require_relative "compiled_method" require_relative "compiled_method"
require_relative "frame" require_relative "frame"
@ -87,3 +86,6 @@ require_relative "boot_space"
require_relative "passes/send_implementation" require_relative "passes/send_implementation"
require_relative "passes/get_implementation" require_relative "passes/get_implementation"
require_relative "passes/frame_implementation" require_relative "passes/frame_implementation"
Sof.Volotile.add(Virtual::Block , [:method])
Sof.Volotile.add(Virtual::CompiledMethod , [:current])