mirah 0.0.6-java → 0.0.7-java

data/examples/fib.mirah

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-def fib(a:int)
+def fib(a:int):int
   if a < 2
     a
   else

data/examples/tak.mirah

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-def tak(x:fixnum, y:fixnum, z:fixnum)
+def tak(x:int, y:int, z:int):int
   unless y < x
     z
   else

data/lib/mirah/ast/intrinsics.rb

@@ -277,7 +277,7 @@ module Mirah::AST
       Mirah::AST.type_factory = new_factory
       ast = build_ast(name, parent, transformer)
       classes = compile_ast(name, ast, transformer)
-      loader = MirahClassLoader.new(
+      loader = Mirah::ClassLoader.new(
           JRuby.runtime.jruby_class_loader, classes)
       klass = loader.loadClass(name, true)
       if state.save_extensions

data/lib/mirah/ast/structure.rb

@@ -188,7 +188,10 @@ module Mirah::AST
       # find all methods which would not otherwise be on java.lang.Object
       impl_methods = find_methods(klass.interfaces).select do |m|
         begin
-          obj_m = java.lang.Object.java_class.java_method m.name, *m.parameter_types
+          # Very cumbersome. Not sure how it got this way.
+          mirror = BiteScript::ASM::ClassMirror.for_name('java.lang.Object')
+          mtype = Mirah::JVM::Types::Type.new(mirror)
+          mtype.java_method m.name, *m.argument_types
         rescue NameError
           # not found on Object
           next true

data/lib/mirah/class_loader.rb

@@ -0,0 +1,35 @@
+# This is a custom classloader impl to allow loading classes with
+# interdependencies by having findClass retrieve classes as needed from the
+# collection of all classes generated by the target script.
+module Mirah
+  class ClassLoader < java::security::SecureClassLoader
+    def initialize(parent, class_map)
+      super(parent)
+      @class_map = class_map
+    end
+    
+    def findClass(name)
+      if @class_map[name]
+        bytes = @class_map[name].to_java_bytes
+        defineClass(name, bytes, 0, bytes.length)
+      else
+        raise java.lang.ClassNotFoundException.new(name)
+      end
+    end
+    
+    def loadClass(name, resolve)
+      cls = findLoadedClass(name)
+      if cls == nil
+        if @class_map[name]
+          cls = findClass(name)
+        else
+          cls = super(name, false)
+        end
+      end
+      
+      resolveClass(cls) if resolve
+      
+      cls
+    end
+  end
+end

data/lib/mirah/compilation_state.rb

@@ -0,0 +1,28 @@
+module Mirah
+  class CompilationState
+    def initialize
+      BiteScript.bytecode_version = BiteScript::JAVA1_5
+      @save_extensions = true
+    end
+
+    attr_accessor :verbose, :destination
+    attr_accessor :version_printed
+    attr_accessor :help_printed
+    attr_accessor :save_extensions
+
+    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
+      else
+        $stderr.puts "invalid bytecode version specified: #{ver_str}"
+      end
+    end
+  end
+end

data/lib/mirah/impl.rb

@@ -0,0 +1,273 @@
+module Mirah
+  class Impl
+    def initialize
+      Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new
+      @running = false
+    end
+    
+    def running?
+      @running
+    end
+    
+    def run(*args)
+      main = nil
+      class_map = {}
+      
+      # we're running!
+      @running = true
+      
+      # generate all bytes for all classes
+      generate(args) do |outfile, builder|
+        bytes = builder.generate
+        name = builder.class_name.gsub(/\//, '.')
+        class_map[name] = bytes
+      end
+      
+      # load all classes
+      dcl = Mirah::ClassLoader.new(JRuby.runtime.jruby_class_loader, class_map)
+      class_map.each do |name,|
+        cls = dcl.load_class(name)
+        # TODO: using first main; find correct one
+        main ||= cls.get_method("main", java::lang::String[].java_class) #rescue nil
+      end
+      
+      # run the main method we found
+      if main
+        begin
+          main.invoke(nil, [args.to_java(:string)].to_java)
+        rescue java.lang.Exception => e
+          e = e.cause if e.cause
+          raise e
+        end
+      else
+        puts "No main found" unless @state.version_printed || @state.help_printed
+      end
+    rescue Mirah::InternalCompilerError => ice
+      Mirah.print_error(ice.message, ice.position) if ice.node
+      raise ice
+    rescue Mirah::MirahError => ex
+      Mirah.print_error(ex.message, ex.position)
+      puts ex.backtrace if @state.verbose
+    end
+    
+    def compile(*args)
+      generate(args) do |filename, builder|
+        filename = "#{@state.destination}#{filename}"
+        FileUtils.mkdir_p(File.dirname(filename))
+        bytes = builder.generate
+        File.open(filename, 'wb') {|f| f.write(bytes)}
+      end
+    rescue Mirah::InternalCompilerError => ice
+      Mirah.print_error(ice.message, ice.position) if ice.position
+      puts "error on #{ice.node}(#{ice.node.object_id})"
+      raise ice
+    rescue Mirah::MirahError => ex
+      Mirah.print_error(ex.message, ex.position)
+      puts ex.backtrace if @state.verbose
+    end
+    
+    def generate(args, &block)
+      process_flags!(args)
+      
+      # collect all ASTs from all files
+      all_nodes = []
+      puts "Parsing..." unless running?
+      expand_files(args).each do |duby_file|
+        if duby_file == '-e'
+          @filename = '-e'
+          next
+        elsif @filename == '-e'
+          puts "  <inline script>" unless running?
+          all_nodes << parse('-e', duby_file)
+        else
+          puts "  #{duby_file}" unless running?
+          all_nodes << parse(duby_file)
+        end
+        @filename = nil
+        exit 1 if @error
+      end
+      
+      # enter all ASTs into inference engine
+      puts "Inferring types..." unless running?
+      infer_asts(all_nodes)
+      
+      # compile each AST in turn
+      puts "Compiling..." unless running?
+      all_nodes.each do |ast|
+        puts "  #{ast.position.file}" unless running?
+        compile_ast(ast, &block)
+      end
+      
+      puts "Done!" unless running?
+    end
+    
+    def parse(*args)
+      process_flags!(args)
+      @filename = args.shift
+      
+      if @filename
+        if @filename == '-e'
+          @filename = 'DashE'
+          src = args[0]
+        else
+          src = File.read(@filename)
+        end
+      else
+        print_help
+        exit(1)
+      end
+      begin
+        ast = Mirah::AST.parse_ruby(src, @filename)
+        # rescue org.jrubyparser.lexer.SyntaxException => ex
+        #   Mirah.print_error(ex.message, ex.position)
+        #   raise ex if @state.verbose
+      end
+      @transformer = Mirah::Transform::Transformer.new(@state)
+      Java::MirahImpl::Builtin.initialize_builtins(@transformer)
+      @transformer.filename = @filename
+      ast = @transformer.transform(ast, nil)
+      @transformer.errors.each do |ex|
+        Mirah.print_error(ex.message, ex.position)
+        raise ex.cause || ex if @state.verbose
+      end
+      @error = @transformer.errors.size > 0
+      
+      ast
+    rescue Mirah::InternalCompilerError => ice
+      Mirah.print_error(ice.message, ice.position) if ice.node
+      raise ice
+    rescue Mirah::MirahError => ex
+      Mirah.print_error(ex.message, ex.position)
+      puts ex.backtrace if @state.verbose
+    end
+    
+    def infer_asts(asts)
+      typer = Mirah::Typer::JVM.new(@transformer)
+      asts.each {|ast| typer.infer(ast, true) }
+      begin
+        typer.resolve(false)
+      ensure
+        puts asts.inspect if @state.verbose
+        
+        failed = !typer.errors.empty?
+        if failed
+          puts "Inference Error:"
+          typer.errors.each do |ex|
+            if ex.node
+              Mirah.print_error(ex.message, ex.position)
+            else
+              puts ex.message
+            end
+            puts ex.backtrace if @state.verbose
+          end
+          exit 1
+        end
+      end
+    end
+    
+    def compile_ast(ast, &block)
+      compiler = @compiler_class.new
+      ast.compile(compiler, false)
+      compiler.generate(&block)
+    end
+    
+    def process_flags!(args)
+      @state ||= Mirah::CompilationState.new
+      while args.length > 0 && args[0] =~ /^-/
+        case args[0]
+        when '--classpath', '-c'
+          args.shift
+          Mirah::Env.decode_paths(args.shift, $CLASSPATH)
+        when '--cd'
+          args.shift
+          Dir.chdir(args.shift)
+        when '--dest', '-d'
+          args.shift
+          @state.destination = File.join(File.expand_path(args.shift), '')
+        when '-e'
+          break
+        when '--explicit-packages'
+          args.shift
+          Mirah::AST::Script.explicit_packages = true
+        when '--help', '-h'
+          print_help
+          args.clear
+        when '--java', '-j'
+          require 'mirah/jvm/source_compiler'
+          @compiler_class = Mirah::Compiler::JavaSource
+          args.shift
+        when '--jvm'
+          args.shift
+          @state.set_jvm_version(args.shift)
+        when '-I'
+          args.shift
+          $: << args.shift
+        when '--plugin', '-p'
+          args.shift
+          plugin = args.shift
+          require "mirah/plugin/#{plugin}"
+        when '--verbose', '-V'
+          Mirah::Typer.verbose = true
+          Mirah::AST.verbose = true
+          Mirah::Compiler::JVM.verbose = true
+          @state.verbose = true
+          args.shift
+        when '--version', '-v'
+          args.shift
+          print_version
+        when '--no-save-extensions'
+          args.shift
+          @state.save_extensions = false
+        else
+          puts "unrecognized flag: " + args[0]
+          print_help
+          args.clear
+        end
+      end
+      @state.destination ||= File.join(File.expand_path('.'), '')
+      @compiler_class ||= Mirah::Compiler::JVM
+    end
+    
+    def print_help
+      puts "#{$0} [flags] <files or -e SCRIPT>
+      -c, --classpath PATH\tAdd PATH to the Java classpath for compilation
+      --cd DIR\t\tSwitch to the specified DIR befor compilation
+      -d, --dir DIR\t\tUse DIR as the base dir for compilation, packages
+      -e CODE\t\tCompile or run the inline script following -e
+      \t\t\t  (the class will be named \"DashE\")
+      --explicit-packages\tRequire explicit 'package' lines in source
+      -h, --help\t\tPrint this help message
+      -I DIR\t\tAdd DIR to the Ruby load path before running
+      -j, --java\t\tOutput .java source (compile mode only)
+      --jvm VERSION\t\tEmit JVM bytecode targeting specified JVM
+      \t\t\t  version (1.4, 1.5, 1.6, 1.7)
+      -p, --plugin PLUGIN\trequire 'mirah/plugin/PLUGIN' before running
+      -v, --version\t\tPrint the version of Mirah to the console
+      -V, --verbose\t\tVerbose logging"
+      @state.help_printed = true
+    end
+    
+    def print_version
+      puts "Mirah v#{Mirah::VERSION}"
+      @state.version_printed = true
+    end
+    
+    def expand_files(files)
+      expanded = []
+      files.each do |filename|
+        if File.directory?(filename)
+          Dir[File.join(filename, '*')].each do |child|
+            if File.directory?(child)
+              files << child
+            elsif child =~ /\.(duby|mirah)$/
+              expanded << child
+            end
+          end
+        else
+          expanded << filename
+        end
+      end
+      expanded
+    end
+  end
+end

data/lib/mirah/jvm/types.rb

@@ -336,7 +336,7 @@ module Mirah
       class ArrayMetaType < MetaType; end
 
       class DynamicType < Type
-        ObjectType = Type.new('java.lang.Object')
+        ObjectType = Type.new(BiteScript::ASM::ClassMirror.for_name('java.lang.Object'))
 
         def initialize
           # For naming, bytecode purposes, we are an Object
@@ -358,10 +358,22 @@ module Mirah
         def jvm_type
           java.lang.Object
         end
+        
+        def full_name
+          "dynamic"
+        end
 
         def dynamic?
           true
         end
+        
+        def superclass
+          ObjectType.superclass
+        end
+        
+        def interfaces
+          ObjectType.interfaces
+        end
       end
 
       class TypeDefinition < Type

data/lib/mirah/version.rb

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

data/lib/mirah.rb

@@ -22,6 +22,7 @@ require 'mirah/typer'
 require 'mirah/compiler'
 require 'mirah/env'
 require 'mirah/errors'
+require 'mirah/class_loader'
 begin
   require 'bitescript'
 rescue LoadError
@@ -31,19 +32,21 @@ end
 require 'mirah/jvm/compiler'
 require 'mirah/jvm/typer'
 Dir[File.dirname(__FILE__) + "/mirah/plugin/*"].each {|file| require "#{file}" if file =~ /\.rb$/}
+require 'mirah/impl'
+require 'mirah/compilation_state'
 require 'jruby'
 
 module Mirah
   def self.run(*args)
-    MirahImpl.new.run(*args)
+    Impl.new.run(*args)
   end
 
   def self.compile(*args)
-    MirahImpl.new.compile(*args)
+    Impl.new.compile(*args)
   end
 
   def self.parse(*args)
-    MirahImpl.new.parse(*args)
+    Impl.new.parse(*args)
   end
 
   def self.plugins
@@ -85,323 +88,6 @@ module Mirah
       end
     end
   end
-
-  class CompilationState
-    def initialize
-      BiteScript.bytecode_version = BiteScript::JAVA1_5
-      @save_extensions = true
-    end
-
-    attr_accessor :verbose, :destination
-    attr_accessor :version_printed
-    attr_accessor :help_printed
-    attr_accessor :save_extensions
-
-    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
-      else
-        $stderr.puts "invalid bytecode version specified: #{ver_str}"
-      end
-    end
-  end
-end
-
-# This is a custom classloader impl to allow loading classes with
-# interdependencies by having findClass retrieve classes as needed from the
-# collection of all classes generated by the target script.
-class MirahClassLoader < java::security::SecureClassLoader
-  def initialize(parent, class_map)
-    super(parent)
-    @class_map = class_map
-  end
-
-  def findClass(name)
-    if @class_map[name]
-      bytes = @class_map[name].to_java_bytes
-      defineClass(name, bytes, 0, bytes.length)
-    else
-      raise java.lang.ClassNotFoundException.new(name)
-    end
-  end
-
-  def loadClass(name, resolve)
-    cls = findLoadedClass(name)
-    if cls == nil
-      if @class_map[name]
-        cls = findClass(name)
-      else
-        cls = super(name, false)
-      end
-    end
-
-    resolveClass(cls) if resolve
-
-    cls
-  end
-end
-
-class MirahImpl
-  def initialize
-    Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new
-  end
-
-  def run(*args)
-    main = nil
-    class_map = {}
-
-    # generate all bytes for all classes
-    generate(args) do |outfile, builder|
-      bytes = builder.generate
-      name = builder.class_name.gsub(/\//, '.')
-      class_map[name] = bytes
-    end
-
-    # load all classes
-    dcl = MirahClassLoader.new(JRuby.runtime.jruby_class_loader, class_map)
-    class_map.each do |name,|
-      cls = dcl.load_class(name)
-      # TODO: using first main; find correct one
-      main ||= cls.get_method("main", java::lang::String[].java_class) #rescue nil
-    end
-
-    # run the main method we found
-    if main
-      begin
-        main.invoke(nil, [args.to_java(:string)].to_java)
-      rescue java.lang.Exception => e
-        e = e.cause if e.cause
-        raise e
-      end
-    else
-      puts "No main found" unless @state.version_printed || @state.help_printed
-    end
-  rescue Mirah::InternalCompilerError => ice
-    Mirah.print_error(ice.message, ice.position) if ice.node
-    raise ice
-  rescue Mirah::MirahError => ex
-    Mirah.print_error(ex.message, ex.position)
-    puts ex.backtrace if @state.verbose
-  end
-
-  def compile(*args)
-    generate(args) do |filename, builder|
-      filename = "#{@state.destination}#{filename}"
-      FileUtils.mkdir_p(File.dirname(filename))
-      bytes = builder.generate
-      File.open(filename, 'wb') {|f| f.write(bytes)}
-    end
-  rescue Mirah::InternalCompilerError => ice
-    Mirah.print_error(ice.message, ice.position) if ice.position
-    puts "error on #{ice.node}(#{ice.node.object_id})"
-    raise ice
-  rescue Mirah::MirahError => ex
-    Mirah.print_error(ex.message, ex.position)
-    puts ex.backtrace if @state.verbose
-  end
-
-  def generate(args, &block)
-    process_flags!(args)
-
-    # collect all ASTs from all files
-    all_nodes = []
-    expand_files(args).each do |duby_file|
-      if duby_file == '-e'
-        @filename = '-e'
-        next
-      elsif @filename == '-e'
-        all_nodes << parse('-e', duby_file)
-      else
-        all_nodes << parse(duby_file)
-      end
-      @filename = nil
-      exit 1 if @error
-    end
-
-    # enter all ASTs into inference engine
-    infer_asts(all_nodes)
-
-    # compile each AST in turn
-    all_nodes.each do |ast|
-      compile_ast(ast, &block)
-    end
-  end
-
-  def parse(*args)
-    process_flags!(args)
-    @filename = args.shift
-
-    if @filename
-      if @filename == '-e'
-        @filename = 'DashE'
-        src = args[0]
-      else
-        src = File.read(@filename)
-      end
-    else
-      print_help
-      exit(1)
-    end
-    begin
-      ast = Mirah::AST.parse_ruby(src, @filename)
-    # rescue org.jrubyparser.lexer.SyntaxException => ex
-    #   Mirah.print_error(ex.message, ex.position)
-    #   raise ex if @state.verbose
-    end
-    @transformer = Mirah::Transform::Transformer.new(@state)
-    Java::MirahImpl::Builtin.initialize_builtins(@transformer)
-    @transformer.filename = @filename
-    ast = @transformer.transform(ast, nil)
-    @transformer.errors.each do |ex|
-      Mirah.print_error(ex.message, ex.position)
-      raise ex.cause || ex if @state.verbose
-    end
-    @error = @transformer.errors.size > 0
-
-    ast
-  rescue Mirah::InternalCompilerError => ice
-    Mirah.print_error(ice.message, ice.position) if ice.node
-    raise ice
-  rescue Mirah::MirahError => ex
-    Mirah.print_error(ex.message, ex.position)
-    puts ex.backtrace if @state.verbose
-  end
-
-  def infer_asts(asts)
-    typer = Mirah::Typer::JVM.new(@transformer)
-    asts.each {|ast| typer.infer(ast, true) }
-    begin
-      typer.resolve(false)
-    ensure
-      puts asts.inspect if @state.verbose
-
-      failed = !typer.errors.empty?
-      if failed
-        puts "Inference Error:"
-        typer.errors.each do |ex|
-          if ex.node
-            Mirah.print_error(ex.message, ex.position)
-          else
-            puts ex.message
-          end
-          puts ex.backtrace if @state.verbose
-        end
-        exit 1
-      end
-    end
-  end
-
-  def compile_ast(ast, &block)
-    compiler = @compiler_class.new
-    ast.compile(compiler, false)
-    compiler.generate(&block)
-  end
-
-  def process_flags!(args)
-    @state ||= Mirah::CompilationState.new
-    while args.length > 0 && args[0] =~ /^-/
-      case args[0]
-      when '--classpath', '-c'
-        args.shift
-        Mirah::Env.decode_paths(args.shift, $CLASSPATH)
-      when '--cd'
-        args.shift
-        Dir.chdir(args.shift)
-      when '--dest', '-d'
-        args.shift
-        @state.destination = File.join(File.expand_path(args.shift), '')
-      when '-e'
-        break
-      when '--explicit-packages'
-        args.shift
-        Mirah::AST::Script.explicit_packages = true
-      when '--help', '-h'
-        print_help
-        args.clear
-      when '--java', '-j'
-        require 'mirah/jvm/source_compiler'
-        @compiler_class = Mirah::Compiler::JavaSource
-        args.shift
-      when '--jvm'
-        args.shift
-        @state.set_jvm_version(args.shift)
-      when '-I'
-        args.shift
-        $: << args.shift
-      when '--plugin', '-p'
-        args.shift
-        plugin = args.shift
-        require "mirah/plugin/#{plugin}"
-      when '--verbose', '-V'
-        Mirah::Typer.verbose = true
-        Mirah::AST.verbose = true
-        Mirah::Compiler::JVM.verbose = true
-        @state.verbose = true
-        args.shift
-      when '--version', '-v'
-        args.shift
-        print_version
-      when '--no-save-extensions'
-        args.shift
-        @state.save_extensions = false
-      else
-        puts "unrecognized flag: " + args[0]
-        print_help
-        args.clear
-      end
-    end
-    @state.destination ||= File.join(File.expand_path('.'), '')
-    @compiler_class ||= Mirah::Compiler::JVM
-  end
-
-  def print_help
-    puts "#{$0} [flags] <files or -e SCRIPT>
-  -c, --classpath PATH\tAdd PATH to the Java classpath for compilation
-  --cd DIR\t\tSwitch to the specified DIR befor compilation
-  -d, --dir DIR\t\tUse DIR as the base dir for compilation, packages
-  -e CODE\t\tCompile or run the inline script following -e
-  \t\t\t  (the class will be named \"DashE\")
-  --explicit-packages\tRequire explicit 'package' lines in source
-  -h, --help\t\tPrint this help message
-  -I DIR\t\tAdd DIR to the Ruby load path before running
-  -j, --java\t\tOutput .java source (compile mode only)
-  --jvm VERSION\t\tEmit JVM bytecode targeting specified JVM
-  \t\t\t  version (1.4, 1.5, 1.6, 1.7)
-  -p, --plugin PLUGIN\trequire 'mirah/plugin/PLUGIN' before running
-  -v, --version\t\tPrint the version of Mirah to the console
-  -V, --verbose\t\tVerbose logging"
-    @state.help_printed = true
-  end
-
-  def print_version
-    puts "Mirah v#{Mirah::VERSION}"
-    @state.version_printed = true
-  end
-
-  def expand_files(files)
-    expanded = []
-    files.each do |filename|
-      if File.directory?(filename)
-        Dir[File.join(filename, '*')].each do |child|
-          if File.directory?(child)
-            files << child
-          elsif child =~ /\.(duby|mirah)$/
-            expanded << child
-          end
-        end
-      else
-        expanded << filename
-      end
-    end
-    expanded
-  end
 end
 
 if __FILE__ == $0

data/test/test_java_typer.rb

@@ -16,10 +16,7 @@
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
-require 'mirah/typer'
-require 'mirah/plugin/java'
-require 'mirah/jvm/compiler'
-require 'mirah/jvm/typer'
+require 'mirah'
 
 class TestJavaTyper < Test::Unit::TestCase
   include Mirah
@@ -205,4 +202,12 @@ class TestJavaTyper < Test::Unit::TestCase
     ast = AST.parse("#{1 << 33}")
     assert_equal(AST.type(nil, 'long'), ast.infer(@typer, true))
   end
+  
+  def test_dynamic_assignability
+    ast = AST.parse("a = 1; a = dynamic('foo')")
+    assert_equal :error, ast.infer(@typer, true).name
+    
+    ast = AST.parse("a = Object.new; a = dynamic('foo')")
+    assert_equal 'java.lang.Object', ast.infer(@typer, true).name
+  end
 end

data/test/test_jvm_compiler.rb

@@ -82,7 +82,7 @@ class TestJVMCompiler < Test::Unit::TestCase
     compiler = Compiler::JVM.new
     compiler.compile(ast)
     classes = {}
-    loader = MirahClassLoader.new(JRuby.runtime.jruby_class_loader, classes)
+    loader = Mirah::ClassLoader.new(JRuby.runtime.jruby_class_loader, classes)
     compiler.generate do |name, builder|
       bytes = builder.generate
       FileUtils.mkdir_p(File.dirname(name))
@@ -2056,6 +2056,24 @@ class TestJVMCompiler < Test::Unit::TestCase
     end
   end
 
+  def test_block_with_abstract_from_object
+    # Comparator interface also defines equals(Object) as abstract,
+    # but it can be inherited from Object. We test that here.
+    cls, = compile(<<-EOF)
+      import java.util.ArrayList
+      import java.util.Collections
+      list = ArrayList.new(["a", "ABC", "Cats", "b"])
+      Collections.sort(list) do |a, b|
+        String(a).compareToIgnoreCase(String(b))
+      end
+      list.each {|x| puts x}
+    EOF
+
+    assert_output("a\nABC\nb\nCats\n") do
+      cls.main(nil)
+    end
+  end
+
   def test_each
     cls, = compile(<<-EOF)
       def foo

metadata

@@ -2,7 +2,7 @@
 name: mirah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: java
 authors: 
   - Charles Oliver Nutter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 01:59:06.100000 -05:00
+date: 2011-03-20 17:08:55.863000 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -61,9 +61,12 @@ files:
   - lib/mirah_task.rb
   - lib/mirah/appengine_tasks.rb
   - lib/mirah/ast.rb
+  - lib/mirah/class_loader.rb
+  - lib/mirah/compilation_state.rb
   - lib/mirah/compiler.rb
   - lib/mirah/env.rb
   - lib/mirah/errors.rb
+  - lib/mirah/impl.rb
   - lib/mirah/transform.rb
   - lib/mirah/transform2.rb
   - lib/mirah/typer.rb
@@ -113,7 +116,6 @@ files:
   - test/test_typer.rb
   - examples/bintrees.mirah
   - examples/construction.mirah
-  - examples/Dynamic.class
   - examples/dynamic.mirah
   - examples/edb.mirah
   - examples/fib.mirah
@@ -121,7 +123,6 @@ files:
   - examples/fractal.mirah
   - examples/java_thing.mirah
   - examples/simple_class.mirah
-  - examples/SizeThing.class
   - examples/sort_closure.mirah
   - examples/swing.mirah
   - examples/tak.mirah