using sof again, now rxf

This commit is contained in:
Torsten Ruger 2017-10-05 16:41:45 +03:00
parent 2d16030b08
commit ba304f51df
6 changed files with 29 additions and 30 deletions

View File

@ -1,13 +1,11 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "rubyx" , :path => "." gem "rubyx" , :path => "."
#gem "ast"
#, :github => "whitequark/ast" , branch: :master
gem "rake" gem "rake"
gem "rye" gem "rye"
gem "rubyx-object-file" , :git => "https://github.com/ruby-x/rubyx-object-file" gem "rx-file" , :git => "https://github.com/ruby-x/rx-file"
group :test do group :test do
gem "codeclimate-test-reporter" , require: false gem "codeclimate-test-reporter" , require: false

View File

@ -1,15 +1,15 @@
GIT GIT
remote: https://github.com/ruby-x/rubyx-object-file remote: https://github.com/ruby-x/rx-file
revision: bf1b3e95bde4a9110bfb713c178655b84bbbc0cc revision: c1de10352d8af105fe532008ceafcdd30b5fbdab
specs: specs:
rubyx-object-file (0.3.0) rx-file (0.3.0)
PATH PATH
remote: . remote: .
specs: specs:
rubyx (0.6.0) rubyx (0.6.0)
parser (~> 2.3.0) parser (~> 2.3.0)
rubyx-object-file (~> 0.3) rx-file (~> 0.3)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
@ -19,7 +19,7 @@ GEM
ast (2.3.0) ast (2.3.0)
codeclimate-test-reporter (1.0.8) codeclimate-test-reporter (1.0.8)
simplecov (<= 0.13) simplecov (<= 0.13)
coderay (1.1.1) coderay (1.1.2)
docile (1.1.5) docile (1.1.5)
drydock (0.6.9) drydock (0.6.9)
ffi (1.9.18) ffi (1.9.18)
@ -39,34 +39,33 @@ GEM
guard-compat (~> 1.2) guard-compat (~> 1.2)
minitest (>= 3.0) minitest (>= 3.0)
highline (1.7.8) highline (1.7.8)
json (2.0.3) json (2.1.0)
listen (3.1.5) listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2) ruby_dep (~> 1.2)
lumberjack (1.0.11) lumberjack (1.0.12)
method_source (0.8.2) method_source (0.9.0)
minitest (5.10.1) minitest (5.10.3)
minitest-color (0.0.2) minitest-color (0.0.2)
minitest (~> 5) minitest (~> 5)
nenv (0.3.0) nenv (0.3.0)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (4.1.0) net-ssh (4.2.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
parser (2.3.3.1) parser (2.3.3.1)
ast (~> 2.2) ast (~> 2.2)
pry (0.10.4) pry (0.11.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.9.0)
slop (~> 3.4) rake (12.1.0)
rake (12.0.0) rb-fsevent (0.10.2)
rb-fsevent (0.9.8) rb-inotify (0.9.10)
rb-inotify (0.9.8) ffi (>= 0.5.0, < 2)
ffi (>= 0.5.0) rb-readline (0.5.5)
rb-readline (0.5.4)
ruby_dep (1.5.0) ruby_dep (1.5.0)
rye (0.9.13) rye (0.9.13)
annoy annoy
@ -80,8 +79,7 @@ GEM
docile (~> 1.1.0) docile (~> 1.1.0)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.2)
slop (3.6.0)
storable (0.8.9) storable (0.8.9)
sysinfo (0.8.1) sysinfo (0.8.1)
drydock drydock
@ -100,10 +98,10 @@ DEPENDENCIES
rake rake
rb-readline rb-readline
rubyx! rubyx!
rubyx-object-file! rx-file!
rye rye
simplecov simplecov
thor (= 0.19.1) thor (= 0.19.1)
BUNDLED WITH BUNDLED WITH
1.15.1 1.15.4

View File

@ -275,5 +275,5 @@ module Risc
end end
end end
Sof::Volotile.add(Assembler , [:objects]) RxFile::Volotile.add(Assembler , [:objects])
end end

View File

@ -9,7 +9,7 @@ AST::Node.class_eval do
end end
end end
require "rubyx-object-file" require "rx-file"
require "risc" require "risc"
require "risc/builtin/space" require "risc/builtin/space"
require "arm/arm_machine" require "arm/arm_machine"

View File

@ -14,5 +14,5 @@ Gem::Specification.new do |s|
s.summary = 'RubyX is a native object vm without any c, one day possibly a ruby vm' s.summary = 'RubyX is a native object vm without any c, one day possibly a ruby vm'
s.add_dependency "parser" , "~> 2.3.0" s.add_dependency "parser" , "~> 2.3.0"
s.add_dependency "rubyx-object-file" , "~> 0.3" s.add_dependency "rx-file" , "~> 0.3"
end end

View File

@ -22,8 +22,11 @@ module Vool
def test_if_true_set def test_if_true_set
assert @first.if_true , @first assert @first.if_true , @first
end end
def est_slot_is_set def test_if_true_not_empty
assert @stats.first.left assert @first.if_true.first , @first
end
def test_slot_is_set
assert_equal 1 , @stats , @stats.to_rxf
end end
def est_two_instructions_are_returned def est_two_instructions_are_returned
assert_equal 2 , @stats.length assert_equal 2 , @stats.length