From 90ed4dd73b6dea736e6933298e32358f64bb4bc7 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Thu, 15 Oct 2015 10:21:07 +0300
Subject: [PATCH] test return statement

---
 test/compiler/statements/test_all.rb    |  1 +
 test/compiler/statements/test_if.rb     | 13 -----
 test/compiler/statements/test_return.rb | 70 +++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 test/compiler/statements/test_return.rb

diff --git a/test/compiler/statements/test_all.rb b/test/compiler/statements/test_all.rb
index 15eba1aa..a2f1d4bd 100644
--- a/test/compiler/statements/test_all.rb
+++ b/test/compiler/statements/test_all.rb
@@ -1 +1,2 @@
 require_relative "test_if"
+require_relative "test_return"
diff --git a/test/compiler/statements/test_if.rb b/test/compiler/statements/test_if.rb
index 4375d32d..d36fc8f2 100644
--- a/test/compiler/statements/test_if.rb
+++ b/test/compiler/statements/test_if.rb
@@ -41,19 +41,6 @@ HERE
   end
 
 
-  def ttest_return
-    @string_input = <<HERE
-class Object
-  int main()
-    return 5
-  end
-end
-HERE
-  @expect =  [[Virtual::MethodEnter,Register::LoadConstant] , [Virtual::MethodReturn]]
-  check
-  end
-
-
   def ttest_call_function
     @string_input = <<HERE
 class Object
diff --git a/test/compiler/statements/test_return.rb b/test/compiler/statements/test_return.rb
new file mode 100644
index 00000000..8acbe78f
--- /dev/null
+++ b/test/compiler/statements/test_return.rb
@@ -0,0 +1,70 @@
+require_relative 'helper'
+
+class TestReturnStatement < MiniTest::Test
+  include Statements
+
+
+  def test_return_int
+    @string_input = <<HERE
+class Object
+  int main()
+    return 5
+  end
+end
+HERE
+  @expect =  [[Virtual::MethodEnter,Register::LoadConstant] , [Virtual::MethodReturn]]
+  check
+  end
+
+  def test_return_local
+    @string_input = <<HERE
+class Object
+  int main()
+    int runner
+    return runner
+  end
+end
+HERE
+  @expect =  [[Virtual::MethodEnter,Register::GetSlot] , [Virtual::MethodReturn]]
+  check
+  end
+
+  def test_return_local_assign
+    @string_input = <<HERE
+class Object
+  int main()
+    int runner = 5
+    return runner
+  end
+end
+HERE
+  @expect =  [[Virtual::MethodEnter,Register::LoadConstant, Register::GetSlot] , [Virtual::MethodReturn]]
+  check
+  end
+
+  def test_return_field
+    @string_input = <<HERE
+class Object
+  field int runner
+  int main()
+    return self.runner
+  end
+end
+HERE
+  @expect =  [[Virtual::MethodEnter,Register::GetSlot] , [Virtual::MethodReturn]]
+  check
+  end
+
+  def test_return_call
+    @string_input = <<HERE
+class Object
+  int main()
+    return main()
+  end
+end
+HERE
+  @expect =  [[Virtual::MethodEnter,Register::GetSlot,Register::SetSlot, Register::LoadConstant,
+                Register::SetSlot,Virtual::MethodCall,Register::GetSlot] , [Virtual::MethodReturn]]
+  check
+  end
+end