duby 0.0.2-java → 0.0.3-java

data/lib/duby/jvm/method_lookup.rb

@@ -3,19 +3,8 @@ module Duby
     module MethodLookup
       # dummy log; it's expected the inclusion target will have it
       def log(msg); end
-      
-      # def jvm_type(type)
-      #   return type if type.kind_of? Java::JavaClass
-      #   return type.jvm_type
-      # end
-      # 
-      # def convert_params(params)
-      #   params.map {|param| jvm_type(param)}
-      # end
 
       def find_method(mapped_type, name, mapped_params, meta)
-        # mapped_type = jvm_type(mapped_type)
-        # mapped_params = convert_params(mapped_params)
         raise ArgumentError if mapped_params.any? {|p| p.nil?}
         if name == 'new'
           if meta
@@ -34,64 +23,66 @@ module Duby
           end
         rescue NameError
           # exact args failed, do a deeper search
-          log "No exact match for #{mapped_type.name}.#{name}(#{mapped_params.map(&:name)})"
+          log "No exact match for #{mapped_type.name}.#{name}(#{mapped_params.map(&:name).join ', '})"
 
           method = find_jls(mapped_type, name, mapped_params, meta, constructor)
-          
+
           unless method
-            log "Failed to locate method #{mapped_type.name}.#{name}(#{mapped_params.map(&:name)})"
+            log "Failed to locate method #{mapped_type.name}.#{name}(#{mapped_params.map(&:name).join ', '})"
             return nil
           end
         end
 
-        log "Found method #{method.declaring_class.name}.#{name}(#{method.argument_types.map(&:name)}) from #{mapped_type.name}"
+        log "Found method #{method.declaring_class.name}.#{name}(#{method.argument_types.map(&:name).join ', '}) from #{mapped_type.name}"
         return method
       end
-      
+
       def find_jls(mapped_type, name, mapped_params, meta, constructor)
-        # mapped_type = jvm_type(mapped_type)
-        # mapped_params = convert_params(mapped_params)
         if constructor
-          all_methods = mapped_type.unmeta.declared_constructors
-          by_name = all_methods
+          by_name = mapped_type.unmeta.declared_constructors
         elsif meta
-          all_methods = mapped_type.declared_class_methods
+          by_name = mapped_type.declared_class_methods(name)
         else
-          all_methods = []
+          by_name = []
           cls = mapped_type
           while cls
-            all_methods += cls.declared_instance_methods
+            by_name += cls.declared_instance_methods(name)
             cls = cls.superclass
           end
         end
-        # filter by name, if we haven't already got a by_name list
-        by_name ||= all_methods.select {|m| m.name == name && mapped_params.size <= m.argument_types.size}
         # filter by arity
         by_name_and_arity = by_name.select {|m| m.argument_types.size == mapped_params.size}
 
         phase1_methods = phase1(mapped_params, by_name_and_arity)
 
         if phase1_methods.size > 1
-          raise "Ambiguous targets invoking #{mapped_type}.#{name}:\n#{phase1_methods}"
+          method_list = phase1_methods.map do |m|
+            
+            "#{m.name}(#{m.parameter_types.map(&:name).join(', ')})"
+          end.join("\n")
+          raise "Ambiguous targets invoking #{mapped_type}.#{name}:\n#{method_list}"
         end
 
         phase1_methods[0] ||
           phase2(mapped_params, by_name) ||
-          phase3(mapped_params, by_name)
+          phase3(mapped_params, by_name) ||
+          field_lookup(mapped_params, mapped_type, meta, name) ||
+          inner_class(mapped_params, mapped_type, meta, name)
       end
-        
+
       def phase1(mapped_params, potentials)
         log "Beginning JLS phase 1 search with params (#{mapped_params.map(&:name)})"
-        
+
         # cycle through methods looking for more specific matches; gather matches of equal specificity
         methods = potentials.inject([]) do |currents, potential|
           method_params = potential.argument_types
-          
+          raise "Bad arguments for method #{potential.declaring_class}.#{potential.name}" unless method_params.all?
+
           # exact match always wins; duplicates not possible
           if each_is_exact(mapped_params, method_params)
             return [potential]
           end
-          
+
           # otherwise, check for potential match and compare to current
           # TODO: missing ambiguity check; picks last method of equal specificity
           if each_is_exact_or_subtype_or_convertible(mapped_params, method_params)
@@ -111,42 +102,85 @@ module Duby
               currents = [potential]
             end
           end
-          
+
           currents
         end
 
         methods
       end
-      
+
       def is_more_specific?(potential, current)
         each_is_exact_or_subtype_or_convertible(potential, current)
       end
-      
+
       def phase2(mapped_params, potentials)
         nil
       end
-      
+
       def phase3(mapped_params, potentials)
         nil
       end
-      
+
+      def field_lookup(mapped_params, mapped_type, meta, name)
+        log("Attempting #{meta ? 'static' : 'instance'} field lookup for '#{name}' on class #{mapped_type}")
+        # if we get to this point, the potentials do not match, so we ignore them
+        
+        
+        # search for a field of the given name
+        if name =~ /_set$/
+          # setter
+          setter = true
+          name = name[0..-5]
+          field = mapped_type.field_setter(name)
+        else
+          # getter
+          setter = false
+
+          # field accesses don't take arguments
+          return if mapped_params.size > 0
+          field = mapped_type.field_getter(name)
+        end
+
+        return nil unless field
+
+        if (meta && !field.static?) ||
+            (!meta && field.static?)
+          field == nil
+        end
+
+        # check accessibility
+        # TODO: protected field access check appropriate to current type
+        if setter
+          raise "cannot set final field '#{name}' on class #{mapped_type}" if field.final?
+        end
+        raise "cannot access field '#{name}' on class #{mapped_type}" unless field.public?
+
+        field
+      end
+
+      def inner_class(params, type, meta, name)
+        return unless params.size == 0 && meta
+        log("Attempting inner class lookup for '#{name}' on #{type}")
+        type.inner_class_getter(name)
+      end
+
       def each_is_exact(incoming, target)
         incoming.each_with_index do |in_type, i|
           target_type = target[i]
-          
+
           # exact match
           return false unless target_type == in_type
         end
         return true
       end
-      
+
       def each_is_exact_or_subtype_or_convertible(incoming, target)
         incoming.each_with_index do |in_type, i|
           target_type = target[i]
-          
+
           # exact match
           next if target_type == in_type
-          
+
           # primitive is safely convertible
           if target_type.primitive?
             if in_type.primitive?
@@ -154,39 +188,15 @@ module Duby
             end
             return false
           end
-          
+
           # object type is assignable
           return false unless target_type.assignable_from? in_type
         end
         return true
       end
-      
-      BOOLEAN = Java::boolean.java_class
-      BYTE = Java::byte.java_class
-      SHORT = Java::short.java_class
-      CHAR = Java::char.java_class
-      INT = Java::int.java_class
-      LONG = Java::long.java_class
-      FLOAT = Java::float.java_class
-      DOUBLE = Java::double.java_class
-      
-      PrimitiveConversions = {
-        BOOLEAN => [BOOLEAN],
-        BYTE => [BYTE, SHORT, CHAR, INT, LONG, FLOAT, DOUBLE],
-        SHORT => [SHORT, INT, LONG, FLOAT, DOUBLE],
-        CHAR => [CHAR, INT, LONG, FLOAT, DOUBLE],
-        INT => [INT, LONG, FLOAT, DOUBLE],
-        LONG => [LONG, DOUBLE],
-        FLOAT => [FLOAT, DOUBLE],
-        DOUBLE => [DOUBLE]
-      }
-      
+
       def primitive_convertible?(in_type, target_type)
-        if PrimitiveConversions.include? in_type
-          PrimitiveConversions[in_type].include?(target_type)
-        else
-          in_type.convertible_to?(target_type)
-        end
+        in_type.convertible_to?(target_type)
       end
     end
   end

data/lib/duby/jvm/source_compiler.rb

@@ -14,10 +14,9 @@ end
 
 module Duby
   module Compiler
-    class JavaSource
+    class JavaSource < JVMCompilerBase
       JVMTypes = Duby::JVM::Types
-      include Duby::Compiler::JVM::JVMLogger
-      attr_accessor :filename, :method, :static, :class, :lvalue
+      attr_accessor :lvalue
 
       Operators = [
         '+', '-', '+@', '-@', '/', '%', '*', '<',
@@ -27,114 +26,104 @@ module Duby
       ArrayOps = [
         '[]', '[]=', 'length'
       ]
-      
+
       ImplicitReturn = Struct.new(:value)
 
       def initialize(filename)
-        @filename = File.basename(filename)
-        @static = true
-        parts = filename.split '/'
-        classname = parts.pop.sub /[.].+/, ''
-        package = parts.join('.') unless parts.empty?
-
+        super
         @file = Duby::JavaSource::Builder.new(filename, self)
-        #@file.package = package
-        @type = AST::type(classname)
-      end
-
-      def toplevel_class
-        @class = @type.define(@file)
       end
 
-      def generate(&block)
-        log "Generating source files..."
-        @file.generate do |filename, builder|
-          log "  #{builder.class_name}"
-          if block_given?
-            yield filename, builder
-          else
-            File.open(filename, 'w') {|f| f.write(builder.generate)}
-          end
-        end
-        log "...done!"
+      def output_type
+        "source files"
       end
 
-      def define_main(body)
-        if body.class != AST::ClassDefinition
-          @class = @type.define(@file)
-          with :method => @class.main do
-            log "Starting main method"
-
+      def define_method(node)
+        super(node, false) do |method, _|
+          with :method => method do
+            log "Starting new method #{node.name}"
             @method.start
 
-            body.compile(self, false)
+            prepare_binding(node) do
+              unless @method.type.nil? || @method.type.void?
+                self.return(ImplicitReturn.new(node.body))
+              else
+                node.body.compile(self, false) if node.body
+              end
+            end
 
+            log "Method #{node.name} complete!"
             @method.stop
           end
-          @class.stop
-        else
-          body.compile(self, false)
         end
+      end
 
-        log "Main method complete!"
+      def annotate(node, annotations)
+        node.annotate(annotations)
       end
 
-      def define_method(node)
-        name, signature, args = node.name, node.signature, node.arguments.args
-        args ||= []
-        return_type = signature[:return]
-        exceptions = signature[:throws] || []
-        with :static => @static || node.static? do
-          if @static
-            method = @class.public_static_method(name.to_s, return_type, exceptions, *args)
-          else
-            method = @class.public_method(name.to_s, return_type, exceptions, *args)
-          end
+      def define_optarg_chain(name, arg, return_type,
+                              args_for_opt, arg_types_for_opt)
+        # declare all args so they get their values
+        @method.print "return " unless @method.type.nil? || @method.type.void?
+        @method.print "this." unless @static
+        @method.print "#{name}("
+        @method.print args_for_opt.map(&:name).join(', ')
+        @method.print ', 'if args_for_opt.size > 0
+        arg.children[0].value.compile(self, true)
 
+        # invoke the next one in the chain
+        @method.print ");\n"
+      end
+
+      def constructor(node)
+        super(node, false) do |method, _|
           with :method => method do
-            log "Starting new method #{name}"
-            @method.annotate(node.annotations)
             @method.start
+            if node.delegate_args
+              delegate = if node.calls_super
+                "super"
+              else
+                "this"
+              end
+              method.print "#{delegate}("
+              node.delegate_args.each_with_index do |arg, index|
+                method.print ', ' unless index == 0
+                raise "Invalid constructor argument #{arg}" unless arg.expr?(self)
+                arg.compile(self, true)
+              end
+              method.puts ");"
+            end
 
-            unless @method.type.nil? || @method.type.void?
-              self.return(ImplicitReturn.new(node.body))
-            else
+            prepare_binding(node) do
               node.body.compile(self, false) if node.body
             end
-        
-            log "Method #{name} complete!"
-            @method.stop
+            method.stop
           end
         end
       end
 
-      def constructor(node)
-        args = node.arguments.args || []
-        exceptions = node.signature[:throws] || []
-        method = @class.public_constructor(exceptions, *args)
-        with :method => method do
-          @method.annotate(node.annotations)
-          @method.start
-          if node.delegate_args
-            delegate = if node.calls_super
-              "super"
-            else
-              "this"
-            end
-            method.print "#{delegate}("
-            node.delegate_args.each_with_index do |arg, index|
-              method.print ', ' unless index == 0
-              raise "Invalid constructor argument #{arg}" unless arg.expr?(self)
-              arg.compile(self, true)
-            end
-            method.puts ");"
+      def prepare_binding(scope)
+        if scope.has_binding?
+          type = scope.binding_type
+          @binding = @bindings[type]
+          @method.puts "#{type.name} $binding = new #{type.name}();"
+        end
+        begin
+          yield
+        ensure
+          if scope.has_binding?
+            @binding.stop
+            @binding = nil
           end
-          
-          node.body.compile(self, false) if node.body
-          method.stop
         end
       end
 
+      def define_closure(class_def, expression)
+        compiler = ClosureCompiler.new(@file, @type, self)
+        compiler.define_class(class_def, expression)
+      end
+
       def return(node)
         if @method.type.nil? || @method.type.void?
           @method.puts 'return;'
@@ -158,7 +147,7 @@ module Duby
           store_value('throw ', node)
         end
       end
-      
+
       def rescue(node, expression)
         @method.block 'try' do
           maybe_store(node.body, expression)
@@ -172,7 +161,7 @@ module Duby
           end
         end
       end
-      
+
       def ensure(node, expression)
         @method.block 'try' do
           maybe_store(node.body, expression)
@@ -184,19 +173,20 @@ module Duby
 
       def line(num)
       end
-      
+
       def declare_local(name, type)
         @method.declare_local(type, name)
       end
-      
+
       def declare_field(name, type, annotations)
-        @class.declare_field(name, type, @static, annotations)
+        @class.declare_field(name, type, @static, 'private', annotations)
       end
 
-      def local(name, type)
+      def local(scope, name, type)
+        name = scoped_local_name(name, scope)
         @method.print name
       end
-      
+
       def field(name, type, annotations)
         name = name[1..-1]
         declare_field(name, type, annotations)
@@ -207,13 +197,25 @@ module Duby
         @static ? @class.class_name : 'this'
       end
 
-      def local_assign(name, type, expression, value)
+      def local_assign(scope, name, type, expression, value)
+        simple = value.expr?(self)
         value = value.precompile(self)
+        name = scoped_local_name(name, scope)
         if method.local?(name)
-          @method.print @lvalue if expression
+          if expression
+            if simple
+              @method.print '('
+            else
+              @method.print @lvalue
+            end
+          end
           @method.print "#{name} = "
           value.compile(self, true)
-          @method.puts ';'
+          if simple && expression
+            @method.print ')'
+          else
+            @method.puts ';'
+          end
         else
           @method.declare_local(type, name) do
             value.compile(self, true)
@@ -228,18 +230,38 @@ module Duby
         name = name[1..-1]
         declare_field(name, type, annotations)
       end
-      
-      def local_declare(name, type)
+
+      def local_declare(scope, name, type)
+        name = scoped_local_name(name, scope)
         declare_local(name, type)
       end
-      
+
       def field_assign(name, type, expression, value, annotations)
         name = name[1..-1]
         declare_field(name, type, annotations)
         lvalue = "#{@lvalue if expression}#{this}.#{name} = "
         store_value(lvalue, value)
       end
-      
+
+      def captured_local_declare(scope, name, type)
+        unless declared_captures[name]
+          declared_captures[name] = type
+          @binding.declare_field(name, type, false, '')
+        end
+      end
+
+      def captured_local(scope, name, type)
+        captured_local_declare(scope, name, type)
+        @method.print "$binding.#{name}"
+      end
+
+      def captured_local_assign(node, expression)
+        scope, name, type = node.containing_scope, node.name, node.inferred_type
+        captured_local_declare(scope, name, type)
+        lvalue = "#{@lvalue if expression}$binding.#{name} = "
+        store_value(lvalue, node.value)
+      end
+
       def store_value(lvalue, value)
         if value.is_a? String
           @method.puts "#{lvalue}#{value};"
@@ -253,7 +275,7 @@ module Duby
           end
         end
       end
-      
+
       def assign(name, value)
         store_value("#{name} = ", value)
         name
@@ -268,16 +290,17 @@ module Duby
       end
 
       def body(body, expression)
-        # all except the last element in a body of code is treated as a statement
-        i, last = 0, body.children.size - 1
-        while i < last
-          body.children[i].compile(self, false)
-          i += 1
+        super(body, expression) do |last|
+          maybe_store(last, expression)
         end
-        # last element is an expression only if the body is an expression
-        maybe_store(body.children[last], expression)
       end
-      
+
+      def scoped_body(scope, expression)
+        @method.block do
+          super
+        end
+      end
+
       def branch_expression(node)
         node.condition.compile(self, true)
         @method.print ' ? ('
@@ -294,7 +317,7 @@ module Duby
         end
         @method.print ')'
       end
-      
+
       def branch(node, expression)
         if expression && node.expr?(self)
           return branch_expression(node)
@@ -319,7 +342,7 @@ module Duby
           end
         end
       end
-      
+
       def loop(loop, expression)
         if loop.redo? || loop.post || !loop.condition.predicate.expr?(self)
           loop = ComplexWhileLoop.new(loop, self)
@@ -330,7 +353,7 @@ module Duby
           loop.compile(expression)
         end
       end
-      
+
       def expr?(target, params)
         !([target] + params).any? {|x| x.kind_of? Duby::AST::TempValue}
       end
@@ -358,12 +381,24 @@ module Duby
         end
       end
 
-      def compile_args(call)
-        call.parameters.map do |param|
-          param.precompile(self)
+      def precompile_nodes(nodes)
+        if nodes.all? {|n| n.expr?(self)}
+          nodes
+        else
+          nodes.map do |node|
+            tempval = node.precompile(self)
+            if node == tempval && !node.kind_of?(Duby::AST::Literal)
+              tempval = node.temp(self)
+            end
+            tempval
+          end
         end
       end
 
+      def compile_args(call)
+        precompile_nodes(call.parameters)
+      end
+
       def self_type
         type = AST::type(@class.name.tr('/', '.'))
         type = type.meta if @static
@@ -379,9 +414,9 @@ module Duby
           args = compile_args(call)
           simple = call.expr?(self)
           @method.print @lvalue if expression && !simple
-          @method.print "(#{call.inferred_type.name})("
+          @method.print "((#{call.inferred_type.name})("
           args.each{|arg| arg.compile(self, true)}
-          @method.print ")"
+          @method.print "))"
           @method.puts ';' unless simple && expression
         else
           method_call(this, call, compile_args(call), expression)
@@ -390,12 +425,12 @@ module Duby
 
       def call(call, expression)
         if Duby::AST::Constant === call.target
-          target = call.target.inferred_type.name
+          target = call.target.inferred_type.to_source
         else
           target = call.target.precompile(self)
         end
         params = compile_args(call)
-        
+
         if Operators.include? call.name
           operator(target, call.name, params, expression)
         elsif call.target.inferred_type.array? && ArrayOps.include?(call.name)
@@ -406,7 +441,7 @@ module Duby
           method_call(target, call, params, expression)
         end
       end
-      
+
       def array_op(target, name, args, expression)
         simple = expr?(target, args)
         index, value = args
@@ -429,15 +464,15 @@ module Duby
           @method.puts ';'
         end
       end
-      
+
       def break(node)
         @loop.break
       end
-      
+
       def next(node)
         @loop.next
       end
-      
+
       def redo(node)
         @loop.redo
       end
@@ -474,30 +509,46 @@ module Duby
         end
 
       end
-      
+
       def method_call(target, call, params, expression)
         simple = call.expr?(self)
         method = call.method(self)
         unless simple || method.actual_return_type.void?
           @method.print @lvalue if expression
         end
+
+        # preamble
         if method.constructor?
           @method.print "new "
           target.compile(self, true)
           @method.print '('
+        elsif method.field?
+          target.compile(self, true)
+          @method.print ".#{method.name}"
+          if method.argument_types.size == 1
+            @method.print " = ("
+          end
         else
           target.compile(self, true)
           @method.print ".#{method.name}("
         end
+
+        # args
         params.each_with_index do |param, index|
           @method.print ', ' unless index == 0
           param.compile(self, true)
         end
-        if simple && expression
-          @method.print ')'
-        else
-          @method.puts ');'
+
+        # postamble
+        if !method.field? || (method.field? && method.argument_types.size == 1)
+          if simple && expression
+            @method.print ')'
+          else
+            @method.puts ');'
+          end
         end
+
+        # cleanup
         if method.actual_return_type.void? && expression
           @method.print @lvalue
           if method.static?
@@ -507,11 +558,18 @@ module Duby
             @method.puts ';'
           end
         end
-        
       end
 
       def temp(expression, value=nil)
-        assign(@method.tmp(expression.inferred_type), value || expression)
+        value ||= expression
+        type = value.inferred_type
+        if value.expr?(self)
+          @method.tmp(type) do
+            value.compile(self, true)
+          end
+        else
+          assign(@method.tmp(type), value)
+        end
       end
 
       def empty_array(type, size)
@@ -521,48 +579,82 @@ module Duby
         @method.print ']'
       end
 
-      def import(short, long)
-      end
-
       def string(value)
         @method.print value.inspect
       end
-      
+
       def boolean(value)
         @method.print value ? 'true' : 'false'
       end
 
+      def regexp(value, flags = 0)
+        @method.print "java.util.regex.Pattern.compile("
+        @method.print value.inspect
+        @method.print ")"
+      end
+
       def array(node, expression)
         if expression
           # create unmodifiable list from array (simplest way to do this in Java source)
           @method.print "java.util.Collections.unmodifiableList(java.util.Arrays.asList("
 
           # elements, as expressions
-          boolean comma = false
-          node.children.each do |node|
-            @method.print ", "# if comma
-            node.compile(self, true)
+          comma = false
+          node.children.each do |n|
+            @method.print ", " if comma
+            n.compile(self, true)
             comma = true
           end
-          
+
           @method.print("))")
         else
           # elements, as non-expressions
           # TODO: ensure they're all reference types!
-          node.children.each do |node|
-            node.compile(self, false)
+          node.children.each do |n|
+            n.compile(self, false)
           end
         end
       end
-      
+
+      def build_string(orig_nodes, expression)
+        if expression
+          nodes = precompile_nodes(orig_nodes)
+          simple = nodes.equal?(orig_nodes)
+          if !simple
+            @method.print(lvalue)
+          end
+          first = true
+          unless nodes[0].kind_of?(Duby::AST::String)
+            @method.print '""'
+            first = false
+          end
+          nodes.each do |node|
+            @method.print ' + ' unless first
+            first = false
+            node.compile(self, true)
+          end
+          @method.puts ';' unless simple
+        else
+          orig_nodes.each {|n| n.compile(self, false)}
+        end
+      end
+
+      def to_string(body, expression)
+        body.compile(self, expression)
+      end
+
       def null
         @method.print 'null'
       end
-      
+
+      def binding_reference
+        @method.print '$binding'
+      end
+
       def compile_self
         @method.print 'this'
       end
-      
+
       def print(node)
         value = node.parameters[0]
         value = value && value.precompile(self)
@@ -575,30 +667,31 @@ module Duby
         @method.puts ');'
       end
 
-      def define_class(class_def, expression)
-        with(:class => class_def.inferred_type.define(@file),
-             :static => false) do
-          @class.annotate(class_def.annotations)
-          class_def.body.compile(self, false) if class_def.body
-        
-          @class.stop
+      class ClosureCompiler < JavaSource
+        def initialize(file, type, parent)
+          @file = file
+          @type = type
+          @parent = parent
         end
-      end
 
-      def with(vars)
-        orig_values = {}
-        begin
-          vars.each do |name, new_value|
-            name = "@#{name}"
-            orig_values[name] = instance_variable_get name
-            instance_variable_set name, new_value
+        def prepare_binding(scope)
+          if scope.has_binding?
+            type = scope.binding_type
+            @binding = @parent.get_binding(type)
+            @method.puts("#{type.name} $binding = this.binding;")
           end
-          yield
-        ensure
-          orig_values.each do |name, value|
-            instance_variable_set name, value
+          begin
+            yield
+          ensure
+            if scope.has_binding?
+              @binding = nil
+            end
           end
         end
+
+        def declared_captures
+          @parent.declared_captures(@binding)
+        end
       end
     end
   end