mirah 0.0.4-java → 0.0.5-java

data/lib/mirah/ast.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/transform'
 require 'mirah/ast/scope'
 
-module Duby
+module Mirah
   module AST
     class << self
       attr_accessor :verbose
@@ -46,8 +61,8 @@ module Duby
 
       def initialize(parent, position, children = [])
         JRuby.reference(self.class).setRubyClassAllocator(JRuby.reference(self.class).reified_class)
-        unless parent.nil? || Duby::AST::Node === parent
-          raise "Duby::AST::Node.new parent #{parent.class} must be nil or === Duby::AST::Node."
+        unless parent.nil? || Mirah::AST::Node === parent
+          raise "Mirah::AST::Node.new parent #{parent.class} must be nil or === Mirah::AST::Node."
         end
 
         @parent = parent
@@ -130,13 +145,13 @@ module Duby
           extra_indent = 0
           if child
             name = self.class.child_name(i)
-            if Duby::AST.verbose && name
+            if Mirah::AST.verbose && name
               str << "\n#{indent_str} #{name}:"
               extra_indent = 1
             end
             if ::Array === child
               child.each {|ary_child|
-                if Duby::AST.verbose && Node === ary_child && ary_child.parent != self
+                if Mirah::AST.verbose && Node === ary_child && ary_child.parent != self
                    str << "\n#{indent_str} (wrong parent)"
                  end
                 str << "\n#{ary_child.inspect(indent + extra_indent + 1)}"
@@ -144,7 +159,7 @@ module Duby
             elsif ::Hash === child
               str << "\n#{indent_str} #{child.inspect}"
             else
-              if Duby::AST.verbose && Node === child && child.parent != self
+              if Mirah::AST.verbose && Node === child && child.parent != self
                 str << "\n#{indent_str} (wrong parent)"
               end
               str << "\n#{child.inspect(indent + extra_indent + 1)}"
@@ -234,7 +249,7 @@ module Duby
 
       def inferred_type!
         unless @inferred_type
-          raise Duby::Typer::InferenceError.new(
+          raise Mirah::Typer::InferenceError.new(
               "Internal Error: #{self.class} never inferred", self)
         end
         inferred_type
@@ -327,7 +342,7 @@ module Duby
           begin
             typer.type_reference(scope, name, @array, true)
           rescue NameError => ex
-            typer.known_types[@name] = Duby::AST.error_type
+            typer.known_types[@name] = Mirah::AST.error_type
             raise ex
           end
         end
@@ -337,7 +352,7 @@ module Duby
         begin
           typer.type_reference(scope, @name, @array)
         rescue NameError => ex
-          typer.known_types[@name] = Duby::AST.error_type
+          typer.known_types[@name] = Mirah::AST.error_type
           raise ex
         end
       end

data/lib/mirah/compiler.rb

@@ -1,6 +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 'mirah'
 
-module Duby
+module Mirah
   module AST
     class Fixnum
       def compile(compiler, expression)

data/lib/mirah/env.rb

@@ -1,6 +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 'rbconfig'
 
-module Duby
+module Mirah
   module Env
 
     # Returns the system PATH_SEPARATOR environment variable value. This is used when

data/lib/mirah/jvm/base.rb

@@ -1,4 +1,19 @@
-module Duby
+# 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
   module Compiler
     class JVMCompilerBase
       attr_accessor :filename, :method, :static, :class
@@ -26,7 +41,7 @@ module Duby
         begin
           ast.compile(self, expression)
         rescue => ex
-          Duby.print_error(ex.message, ast.position)
+          Mirah.print_error(ex.message, ast.position)
           raise ex
         end
         log "Compilation successful!"
@@ -177,7 +192,7 @@ module Duby
 
       def body(body, expression)
         saved_self = @self_scope
-        if body.kind_of?(Duby::AST::ScopedBody)
+        if body.kind_of?(Mirah::AST::ScopedBody)
           scope = body.static_scope
           declare_locals(scope)
           if scope != @self_scope

data/lib/mirah/jvm/compiler.rb

@@ -1,3 +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.
+
 require 'mirah'
 require 'mirah/jvm/base'
 require 'mirah/jvm/method_lookup'
@@ -6,7 +21,7 @@ require 'mirah/typer'
 require 'mirah/plugin/java'
 require 'bitescript'
 
-module Duby
+module Mirah
   module AST
     class FunctionalCall
       attr_accessor :target
@@ -21,8 +36,8 @@ module Duby
     class JVM < JVMCompilerBase
       java_import java.lang.System
       java_import java.io.PrintStream
-      include Duby::JVM::MethodLookup
-      Types = Duby::JVM::Types
+      include Mirah::JVM::MethodLookup
+      Types = Mirah::JVM::Types
 
       class << self
         attr_accessor :verbose
@@ -55,7 +70,6 @@ module Duby
 
       def initialize
         super
-        BiteScript.bytecode_version = BiteScript::JAVA1_5
         @jump_scope = []
       end
 
@@ -70,7 +84,7 @@ module Duby
       end
 
       def push_jump_scope(node)
-        raise "Not a node" unless Duby::AST::Node === node
+        raise "Not a node" unless Mirah::AST::Node === node
         begin
           @jump_scope << node
           yield
@@ -82,7 +96,7 @@ module Duby
       def find_ensures(before)
         found = []
         @jump_scope.reverse_each do |scope|
-          if Duby::AST::Ensure === scope
+          if Mirah::AST::Ensure === scope
             found << scope
           end
           break if before === scope
@@ -300,19 +314,19 @@ module Duby
 
       def break(node)
         error("break outside of loop", node) unless @break_label
-        handle_ensures(find_ensures(Duby::AST::Loop))
+        handle_ensures(find_ensures(Mirah::AST::Loop))
         @method.goto(@break_label)
       end
 
       def next(node)
         error("next outside of loop", node) unless @next_label
-        handle_ensures(find_ensures(Duby::AST::Loop))
+        handle_ensures(find_ensures(Mirah::AST::Loop))
         @method.goto(@next_label)
       end
 
       def redo(node)
         error("redo outside of loop", node) unless @redo_label
-        handle_ensures(find_ensures(Duby::AST::Loop))
+        handle_ensures(find_ensures(Mirah::AST::Loop))
         @method.goto(@redo_label)
       end
 
@@ -320,7 +334,7 @@ module Duby
         unless predicate.inferred_type == Types::Boolean
           raise "Expected boolean, found #{predicate.inferred_type}"
         end
-        if Duby::AST::Call === predicate
+        if Mirah::AST::Call === predicate
           method = extract_method(predicate)
           if method.respond_to? :jump_if
             method.jump_if(self, predicate, target)
@@ -335,7 +349,7 @@ module Duby
         unless predicate.inferred_type == Types::Boolean
           raise "Expected boolean, found #{predicate.inferred_type}"
         end
-        if Duby::AST::Call === predicate
+        if Mirah::AST::Call === predicate
           method = extract_method(predicate)
           if method.respond_to? :jump_if_not
             method.jump_if_not(self, predicate, target)
@@ -487,7 +501,7 @@ module Duby
 
       def annotation_value(builder, name, value)
         case value
-        when Duby::AST::Annotation
+        when Mirah::AST::Annotation
           type = value.type
           type = type.jvm_type if type.respond_to?(:jvm_type)
           builder.annotation(name, type) do |child|
@@ -634,7 +648,7 @@ module Duby
       def build_string(nodes, expression)
         if expression
           # could probably be more efficient with non-default constructor
-          builder_class = Duby::AST.type(nil, 'java.lang.StringBuilder')
+          builder_class = Mirah::AST.type(nil, 'java.lang.StringBuilder')
           @method.new builder_class
           @method.dup
           @method.invokespecial builder_class, "<init>", [@method.void]
@@ -759,7 +773,7 @@ module Duby
 
       def return(return_node)
         return_node.value.compile(self, true) if return_node.value
-        handle_ensures(find_ensures(Duby::AST::MethodDefinition))
+        handle_ensures(find_ensures(Mirah::AST::MethodDefinition))
         return_node.inferred_type.return(@method)
       end
 
@@ -835,7 +849,7 @@ module Duby
         end
       end
 
-      class ClosureCompiler < Duby::Compiler::JVM
+      class ClosureCompiler < Mirah::Compiler::JVM
         def initialize(file, type, parent)
           @file = file
           @type = type
@@ -869,16 +883,16 @@ module Duby
 end
 
 if __FILE__ == $0
-  Duby::Typer.verbose = true
-  Duby::AST.verbose = true
-  Duby::Compiler::JVM.verbose = true
-  ast = Duby::AST.parse(File.read(ARGV[0]))
+  Mirah::Typer.verbose = true
+  Mirah::AST.verbose = true
+  Mirah::Compiler::JVM.verbose = true
+  ast = Mirah::AST.parse(File.read(ARGV[0]))
 
-  typer = Duby::Typer::Simple.new(:script)
+  typer = Mirah::Typer::Simple.new(:script)
   ast.infer(typer)
   typer.resolve(true)
 
-  compiler = Duby::Compiler::JVM.new(ARGV[0])
+  compiler = Mirah::Compiler::JVM.new(ARGV[0])
   compiler.compile(ast)
 
   compiler.generate

data/lib/mirah/jvm/method_lookup.rb

@@ -1,4 +1,19 @@
-module Duby
+# 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
   module JVM
     module MethodLookup
       # dummy log; it's expected the inclusion target will have it

data/lib/mirah/jvm/source_compiler.rb

@@ -1,3 +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.
+
 require 'mirah'
 require 'mirah/ast'
 require 'mirah/jvm/types'
@@ -12,10 +27,10 @@ class String
   end
 end
 
-module Duby
+module Mirah
   module Compiler
     class JavaSource < JVMCompilerBase
-      JVMTypes = Duby::JVM::Types
+      JVMTypes = Mirah::JVM::Types
       attr_accessor :lvalue
 
       Operators = [
@@ -34,7 +49,7 @@ module Duby
       end
 
       def file_builder(filename)
-        Duby::JavaSource::Builder.new(filename, self)
+        Mirah::JavaSource::Builder.new(filename, self)
       end
 
       def output_type
@@ -185,8 +200,8 @@ module Duby
         @method.declare_local(type, name)
       end
 
-      def declare_field(name, type, annotations)
-        @class.declare_field(name, type, @static, 'private', annotations)
+      def declare_field(name, type, annotations, static_field)
+        @class.declare_field(name, type, @static || static_field, 'private', annotations)
       end
 
       def local(scope, name, type)
@@ -194,9 +209,9 @@ module Duby
         @method.print name
       end
 
-      def field(name, type, annotations)
+      def field(name, type, annotations, static_field)
         name = name[1..-1] if name =~ /^@/
-        declare_field(name, type, annotations)
+        declare_field(name, type, annotations, static_field)
         @method.print "#{this}.#{name}"
       end
 
@@ -258,9 +273,9 @@ module Duby
         declare_local(name, type)
       end
 
-      def field_assign(name, type, expression, value, annotations)
+      def field_assign(name, type, expression, value, annotations, static_field)
         name = name[1..-1] if name =~ /^@/
-        declare_field(name, type, annotations)
+        declare_field(name, type, annotations, static_field)
         lvalue = "#{@lvalue if expression}#{this}.#{name} = "
         store_value(lvalue, value)
       end
@@ -377,7 +392,7 @@ module Duby
       end
 
       def expr?(target, params)
-        !([target] + params).any? {|x| x.kind_of? Duby::AST::TempValue}
+        !([target] + params).any? {|x| x.kind_of? Mirah::AST::TempValue}
       end
 
       def operator(target, op, params, expression)
@@ -409,7 +424,7 @@ module Duby
         else
           nodes.map do |node|
             tempval = node.precompile(self)
-            if node == tempval && !node.kind_of?(Duby::AST::Literal)
+            if node == tempval && !node.kind_of?(Mirah::AST::Literal)
               tempval = node.temp(self)
             end
             tempval
@@ -457,7 +472,7 @@ module Duby
 
       def call(call, expression)
         return cast(call, expression) if call.cast?
-        if Duby::AST::Constant === call.target
+        if Mirah::AST::Constant === call.target
           target = call.target.inferred_type.to_source
         else
           target = call.precompile_target(self)
@@ -564,7 +579,7 @@ module Duby
           if method.argument_types.size == 1
             @method.print " = ("
           end
-        elsif Duby::JVM::Types::Intrinsic === method
+        elsif Mirah::JVM::Types::Intrinsic === method
           method.call(self, call, expression)
           return
         else
@@ -663,7 +678,7 @@ module Duby
             @method.print(lvalue)
           end
           first = true
-          unless nodes[0].kind_of?(Duby::AST::String)
+          unless nodes[0].kind_of?(Mirah::AST::String)
             @method.print '""'
             first = false
           end

data/lib/mirah/jvm/source_generator/builder.rb

@@ -1,6 +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 'mirah/jvm/types'
 
-module Duby
+module Mirah
   class JVM::Types::Type
     def to_source
       java_name = name
@@ -10,7 +25,7 @@ module Duby
   end
 
   module JavaSource
-    JVMTypes ||= Duby::JVM::Types
+    JVMTypes ||= Mirah::JVM::Types
 
     class Builder
       attr_accessor :package, :classes, :filename, :compiler
@@ -165,7 +180,7 @@ module Duby
 
     class ClassBuilder
       include Helper
-      include Duby::Compiler::JVM::JVMLogger
+      include Mirah::Compiler::JVM::JVMLogger
       attr_reader :package, :name, :superclass, :filename, :class_name, :out
       attr_reader :interfaces, :abstract
       def initialize(builder, name, superclass, interfaces, abstract)
@@ -263,7 +278,7 @@ module Duby
 
       def build_method(name, visibility, static, exceptions, type, *args)
         finish_declaration
-        type ||= Duby::AST::type(nil, :void)
+        type ||= Mirah::AST::type(nil, :void)
         @methods << MethodBuilder.new(self,
                                       :name => name,
                                       :visibility => visibility,
@@ -313,7 +328,7 @@ module Duby
       def build_method(name, visibility, static, exceptions, type, *args)
         raise "Interfaces can't have static methods" if static
         finish_declaration
-        type ||= Duby::AST::type(nil, :void)
+        type ||= Mirah::AST::type(nil, :void)
         @methods << MethodBuilder.new(self,
                                       :name => name,
                                       :visibility => visibility,
@@ -363,7 +378,7 @@ module Duby
           print ' throws '
           @exceptions.each_with_index do |exception, i|
             print ', ' unless i == 0
-            print exception.name
+            print exception.to_source
           end
         end
         if @abstract

data/lib/mirah/jvm/source_generator/loops.rb

@@ -1,4 +1,19 @@
-class Duby::Compiler::JavaSource < Duby::Compiler::JVMCompilerBase
+# 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 Mirah::Compiler::JavaSource < Mirah::Compiler::JVMCompilerBase
   class SimpleWhileLoop
     attr_reader :compiler, :loop
     def initialize(loop, compiler)

data/lib/mirah/jvm/source_generator/precompile.rb

@@ -1,6 +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 'mirah/ast'
 
-module Duby::AST
+module Mirah::AST
   class TempValue
     def initialize(node, compiler=nil, value=nil)
       if compiler.nil?
@@ -77,7 +92,7 @@ module Duby::AST
     def expr?(compiler)
       target.expr?(compiler) &&
           parameters.all? {|p| p.expr?(compiler)} &&
-          !method.return_type.kind_of?(Duby::AST::InlineCode) &&
+          !method.return_type.kind_of?(Mirah::AST::InlineCode) &&
           !method.return_type.void?
     end
 

data/lib/mirah/jvm/source_generator/typer.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/typer'
 require 'mirah/jvm/source_generator/builder'
 
-module Duby
+module Mirah
   module Typer
     class JavaSource < JVM
-      include Duby::JVM::Types
+      include Mirah::JVM::Types
       
     end
   end

data/lib/mirah/jvm/typer.rb

@@ -1,11 +1,26 @@
+# 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/types'
 require 'mirah/jvm/types/factory'
 
-module Duby
+module Mirah
   module Typer
     class JVM < Simple
-      include Duby::JVM::Types
+      include Mirah::JVM::Types
 
       attr_reader :transformer
 
@@ -21,7 +36,7 @@ module Duby
       end
 
       def set_filename(scope, filename)
-        classname = Duby::Compiler::JVM.classname_from_filename(filename)
+        classname = Mirah::Compiler::JVM.classname_from_filename(filename)
         main_class = @factory.declare_type(scope, classname)
         @known_types['self'] = main_class.meta
       end
@@ -95,7 +110,7 @@ module Duby
         return_type = sig_args.delete(:return)
         exceptions = sig_args.delete(:throws)
         args = method_def.arguments.args || []
-        static = method_def.kind_of? Duby::AST::StaticMethodDefinition
+        static = method_def.kind_of? Mirah::AST::StaticMethodDefinition
         if sig_args.size != args.size
           # If the superclass declares one method with the same name and
           # same number of arguments, assume we're overriding it.