ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass return integer back out through exit

Browse Source 
for testing of binaries later (and off course general correctness)
Some tests were using the fact that the interpreter was used, changed those to return ints rather than strings
This commit is contained in:
Torsten Ruger
2018-06-19 18:55:47 +03:00
parent db459fcd3d
commit 5f7683efcf
33 changed files with 174 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/risc/interpreter/conditional/test_if_constant.rb
View File

@ -5,7 +5,7 @@ module Risc
include Ticker
def setup
@string_input = as_main 'if( 10 ); return "then";else;return "else";end'
@string_input = as_main 'if( 10 ); return 1;else;return 2;end'
super
end
@ -14,9 +14,10 @@ module Risc
check_main_chain [LoadConstant, LoadConstant, OperatorInstruction, IsZero, LoadConstant,
OperatorInstruction, IsZero, LoadConstant, RegToSlot, SlotToReg,
SlotToReg, RegToSlot, SlotToReg, Branch, SlotToReg,
SlotToReg, FunctionReturn, Transfer, Syscall, NilClass]
assert_equal Parfait::Word , get_return.class
assert_equal "then" , get_return.to_string
SlotToReg, FunctionReturn, SlotToReg, SlotToReg, Branch,
Transfer, Syscall, NilClass]
assert_equal Fixnum , get_return.class
assert_equal 1 , get_return
end
def test_load_10
load = main_ticks(1)
@ -39,7 +40,7 @@ module Risc
assert check.label.name.start_with?("false_label") , check.label.name
end
def test_exit
done = main_ticks(19)
done = main_ticks(22)
assert_equal Syscall , done.class
end
end

13
test/risc/interpreter/conditional/test_if_greater.rb
View File

@ -5,13 +5,13 @@ module Risc
include Ticker
def setup
@string_input = as_main 'if( 5 > 5 ); return "then";else;return "else";end'
@string_input = as_main 'if( 5 > 5 ); return 1;else;return 2;end'
super
end
def test_if
#show_main_ticks # get output of what is in main
check_main_chain [LoadConstant, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
check_main_chain [LoadConstant, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
RegToSlot, SlotToReg, RegToSlot, Branch, SlotToReg,
RegToSlot, LoadConstant, SlotToReg, RegToSlot, LoadConstant,
@ -24,12 +24,13 @@ module Risc
SlotToReg, SlotToReg, LoadConstant, OperatorInstruction, IsZero,
LoadConstant, RegToSlot, SlotToReg, SlotToReg, Branch,
RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
Transfer, Syscall, NilClass]
assert_equal Parfait::Word , get_return.class
assert_equal "else" , get_return.to_string
SlotToReg, SlotToReg, Branch, Transfer, Syscall,
NilClass]
assert_equal Fixnum , get_return.class
assert_equal 2 , get_return
end
def test_exit
done = main_ticks(67)
done = main_ticks(70)
assert_equal Syscall , done.class
end
end

12
test/risc/interpreter/conditional/test_if_greater_or.rb
View File

@ -5,7 +5,7 @@ module Risc
include Ticker
def setup
@string_input = as_main 'if( 5 >= 5 ); return "then";else;return "else";end'
@string_input = as_main 'if( 5 >= 5 ); return 1;else;return 2;end'
super
end
@ -24,13 +24,13 @@ module Risc
SlotToReg, SlotToReg, LoadConstant, OperatorInstruction, IsZero,
LoadConstant, OperatorInstruction, IsZero, LoadConstant, Branch,
RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg,
SlotToReg, SlotToReg, FunctionReturn, Transfer, Syscall,
NilClass]
assert_equal Parfait::Word , get_return.class
assert_equal "then" , get_return.to_string
SlotToReg, SlotToReg, FunctionReturn, SlotToReg, SlotToReg,
Branch, Transfer, Syscall, NilClass]
assert_equal Fixnum , get_return.class
assert_equal 1 , get_return
end
def test_exit
done = main_ticks(70)
done = main_ticks(73)
assert_equal Syscall , done.class
end
end

11
test/risc/interpreter/conditional/test_if_smaller.rb
View File

@ -5,7 +5,7 @@ module Risc
include Ticker
def setup
@string_input = as_main 'if( 5 < 5 ); return "then";else;return "else";end'
@string_input = as_main 'if( 5 < 5 ); return 1;else;return 2;end'
super
end
@ -24,12 +24,13 @@ module Risc
SlotToReg, SlotToReg, LoadConstant, OperatorInstruction, IsZero,
LoadConstant, RegToSlot, SlotToReg, SlotToReg, Branch,
RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
Transfer, Syscall, NilClass]
assert_equal Parfait::Word , get_return.class
assert_equal "else" , get_return.to_string
SlotToReg, SlotToReg, Branch, Transfer, Syscall,
NilClass]
assert_equal Fixnum , get_return.class
assert_equal 2 , get_return
end
def test_exit
done = main_ticks(67)
done = main_ticks(70)
assert_equal Syscall , done.class
end
end

12
test/risc/interpreter/conditional/test_if_smaller_or.rb
View File

@ -5,7 +5,7 @@ module Risc
include Ticker
def setup
@string_input = as_main 'if( 5 <= 5 ); return "then";else;return "else";end'
@string_input = as_main 'if( 5 <= 5 ); return 1;else;return 2;end'
super
end
@ -24,13 +24,13 @@ module Risc
SlotToReg, SlotToReg, LoadConstant, OperatorInstruction, IsZero,
LoadConstant, OperatorInstruction, IsZero, LoadConstant, Branch,
RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg,
SlotToReg, SlotToReg, FunctionReturn, Transfer, Syscall,
NilClass]
assert_equal Parfait::Word , get_return.class
assert_equal "then" , get_return.to_string
SlotToReg, SlotToReg, FunctionReturn, SlotToReg, SlotToReg,
Branch, Transfer, Syscall, NilClass]
assert_equal Fixnum , get_return.class
assert_equal 1 , get_return
end
def test_exit
done = main_ticks(70)
done = main_ticks(73)
assert_equal Syscall , done.class
end
end