duby 0.0.2-java → 0.0.3-java

data/lib/duby/jvm/typer.rb

@@ -6,7 +6,7 @@ module Duby
   module Typer
     class JVM < Simple
       include Duby::JVM::Types
-      
+
       attr_reader :transformer
 
       def initialize(filename, transformer)
@@ -16,24 +16,25 @@ module Duby
           raise "TypeFactory not installed"
         end
         @known_types = @factory.known_types
-        classname = File.basename(filename, '.duby')
+        classname = Duby::Compiler::JVM.classname_from_filename(filename)
         main_class = @factory.declare_type(classname)
         @known_types['self'] = main_class.meta
+        @known_types['dynamic'] = DynamicType.new
         @errors = []
       end
-      
+
       def type_reference(name, array=false, meta=false)
         @factory.type(name, array, meta)
       end
-      
+
       def alias_types(short, long)
-        @known_types[short] = type_reference(long)
+        @factory.alias(short, long)
       end
-      
+
       def name
         "JVM"
       end
-      
+
       def type_definition(name, superclass, interfaces)
         @known_types[name]
       end
@@ -41,7 +42,7 @@ module Duby
       def null_type
         Null
       end
-      
+
       def no_type
         Void
       end
@@ -55,7 +56,15 @@ module Duby
         # TODO: allow other types for pre-1.2 profiles
         type_reference("java.util.Map")
       end
-      
+
+      def regexp_type
+        type_reference("java.util.regex.Pattern")
+      end
+
+      def known_type(name)
+        @factory.known_type(name)
+      end
+
       def learn_method_type(target_type, name, parameter_types, type, exceptions)
         static = target_type.meta?
         unless target_type.unmeta.kind_of?(TypeDefinition)
@@ -68,7 +77,7 @@ module Duby
         end
         super
       end
-      
+
       def infer_signature(method_def)
         signature = method_def.signature
         sig_args = signature.dup

data/lib/duby/jvm/types.rb

@@ -3,31 +3,27 @@ require 'duby/ast'
 require 'duby/jvm/method_lookup'
 require 'duby/jvm/compiler'
 
-class Object
-  def class_builder?
-    self.class.name =~ /::ClassBuilder$/
-  end
-end
-
 module Duby
   module JVM
     module Types
       class Type < AST::TypeReference
         include Duby::JVM::MethodLookup
 
+        attr_writer :inner_class
+
         def log(message)
           puts "* [JVM::Types] #{message}" if Duby::Compiler::JVM.verbose
         end
 
-        def initialize(java_type)
-          orig_type = java_type
-          if !(java_type.kind_of?(Java::JavaClass) ||
-               java_type.class_builder?)
-            java_type = java_type.java_class
+        def initialize(mirror_or_name)
+          if mirror_or_name.kind_of?(BiteScript::ASM::ClassMirror)
+            @type = mirror_or_name
+            name = mirror_or_name.type.class_name
+          else
+            name = mirror_or_name.to_s
           end
-          super(java_type.name, false, false)
-          raise ArgumentError, "Bad type #{orig_type}" if name =~ /Java::/
-          @type = java_type
+          super(name, false, false)
+          raise ArgumentError, "Bad type #{mirror_or_name}" if name =~ /Java::/
         end
 
         def jvm_type
@@ -53,25 +49,36 @@ module Duby
         def interface?
           @type.interface?
         end
-        
+
+        def dynamic?
+          false
+        end
+
+        def inner_class?
+          @inner_class
+        end
+
         def is_parent(other)
           assignable_from?(other)
         end
-        
+
         def compatible?(other)
           assignable_from?(other)
         end
-        
+
         def assignable_from?(other)
+          return false if other.nil?
           return true if !primitive? && other == Null
           return true if other == self
           return true if other.error? || other.unreachable?
-          begin
-            jvm_type.assignable_from?(other.jvm_type)
-          rescue
-            assignable_from?(other.superclass) ||
-                other.interfaces.any? {|i| assignable_from?(i)}
-          end
+
+          # TODO should we allow more here?
+          return interface? if other.block?
+
+          return true if jvm_type && (jvm_type == other.jvm_type)
+
+          assignable_from?(other.superclass) ||
+              other.interfaces.any? {|i| assignable_from?(i)}
         end
 
         def iterable?
@@ -79,7 +86,7 @@ module Duby
            'java.util.Iterator',
            'java.util.Enumeration'].any? {|n| AST.type(n).assignable_from(self)}
         end
-        
+
         def component_type
           AST.type('java.lang.Object') if iterable?
         end
@@ -87,7 +94,7 @@ module Duby
         def meta
           @meta ||= MetaType.new(self)
         end
-        
+
         def unmeta
           self
         end
@@ -97,13 +104,13 @@ module Duby
         end
 
         def array_type
-          @array_type ||= ArrayType.new(self)
+          @array_type ||= Duby::JVM::Types::ArrayType.new(self)
         end
 
         def prefix
           'a'
         end
-        
+
         # is this a 64 bit type?
         def wide?
           false
@@ -121,13 +128,14 @@ module Duby
           raise "Incomplete type #{self}" unless jvm_type
           AST.type(jvm_type.superclass) if jvm_type.superclass
         end
-        
+
         def interfaces
+          raise "Incomplete type #{self} (#{self.class})" unless jvm_type
           @interfaces ||= jvm_type.interfaces.map do |interface|
             AST.type(interface)
           end
         end
-        
+
         def astore(builder)
           if primitive?
             builder.send "#{name[0,1]}astore"
@@ -135,7 +143,7 @@ module Duby
             builder.aastore
           end
         end
-        
+
         def aload(builder)
           if primitive?
             builder.send "#{name[0,1]}aload"
@@ -162,18 +170,22 @@ module Duby
         def newarray(method)
           method.send "new#{name}array"
         end
-        
+
         def interfaces
           []
         end
-        
+
         def convertible_to?(type)
           return true if type == self
-          a, b = TYPE_ORDERING.index(self), TYPE_ORDERING.index(type)
-          a && b && b > a
+          widening_conversions = WIDENING_CONVERSIONS[self]
+          widening_conversions && widening_conversions.include?(type)
+        end
+
+        def superclass
+          nil
         end
       end
-      
+
       class MetaType < Type
         attr_reader :unmeta
 
@@ -193,25 +205,33 @@ module Duby
         def meta
           self
         end
-        
+
         def superclass
           @unmeta.superclass.meta if @unmeta.superclass
         end
-        
+
         def interfaces
           []
         end
-        
+
         def jvm_type
           unmeta.jvm_type
         end
+
+        def inner_class?
+          basic_type.inner_class?
+        end
       end
-      
+
       class NullType < Type
         def initialize
-          super(java.lang.Object)
+          super('java.lang.Object')
         end
-        
+
+        def to_s
+          "Type(null)"
+        end
+
         def compatible?(other)
           !other.primitive?
         end
@@ -219,14 +239,13 @@ module Duby
 
       class VoidType < PrimitiveType
         def initialize
-          super(Java::JavaLang::Void, Java::JavaLang::Void)
-          @name = "void"
+          super('void', Java::JavaLang::Void)
         end
 
         def void?
           true
         end
-        
+
         def return(builder)
           builder.returnvoid
         end
@@ -237,44 +256,79 @@ module Duby
 
         def initialize(component_type)
           @component_type = component_type
+          if @component_type.jvm_type
+            #@type = java.lang.reflect.Array.newInstance(@component_type.jvm_type, 0).class
+          else
+            # FIXME: THIS IS WRONG, but I don't know how to fix it
+            #@type = @component_type
+          end
           @name = component_type.name
         end
 
-        def jvm_type
-          @component_type.jvm_type
-        end
-
         def array?
           true
         end
-        
+
         def iterable?
           true
         end
-        
+
+        def inner_class?
+          basic_type.inner_class?
+        end
+
         def basic_type
           component_type.basic_type
         end
-        
+
         def superclass
           Object
         end
+
+        def interfaces
+          []
+        end
       end
-      
+
+      class DynamicType < Type
+        ObjectType = Type.new('java.lang.Object')
+
+        def initialize
+          # For naming, bytecode purposes, we are an Object
+          @name = "java.lang.Object"
+        end
+
+        def basic_type
+          self
+        end
+
+        def is_parent(other)
+          ObjectType.assignable_from?(other)
+        end
+
+        def assignable_from?(other)
+          ObjectType.assignable_from?(other)
+        end
+
+        def jvm_type
+          java.lang.Object
+        end
+
+        def dynamic?
+          true
+        end
+      end
+
       class TypeDefinition < Type
         attr_accessor :node
-        
+
         def initialize(name, node)
-          if name.class_builder?
-            super(name)
-          else
-            raise ArgumentError, "Bad name #{name}" if name[0,1] == '.'
-            @name = name
-          end
+          raise ArgumentError, "Bad name #{name}" if name[0,1] == '.'
+          @name = name
           @node = node
           raise ArgumentError, "Bad type #{name}" if self.name =~ /Java::/
         end
-        
+
         def name
           if @type
             @type.name
@@ -282,11 +336,11 @@ module Duby
             @name
           end
         end
-        
+
         def superclass
           (node && node.superclass) || Object
         end
-        
+
         def interfaces
           if node
             node.interfaces
@@ -294,27 +348,32 @@ module Duby
             []
           end
         end
-        
+
         def define(builder)
           class_name = @name.tr('.', '/')
           @type ||= builder.public_class(class_name, superclass, *interfaces)
         end
-        
+
         def meta
           @meta ||= TypeDefMeta.new(self)
         end
       end
-      
+
       class InterfaceDefinition < TypeDefinition
         def initialize(name, node)
           super(name, node)
         end
-        
+
         def define(builder)
-          @type ||= builder.public_interface(@name, *interfaces)
+          class_name = @name.tr('.', '/')
+          @type ||= builder.public_interface(class_name, *interfaces)
+        end
+
+        def interface?
+          true
         end
       end
-      
+
       class TypeDefMeta < MetaType
       end
     end

data/lib/duby/jvm/types/basic_types.rb

@@ -1,19 +1,32 @@
 module Duby::JVM::Types
-  Boolean = BooleanType.new(Java::boolean, java.lang.Boolean)
-  Byte = IntegerType.new(Java::byte, java.lang.Byte)
-  Char = IntegerType.new(Java::char, java.lang.Character)
-  Short = IntegerType.new(Java::short, java.lang.Short)
-  Int = IntegerType.new(Java::int, java.lang.Integer)
-  Long = LongType.new(Java::long, java.lang.Long)
-  Float = FloatType.new(Java::float, java.lang.Float)
-  Double = DoubleType.new(Java::double, java.lang.Double)
+  Boolean = BooleanType.new('boolean', java.lang.Boolean)
+  Byte = IntegerType.new('byte', java.lang.Byte)
+  Char = IntegerType.new('char', java.lang.Character)
+  Short = IntegerType.new('short', java.lang.Short)
+  Int = IntegerType.new('int', java.lang.Integer)
+  Long = LongType.new('long', java.lang.Long)
+  Float = FloatType.new('float', java.lang.Float)
+  Double = DoubleType.new('double', java.lang.Double)
 
-  Object = Type.new(Java::JavaLang.Object)
-  String = StringType.new(Java::JavaLang.String)
-  Iterable = IterableType.new(Java::JavaLang.Iterable)
+  # TODO these shouldn't be constants. They should be loaded from
+  # the compilation class path.
+  Object = Type.new(BiteScript::ASM::ClassMirror.load('java.lang.Object'))
+  String = StringType.new(
+      BiteScript::ASM::ClassMirror.load('java.lang.String'))
+  Iterable = IterableType.new(
+          BiteScript::ASM::ClassMirror.load('java.lang.Iterable'))
 
   Void = VoidType.new
   Null = NullType.new
-  
+
+  WIDENING_CONVERSIONS = {
+    Byte => [Byte, Short, Int, Long, Float, Double],
+    Short => [Short, Int, Long, Float, Double],
+    Char => [Char, Int, Long, Float, Double],
+    Int => [Int, Long, Float, Double],
+    Long => [Long, Float, Double],
+    Float => [Float, Double],
+    Double => [Double]
+  }
   TYPE_ORDERING = [Byte, Short, Int, Long, Float, Double]
-end  
+end