mirah 0.1.0.pre-java → 0.1.1-java

data/lib/mirah/util/compilation_state.rb

@@ -20,6 +20,7 @@ module Mirah
     class CompilationState
       def initialize
         @save_extensions = true
+        set_jvm_version ENV_JAVA['java.specification.version']
       end
 
       attr_accessor :verbose, :destination
@@ -32,22 +33,27 @@ module Mirah
       attr_accessor :args
       attr_accessor :command
       attr_accessor :loggers
+      attr_accessor :type_system
 
       attr_accessor :classpath, :bootclasspath
+      attr_reader :target_jvm_version, :bytecode_version
 
       def set_jvm_version(ver_str)
-        case ver_str
-        when '1.4'
-          BiteScript.bytecode_version = BiteScript::JAVA1_4
-        when '1.5'
-          BiteScript.bytecode_version = BiteScript::JAVA1_5
-        when '1.6'
-          BiteScript.bytecode_version = BiteScript::JAVA1_6
-        when '1.7'
-          BiteScript.bytecode_version = BiteScript::JAVA1_7
+        @target_jvm_version = ver_str
+        @bytecode_version = case ver_str
+        when '1.4' then BiteScript::JAVA1_4
+        when '1.5' then BiteScript::JAVA1_5
+        when '1.6' then BiteScript::JAVA1_6
+        when '1.7' then BiteScript::JAVA1_7
+        when '1.8' then BiteScript::JAVA1_8
         else
           $stderr.puts "invalid bytecode version specified: #{ver_str}"
         end
+        BiteScript.bytecode_version = @bytecode_version
+      end
+
+      def supports_invokedynamic?
+        @bytecode_version == BiteScript::JAVA1_7
       end
     end
   end

data/lib/mirah/util/process_errors.rb

@@ -55,9 +55,15 @@ module Mirah
           type = type.resolve if type
           if (type && type.isError)
             @errors[type] ||= begin
-              if type.message.size == 1 && type.message[0].size == 1
+              if type.message.size == 1
                 m = type.message[0]
-                m << node rescue nil
+                if m.size == 1
+                  m << node rescue nil
+                elsif m.size == 2 && m[1] == nil
+                  m[1] = node.position rescue nil
+                end
+              elsif type.message.size == 0
+                type.message << ["Error", node.position]
               end
               type
             end

data/lib/mirah/version.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+# Copyright (c) 2010-2013 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");
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module Mirah
-  VERSION = "0.1.0.pre"
+  VERSION = "0.1.1"
 end

data/lib/mirah_task.rb

@@ -109,13 +109,6 @@ def mirahc(*files)
   end
 end
 
-rule '.java' => [proc {|n| Mirah.dest_to_source_path(n)}] do |t|
-  mirahc(t.source,
-         :dir=>Mirah.find_source(t.source),
-         :dest=>Mirah.find_dest(t.name),
-         :options=>['-java'])
-end
-
 rule '.class' => [proc {|n| Mirah.dest_to_source_path(n)}] do |t|
   mirahc(t.source,
          :dir=>Mirah.find_source(t.source),

data/test/core/typer_test.rb

@@ -32,8 +32,7 @@ class TyperTest < Test::Unit::TestCase
 
   def setup
     @scopes = SimpleScoper.new
-    @types = SimpleTypes.new('bar')
-    new_typer('bar')
+    new_typer('Bar')
   end
 
   def parse(text)
@@ -42,7 +41,7 @@ class TyperTest < Test::Unit::TestCase
 
   def new_typer(n)
     @types = SimpleTypes.new(n.to_s)
-    @typer = Mirah::Typer::Typer.new(@types, @scopes, nil)
+    @typer = Mirah::Typer::Typer.new(@types, @scopes, nil, nil)
     @mirah = Transform::Transformer.new(Mirah::Util::CompilationState.new, @typer)
     @typer
   end
@@ -75,9 +74,18 @@ class TyperTest < Test::Unit::TestCase
 
   def infer(ast, expression=true)
     new_typer(:bar).infer(ast, expression)
+    if ast.kind_of? Java::MirahLangAst::Script
+      ast = ast.body
+    end
     inferred_type(ast)
   end
 
+  def test_script_is_void
+    ast = parse("x='a script'")
+    infer(ast)
+    assert_equal(@types.getVoidType, inferred_type(ast))
+  end
+
   def test_fixnum
     ast = parse("1")
     assert_equal(@types.getFixnumType(1), infer(ast))
@@ -155,7 +163,7 @@ class TyperTest < Test::Unit::TestCase
 
 #    assert_equal(@types.getNullType, @types.getMethodType(type, 'foo', [@types.getStringType.resolve]).resolve)
     assert_equal(@types.getStringType, @types.getLocalType(inner_scope, 'a', nil).resolve)
-    assert_equal(@types.getNullType, inferred_type(mdef))
+    assert_equal(@types.getNullType, inferred_type(mdef).returnType)
     assert_equal(@types.getStringType, inferred_type(mdef.arguments.required.get(0)))
 
     ast1 = parse("#{def_foo}(a:String); a; end")
@@ -166,7 +174,7 @@ class TyperTest < Test::Unit::TestCase
 
     # assert_equal(@types.getStringType, @types.getMethodType(type, 'foo', [@types.getStringType.resolve]).resolve)
     assert_equal(@types.getStringType, @types.getLocalType(inner_scope, 'a', nil).resolve)
-    assert_equal(@types.getStringType, inferred_type(mdef))
+    assert_equal(@types.getStringType, inferred_type(mdef).returnType)
     assert_equal(@types.getStringType, inferred_type(mdef.arguments.required.get(0)))
   end
 
@@ -180,8 +188,8 @@ class TyperTest < Test::Unit::TestCase
     infer(ast)
     ast = ast.body
     self_type = @scopes.getScope(ast.get(0)).selfType
-    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(0)))
-    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)))
+    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(0)).returnType)
+    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)).returnType)
 
     # Reverse the order, ensure deferred inference succeeds
     ast = parse("def baz; bar(1, 'x'); end; def bar(a:Int, b:String); 1.0; end")
@@ -192,8 +200,8 @@ class TyperTest < Test::Unit::TestCase
 
     assert_no_errors(typer, ast)
 
-    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(0)))
-    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)))
+    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(0)).returnType)
+    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)).returnType)
 
     # modify bar call to have bogus types, ensure resolution fails
     ast = parse("def baz; bar(1, 1); end; def bar(a:Int, b:String); 1.0; end")
@@ -203,7 +211,7 @@ class TyperTest < Test::Unit::TestCase
     ast = ast.body
 
     assert_equal(":error", inferred_type(ast.get(0)).name)
-    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)))
+    assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)).returnType)
   end
 
   def test_if
@@ -220,7 +228,7 @@ class TyperTest < Test::Unit::TestCase
     assert_equal(@types.getFloatType(1.0), inferred_type(ast.body))
     assert_equal(@types.getFloatType(1.0), inferred_type(ast.elseBody))
 
-    typer = new_typer(:bar)
+    typer = new_typer(:Bar)
 
     ast = parse("if foo; bar; else; baz; end").body.get(0)
     typer.infer(ast.parent.parent, true)
@@ -239,7 +247,7 @@ class TyperTest < Test::Unit::TestCase
     ast2 = parse("def baz; 2.0; end")
     typer.infer(ast2, true)
 
-    assert_equal(@types.getFloatType(1.0), inferred_type(ast2.body))
+    assert_equal(@types.getFloatType(1.0), inferred_type(ast2.body).returnType)
 
     assert_equal(@types.getFloatType(1.0), inferred_type(ast))
     assert_equal(@types.getFloatType(1.0), inferred_type(ast.elseBody))
@@ -282,7 +290,7 @@ class TyperTest < Test::Unit::TestCase
   end
 
   def test_vcall
-    ast = parse("foo = 1; def bar; end; foo; bar")
+    ast = parse("foo = 1; def squeak; nil; end; foo; squeak")
     assert_kind_of(VCall, ast.body(2))
     assert_kind_of(VCall, ast.body(3))
     infer(ast)

data/test/core/util/argument_processor_test.rb

@@ -1,3 +1,17 @@
+# Copyright (c) 2013 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 ArgumentProcessorTest < Test::Unit::TestCase
@@ -27,27 +41,13 @@ class ArgumentProcessorTest < Test::Unit::TestCase
     assert_equal 1, processor.exit_status_code
   end
 
-#  def test_arg_bootclasspath_sets_bootclasspath_on_type_factory_ugh
-#    Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new # global state grumble grumble
-#
-#    path = "class:path"
-#    state = Mirah::Util::CompilationState.new
-#    processor = Mirah::Util::ArgumentProcessor.new state, ["--bootclasspath", path]
-#    processor.process
-#
-#    assert_equal path, Mirah::AST.type_factory.bootclasspath
-#  end
-
-  def test_dash_j_fails_when_not_compiling
+  def test_arg_bootclasspath_sets_bootclasspath_on_compilation_state
+    path = "class:path"
     state = Mirah::Util::CompilationState.new
-    processor = Mirah::Util::ArgumentProcessor.new state, ["-j"]
+    processor = Mirah::Util::ArgumentProcessor.new state, ["--bootclasspath", path]
+    processor.process
 
-    assert_output "-j/--java flag only applies to \"compile\" mode.\n" do
-      processor.process
-    end
-
-    assert processor.exit?
-    assert_equal 1, processor.exit_status_code
+    assert_equal path, state.bootclasspath
   end
 
   def test_dash_h_prints_help_and_exits

data/test/core/util/class_loader_test.rb

@@ -1,3 +1,17 @@
+# Copyright (c) 2013 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 ClassLoaderTest < Test::Unit::TestCase
@@ -16,13 +30,14 @@ class ClassLoaderTest < Test::Unit::TestCase
   def test_mirah_class_loader_w_missing_class_raises_class_not_found
     class_loader = Mirah::Util::ClassLoader.new nil, {}
 
-    ex = assert_raise NativeException do
-      class_loader.find_class 'org.doesnt.exist.Class'
+    begin
+      klass = class_loader.find_class 'org.doesnt.exist.Class'
+      fail 'Expected ClassNotFoundException'
+    rescue java.lang.ClassNotFoundException
+      # expected
     end
-    assert_equal java.lang.ClassNotFoundException, ex.cause.class
   end
 
-
   def test_isolated_resource_loader_only_finds_resources_given_to_it
     loader = Mirah::Util::IsolatedResourceLoader.new [java.net.URL.new("file:#{FIXTURES}")]
     url = loader.get_resource "my.properties"

data/test/core/util/compilation_state_test.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2013 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");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 CampilationStateTest < Test::Unit::TestCase
+  include Mirah::Util
+  def test_defaults_to_current_java
+    state = CompilationState.new
+    spec_version = ENV_JAVA['java.specification.version']
+    assert_equal spec_version, state.target_jvm_version
+    assert_equal bitescript_const(spec_version), state.bytecode_version
+  end
+
+  %w[1.4 1.5 1.6 1.7 1.8].each do |version|
+    define_method  "test_setting_version_to_#{version.tr '.', '_'}" do
+      state = CompilationState.new
+      state.set_jvm_version version
+      assert_equal version, state.target_jvm_version
+      assert_equal bitescript_const(version), state.bytecode_version
+    end
+  end
+
+  def bitescript_const version
+    BiteScript.const_get("JAVA#{version.gsub('.', '_')}")
+  end
+end

data/test/fixtures/org/foo/LowerCaseInnerClass.java

@@ -0,0 +1,7 @@
+package org.foo;
+
+public class LowerCaseInnerClass {
+    public static final class inner {
+	public static final int field = 1234;
+    }
+}

data/test/jvm/blocks_test.rb

@@ -12,14 +12,10 @@
 # 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 BlocksTest < Test::Unit::TestCase
 
-  def setup
-    super
-    clear_tmp_files
-  end
-
   def parse_and_type code, name=tmp_script_name
     parse_and_resolve_types name, code
   end
@@ -30,13 +26,13 @@ class BlocksTest < Test::Unit::TestCase
       parse_and_type(<<-CODE)
         interface Bar do;def run:void;end;end
 
-        class Foo
+        class BarOner
           def initialize; end
           def foo(a:Bar)
             1
           end
         end
-        Foo.new.foo do
+        BarOner.new.foo do
         end
       CODE
     end
@@ -49,13 +45,13 @@ class BlocksTest < Test::Unit::TestCase
           def run:void; end
         end
 
-        class Foo
+        class NotEmptyAccepter
           def initialize; end
           def foo(a:Bar)
             1
           end
         end
-        Foo.new.foo do
+        NotEmptyAccepter.new.foo do
           1
         end
       CODE
@@ -244,17 +240,17 @@ class BlocksTest < Test::Unit::TestCase
   def test_block_impling_interface_w_multiple_methods
     assert_jraise java.lang.UnsupportedOperationException do
       parse_and_type(<<-CODE)
-        interface Bar do
+        interface RunOrRun2 do
           def run:void;end
           def run2:void;end;
         end
 
-        class Foo
-          def foo(a:Bar)
+        class RunOrRun2Fooer
+          def foo(a:RunOrRun2)
             1
           end
         end
-        Foo.new.foo do
+        RunOrRun2Fooer.new.foo do
           1
         end
         CODE
@@ -264,15 +260,15 @@ class BlocksTest < Test::Unit::TestCase
   def test_block_with_missing_params
     cls, = compile(<<-CODE)
         interface Bar do
-          def run(a:string):void;end
+          def run(a:String):void;end
         end
 
-        class Foo
+        class TakesABar
           def foo(a:Bar)
             a.run("x")
           end
         end
-        Foo.new.foo do
+        TakesABar.new.foo do
           puts "hi"
         end
         CODE
@@ -284,16 +280,16 @@ class BlocksTest < Test::Unit::TestCase
   def test_block_with_too_many_params
     assert_raises Mirah::MirahError do
       parse_and_type(<<-CODE)
-        interface Bar do
-          def run(a:string):void;end
+        interface SingleArgMethod do
+          def run(a:String):void;end
         end
 
-        class Foo
-          def foo(a:Bar)
+        class ExpectsSingleArgMethod
+          def foo(a:SingleArgMethod)
             1
           end
         end
-        Foo.new.foo do |a, b|
+        ExpectsSingleArgMethod.new.foo do |a, b|
           1
         end
         CODE
@@ -301,20 +297,24 @@ class BlocksTest < Test::Unit::TestCase
   end
 
   def test_closure_in_closure_doesnt_raise_error
-    parse_and_type(<<-CODE)
-        interface Bar do;def run:void;end;end
+    cls, = compile(<<-CODE)
+        interface BarRunner do;def run:void;end;end
 
-        class Foo
-          def foo(a:Bar)
-            1
+        class Nestable
+          def foo(a:BarRunner)
+            a.run
           end
         end
-        Foo.new.foo do
-          Foo.new.foo do
-            1
+        Nestable.new.foo do
+          puts "first closure"
+          Nestable.new.foo do
+            puts "second closure"
           end
         end
       CODE
+    assert_output "first closure\nsecond closure\n" do
+      cls.main(nil)
+    end
   end
 
   def test_method_requiring_subclass_of_abstract_class_finds_abstract_method
@@ -332,4 +332,25 @@ class BlocksTest < Test::Unit::TestCase
       cls.main(nil)
     end
   end
+
+  def test_block_with_interface_method_with_2_arguments
+    cls, = compile(<<-EOF)
+      interface DoubleArgMethod do
+        def run(a: String, b: int):void;end
+      end
+
+      class ExpectsDoubleArgMethod
+        def foo(a:DoubleArgMethod)
+          a.run "hello", 1243
+        end
+      end
+      ExpectsDoubleArgMethod.new.foo do |a, b|
+        puts a
+        puts b
+      end
+    EOF
+    assert_output "hello\n1243\n" do
+      cls.main(nil)
+    end
+  end
 end