create hard dependency to salama-arm (for now)(as path for now-now)

This commit is contained in:
Torsten Ruger 2014-08-23 21:49:52 +03:00
parent 435fefd310
commit 594784c729
5 changed files with 18 additions and 3 deletions

View File

@ -2,6 +2,7 @@ source "http://rubygems.org"
gem "parslet" gem "parslet"
gem "salama-reader" , "0.0.2" , :require => "parser" , :git => "https://github.com/salama/salama-reader.git" gem "salama-reader" , "0.0.2" , :require => "parser" , :git => "https://github.com/salama/salama-reader.git"
gem "salama-arm" , "0.0.1" , :path => "/Users/raisa/salama-arm"
group :development do group :development do
gem "minitest" gem "minitest"

View File

@ -5,6 +5,12 @@ GIT
salama-reader (0.0.2) salama-reader (0.0.2)
salama (~> 0.0.1) salama (~> 0.0.1)
PATH
remote: /Users/raisa/salama-arm
specs:
salama-arm (0.0.1)
salama (~> 0.0.1)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -90,5 +96,6 @@ DEPENDENCIES
parslet parslet
pry pry
roodi roodi
salama-arm (= 0.0.1)!
salama-reader (= 0.0.2)! salama-reader (= 0.0.2)!
simplecov simplecov

View File

@ -76,6 +76,9 @@ module Register
def self.instance def self.instance
if(@@instance.nil?)
@@instance = Arm::ArmMachine.new
end
@@instance @@instance
end end
def self.instance= machine def self.instance= machine
@ -141,3 +144,8 @@ module Register
end end
end end
end end
require_relative "instruction"
require_relative "register_reference"
require_relative "get_implementation"
require_relative "set_implementation"
require "arm/arm_machine"

View File

@ -6,3 +6,4 @@ require 'parser/transform'
require "virtual/machine" require "virtual/machine"
require "ast/all" require "ast/all"
require "sof/all" require "sof/all"
require "register/register_machine"

View File

@ -85,5 +85,3 @@ require_relative "object"
require_relative "constants" require_relative "constants"
require "boot/boot_space" require "boot/boot_space"
require_relative "send_implementation" require_relative "send_implementation"
require_relative "get_implementation"
require_relative "set_implementation"