mirah 0.1.2-java → 0.1.3-java

data/test/jvm/list_extensions_test.rb

@@ -11,7 +11,7 @@ class ListExtensionsTest < Test::Unit::TestCase
 
   def test_bracket_assignment
     cls, = compile(<<-EOF)
-      import java.util.ArrayList # literals are immutable
+      import java.util.ArrayList
       x = ArrayList.new
       x[0]= "2"
       puts x

data/test/jvm/macros_test.rb

@@ -14,13 +14,49 @@
 # limitations under the License.
 
 class MacrosTest < Test::Unit::TestCase
+  #TODO perhaps one of these should be an error
+  def test_block_args_no_pipes_macro
+    cls, = compile(<<-EOF)
+      macro def foo(list: Node, block: Block)
+        quote do
+          `list`.each do `block.arguments`
+            puts 1
+            `block.body`
+          end
+        end
+      end
+
+      foo [2,3] {|x| puts x }
+    EOF
+
+    assert_output("1\n2\n1\n3\n") {cls.main(nil)}
+  end
+
+  def test_block_args_with_pipes_macro
+    cls, = compile(<<-EOF)
+      macro def foo(list: Node, block: Block)
+        quote do
+          `list`.each do |`block.arguments`|
+            puts 1
+            `block.body`
+          end
+        end
+      end
+
+      foo [2,3] {|x| puts x }
+    EOF
+
+    assert_output("1\n2\n1\n3\n") {cls.main(nil)}
+  end
+
+
   def test_vcall_macro
     cls, = compile(<<-EOF)
       macro def foo
         mirah::lang::ast::Null.new
       end
 
-      System.out.println(Object(foo))
+      puts(Object(foo))
     EOF
 
     assert_output("null\n") {cls.main(nil)}
@@ -48,7 +84,7 @@ class MacrosTest < Test::Unit::TestCase
         mirah::lang::ast::Null.new
       end
 
-      System.out.println(Object(foo()))
+      puts(Object(foo()))
     EOF
 
     assert_output("null\n") {cls.main(nil)}
@@ -61,7 +97,7 @@ class MacrosTest < Test::Unit::TestCase
         quote { nil }
       end
 
-      System.out.println(Object(foo))
+      puts(Object(foo))
     EOF
 
     assert_output("null\n") {cls.main(nil)}
@@ -192,10 +228,11 @@ class MacrosTest < Test::Unit::TestCase
       end
 
       x = UnquoteMacros.new
-      System.out.println x.foo
+      puts x.foo
       x.foo = 3
-      System.out.println x.foo
+      puts x.foo
     EOF
+
     assert_output("0\n3\n") {script.main(nil)}
   end
 
@@ -213,8 +250,8 @@ class MacrosTest < Test::Unit::TestCase
 
       def foo
         x = "1"
-        System.out.println doubleIt(x)
-        System.out.println x
+        puts doubleIt(x)
+        puts x
       end
     EOF
 
@@ -236,8 +273,8 @@ class MacrosTest < Test::Unit::TestCase
 
       def foo
         x = 1
-        System.out.println doubleIt(x)
-        System.out.println x
+        puts doubleIt(x)
+        puts x
       end
     EOF
 
@@ -251,7 +288,7 @@ class MacrosTest < Test::Unit::TestCase
       end
 
       def bar(a:String, b:String, c:String, d:String)
-        System.out.println "\#{a} \#{b} \#{c} \#{d}"
+        puts "\#{a} \#{b} \#{c} \#{d}"
       end
 
       foo(["a", "b"])
@@ -265,7 +302,7 @@ class MacrosTest < Test::Unit::TestCase
   def test_block_parameter_uses_outer_scope
     cls, = compile(<<-EOF)
       macro def foo(block:Block)
-        quote { z = `block.body`; System.out.println z }
+        quote { z = `block.body`; puts z }
       end
       apple = 1
       foo do
@@ -278,11 +315,27 @@ class MacrosTest < Test::Unit::TestCase
     end
   end
 
+
+  def test_block_parameter
+    cls, = compile(<<-EOF)
+      macro def foo(&block)
+        block.body
+      end
+      foo do
+        puts :hi
+      end
+    EOF
+
+    assert_output("hi\n") do
+      cls.main(nil)
+    end
+  end
+
   def test_method_def_after_macro_def_with_same_name_raises_error
     assert_raises Mirah::MirahError do
       compile(<<-EOF)
         macro def self.foo
-          quote { System.out.println :z }
+          quote { puts :z }
         end
         def foo
           :bar
@@ -314,9 +367,9 @@ class MacrosTest < Test::Unit::TestCase
       end
 
       x = AttrAccessorTest.new
-      System.out.println x.foo
+      puts x.foo
       x.foo = 3
-      System.out.println x.foo
+      puts x.foo
     EOF
     assert_output("0\n3\n") {script.main(nil)}
   end

data/test/jvm/main_method_test.rb

@@ -3,7 +3,7 @@ class MainMethodTest < Test::Unit::TestCase
     code = <<-EOC
       class WithMain
       end
-      System.out.println 'bar'
+      puts 'bar'
     EOC
 
     main_class, = compile code, :name => 'with_main'

data/test/jvm/new_backend_test_helper.rb

@@ -12,14 +12,111 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-require 'bytecode_test_helper'
+require 'test_helper'
 
 module JVMCompiler
-  def compiler_type
-    Mirah::JVM::Compiler::Backend
+  java_import 'org.mirah.tool.RunCommand'
+  java_import 'org.mirah.util.SimpleDiagnostics'
+  System = java.lang.System
+  JVM_VERSION = ENV['MIRAH_TEST_JVM_VERSION'] || '1.7'
+
+  class TestDiagnostics < SimpleDiagnostics
+    java_import 'java.util.Locale'
+    def report(diagnostic)
+      if diagnostic.kind.name == "ERROR"
+        raise Mirah::MirahError, diagnostic.getMessage(Locale.getDefault)
+      end
+      super
+    end
+  end
+  def parse_and_resolve_types name, code
+    cmd = build_command name, code
+    compile_or_raise cmd, ["-d", TEST_DEST]
+    cmd.compiler.getParsedNodes[0]
+  end
+
+  def compile(code, options = {})
+    name = options.fetch :name, tmp_script_name
+
+    java_version = options.fetch :java_version, JVMCompiler::JVM_VERSION
+    args = ["-d", TEST_DEST,
+            "--vmodule", "org.mirah.jvm.compiler.ClassCompiler=OFF",
+            "--classpath", Mirah::Env.encode_paths([FIXTURE_TEST_DEST, TEST_DEST]) ]
+    if java_version
+      args += ["--jvm", java_version]
+    end
+
+    cmd = build_command name, code
+    compile_or_raise cmd, args
+
+    dump_class_files cmd.classMap
+
+    cmd.loadClasses.map {|cls| JRuby.runtime.java_support.getProxyClassFromCache(cls)}
+  end
+
+  def build_command(name, code)
+    cmd = RunCommand.new
+    cmd.addFakeFile(name, code)
+    cmd.setDiagnostics(TestDiagnostics.new(false))
+    cmd
+  end
+
+  def compile_or_raise cmd, args
+    if 0 != cmd.compile(args)
+      raise Mirah::MirahError, "Compilation failed"
+    end
+  rescue => e
+    raise e.cause if e.respond_to?(:cause) && e.cause
+    raise e
   end
 
   def compiler_name
     "new"
   end
+
+  def clean_tmp_files
+    return unless @tmp_classes
+    File.unlink(*@tmp_classes)
+  end
+
+  def dump_class_files class_map
+    class_map.each do |filename, bytes|
+      filename = "#{TEST_DEST}#{filename}.class"
+      FileUtils.mkdir_p(File.dirname(filename))
+      File.open(filename, 'wb') { |f| f.write(bytes) }
+      @tmp_classes << filename
+    end
+  end
+
+  def tmp_script_name
+    "script#{name.gsub(/\)|\(/,'_').capitalize}#{System.nano_time}"
+  end
+
+  def assert_raise_java(type, message=nil)
+    begin
+      yield
+    rescue Exception => e
+      ex = e
+    end
+    ex = ex.cause if ex.is_a? NativeException
+    assert_equal type, ex.class
+    if message
+      assert_equal message,
+                   ex.message.to_s,
+                  "expected error message to be '#{message}' but was '#{ex.message}'"
+    end
+    ex
+  end
+end
+
+class Test::Unit::TestCase
+  include JVMCompiler
+
+  def setup
+    @tmp_classes = Set.new
+  end
+
+  def cleanup
+    clean_tmp_files
+  end
 end

data/{lib/mirah/jvm/types/bitescript_ext.rb → test/jvm/static_fields_test.rb}

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+# Copyright (c) 2014 The Mirah project authors. All Rights Reserved.
 # All contributing project authors may be found in the NOTICE file.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,30 +12,31 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+require 'test_helper'
 
-class BiteScript::MethodBuilder
-  def inot
-    iconst_m1
-    ixor
-  end
+class StaticFieldsTest < Test::Unit::TestCase
+  def test_static_field_inheritance_lookup_with_dot
+    cls, = with_finest_logging{compile(<<-EOF)}
+      import java.util.GregorianCalendar
+      puts GregorianCalendar.AM
+    EOF
 
-  def lnot
-    # TODO would any of these be faster?
-    #   iconst_m1; i2l
-    #   lconst_1; lneg
-    ldc_long(-1)
-    ixor
+    assert_output "0\n" do
+      cls.main(nil)
+    end
   end
 
-  def op_to_bool
-    done_label = label
-    true_label = label
+  def test_static_field_inheritance_lookup_with_double_colon
+    return
+    pend("double colon is treated special for lookup") {
+    cls, = compile(<<-EOF)
+      import java.util.GregorianCalendar
+      puts GregorianCalendar::AM
+    EOF
 
-    yield(true_label)
-    iconst_0
-    goto(done_label)
-    true_label.set!
-    iconst_1
-    done_label.set!
+    assert_output "0\n" do
+      cls.main(nil)
+    end
+    }
   end
 end

data/test/mirrors/base_type_test.rb

@@ -14,11 +14,12 @@
 # limitations under the License.
 
 require 'test/unit'
-require 'mirah'
+require 'java'
+require 'dist/mirahc.jar'
 
 class BaseTypeTest < Test::Unit::TestCase
-  java_import 'org.jruby.org.objectweb.asm.Type'
-  java_import 'org.jruby.org.objectweb.asm.Opcodes'
+  java_import 'org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Opcodes'
   java_import 'org.mirah.jvm.mirrors.BaseType'
   java_import 'org.mirah.jvm.mirrors.Member'
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'

data/test/mirrors/bytecode_mirror_test.rb

@@ -14,38 +14,48 @@
 # limitations under the License.
 
 require 'test/unit'
-require 'mirah'
+require 'java'
+require 'dist/mirahc.jar'
 
 class BytecodeMirrorTest < Test::Unit::TestCase
-  java_import 'org.jruby.org.objectweb.asm.Type'
-  java_import 'org.mirah.jvm.mirrors.ClassPath'
+  java_import 'org.objectweb.asm.Type'
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
+  java_import 'org.mirah.jvm.mirrors.ClassLoaderResourceLoader'
+  java_import 'org.mirah.jvm.mirrors.ClassResourceLoader'
   java_import 'org.mirah.jvm.types.JVMTypeUtils'
+  java_import 'org.mirah.IsolatedResourceLoader'
 
   def setup
-    types = MirrorTypeSystem.new
-    @loader = types.context.get(ClassPath).bytecode_loader
+    class_based_loader = ClassResourceLoader.new(MirrorTypeSystem.java_class)
+    loader = ClassLoaderResourceLoader.new(
+                IsolatedResourceLoader.new([TEST_DEST,FIXTURE_TEST_DEST].map{|u|java.net.URL.new "file:"+u}),
+                class_based_loader)
+    @types = MirrorTypeSystem.new nil, loader
   end
-  
+
+  def load(desc)
+    @types.wrap(desc).resolve
+  end
+
   def test_parent
-    mirror = @loader.loadMirror(Type.getType("I"))
+    mirror = load(Type.getType("I"))
     assert_equal("I", mirror.asm_type.descriptor)
   end
 
   def test_classloading
-    mirror = @loader.loadMirror(Type.getType("Ljava/lang/Object;"))
+    mirror = load(Type.getType("Ljava/lang/Object;"))
     assert(!mirror.isError)
     assert_equal("java.lang.Object", mirror.name)
   end
 
   def test_inner_class
-    mirror = @loader.loadMirror(Type.getType("Ljava/util/Map/Entry;"))
+    mirror = load(Type.getType("Ljava/util/Map/Entry;"))
     assert(!mirror.isError)
     assert_equal("java.util.Map$Entry", mirror.name)
   end
 
   def test_superclass
-    mirror = @loader.loadMirror(Type.getType("Ljava/lang/String;"))
+    mirror = load(Type.getType("Ljava/lang/String;"))
     assert(!mirror.isError)
     assert_equal("java.lang.String", mirror.name)
     
@@ -56,13 +66,13 @@ class BytecodeMirrorTest < Test::Unit::TestCase
   end
 
   def test_interfaces
-    mirror = @loader.loadMirror(Type.getType("Ljava/lang/String;"))
+    mirror = load(Type.getType("Ljava/lang/String;"))
     interfaces = mirror.interfaces.map {|t| t.resolve.name}
     assert_equal(['java.io.Serializable', 'java.lang.Comparable', 'java.lang.CharSequence'], interfaces)
   end
 
   def test_declared_field
-    mirror = @loader.loadMirror(Type.getType("Ljava/lang/String;"))
+    mirror = load(Type.getType("Ljava/lang/String;"))
     field = mirror.getDeclaredField('hash')
     assert_equal(mirror, field.declaringClass)
     assert_equal('hash', field.name)
@@ -74,13 +84,23 @@ class BytecodeMirrorTest < Test::Unit::TestCase
   end
 
   def test_array
-    mirror = @loader.loadMirror(Type.getType("[Ljava/lang/Object;"))
+    mirror = load(Type.getType("[Ljava/lang/Object;"))
     assert(JVMTypeUtils.isArray(mirror))
     assert_equal("Ljava/lang/Object;", mirror.getComponentType.asm_type.descriptor)
   end
 
-  def test_retention
-    mirror = @loader.loadMirror(Type.getType("Ljava/lang/annotation/Retention;"))
+  def test_annotation_retention_with_runtime
+    mirror = load(Type.getType("Ljava/lang/annotation/Retention;"))
     assert_equal("RUNTIME", mirror.retention)
   end
+
+  def test_annotation_retention_with_source
+    mirror = load(Type.getType("Ljava/lang/Override;"))
+    assert_equal("SOURCE", mirror.retention)
+  end
+
+  def test_annotation_retention_with_class
+    mirror = load(Type.getType("Lorg/foo/ImplicitClassRetAnno;"))
+    assert_equal("CLASS", mirror.retention)
+  end
 end