mirah 0.0.4-java → 0.0.5-java

data/lib/mirah/plugin/gwt.rb

@@ -1,10 +1,25 @@
+# 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 'mirah/jvm/source_generator/builder'
 
-module Duby::JavaSource
+module Mirah::JavaSource
   class ClassBuilder
     def build_jsni_method(name, visibility, static, exceptions, type, *args)
       finish_declaration
-      type ||= Duby::AST.type(nil, :void)
+      type ||= Mirah::AST.type(nil, :void)
       @methods << JsniMethodBuilder.new(self,
         :name => name,
         :visibility => visibility,
@@ -50,11 +65,11 @@ module Duby::JavaSource
   end
 end
 
-module Duby::Compiler
+module Mirah::Compiler
   class JVMCompilerBase
     # arg_types must be an Array
     def create_method_builder(name, node, static, exceptions, return_type, arg_types)
-      unless node.class == Duby::AST::JsniMethodDefinition
+      unless node.class == Mirah::AST::JsniMethodDefinition
         @class.build_method(name.to_s, node.visibility, static,
           exceptions, return_type, *arg_types)
       else
@@ -81,7 +96,7 @@ module Duby::Compiler
   end
 end
 
-module Duby::AST
+module Mirah::AST
   class JsniMethodDefinition < MethodDefinition
     def initialize(static, parent, line_number, name, annotations=[], &block)
       super(parent, line_number, name, annotations, &block)
@@ -138,7 +153,7 @@ module Duby::AST
       call_node.name,
       transformer.annotations) do |defn|
 
-      signature = {:return => Duby::AST.type(nil, args[0].name)}
+      signature = {:return => Mirah::AST.type(nil, args[0].name)}
       method = call_node.parameters[0]
 
       unless method.nil?
@@ -149,7 +164,7 @@ module Duby::AST
           hash_node.child_nodes.each_slice(2) do |name, type|
             position = name.position + type.position
             name = name.literal
-            type = Duby::AST.type(nil, type.name)
+            type = Mirah::AST.type(nil, type.name)
             signature[name.intern] = type
             arg_list.push(RequiredArgument.new(args_new, position, name))
           end

data/lib/mirah/plugin/java.rb

@@ -1,13 +1,28 @@
+# 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 'mirah/typer'
 require 'mirah/jvm/method_lookup'
 require 'mirah/jvm/types'
 require 'java'
 
-module Duby
+module Mirah
   module Typer
     class JavaTyper < BaseTyper
-      include Duby::JVM::MethodLookup
-      include Duby::JVM::Types
+      include Mirah::JVM::MethodLookup
+      include Mirah::JVM::Types
       
       def initialize
       end

data/lib/mirah/transform.rb

@@ -1,7 +1,22 @@
+# 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 'base64'
 require 'jruby'
 
-module Duby
+module Mirah
   module Transform
     class Error < StandardError
       attr_reader :position, :cause
@@ -30,7 +45,7 @@ module Duby
         @scopes = []
         @extra_body = nil
         @state = state
-        @helper = Duby::AST::TransformHelper.new(self)
+        @helper = Mirah::AST::TransformHelper.new(self)
       end
 
       def destination
@@ -48,7 +63,7 @@ module Duby
 
       def add_annotation(annotation)
         @annotations << annotation
-        Duby::AST::Noop.new(annotation.parent, annotation.position)
+        Mirah::AST::Noop.new(annotation.parent, annotation.position)
       end
 
       def tmp(format="__xform_tmp_%d")
@@ -88,13 +103,13 @@ module Duby
         begin
           top = @extra_body.nil?
           if top
-            @extra_body = Duby::AST::Body.new(nil, position(node))
+            @extra_body = Mirah::AST::Body.new(nil, position(node))
           end
           method = "transform_#{camelize(node[0])}"
           result = @helper.send method, node, parent
           if top
             body = result.body
-            if body.kind_of?(Duby::AST::Body) && @extra_body.empty?
+            if body.kind_of?(Mirah::AST::Body) && @extra_body.empty?
               @extra_body = body
             else
               result.body = @extra_body
@@ -105,11 +120,11 @@ module Duby
           return result
         rescue Error => ex
           @errors << ex
-          Duby::AST::ErrorNode.new(parent, ex)
+          Mirah::AST::ErrorNode.new(parent, ex)
         rescue Exception => ex
           error = Error.new(ex.message, position(node), ex)
           @errors << error
-          Duby::AST::ErrorNode.new(parent, error)
+          Mirah::AST::ErrorNode.new(parent, error)
         end
       end
 
@@ -124,7 +139,7 @@ module Duby
       end
 
       def eval(src, filename='-', parent=nil, *vars)
-        node = Duby::AST.parse_ruby(src, filename)
+        node = Mirah::AST.parse_ruby(src, filename)
         duby_node = transform(node, nil).body
         duby_node.parent = parent
         duby_node
@@ -132,11 +147,11 @@ module Duby
 
       def dump_ast(node)
         encoded = nil
-        values = Duby::AST::Unquote.extract_values do
+        values = Mirah::AST::Unquote.extract_values do
           encoded = Base64.encode64(Marshal.dump(node))
         end
-        result = Duby::AST::Array.new(nil, node.position)
-        result << Duby::AST::String.new(result, node.position, encoded)
+        result = Mirah::AST::Array.new(nil, node.position)
+        result << Mirah::AST::String.new(result, node.position, encoded)
         values.each {|value| result << value}
         return result
       end
@@ -144,9 +159,9 @@ module Duby
       def load_ast(args)
         nodes = args.to_a
         encoded = nodes.shift
-        Duby::AST::Unquote.inject_values(nodes) do
+        Mirah::AST::Unquote.inject_values(nodes) do
           result = Marshal.load(Base64.decode64(encoded))
-          if Duby::AST::UnquotedValue === result
+          if Mirah::AST::UnquotedValue === result
             result.node
           else
             result
@@ -155,7 +170,7 @@ module Duby
       end
 
       def __ruby_eval(code, arg)
-        Kernel.eval(code)
+        self.instance_eval(code)
       end
 
       def fixnum(value)
@@ -188,7 +203,7 @@ module Duby
       end
 
       def define_class(position, name, &block)
-        append_node Duby::AST::ClassDefinition.new(@extra_body, position, name, &block)
+        append_node Mirah::AST::ClassDefinition.new(@extra_body, position, name, &block)
       end
 
       def define_closure(position, name, enclosing_type)
@@ -198,7 +213,7 @@ module Duby
         if enclosing_type.respond_to?(:node) && enclosing_type.node
           parent = target = enclosing_type.node
         end
-        target.append_node(Duby::AST::ClosureDefinition.new(
+        target.append_node(Mirah::AST::ClosureDefinition.new(
             parent, position, name, enclosing_type))
       end
     end
@@ -221,9 +236,9 @@ module Duby
         messages.each_with_index do |message, i|
           jpos = positions[i]
           if jpos
-            dpos = Duby::Transform::Transformer::JMetaPosition.new(jpos, jpos)
+            dpos = Mirah::Transform::Transformer::JMetaPosition.new(jpos, jpos)
             print "#{message} at "
-            Duby.print_error("", dpos)
+            Mirah.print_error("", dpos)
           else
             print message
           end
@@ -233,7 +248,7 @@ module Duby
 
     def parse(src, filename='dash_e', raise_errors=false, transformer=nil)
       ast = parse_ruby(src, filename)
-      transformer ||= Transform::Transformer.new(Duby::CompilationState.new)
+      transformer ||= Transform::Transformer.new(Mirah::CompilationState.new)
       transformer.filename = filename
       ast = transformer.transform(ast, nil)
       if raise_errors
@@ -255,7 +270,7 @@ module Duby
       rescue => ex
         if ex.cause.respond_to? :position
           position = ex.cause.position
-          Duby.print_error(ex.cause.message, position)
+          Mirah.print_error(ex.cause.message, position)
         end
         raise ex
       end

data/lib/mirah/transform2.rb

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+
+module Mirah::AST
   class TransformHelper
     java_import 'jmeta.Ast'
     def initialize(transformer)
@@ -25,11 +40,11 @@ module Duby::AST
     end
 
     def transform_fixnum(node, parent)
-      Duby::AST::fixnum(parent, position(node), node[1])
+      Mirah::AST::fixnum(parent, position(node), node[1])
     end
 
     def transform_float(node, parent)
-      Duby::AST::float(parent, position(node), node[1])
+      Mirah::AST::float(parent, position(node), node[1])
     end
 
     def transform_true(node, parent)
@@ -257,7 +272,7 @@ module Duby::AST
           iter_node ? transformer.transform(iter_node, call) : nil
         ]
       end
-      macro = Duby::AST.macro(name)
+      macro = Mirah::AST.macro(name)
       if macro
         transformer.expand(fcall, parent, &macro)
       else
@@ -334,7 +349,7 @@ module Duby::AST
       elsif ['public', 'private', 'protected'].include?(name)
         AccessLevel.new(parent, position, name)
       else
-        macro = Duby::AST.macro(name)
+        macro = Mirah::AST.macro(name)
         fcall = FunctionalCall.new(parent, position, name) do |call|
           [
             [],

data/lib/mirah/typer.rb

@@ -1,7 +1,22 @@
+# 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 'mirah/ast'
 require 'mirah/transform'
 
-module Duby
+module Mirah
   module Typer
     class << self
       attr_accessor :verbose
@@ -20,7 +35,7 @@ module Duby
     end
 
     class BaseTyper
-      include Duby
+      include Mirah
 
       def log(message); Typer.log(message); end
 
@@ -219,7 +234,7 @@ module Duby
 
       def plugins
         if cycling?
-          Duby.typer_plugins.each do |plugin|
+          Mirah.typer_plugins.each do |plugin|
             log "Invoking plugin: #{plugin}"
 
             result = yield plugin
@@ -391,14 +406,14 @@ module Duby
 end
 
 if __FILE__ == $0
-  Duby::AST.verbose = true
-  Duby::Typer.verbose = true
-  ast = Duby::AST.parse(File.read(ARGV[0]))
-  typer = Duby::Typer::Simple.new("script")
+  Mirah::AST.verbose = true
+  Mirah::Typer.verbose = true
+  ast = Mirah::AST.parse(File.read(ARGV[0]))
+  typer = Mirah::Typer::Simple.new("script")
   typer.infer(ast)
   begin
     typer.resolve(true)
-  rescue Duby::Typer::InferenceError => e
+  rescue Mirah::Typer::InferenceError => e
     puts e.message
   end
 

data/lib/mirah/version.rb

@@ -0,0 +1,18 @@
+# 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.
+
+module Mirah
+  VERSION = "0.0.5"
+end

data/lib/mirah.rb

@@ -1,5 +1,21 @@
+# 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 'fileutils'
 require 'rbconfig'
+require 'mirah/version'
 require 'mirah/transform'
 require 'mirah/ast'
 require 'mirah/typer'
@@ -16,17 +32,17 @@ require 'mirah/jvm/typer'
 Dir[File.dirname(__FILE__) + "/mirah/plugin/*"].each {|file| require "#{file}" if file =~ /\.rb$/}
 require 'jruby'
 
-module Duby
+module Mirah
   def self.run(*args)
-    DubyImpl.new.run(*args)
+    MirahImpl.new.run(*args)
   end
 
   def self.compile(*args)
-    DubyImpl.new.compile(*args)
+    MirahImpl.new.compile(*args)
   end
 
   def self.parse(*args)
-    DubyImpl.new.parse(*args)
+    MirahImpl.new.parse(*args)
   end
 
   def self.plugins
@@ -66,14 +82,34 @@ module Duby
   end
 
   class CompilationState
+    def initialize
+      BiteScript.bytecode_version = BiteScript::JAVA1_5
+    end
+    
     attr_accessor :verbose, :destination
+    attr_accessor :version_printed
+    
+    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 DubyClassLoader < java::security::SecureClassLoader
+class MirahClassLoader < java::security::SecureClassLoader
   def initialize(parent, class_map)
     super(parent)
     @class_map = class_map
@@ -104,9 +140,9 @@ class DubyClassLoader < java::security::SecureClassLoader
   end
 end
 
-class DubyImpl
+class MirahImpl
   def initialize
-    Duby::AST.type_factory = Duby::JVM::Types::TypeFactory.new
+    Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new
   end
 
   def run(*args)
@@ -121,7 +157,7 @@ class DubyImpl
     end
 
     # load all classes
-    dcl = DubyClassLoader.new(java.lang.ClassLoader.system_class_loader, class_map)
+    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
@@ -137,7 +173,7 @@ class DubyImpl
         raise e
       end
     else
-      puts "No main found"
+      puts "No main found" unless @state.version_printed
     end
   end
 
@@ -193,17 +229,17 @@ class DubyImpl
       exit(1)
     end
     begin
-      ast = Duby::AST.parse_ruby(src, @filename)
+      ast = Mirah::AST.parse_ruby(src, @filename)
     # rescue org.jrubyparser.lexer.SyntaxException => ex
-    #   Duby.print_error(ex.message, ex.position)
+    #   Mirah.print_error(ex.message, ex.position)
     #   raise ex if @state.verbose
     end
-    @transformer = Duby::Transform::Transformer.new(@state)
+    @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|
-      Duby.print_error(ex.message, ex.position)
+      Mirah.print_error(ex.message, ex.position)
       raise ex.cause || ex if @state.verbose
     end
     @error = @transformer.errors.size > 0
@@ -212,7 +248,7 @@ class DubyImpl
   end
 
   def infer_asts(asts)
-    typer = Duby::Typer::JVM.new(@transformer)
+    typer = Mirah::Typer::JVM.new(@transformer)
     asts.each {|ast| typer.infer(ast) }
     begin
       typer.resolve(false)
@@ -224,7 +260,7 @@ class DubyImpl
         puts "Inference Error:"
         typer.errors.each do |ex|
           if ex.node
-            Duby.print_error(ex.message, ex.node.position)
+            Mirah.print_error(ex.message, ex.node.position)
           else
             puts ex.message
           end
@@ -242,7 +278,7 @@ class DubyImpl
       compiler.generate(&block)
     rescue Exception => ex
       if ex.respond_to? :node
-        Duby.print_error(ex.message, ex.node.position)
+        Mirah.print_error(ex.message, ex.node.position)
         puts ex.backtrace if @state.verbose
         exit 1
       else
@@ -253,43 +289,49 @@ class DubyImpl
   end
 
   def process_flags!(args)
-    @state ||= Duby::CompilationState.new
+    @state ||= Mirah::CompilationState.new
     while args.length > 0 && args[0] =~ /^-/
       case args[0]
-      when '--verbose', '-V'
-        Duby::Typer.verbose = true
-        Duby::AST.verbose = true
-        Duby::Compiler::JVM.verbose = true
-        @state.verbose = true
+      when '--classpath', '-c'
         args.shift
-      when '--java', '-j'
-        require 'mirah/jvm/source_compiler'
-        @compiler_class = Duby::Compiler::JavaSource
+        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 '--cd'
+      when '-e'
+        break
+      when '--explicit-packages'
         args.shift
-        Dir.chdir(args.shift)
-      when '--plugin', '-p'
+        Mirah::AST::Script.explicit_packages = true
+      when '--help', '-h'
+        print_help
+        exit(0)
+      when '--java', '-j'
+        require 'mirah/jvm/source_compiler'
+        @compiler_class = Mirah::Compiler::JavaSource
         args.shift
-        plugin = args.shift
-        require "mirah/plugin/#{plugin}"
+      when '--jvm'
+        args.shift
+        @state.set_jvm_version(args.shift)
       when '-I'
         args.shift
         $: << args.shift
-      when '--classpath', '-c'
+      when '--plugin', '-p'
         args.shift
-        Duby::Env.decode_paths(args.shift, $CLASSPATH)
-      when '--explicit-packages'
+        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
-        Duby::AST::Script.explicit_packages = true
-      when '--help', '-h'
-        print_help
-        exit(0)
-      when '-e'
-        break
+      when '--version', '-v'
+        args.shift
+        print_version
       else
         puts "unrecognized flag: " + args[0]
         print_help
@@ -297,19 +339,30 @@ class DubyImpl
       end
     end
     @state.destination ||= File.join(File.expand_path('.'), '')
-    @compiler_class ||= Duby::Compiler::JVM
+    @compiler_class ||= Mirah::Compiler::JVM
   end
 
   def print_help
-    $stdout.puts "#{$0} [flags] <files or \"-e SCRIPT\">
-  -V, --verbose\t\tVerbose logging
-  -j, --java\t\tOutput .java source (jrubyc only)
-  -d, --dir DIR\t\tUse DIR as the base dir for compilation, packages
-  -p, --plugin PLUGIN\tLoad and use plugin during compilation
+    puts "#{$0} [flags] <files or \"-e SCRIPT\">
   -c, --classpath PATH\tAdd PATH to the Java classpath for compilation
-  --explicit-packages\tDisable guessing the package from the filename
+  --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
-  -e\t\t\tCompile or run the script following -e (naming it \"DashE\")"
+  -I DIR\t\tAdd DIR to the Ruby load path before running
+  -j, --java\t\tOutput .java source (jrubyc 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"
+  end
+  
+  def print_version
+    puts "Mirah v#{Mirah::VERSION}"
+    @state.version_printed = true
   end
 
   def expand_files(files)
@@ -331,8 +384,6 @@ class DubyImpl
   end
 end
 
-Mirah = Duby
-
 if __FILE__ == $0
-  Duby.run(ARGV[0], *ARGV[1..-1])
+  Mirah.run(ARGV[0], *ARGV[1..-1])
 end