duby 0.0.2-java → 0.0.3-java

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

@@ -88,5 +88,8 @@ module Duby::JVM::Types
       unary_operator('+@', nil)
     end
 
+    def box(builder)
+      builder.invokestatic box_type, "valueOf", [box_type, math_type]
+    end
   end
 end

data/lib/duby/nbcompiler.rb

@@ -21,7 +21,7 @@ module Duby
     def parse(text)
       Duby::AST.type_factory = Duby::JVM::Types::TypeFactory.new
       ast = Duby::AST.parse_ruby(text)
-      transformer = Duby::Transform::Transformer.new
+      transformer = Duby::Transform::Transformer.new(Duby::CompilationState.new)
       return ParseResult.new(
           transformer.transform(ast, nil), transformer.errors)
     end

data/lib/duby/plugin/edb.rb

@@ -9,7 +9,7 @@ Duby::AST.defmacro('def_edb') do |transformer, fcall, parent|
   compiler.pre_cmd = ["def #{name}", "_edbout = StringBuilder.new"]
   compiler.post_cmd = ["_edbout.toString", "end"]
   src = compiler.compile(IO.read(path))
-  ast = Duby::AST.parse_ruby(src, "(edb)")
+  ast = Duby::AST.parse_ruby(src, path)
   transformer.transform(ast.body_node, parent)
 end
 

data/lib/duby/plugin/java.rb

@@ -24,7 +24,16 @@ module Duby
             raise NoMethodError, "Method %s(%s) on %s not found" %
                 [name, parameter_types.join(', '), target_type]
           end
-          result = method.return_type if method
+          if method
+            result = method.return_type
+          elsif typer.last_chance && target_type.meta? &&
+              name == 'new' && parameter_types == []
+            unmeta = target_type.unmeta
+            if unmeta.respond_to?(:default_constructor)
+              result = unmeta.default_constructor
+              typer.last_chance = false if result
+            end
+          end
         end
 
         if result

data/lib/duby/transform.rb

@@ -11,14 +11,31 @@ module Duby
         @cause = cause
       end
     end
-    
+
     class Transformer
-      attr_reader :errors
-      def initialize
+      begin
+        include Java::DubyLangCompiler.Compiler
+      rescue NameError
+        $CLASSPATH << File.dirname(__FILE__) + '/../../javalib/duby-bootstrap.jar'
+        include Java::DubyLangCompiler.Compiler
+      end
+
+      attr_reader :errors, :state
+      def initialize(state)
         @errors = []
         @tmp_count = 0
         @annotations = []
         @scopes = []
+        @extra_body = nil
+        @state = state
+      end
+
+      def destination
+        @state.destination
+      end
+
+      def verbose?
+        @state.verbose
       end
 
       def annotations
@@ -30,19 +47,34 @@ module Duby
         @annotations << annotation
         Duby::AST::Noop.new(annotation.parent, annotation.position)
       end
-      
-      def tmp
-        "__xform_tmp_#{@tmp_count += 1}"
+
+      def tmp(format="__xform_tmp_%d")
+        format % [@tmp_count += 1]
       end
-      
+
       def transform(node, parent)
         begin
           scope = node.getScope if node.respond_to? :getScope
           if scope
             @scopes << scope
           end
+          top = @extra_body.nil?
+          if top
+            @extra_body = Duby::AST::Body.new(nil, node.position)
+          end
           begin
-            node.transform(self, parent)
+            result = node.transform(self, parent)
+            if top
+              body = result.body
+              if body.kind_of?(Duby::AST::Body) && @extra_body.empty?
+                @extra_body = body
+              else
+                result.body = @extra_body
+                body.parent = @extra_body
+                @extra_body.children.insert(0, body)
+              end
+            end
+            return result
           ensure
             if scope
               @scopes.pop
@@ -51,13 +83,13 @@ module Duby
         rescue Error => ex
           @errors << ex
           Duby::AST::ErrorNode.new(parent, ex)
-        rescue Exception => ex 
+        rescue Exception => ex
           error = Error.new(ex.message, node.position, ex)
           @errors << error
           Duby::AST::ErrorNode.new(parent, error)
         end
       end
-      
+
       def captured?(node)
         depth = node.depth
         scope = @scopes[-1]
@@ -82,14 +114,28 @@ module Duby
         duby_node.parent = parent
         duby_node
       end
-      
+
       def expand(fvcall, parent)
         result = yield self, fvcall, parent
-        unless result.kind_of?(AST::Node)
+        unless AST::Node === result
           raise Error.new('Invalid macro result', fvcall.position)
         end
         result
       end
+
+      def append_node(node)
+        @extra_body << node
+        node
+      end
+
+      def define_class(position, name, &block)
+        append_node Duby::AST::ClassDefinition.new(nil, position, name, &block)
+      end
+
+      def define_closure(position, name, enclosing_type)
+        append_node(Duby::AST::ClosureDefinition.new(
+            nil, position, name, enclosing_type))
+      end
     end
   end
   TransformError = Transform::Error
@@ -104,10 +150,10 @@ module Duby
     java_import org.jrubyparser.parser.ParserConfiguration
     java_import org.jrubyparser.CompatVersion
     java_import java.io.StringReader
-    
+
     def parse(src, filename='-', raise_errors=false, transformer=nil)
       ast = parse_ruby(src, filename)
-      transformer ||= Transform::Transformer.new
+      transformer ||= Transform::Transformer.new(Duby::CompilationState.new)
       ast = transformer.transform(ast, nil)
       if raise_errors
         transformer.errors.each do |e|
@@ -117,7 +163,7 @@ module Duby
       ast
     end
     module_function :parse
-    
+
     def parse_ruby(src, filename='-')
       raise ArgumentError if src.nil?
       parser = Parser.new
@@ -127,7 +173,7 @@ module Duby
       rescue => ex
         if ex.cause.respond_to? :position
           position = ex.cause.position
-          puts "#{position.file}:#{position.start_line + 1}: #{ex.message}"
+          Duby.print_error(ex.cause.message, position)
         end
         raise ex
       end
@@ -141,7 +187,7 @@ module Duby
         set_args = JRubyAst::ListNode.new(position)
         set_args.add_all(args)
         set_args.add(value_node)
-        
+
         first = JRubyAst::CallNode.new(position, receiver_node, name, args)
         second = JRubyAst::AttrAssignNode.new(position, receiver_node,
                                               "#{name}=", set_args)
@@ -157,7 +203,7 @@ module Duby
       end
     end
 
-    # reload 
+    # reload
     module JRubyAst
       class Node
         def transform(transformer, parent)
@@ -189,7 +235,7 @@ module Duby
 
           [:receiver_node, :args_node, :var_node, :head_node, :value_node, :iter_node, :body_node, :next_node, :condition, :then_body, :else_body].each do |mm|
             if self.respond_to?(mm)
-              begin 
+              begin
                 s << "\n#{self.send(mm).inspect(indent+2)}" if self.send(mm)
               rescue
                 s << "\n#{' '*(indent+2)}#{self.send(mm).inspect}" if self.send(mm)
@@ -208,7 +254,7 @@ module Duby
           end
           s
         end
-        
+
         def signature(parent)
           nil
         end
@@ -216,7 +262,7 @@ module Duby
 
       class ListNode
         include Enumerable
-        
+
         def each(&block)
           child_nodes.each(&block)
         end
@@ -232,7 +278,7 @@ module Duby
             pre
           end
         end
-        
+
         def transform(transformer, parent)
           Arguments.new(parent, position) do |args_node|
             arg_list = args.child_nodes.map do |node|
@@ -311,7 +357,7 @@ module Duby
           Break.new(parent, position)
         end
       end
-      
+
       class ClassNode
         def transform(transformer, parent)
           ClassDefinition.new(parent, position,
@@ -325,11 +371,30 @@ module Duby
         end
       end
 
+      class DStrNode
+        def transform(transformer, parent)
+          StringConcat.new(parent, position) do |p|
+            child_nodes.map{|n| n.transform(transformer, p)}
+          end
+        end
+      end
+
+      class EvStrNode
+        def transform(transformer, parent)
+          ToString.new(parent, position) do |p|
+            [body.transform(transformer, p)]
+          end
+        end
+      end
+
       class GlobalVarNode
         def transform(transformer, parent)
+          transformer.add_annotation(annotation(transformer, parent))
+        end
+
+        def annotation(transformer, parent)
           classname = name[1..-1]
           annotation = Annotation.new(parent, position, AST.type(classname))
-          transformer.add_annotation(annotation)
         end
       end
 
@@ -362,7 +427,7 @@ module Duby
               actual_name = name[0..-2] + '_set'
             end
           end
-          
+
           Call.new(parent, position, actual_name) do |call|
             [
               transformer.transform(receiver_node, call),
@@ -416,15 +481,15 @@ module Duby
             case value
             when HashNode
               values = value.list_node
-              (0..(values.size / 2)).each do |i|
+              (0...(values.size / 2)).each do |i|
                 name = values.get(2 * i).name
                 value = values.get(2 * i + 1)
-                annotation[name] = transformer.transform(value, annotation)
+                annotation[name] = annotation_value(value, annotation)
               end
             when nil
               # ignore an empty argument list
             else
-              annotation['value'] = transformer.transform(value, annotation)
+              annotation['value'] = annotation_value(value, annotation)
             end
             annotation
           else
@@ -442,6 +507,20 @@ module Duby
           receiver = receiver.receiver_node while CallNode === receiver
           GlobalVarNode === receiver
         end
+
+        def annotation_value(value, annotation)
+          case value
+          when StrNode
+            java.lang.String.new(value.value)
+          when ArrayNode
+            value.child_nodes.map {|node| annotation_value(node, annotation)}
+          else
+            # TODO Support other types
+            ref = value.type_reference(annotation)
+            desc = BiteScript::Signature.class_id(ref)
+            BiteScript::ASM::Type.getType(desc)
+          end
+        end
       end
 
       class Colon2Node
@@ -532,7 +611,7 @@ module Duby
           end
         end
       end
-      
+
       class FalseNode
         def transform(transformer, parent)
           Boolean.new(parent, position, false)
@@ -555,7 +634,7 @@ module Duby
             nil
           end
         end
-        
+
         def transform(transformer, parent)
           @declaration ||= false
 
@@ -575,7 +654,7 @@ module Duby
             end
           end
         end
-        
+
         def type_reference(parent)
           AST::type(name)
         end
@@ -790,10 +869,9 @@ module Duby
 
       class LocalAsgnNode
         def transform(transformer, parent)
-          captured = transformer.captured?(self)
           case value_node
           when SymbolNode, ConstNode
-            LocalDeclaration.new(parent, position, name, captured) {|local_decl| [value_node.type_reference(local_decl)]}
+            LocalDeclaration.new(parent, position, name) {|local_decl| [value_node.type_reference(local_decl)]}
           when JRubyAst::GlobalVarNode
             real_parent = parent
             real_parent = parent.parent if Body === real_parent
@@ -804,14 +882,19 @@ module Duby
               raise "Illegal global variable"
             end
           else
-            LocalAssignment.new(parent, position, name, captured) {|local| [transformer.transform(value_node, local)]}
+            LocalAssignment.new(parent, position, name) {|local| [transformer.transform(value_node, local)]}
           end
         end
       end
 
       class LocalVarNode
         def transform(transformer, parent)
-          Local.new(parent, position, name, transformer.captured?(self))
+          FunctionalCall.new(parent, position, name) do |call|
+            [
+              [],
+              nil
+            ]
+          end
         end
       end
 
@@ -850,6 +933,12 @@ module Duby
         end
       end
 
+      class RegexpNode
+        def transform(transformer, parent)
+          Regexp.new(parent, position, value.to_s)
+        end
+      end
+
       class ReturnNode
         def transform(transformer, parent)
           Return.new(parent, position) do |ret|
@@ -875,7 +964,7 @@ module Duby
         def transform(transformer, parent)
           String.new(parent, position, value)
         end
-        
+
         def type_reference(parent)
           AST::type(value)
         end
@@ -886,13 +975,13 @@ module Duby
           AST::type(name)
         end
       end
-      
+
       class TrueNode
         def transform(transformer, parent)
           Boolean.new(parent, position, true)
         end
       end
-      
+
       class TypedArgumentNode
         def transform(transformer, parent)
           type_node.transform(transformer, parent)
@@ -921,7 +1010,7 @@ module Duby
             end
           end
         end
-        
+
         def type_reference(parent)
           AST::type name
         end
@@ -952,18 +1041,17 @@ module Duby
       class DVarNode
         def transform(transformer, parent)
           # TODO does this need to be handled specially?
-          Local.new(parent, position, name, transformer.captured?(self))
+          Local.new(parent, position, name)
         end
       end
 
       class DAsgnNode
         def transform(transformer, parent)
-          captured = transformer.captured?(self)
           case value_node
           when SymbolNode, ConstNode
-            LocalDeclaration.new(parent, position, name, captured) {|local_decl| [value_node.type_reference(local_decl)]}
+            LocalDeclaration.new(parent, position, name) {|local_decl| [value_node.type_reference(local_decl)]}
           else
-            LocalAssignment.new(parent, position, name, captured) {|local| [transformer.transform(value_node, local)]}
+            LocalAssignment.new(parent, position, name) {|local| [transformer.transform(value_node, local)]}
           end
         end
       end
@@ -1003,7 +1091,7 @@ module Duby
           end
         end
       end
-      
+
       class SuperNode
         def transform(transformer, parent)
           Super.new(parent, position) do
@@ -1011,13 +1099,13 @@ module Duby
           end
         end
       end
-      
+
       class ZSuperNode
         def transform(transformer, parent)
           Super.new(parent, position)
         end
       end
-      
+
       class SelfNode
         def transform(transformer, parent)
           Self.new(parent, position)