mirah 0.1.4-java → 0.2.0-java

data/test/jvm/example_test.rb

@@ -23,14 +23,18 @@ class ExampleTest < Test::Unit::TestCase
 
   def example_test name, output
     cls = compile_ex name
-    assert_output(output) { cls.main nil }
+    assert_run_output(output, cls)
   end
 
   {
     'simple_class' => "constructor\nHello, \nMirah\n",
     'macros/square' => "2.0\n8.0\n",
     'macros/square_int' => "2.0\n8.0\n",
-    'macros/string_each_char' => "l\na\na\nt\n \nd\ne\n \nl\ne\ne\ne\nu\nw\n \nn\ni\ne\nt\n \ni\nn\n \nz\ni\nj\nn\n \nh\ne\nm\np\ni\ne\n \ns\nt\na\na\nn\n"
+    'macros/string_each_char' => "l\na\na\nt\n \nd\ne\n \nl\ne\ne\ne\nu\nw\n \nn\ni\ne\nt\n \ni\nn\n \nz\ni\nj\nn\n \nh\ne\nm\np\ni\ne\n \ns\nt\na\na\nn\n",
+    'sort_closure' =>
+      "unsorted: [9, 5, 2, 6, 8, 5, 0, 3, 6, 1, 8, 3, 6, 4, 7, 5, 0, 8, 5, 6, 7, 2, 3]\n" +
+      "sorted:   [0, 0, 1, 2, 2, 3, 3, 3, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 8, 8, 9]\n",
+    'rosettacode/fizz-buzz' => "1\n2\nFizz\n4\nBuzz\nFizz\n7\n8\nFizz\nBuzz\n11\nFizz\n13\n14\nFizzBuzz\n16\n17\nFizz\n19\nBuzz\nFizz\n22\n23\nFizz\nBuzz\n26\nFizz\n28\n29\nFizzBuzz\n31\n32\nFizz\n34\nBuzz\nFizz\n37\n38\nFizz\nBuzz\n41\nFizz\n43\n44\nFizzBuzz\n46\n47\nFizz\n49\nBuzz\nFizz\n52\n53\nFizz\nBuzz\n56\nFizz\n58\n59\nFizzBuzz\n61\n62\nFizz\n64\nBuzz\nFizz\n67\n68\nFizz\nBuzz\n71\nFizz\n73\n74\nFizzBuzz\n76\n77\nFizz\n79\nBuzz\nFizz\n82\n83\nFizz\nBuzz\n86\nFizz\n88\n89\nFizzBuzz\n91\n92\nFizz\n94\nBuzz\nFizz\n97\n98\nFizz\nBuzz\n1\n2\nFizz\n4\nBuzz\nFizz\n7\n8\nFizz\nBuzz\n11\nFizz\n13\n14\nFizzBuzz\n16\n17\nFizz\n19\nBuzz\nFizz\n22\n23\nFizz\nBuzz\n26\nFizz\n28\n29\nFizzBuzz\n31\n32\nFizz\n34\nBuzz\nFizz\n37\n38\nFizz\nBuzz\n41\nFizz\n43\n44\nFizzBuzz\n46\n47\nFizz\n49\nBuzz\nFizz\n52\n53\nFizz\nBuzz\n56\nFizz\n58\n59\nFizzBuzz\n61\n62\nFizz\n64\nBuzz\nFizz\n67\n68\nFizz\nBuzz\n71\nFizz\n73\n74\nFizzBuzz\n76\n77\nFizz\n79\nBuzz\nFizz\n82\n83\nFizz\nBuzz\n86\nFizz\n88\n89\nFizzBuzz\n91\n92\nFizz\n94\nBuzz\nFizz\n97\n98\nFizz\nBuzz\n",
   }.each do |example,output|
     define_method "test_#{example}" do
       example_test example, output

data/test/jvm/extensions/array_extensions_test.rb

@@ -0,0 +1,181 @@
+class ArrayExtensionsTest < Test::Unit::TestCase
+  def test_empty_q
+    cls, = compile(<<-EOF)
+      x = int[0]
+      puts x.empty?
+    EOF
+    assert_run_output("true\n", cls)
+  end
+
+  def test_bracket_getter
+    cls, = compile(<<-EOF)
+      x = int[2]
+      x[0] = 1
+      x[1] = 2
+      puts x[0]
+    EOF
+    assert_run_output("1\n", cls)
+  end
+
+  def test_bracket_assignment
+    cls, = compile(<<-EOF)
+      x = String[1]
+      x[0]= "2"
+      puts java::util::Arrays.toString(x)
+    EOF
+    assert_run_output("[2]\n", cls)
+  end
+  
+  def test_size
+    cls, = compile(%q{
+      puts int[4].size
+    })
+    assert_run_output("4\n", cls)
+  end
+  
+  def test_each_with_index
+    cls, = compile(%q{
+      x = int[3]
+      x[0] = 9
+      x[1] = 7
+      x[2] = 5
+      x.each_with_index do |value,index|
+        puts "#{value} #{index}"
+      end
+    })
+    assert_run_output("9 0\n7 1\n5 2\n", cls)
+  end
+  
+  def test_sort_with_comparator_block # comparators are only support for non-primitive types
+    cls, = compile(%q{
+      x = Integer[3]
+      x[0] = 3
+      x[1] = 1
+      x[2] = 2
+      y = x.sort do |a:Integer,b:Integer|
+        -(a.intValue-b.intValue)
+      end
+      puts java::util::Arrays.toString(y)
+    })
+    assert_run_output("[3, 2, 1]\n", cls)
+  end
+
+  def test_sort_without_comparator
+    cls, = compile(<<-EOF)
+      x = int[3]
+      x[0] = 5
+      x[1] = 1
+      x[2] = 3
+      puts java::util::Arrays.toString(x.sort)
+    EOF
+    assert_run_output("[1, 3, 5]\n", cls)
+  end
+
+  def test_first!
+    cls, = compile(<<-EOF)
+      x = int[3]
+      x[0] = 5
+      x[1] = 1
+      x[2] = 3
+      puts x.first!
+    EOF
+    assert_run_output("5\n", cls)
+  end
+
+  def test_empty_array_first!
+    cls, = compile(<<-EOF)
+      x = int[0]
+      puts x.first!
+    EOF
+    assert_raise_java(java.lang.ArrayIndexOutOfBoundsException) do
+      cls.main nil
+    end
+  end
+
+  def test_last!
+    cls, = compile(<<-EOF)
+      x = int[3]
+      x[0] = 5
+      x[1] = 1
+      x[2] = 3
+      puts x.last!
+    EOF
+    assert_run_output("3\n", cls)
+  end
+
+  def test_empty_array_last!
+    cls, = compile(<<-EOF)
+      x = int[0]
+      puts x.last!
+    EOF
+    assert_raise_java(java.lang.ArrayIndexOutOfBoundsException) do
+      cls.main nil
+    end
+  end
+  
+  def test_array_join
+    cls, = compile(<<-EOF)
+      x = int[3]
+      x[0] = 5
+      x[1] = 1
+      x[2] = 3
+      puts x.join(':')
+    EOF
+    assert_run_output("5:1:3\n", cls)
+  end
+  
+  def test_array_join_empty
+    cls, = compile(<<-EOF)
+      x = int[0]
+      puts x.join(':')
+    EOF
+    assert_run_output("\n", cls)
+  end
+  
+  def test_array_join_single
+    cls, = compile(<<-EOF)
+      x = int[1]
+      x[0] = 4
+      puts x.join(':')
+    EOF
+    assert_run_output("4\n", cls)
+  end
+  
+  def test_array_join_direct
+    cls, = compile(<<-EOF)
+      x = int[3]
+      x[0] = 5
+      x[1] = 1
+      x[2] = 3
+      puts x.join
+    EOF
+    assert_run_output("513\n", cls)
+  end
+  
+  def test_array_join_direct_empty
+    cls, = compile(<<-EOF)
+      x = int[0]
+      puts x.join
+    EOF
+    assert_run_output("\n", cls)
+  end
+  
+  def test_array_join_direct_single
+    cls, = compile(<<-EOF)
+      x = int[1]
+      x[0] = 4
+      puts x.join
+    EOF
+    assert_run_output("4\n", cls)
+  end
+  
+  def test_array_new
+    cls, = compile(<<-EOF)
+      x = int[].new(5) do |i|
+        i*2+1
+      end
+      puts x.join(",")
+    EOF
+    assert_run_output("1,3,5,7,9\n", cls)
+  end
+end

data/test/jvm/extensions/collection_extensions_test.rb

@@ -0,0 +1,195 @@
+class CollectionExtensionsTest < Test::Unit::TestCase
+  def test_mirah_array_join_empty
+    cls, = compile(<<-EOF)
+      x = [].join
+      puts x
+    EOF
+    assert_run_output("\n", cls)
+  end
+
+  def test_mirah_array_join_single
+    cls, = compile(<<-EOF)
+      x = ["a"].join
+      puts x
+    EOF
+    assert_run_output("a\n", cls)
+  end
+
+  def test_mirah_array_join_multiple
+    cls, = compile(<<-EOF)
+      x = ["a",1,"c"].join
+      puts x
+    EOF
+    assert_run_output("a1c\n", cls)
+  end
+
+  def test_java_array_join_empty
+    cls, = compile(<<-EOF)
+      x = int[0].join
+      puts x
+    EOF
+    assert_run_output("\n", cls)
+  end
+
+  def test_java_array_join_single
+    cls, = compile(<<-EOF)
+      x = ["a"].to_array(String).join
+      puts x
+    EOF
+    assert_run_output("a\n", cls)
+  end
+
+  def test_java_array_join_multiple
+    cls, = compile(<<-EOF)
+      x = ["a",1,"c"].to_array(Object).join
+      puts x
+    EOF
+    assert_run_output("a1c\n", cls)
+  end
+
+  def test_primitve_java_array_join_multiple
+    cls, = compile(<<-EOF)
+      x = int[4].join
+      puts x
+    EOF
+    assert_run_output("0000\n", cls)
+  end
+
+  def test_mirah_array_join_separator_empty
+    cls, = compile(<<-EOF)
+      x = [].join(",")
+      puts x
+    EOF
+    assert_run_output("\n", cls)
+  end
+
+  def test_mirah_array_join_separator_single
+    cls, = compile(<<-EOF)
+      x = ["a"].join(",")
+      puts x
+    EOF
+    assert_run_output("a\n", cls)
+  end
+
+  def test_mirah_array_join_separator_multiple
+    cls, = compile(<<-EOF)
+      x = ["a",1,"c"].join(",")
+      puts x
+    EOF
+    assert_run_output("a,1,c\n", cls)
+  end
+
+  def test_java_array_join_separator_empty
+    cls, = compile(<<-EOF)
+      x = int[0].join(",")
+      puts x
+    EOF
+    assert_run_output("\n", cls)
+  end
+
+  def test_java_array_join_separator_single
+    cls, = compile(<<-EOF)
+      x = ["a"].to_array(String).join(",")
+      puts x
+    EOF
+    assert_run_output("a\n", cls)
+  end
+
+  def test_java_array_join_separator_multiple
+    cls, = compile(<<-EOF)
+      x = ["a",1,"c"].to_array(Object).join(",")
+      puts x
+    EOF
+    assert_run_output("a,1,c\n", cls)
+  end
+
+  def test_primitve_java_array_join_separator_multiple
+    cls, = compile(<<-EOF)
+      x = int[4].join(",")
+      puts x
+    EOF
+    assert_run_output("0,0,0,0\n", cls)
+  end
+
+  # implicitly tests each_with_index
+  def test_mapa_on_list
+    cls, = compile(%q[
+      x = ["a","b","c","d"].mapa do |s|
+        "#{s}x"
+      end
+      puts x[2]
+      puts x.getClass.getName
+    ])
+    assert_run_output("cx\n[Ljava.lang.String;\n", cls)
+  end
+
+  # implicitly tests each_with_index
+  def test_mapa_on_java_array_with_complex_basetype
+    cls, = compile(%q[
+      x = ["a","b","c","d"].to_array(String).mapa do |s|
+        "#{s}x"
+      end
+      puts x[2]
+      puts x.getClass.getName
+    ])
+    assert_run_output("cx\n[Ljava.lang.String;\n", cls)
+  end
+
+  # implicitly tests each_with_index
+  def test_mapa_on_java_array_with_primitive_basetype
+    cls, = compile(%q[
+      x = [1,2,3,4].to_array(int).mapa do |s|
+        "#{s}x"
+      end
+      puts x[2]
+      puts x.getClass.getName
+    ])
+    assert_run_output("3x\n[Ljava.lang.String;\n", cls)
+  end
+
+  def test_map
+    cls, = compile(%q[
+      x = ["a","b","c","d"].map do |s|
+        "#{s}x"
+      end
+      puts x[2]
+      puts x.getClass.getName
+    ])
+    assert_run_output("cx\njava.util.ArrayList\n", cls)
+  end
+
+  def test_operator_append
+    cls, = compile(%q{
+      x = ["a"]
+      x << "b"
+      x << "c" << "d"
+      x << "e"
+      puts x
+    })
+    assert_run_output("[a, b, c, d, e]\n", cls)
+  end
+ 
+  def test_mapa_on_java_array_with_complex_basetype_returning_type_defined_later
+    cls, = compile(%q[
+      x = ["a","b","c","d"].mapa do |s|
+        TypeDefinedLater.new(s)
+      end
+      puts x[2]
+      puts x.getClass.getName
+      
+      class TypeDefinedLater
+        attr_accessor foo:Object
+        
+        def initialize(foo:Object)
+          self.foo = foo
+        end
+        
+        def toString
+          "TypeDefinedLater(#{foo})"
+        end
+      end
+    ])
+    assert_run_output("TypeDefinedLater(c)\n[LTypeDefinedLater;\n", cls)
+  end
+end
+

data/test/jvm/{enumerable_test.rb → extensions/enumerable_test.rb}

@@ -309,36 +309,104 @@ class EnumerableTest < Test::Unit::TestCase
     cls, = compile(<<-EOF)
        puts [].map { 'b' }
     EOF
-    assert_output "[]\n" do
-      cls.main(nil)
-    end
+    assert_run_output("[]\n", cls)
   end
 
   def test_map_to_different_type
     cls, = compile(<<-EOF)
       puts [1].map { 'a' }
     EOF
-    assert_output "[a]\n" do
-      cls.main(nil)
-    end
+    assert_run_output("[a]\n", cls)
   end
 
-def test_map_identity
+  def test_map_identity
     cls, = compile(<<-EOF)
       puts [1,2,3].map {|x| x}
     EOF
-    assert_output("[1, 2, 3]\n") do
-      cls.main(nil)
-    end
+    assert_run_output("[1, 2, 3]\n", cls)
   end
 
   def test_map_with_type_declaration
     cls, = compile(<<-EOF)
       puts [1,2,3].map {|x:Integer| x.intValue + 1}
     EOF
-    assert_output("[2, 3, 4]\n") do
-      cls.main(nil)
-    end
+    assert_run_output("[2, 3, 4]\n", cls)
+  end
+
+  def test_native_array_map_empty_literal
+    cls, = compile(<<-EOF)
+      puts int[0].map { 'b' }
+    EOF
+    assert_run_output("[]\n", cls)
+  end
+
+  def test_native_array_map_to_different_type
+    cls, = compile(<<-EOF)
+    	a = int[1]
+    	a[0] = 1
+      puts a.map { 'a' }
+    EOF
+    assert_run_output("[a]\n", cls)
+  end
+
+  def test_native_array_map_identity
+    cls, = compile(<<-EOF)
+    	a = int[3]
+    	a[0] = 1
+    	a[1] = 2
+    	a[2] = 3
+      puts a.map {|x| x}
+    EOF
+    assert_run_output("[1, 2, 3]\n", cls)
+  end
+
+  def test_native_array_map_with_type_declaration
+    cls, = compile(<<-EOF)
+    	a = int[3]
+    	a[0] = 1
+    	a[1] = 2
+    	a[2] = 3
+      puts a.map {|x:int| x + 1}
+    EOF
+    assert_run_output("[2, 3, 4]\n", cls)
+  end
+
+  def test_select_identity
+    cls, = compile(<<-EOF)
+      puts [1,2,3].select {|x| true}
+    EOF
+    assert_run_output("[1, 2, 3]\n", cls)
+  end
+
+  def test_select_odd
+    cls, = compile(<<-EOF)
+      puts [1,2,3].select {|x| (x.intValue&1)==1}
+    EOF
+    assert_run_output("[1, 3]\n", cls)
+  end
+
+  def test_select_multistatement_block
+    cls, = compile(<<-EOF)
+      puts ([1,2,3].select do |x|
+       v = x.intValue
+       v&1==1
+      end)
+    EOF
+    assert_run_output("[1, 3]\n", cls)
+  end
+  
+  def test_join
+    cls, = compile(<<-EOF)
+      puts [1,23,4].join
+    EOF
+    assert_run_output("1234\n", cls)
+  end
+
+  def test_join_with_separator
+    cls, = compile(<<-EOF)
+      puts [1,23,4].join ', '
+    EOF
+    assert_run_output("1, 23, 4\n", cls)
   end
 
   def test_zip