From 6ea698d397fac2bb7ccc87e1c7445bffc701d220 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sun, 8 Nov 2015 14:30:42 +0200
Subject: [PATCH] save some to_s code

---
 lib/soml/parfait/integer.soml | 35 ++++++++++++++
 test/interpreter/test_puti.rb | 91 -----------------------------------
 test/parfait/test_puti.rb     | 15 ++++++
 3 files changed, 50 insertions(+), 91 deletions(-)
 create mode 100644 lib/soml/parfait/integer.soml
 delete mode 100644 test/interpreter/test_puti.rb
 create mode 100644 test/parfait/test_puti.rb

diff --git a/lib/soml/parfait/integer.soml b/lib/soml/parfait/integer.soml
new file mode 100644
index 00000000..4a5bb5a8
--- /dev/null
+++ b/lib/soml/parfait/integer.soml
@@ -0,0 +1,35 @@
+class Integer < Value
+  Word digit( int rest )
+    if_zero( rest == 5 )
+      return "5"
+    end
+    if_zero( rest == 1 )
+      return "1"
+    end
+    if_zero( rest == 2 )
+      return "2"
+    end
+    if_zero( rest == 3 )
+      return "3"
+    end
+    if_zero( rest == 4 )
+      return "4"
+    end
+  end
+  Word add_string(Word str)
+    int div
+    div = self / 10
+    int rest
+    rest = self - div
+    if_notzero( rest )
+      rest = self.digit( rest )
+    else
+      str = div.add_string(str)
+    end
+    return str
+  end
+  Word to_string()
+    Word start = " "
+    return add_string( start )
+  end
+end
diff --git a/test/interpreter/test_puti.rb b/test/interpreter/test_puti.rb
deleted file mode 100644
index 1e72d754..00000000
--- a/test/interpreter/test_puti.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require_relative "helper"
-
-class AddTest < MiniTest::Test
-  include Ticker
-  include AST::Sexp
-
-  def test_puti
-    @string_input = <<HERE
-class Integer < Object
-  Word digit( int rest )
-    if_zero( rest == 5 )
-      return "5"
-    end
-    if_zero( rest == 1 )
-      return "1"
-    end
-    if_zero( rest == 2 )
-      return "2"
-    end
-    if_zero( rest == 3 )
-      return "3"
-    end
-    if_zero( rest == 4 )
-      return "4"
-    end
-  end
-  Word add_string(Word str)
-    int div
-    div = self / 10
-    int rest
-    rest = self - div
-    if_notzero( rest )
-      rest = self.digit( rest )
-    else
-      str = div.add_string(str)
-    end
-    return str
-  end
-  Word to_string()
-    Word start = " "
-    return add_string( start )
-  end
-end
-class Object
-  int main()
-    5.to_string()
-  end
-end
-HERE
-    machine = Register.machine.boot
-    syntax  = Parser::Salama.new.parse_with_debug(@string_input)
-    parts = Parser::Transform.new.apply(syntax)
-    #puts parts.inspect
-    Soml.compile( parts )
-    machine.collect
-    @interpreter = Interpreter::Interpreter.new
-    @interpreter.start Register.machine.init
-    #show_ticks # get output of what is
-    ["Branch","Label","LoadConstant","GetSlot","SetSlot",
-     "LoadConstant","SetSlot","FunctionCall","Label","GetSlot",
-     "LoadConstant","SetSlot","LoadConstant","SetSlot","LoadConstant",
-     "SetSlot","LoadConstant","SetSlot","RegisterTransfer","FunctionCall",
-     "Label","LoadConstant","GetSlot","SetSlot","GetSlot",
-     "GetSlot","SetSlot","LoadConstant","SetSlot","LoadConstant",
-     "SetSlot","GetSlot","GetSlot","SetSlot","LoadConstant",
-     "SetSlot","RegisterTransfer","FunctionCall","Label","GetSlot",
-     "LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
-     "GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
-     "GetSlot","GetSlot","IsNotzero","Label","GetSlot",
-     "GetSlot","SetSlot","LoadConstant","SetSlot","LoadConstant",
-     "SetSlot","GetSlot","GetSlot","SetSlot","LoadConstant",
-     "SetSlot","RegisterTransfer","FunctionCall","Label","GetSlot",
-     "LoadConstant","OperatorInstruction","IsZero","Branch","Label",
-     "GetSlot","LoadConstant","OperatorInstruction","IsZero","Label",
-     "LoadConstant","SetSlot","Label","GetSlot","LoadConstant",
-     "OperatorInstruction","IsZero","Label","LoadConstant","SetSlot",
-     "Label","GetSlot","LoadConstant","OperatorInstruction","IsZero",
-     "Label","LoadConstant","SetSlot","Label","GetSlot",
-     "LoadConstant","OperatorInstruction","IsZero","Label","LoadConstant",
-     "SetSlot","Label","Label","FunctionReturn","RegisterTransfer",
-     "GetSlot","GetSlot","GetSlot","SetSlot","Label",
-     "GetSlot","SetSlot","Label","FunctionReturn","RegisterTransfer",
-     "GetSlot","GetSlot","SetSlot","Label","FunctionReturn",
-     "RegisterTransfer","GetSlot","GetSlot","Label","FunctionReturn",
-     "RegisterTransfer","Syscall"].each_with_index do |name , index|
-    got = ticks(1)
-    assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
-end
-
-  end
-end
diff --git a/test/parfait/test_puti.rb b/test/parfait/test_puti.rb
new file mode 100644
index 00000000..f78f972f
--- /dev/null
+++ b/test/parfait/test_puti.rb
@@ -0,0 +1,15 @@
+require_relative 'helper'
+
+class TestPutiRT < MiniTest::Test
+  include RuntimeTests
+
+  def test_puti
+    @string_input = <<HERE
+5.puts()
+HERE
+    @stdout = "5"
+    check
+  end
+
+
+end