diff --git a/test/compiler/expressions/test_all.rb b/test/compiler/expressions/test_all.rb index 933bcb16..84ede13b 100644 --- a/test/compiler/expressions/test_all.rb +++ b/test/compiler/expressions/test_all.rb @@ -1,4 +1,3 @@ require_relative "test_basic" require_relative "test_call" require_relative "test_field_access" -require_relative "test_function" diff --git a/test/compiler/expressions/test_call.rb b/test/compiler/expressions/test_call.rb index ee06c615..c86b18aa 100644 --- a/test/compiler/expressions/test_call.rb +++ b/test/compiler/expressions/test_call.rb @@ -6,48 +6,38 @@ module Virtual def setup Virtual.machine.boot + @root = :call_site + @output = Register::RegisterValue end def test_call_main_plain - @root = :call_site @string_input = 'main()' - @output = Register::RegisterValue check end def test_call_main_int - @root = :call_site @string_input = 'main(1)' - @output = Register::RegisterValue check end - def ttest_call_self_main - @root = :call_site + def test_call_self_main @string_input = 'self.main()' - @output = Register::RegisterValue check end def test_call_main_string - @root = :call_site @string_input = 'main("1")' - @output = Register::RegisterValue check end def test_call_main_op Virtual.machine.space.get_main.ensure_local(:bar , :Integer) - @root = :call_site @string_input = 'main( bar )' - @output = Register::RegisterValue check end def test_call_string_put - @root = :call_site @string_input = '"Hello Raisa, I am salama".putstring()' - @output = Register::RegisterValue check end diff --git a/test/compiler/expressions/test_function.rb b/test/compiler/expressions/test_function.rb deleted file mode 100644 index 1f92f271..00000000 --- a/test/compiler/expressions/test_function.rb +++ /dev/null @@ -1,27 +0,0 @@ -require_relative "compiler_helper" - -module Virtual - class TestFunctions < MiniTest::Test - include CompilerHelper - - def setup - Virtual.machine.boot - end - - #reset the compiler (other than other tests that need to fake their inside a method) - def set_main compiler - compiler.set_main(nil) - end - - def test_puts - @root = :function_definition - @string_input = <