mirah 0.0.9-java → 0.0.10-java

data/lib/mirah/jvm/types/intrinsics.rb

@@ -73,7 +73,7 @@ module Mirah::JVM::Types
     end
 
     def add_compiled_macro(klass, name, arg_types)
-      add_macro(name, *arg_types) do |duby, call|
+      add_macro(name, *arg_types) do |mirah, call|
         # Ick. We need to preserve the scope of the arguments to the macro.
         # However the only way to do that is to wrap them in a ScopedBody.
         # It'd be better if we didn't have to expose this wrapper node to
@@ -87,15 +87,20 @@ module Mirah::JVM::Types
           wrap_with_scoped_body call, arg
         end
         
-        expander = klass.constructors[0].newInstance(duby, call)
+        expander = klass.constructors[0].newInstance(mirah, call)
         ast = expander.expand
         if ast
           body = Mirah::AST::ScopedBody.new(call.parent, call.position)
           body << ast
-          if call.target
+          
+          # if the macro was called on something, and that something
+          # was not a class only containing macros, reassign self for
+          # the body.
+          if call.target && !call.target.is_a?(Mirah::AST::Builtin)
             body.static_scope.self_type = call.target.inferred_type!
             body.static_scope.self_node = call.target
           end
+          
           body
         else
           Mirah::AST::Noop.new(call.parent, call.position)

data/lib/mirah/transform/helper.rb

@@ -406,7 +406,7 @@ module Mirah
         Mirah::AST::Block.new(parent, position(node)) do |block|
           [
             args ? transformer.transform(args, block) : Mirah::AST::Arguments.new(block, position(node)),
-            body ? transformer.transform(body, block) : nil,
+            body ? transformer.transform(body, block) : Mirah::AST::Body.new(block, position(node)),
           ]
         end
       end

data/lib/mirah/typer/simple.rb

@@ -330,7 +330,7 @@ module Mirah
             end
           end
 
-          if @deferred_nodes.size == 0
+          if @deferred_nodes.empty?
             log "[Cycle #{i}]:  Resolved all types, exiting"
             break
           elsif old_deferred == @deferred_nodes

data/lib/mirah/util/argument_processor.rb

@@ -52,7 +52,7 @@ module Mirah
             else
               puts "-j/--java flag only applies to \"compile\" mode."
               print_help
-              throw :exit
+              throw :exit, 1
             end
           when '--jvm'
             args.shift
@@ -79,7 +79,7 @@ module Mirah
           else
             puts "unrecognized flag: " + args[0]
             print_help
-            throw :exit
+            throw :exit, 1
           end
         end
         state.destination ||= File.join(File.expand_path('.'), '')

data/lib/mirah/util/process_errors.rb

@@ -16,6 +16,7 @@
 module Mirah
   module Util
     module ProcessErrors
+      # errors - array of NodeErrors
       def process_errors(errors)
         errors.each do |ex|
           puts ex
@@ -26,7 +27,7 @@ module Mirah
           end
           puts ex.backtrace if @verbose
         end
-        throw :exit unless errors.empty?
+        throw :exit, 1 unless errors.empty?
       end
     end
   end

data/lib/mirah/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module Mirah
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/core/test_ast.rb

@@ -12,10 +12,7 @@
 # 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 'mirah'
-require 'test/unit'
-require 'jruby'
+require 'test_helper'
 
 class TestAst < Test::Unit::TestCase
   include Mirah
@@ -360,7 +357,8 @@ class TestAst < Test::Unit::TestCase
     assert_not_nil(new_ast)
     assert(AST::EmptyArray === new_ast)
     assert_equal(5, new_ast.size.literal)
-    assert_equal(AST.type(:int), new_ast.inferred_type)
+
+    assert_equal("int", new_ast.type_node.name)
   end
 
   def test_block_comment
@@ -377,4 +375,4 @@ class TestAst < Test::Unit::TestCase
       AST.parse("puts( 'aoue'")
     end
   end
-end
+end

data/test/core/test_commands.rb

@@ -0,0 +1,80 @@
+# Copyright (c) 2010 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 TestCommands < Test::Unit::TestCase
+  def teardown
+    Mirah::AST.type_factory = nil
+  end
+  
+  class RaisesMirahErrorCommand < Mirah::Commands::Base
+    def execute
+      execute_base { raise Mirah::MirahError, "just an error" }
+    end
+    def command_name; :foo; end
+  end
+  
+  class MirahProcessesErrorCommand < Mirah::Commands::Base
+    include  Mirah::Util::ProcessErrors
+    def execute
+      execute_base { process_errors [Mirah::NodeError.new("just an error")] }
+    end
+    def command_name; :foo; end
+  end
+  
+  class SuccessfulCommand < Mirah::Commands::Base
+    def execute
+      execute_base { "something" }
+    end
+    def command_name; :foo; end
+  end
+
+  def test_on_Mirah_error_has_non_zero_exit_code
+    assert_non_zero_exit do
+      RaisesMirahErrorCommand.new([]).execute
+    end
+  end
+
+  def test_on_bad_argument_has_non_zero_exit_code
+    assert_non_zero_exit do
+      RaisesMirahErrorCommand.new(['-bad-argument']).execute
+    end
+  end
+  
+  def test_on_j_option_when_command_is_not_compile_has_non_zero_exit_code
+    assert_non_zero_exit do
+      RaisesMirahErrorCommand.new(['-j']).execute
+    end
+  end
+  
+  def test_success_is_truthy
+    assert SuccessfulCommand.new([]).execute, "expected it to be truthy"
+  end
+  
+  def test_process_errors_causes_a_non_zero_exit
+    assert_non_zero_exit do
+      MirahProcessesErrorCommand.new([]).execute
+    end
+  end
+
+  def assert_non_zero_exit
+    ex = assert_raise SystemExit do
+      yield
+    end
+    assert_not_equal 0, ex.status
+  end
+
+end

data/test/core/test_compilation.rb

@@ -12,13 +12,9 @@
 # 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'
 
-require 'mirah'
-require 'mirah/compiler'
-require 'test/unit'
-require 'jruby'
-
-class TestAst < Test::Unit::TestCase
+class TestCompilation < Test::Unit::TestCase
   include Mirah
 
   class MockCompiler

data/test/core/test_env.rb

@@ -12,9 +12,7 @@
 # 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/unit'
-require 'mirah'
+require 'test_helper'
 
 class TestEnv < Test::Unit::TestCase
   include Mirah

data/test/core/test_macros.rb

@@ -1,7 +1,19 @@
+# Copyright (c) 2010 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.
 # TODO refactor this and test_jvm_compiler to use mirah.rb
-
-require 'test/unit'
-require 'mirah'
+require 'test_helper'
 
 class TestMacros < Test::Unit::TestCase
   java_import 'java.lang.System'

data/test/core/test_typer.rb

@@ -12,9 +12,7 @@
 # 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/unit'
-require 'mirah'
+require 'test_helper'
 
 class TestTyper < Test::Unit::TestCase
   include Mirah
@@ -222,6 +220,21 @@ class TestTyper < Test::Unit::TestCase
 
     assert_equal(typer.float_type, ast2.body[0].inferred_type)
   end
+  
+  def test_rescue_w_different_type_raises_inference_error_when_expression
+    ast = AST.parse("begin true; 1.0; rescue; ''; end").body[0]
+    typer = Typer::Simple.new("bar")
+
+    assert_raise(Mirah::InferenceError) {ast.infer(typer, true)}
+  end
+
+  def test_rescue_w_different_type_doesnt_raise_inference_error_when_statement
+    ast = AST.parse("begin true; 1.0; rescue; ''; end").body[0]
+    typer = Typer::Simple.new("bar")
+
+    assert_nothing_raised {ast.infer(typer, false)}
+  end
+
 
   def test_class
     ast = AST.parse("class Foo; def foo; 1; end; def baz; foo; end; end")
@@ -234,4 +247,4 @@ class TestTyper < Test::Unit::TestCase
 
     assert_nothing_raised {typer.resolve(true)}
   end
-end
+end

data/test/jvm/bytecode_test_helper.rb

@@ -12,15 +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 'bundler/setup'
-require 'test/unit'
-require 'mirah'
-require 'jruby'
+require 'test_helper'
 require 'stringio'
 require 'fileutils'
 
-#$CLASSPATH << File.expand_path("#{File.dirname(__FILE__)}/../..")
-
 unless Mirah::AST.macro "__gloop__"
   Mirah::AST.defmacro "__gloop__" do |transformer, fcall, parent|
     Mirah::AST::Loop.new(parent, parent.position, true, false) do |loop|
@@ -125,7 +120,7 @@ module JVMCompiler
     compiler
   end
   
-  def compile(code, name = "script" + System.nano_time.to_s)
+  def compile(code, name = tmp_script_name)
     clear_tmp_files
     reset_type_factory
     
@@ -135,6 +130,10 @@ module JVMCompiler
     
     generate_classes compiler
   end
+  
+  def tmp_script_name
+    "script" + System.nano_time.to_s
+  end
 end
 
 

data/test/jvm/javac_test_helper.rb

@@ -12,14 +12,7 @@
 # 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 'bundler/setup'
-require 'test/unit'
-require 'mirah'
-
 require 'bytecode_test_helper'
-
-
 require 'mirah/jvm/compiler/java_source'
 
 

data/test/jvm/test_annotations.rb

@@ -0,0 +1,58 @@
+class TestAnnotations < Test::Unit::TestCase
+  def deprecated
+    @deprecated ||= java.lang.Deprecated.java_class
+  end
+
+  def test_annotation_on_a_method
+    cls, = compile(<<-EOF)
+      $Deprecated
+      def foo
+        'foo'
+      end
+    EOF
+
+    assert_not_nil cls.java_class.java_method('foo').annotation(deprecated)
+    assert_nil cls.java_class.annotation(deprecated)
+  end
+  
+  def test_annotation_on_a_class
+    script, cls = compile(<<-EOF)
+      $Deprecated
+      class Annotated
+      end
+    EOF
+    assert_not_nil cls.java_class.annotation(deprecated)
+  end
+  
+  def test_annotation_on_a_field
+    cls, = compile(<<-EOF)
+      class AnnotatedField
+        def initialize
+          $Deprecated
+          @foo = 1
+        end
+      end
+    EOF
+
+    assert_not_nil cls.java_class.declared_fields[0].annotation(deprecated)
+  end
+  
+  def test_annotation_with_an_integer
+    jruby_method = Java::OrgJrubyAnno::JRubyMethod.java_class
+
+    cls, = compile(<<-EOF)
+      import org.jruby.*
+      import org.jruby.anno.*
+      import org.jruby.runtime.*
+      import org.jruby.runtime.builtin.*
+
+      $JRubyMethod["name" => "bar", "optional" => 1]
+      def bar(baz:int)
+      end
+    EOF
+    method_annotation = cls.java_class.java_method('bar', :int).annotation(jruby_method)
+
+    assert_equal 1, method_annotation.optional
+  end
+
+end

data/test/jvm/test_blocks.rb

@@ -0,0 +1,62 @@
+# Copyright (c) 2010 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.
+
+class TestBlocks < Test::Unit::TestCase
+
+  def setup
+    super
+    clear_tmp_files
+    reset_type_factory
+  end
+  
+  def parse_and_type code, name=tmp_script_name
+    parse_and_resolve_types name, code
+  end
+  
+  #this should probably be a core test
+  def test_empty_block_parses_and_types_without_error
+    assert_nothing_raised do
+      parse_and_type(<<-CODE)
+        interface Bar do;def run:void;end;end
+      
+        class Foo
+          def foo(a:Bar)
+            1
+          end
+        end
+        Foo.new.foo do
+        end
+      CODE
+    end
+  end
+  
+  def test_non_empty_block_parses_and_types_without_error
+    assert_nothing_raised do
+      parse_and_type(<<-CODE)
+        interface Bar do;def run:void;end;end
+      
+        class Foo
+          def foo(a:Bar)
+            1
+          end
+        end
+        Foo.new.foo do
+          1
+        end
+      CODE
+    end
+  end
+
+end