From 418640593093379bc7ad610eaed542019ec4bf4f Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sun, 27 Sep 2015 22:39:10 +0300
Subject: [PATCH] new i_to_s test

---
 lib/virtual/machine.rb        |  2 +-
 test/interpreter/helper.rb    | 11 ++++++++
 test/interpreter/test_add.rb  | 18 +++++--------
 test/interpreter/test_puti.rb | 48 +++++++++++++++++++++++++++++++++++
 test/interpreter/test_puts.rb | 11 ++------
 5 files changed, 68 insertions(+), 22 deletions(-)
 create mode 100644 test/interpreter/test_puti.rb

diff --git a/lib/virtual/machine.rb b/lib/virtual/machine.rb
index f6c7018c..2d9959c2 100644
--- a/lib/virtual/machine.rb
+++ b/lib/virtual/machine.rb
@@ -135,7 +135,7 @@ module Virtual
     def compile_main bytes
       syntax  = @parser.parse_with_debug(bytes)
       parts = Parser::Transform.new.apply(syntax)
-      #puts parts.to_s
+      #puts parts.inspect
       Bosl::Compiler.compile( parts , @space.get_main )
     end
 
diff --git a/test/interpreter/helper.rb b/test/interpreter/helper.rb
index a6946d19..e49e784a 100644
--- a/test/interpreter/helper.rb
+++ b/test/interpreter/helper.rb
@@ -1,2 +1,13 @@
 require_relative "../helper"
 require "interpreter/interpreter"
+
+module Ticker
+  def ticks num
+    last = nil
+    num.times do
+      last = @interpreter.instruction
+      @interpreter.tick
+    end
+    return last
+  end
+end
diff --git a/test/interpreter/test_add.rb b/test/interpreter/test_add.rb
index fea397bd..27bafdb7 100644
--- a/test/interpreter/test_add.rb
+++ b/test/interpreter/test_add.rb
@@ -2,6 +2,8 @@ require_relative "helper"
 
 class AddTest < MiniTest::Test
   include AST::Sexp
+  include Ticker
+  
   def setup
     Virtual.machine.boot
     code =    s(:call,
@@ -14,15 +16,6 @@ class AddTest < MiniTest::Test
     @interpreter.start Virtual.machine.init
   end
 
-  def ticks num
-    last = nil
-    num.times do
-      last = @interpreter.instruction
-      @interpreter.tick
-    end
-    return last
-  end
-
   def test_branch
     was = @interpreter.block
     assert_equal Register::Branch , ticks(1).class
@@ -47,7 +40,7 @@ class AddTest < MiniTest::Test
     assert_equal Register::FunctionCall ,  ticks(7).class
     assert @interpreter.link
   end
-  def ttest_adding
+  def test_adding
     done = ticks(23)
     assert_equal Register::OperatorInstruction ,  done.class
     left = @interpreter.get_register(done.left)
@@ -55,11 +48,12 @@ class AddTest < MiniTest::Test
     right = @interpreter.get_register(rr)
     assert_equal Fixnum , left.class
     assert_equal Fixnum , right.class
-    assert_equal 5 , right
+    assert_equal 16 , right
+    assert_equal 8 , left
     done = ticks(1)
     assert_equal Register::RegisterTransfer ,  done.class
     result = @interpreter.get_register(rr)
-    assert_equal result , left + right
+    assert_equal result , 16
   end
 
   def test_chain
diff --git a/test/interpreter/test_puti.rb b/test/interpreter/test_puti.rb
new file mode 100644
index 00000000..528f95c3
--- /dev/null
+++ b/test/interpreter/test_puti.rb
@@ -0,0 +1,48 @@
+require_relative "helper"
+
+class AddTest < MiniTest::Test
+  include Ticker
+
+  def test_puti
+    @string_input = <<HERE
+class Integer < Object
+  ref add_string(ref str)
+    int div
+    div = self / 10
+    int rest
+    rest = self - div
+    if( rest < 0)
+      str = str + digit( rest )
+    else
+      str = div.add_string(str)
+    end
+    return str
+  end
+  ref to_string()
+    ref start = " "
+    return add_string( start )
+  end
+end
+
+HERE
+    expressions = Virtual.machine.boot.compile_main @string_input
+    puts expressions
+#    Bosl::Compiler.compile( expressions , Virtual.machine.space.get_main )
+    Virtual.machine.run_before "Register::CallImplementation"
+    @interpreter = Interpreter::Interpreter.new
+    @interpreter.start Virtual.machine.init
+#    done = ticks(34)
+  ["Branch" , "LoadConstant" , "GetSlot" , "SetSlot" , "RegisterTransfer" ,
+   "GetSlot" , "FunctionCall" , "SaveReturn" , "RegisterTransfer"  , "GetSlot" ,
+   "GetSlot" ,  "GetSlot" , "SetSlot" , "LoadConstant" , "SetSlot" ,
+   "LoadConstant" ,  "SetSlot" ,  "RegisterTransfer" , "GetSlot" , "FunctionCall" ,
+   "SaveReturn" ,  "GetSlot", "OperatorInstruction" , "RegisterTransfer" , "GetSlot" , "GetSlot" ,
+   "GetSlot" , "FunctionReturn" ,"RegisterTransfer" , "Syscall", "NilClass"].each_with_index do |name , index|
+     return if index == 10
+    got = ticks(1)
+    puts got
+    assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
+end
+
+  end
+end
diff --git a/test/interpreter/test_puts.rb b/test/interpreter/test_puts.rb
index 8b2320d4..5f3a2a59 100644
--- a/test/interpreter/test_puts.rb
+++ b/test/interpreter/test_puts.rb
@@ -2,6 +2,7 @@ require_relative "helper"
 
 class TestPuts < MiniTest::Test
   include AST::Sexp
+  include Ticker
   def setup
     Virtual.machine.boot
     code = s(:call,
@@ -16,15 +17,6 @@ class TestPuts < MiniTest::Test
     @interpreter.start Virtual.machine.init
   end
 
-  def ticks num
-    last = nil
-    num.times do
-      last = @interpreter.instruction
-      @interpreter.tick
-    end
-    return last
-  end
-
   def test_branch
     was = @interpreter.block
     assert_equal Register::Branch , ticks(1).class
@@ -85,5 +77,6 @@ class TestPuts < MiniTest::Test
   def test_exit
     done = ticks(34)
     assert_equal NilClass ,  done.class
+    assert_equal "Hello again" , @interpreter.stdout
   end
 end