misc to_s and small fixes

This commit is contained in:
Torsten Ruger
2018-07-04 08:28:29 +03:00
parent 8b9fd29ce9
commit 6f936f190d
13 changed files with 46 additions and 21 deletions

View File

@ -54,7 +54,7 @@ module Risc
end
def test_pc1
@interpreter.tick
assert_equal 21304 , @interpreter.pc
assert_equal 21432 , @interpreter.pc
end
def test_tick2
@interpreter.tick
@ -68,7 +68,7 @@ module Risc
def test_pc2
@interpreter.tick
@interpreter.tick
assert_equal 21308 , @interpreter.pc
assert_equal 21436 , @interpreter.pc
end
def test_tick_14_jump
14.times {@interpreter.tick}

View File

@ -1,7 +1,7 @@
require_relative "helper"
module Risc
class TestMachineObjects < MiniTest::Test
class TestLinkerObjects < MiniTest::Test
def setup
Parfait.boot!
@ -17,7 +17,7 @@ module Risc
assert_raises {@machine.add_constant( 1 )}
end
end
class TestMachineInit < MiniTest::Test
class TestLinkerInit < MiniTest::Test
def setup
Parfait.boot!
Risc.boot!

View File

@ -13,5 +13,12 @@ module Risc
assert Position.get(obj).valid? , "#{Position.get(obj)} , #{obj.object_id.to_s(16)}"
end
end
def test_one_main
mains = @linker.assemblers.find_all{|asm| asm.method.name == :main }
assert_equal 1 , mains.length
end
def test_assembler_num
assert_equal 23 , @linker.assemblers.length
end
end
end

View File

@ -14,7 +14,7 @@ module RubyX
assert_equal Risc::Linker , @linker.class
end
def test_method
assert_equal :main , @linker.assemblers.last.method.name
assert_equal :main , @linker.assemblers.first.method.name
end
end
end

View File

@ -10,7 +10,7 @@ module ScopeHelper
end
def as_main(statements)
in_Space("def main ; #{statements}; end")
in_Space("def main(arg) ; #{statements}; end")
end
def as_test_main( statements )