duby 0.0.2-java → 0.0.3-java

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

@@ -3,7 +3,9 @@ require 'duby/jvm/types'
 module Duby
   class JVM::Types::Type
     def to_source
-      "#{name}#{'[]' if array?}"
+      java_name = name
+      java_name = java_name.tr '$', '.' if inner_class?
+      "#{java_name}#{'[]' if array?}"
     end
   end
 
@@ -12,38 +14,38 @@ module Duby
 
     class Builder
       attr_accessor :package, :classes, :filename, :compiler
-      
+
       def initialize(filename, compiler)
         @filename = filename
         @classes = []
         @compiler = compiler
       end
-      
+
       def public_class(name, superclass=nil, *interfaces)
         cls = ClassBuilder.new(self, name, superclass, interfaces)
         @classes << cls
         cls
       end
-      
+
       def public_interface(name, *interfaces)
         cls = InterfaceBuilder.new(self, name, interfaces)
         @classes << cls
         cls
       end
-      
+
       def generate
         @classes.each do |cls|
           yield cls.filename, cls
         end
       end
     end
-    
+
     class Output
       def initialize
         @out = ""
         @indent = 0
       end
-      
+
       def puts(*lines)
         lines.each do |line|
           print_indent
@@ -52,22 +54,22 @@ module Duby
           @indented = false
         end
       end
-      
+
       def print_indent
         @indent ||= 0
         @out << (' ' * @indent) unless @indented
         @indented = true
       end
-      
+
       def print(str)
         print_indent
         @out << str.to_s
       end
-      
+
       def indent
         @indent += 2
       end
-      
+
       def dedent
         @indent -= 2
       end
@@ -79,29 +81,29 @@ module Duby
           @indented = false
         end
       end
-      
+
       def to_s
         @out
       end
     end
-    
+
     module Helper
       def puts(*args)
         @out.puts(*args)
       end
-      
+
       def print(*args)
         @out.print(*args)
       end
-      
+
       def indent
         @out.indent
       end
-      
+
       def dedent
         @out.dedent
       end
-      
+
       def block(line='')
         puts line + " {"
         indent
@@ -120,16 +122,15 @@ module Duby
         else
           'null'
         end
-      end   
+      end
 
       def annotate(annotations)
         annotations.each do |annotation|
-          # TODO values
           puts "@#{annotation.name}"
         end
       end
     end
-    
+
     class ClassBuilder
       include Helper
       include Duby::Compiler::JVM::JVMLogger
@@ -159,11 +160,11 @@ module Duby
         @fields = {}
         start
       end
-      
+
       def compiler
         @builder.compiler
       end
-      
+
       def start
         puts "// Generated from #{@builder.filename}"
         puts "package #{package};" if package
@@ -183,7 +184,7 @@ module Duby
         puts " {"
         indent
       end
-      
+
       def stop
         finish_declaration
         return if @stopped
@@ -196,23 +197,24 @@ module Duby
         puts "}"
         log "Class #{name} complete (#{@out.to_s.size})"
       end
-      
+
       def main
-        public_static_method('main', JVMTypes::Void, [],
+        public_static_method('main', [], JVMTypes::Void,
                              [JVMTypes::String.array_type, 'argv'])
       end
-      
-      def declare_field(name, type, static, annotations=[])
+
+      def declare_field(name, type, static, access='private', annotations=[])
         finish_declaration
         return if @fields[name]
         static = static ? 'static' : ''
         annotate(annotations)
-        puts "private #{static} #{type.to_source} #{name};"
+        puts "#{access} #{static} #{type.to_source} #{name};"
         @fields[name] = true
       end
-      
-      def public_method(name, type, exceptions, *args)
+
+      def public_method(name, exceptions, type, *args)
         finish_declaration
+        type ||= Duby::AST::type(:void)
         @methods << MethodBuilder.new(self,
                                       :name => name,
                                       :return => type,
@@ -220,9 +222,10 @@ module Duby
                                       :exceptions => exceptions)
         @methods[-1]
       end
-      
-      def public_static_method(name, type, exceptions, *args)
+
+      def public_static_method(name, exceptions, type, *args)
         finish_declaration
+        type ||= Duby::AST::type(:void)
         @methods << MethodBuilder.new(self,
                                       :name => name,
                                       :return => type,
@@ -231,7 +234,7 @@ module Duby
                                       :exceptions => exceptions)
         @methods[-1]
       end
-      
+
       def public_constructor(exceptions, *args)
         finish_declaration
         @methods << MethodBuilder.new(self,
@@ -240,18 +243,18 @@ module Duby
                                       :exceptions => exceptions)
         @methods[-1]
       end
-      
+
       def generate
         stop
         @out.to_s
       end
     end
-    
+
     class InterfaceBuilder < ClassBuilder
       def initialize(builder, name, interfaces)
         super(builder, name, nil, interfaces)
       end
-      
+
       def finish_declaration
         return if @declaration_finished
         @declaration_finished = true
@@ -266,9 +269,10 @@ module Duby
         puts " {"
         indent
       end
-      
+
       def public_method(name, type, exceptions, *args)
         finish_declaration
+        type ||= Duby::AST::type(:void)
         @methods << MethodBuilder.new(self,
                                       :name => name,
                                       :return => type,
@@ -278,12 +282,12 @@ module Duby
         @methods[-1]
       end
     end
-    
+
     class MethodBuilder
       include Helper
-      
+
       attr_accessor :name, :type, :out
-      
+
       def initialize(cls, options)
         @class = cls
         @compiler = cls.compiler
@@ -328,7 +332,7 @@ module Duby
         end
         indent
       end
-      
+
       def stop
         dedent
         puts "}"
@@ -347,33 +351,33 @@ module Duby
         end
         name
       end
-      
+
       def local?(name)
         !!@locals[name]
       end
 
-      def tmp(type)
+      def tmp(type, &block)
         @temps += 1
-        declare_local(type, "temp$#{@temps}")
+        declare_local(type, "temp$#{@temps}", &block)
       end
-      
+
       def label
         @temps += 1
         "label#{@temps}"
       end
-      
+
       def push_int(value)
         print value
       end
-      
+
       def ldc_float(value)
         print "(float)#{value}"
       end
-      
+
       def ldc_double(value)
         print value
       end
-      
+
       def method_missing(name, *args)
         if name.to_s =~ /.const_(m)?(\d)/
           print '-' if $1

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

@@ -1,23 +1,23 @@
-class Duby::Compiler::JavaSource
+class Duby::Compiler::JavaSource < Duby::Compiler::JVMCompilerBase
   class SimpleWhileLoop
     attr_reader :compiler, :loop
     def initialize(loop, compiler)
       @loop = loop
       @compiler = compiler
     end
-    
+
     def break
       compiler.method.puts "break;"
     end
-    
+
     def next
       compiler.method.puts "continue;"
     end
-    
+
     def redo
       raise "#{self.class.name} doesn't support redo"
     end
-    
+
     def compile(expression)
       prepare
       @loop.init.compile(compiler, false) if @loop.init?
@@ -35,11 +35,11 @@ class Duby::Compiler::JavaSource
         compiler.method.puts "#{compiler.lvalue}null;"
       end
     end
-    
+
     def compile_body
       loop.body.compile(compiler, false)
     end
-    
+
     def prepare
       predicate = loop.condition.predicate.precompile(compiler)
       negative = loop.negative ? '!' : ''
@@ -71,11 +71,11 @@ class Duby::Compiler::JavaSource
     def break
       compiler.method.puts "break #{@outer};"
     end
-    
+
     def next
       compiler.method.puts "break #{@inner};"
     end
-    
+
     def redo
       compiler.method.puts "#{@redo} = true;"
       compiler.method.puts "continue #{@inner};"

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

@@ -10,18 +10,18 @@ module Duby::AST
         @tempvalue = value || node
       end
     end
-    
+
     def compile(compiler, expression)
       if expression
         compiler.method.print @tempname
       end
     end
-    
+
     def reload(compiler)
       compiler.assign(@tempname, @tempvalue)
     end
   end
-  
+
   class Node
     def expr?(compiler)
       true
@@ -34,18 +34,18 @@ module Duby::AST
         temp(compiler)
       end
     end
-    
+
     def temp(compiler, value=nil)
       TempValue.new(self, compiler, value)
     end
   end
-  
+
   class Body
     def expr?(compiler)
       false
     end
   end
-  
+
   class If
     def expr?(compiler)
       return false unless condition.predicate.expr?(compiler)
@@ -54,18 +54,18 @@ module Duby::AST
       true
     end
   end
-  
+
   class Loop
     def expr?(compiler)
       false
     end
-    
+
     def precompile(compiler)
       compile(compiler, false)
       temp(compiler, 'null')
     end
   end
-  
+
   class Call
     def method(compiler=nil)
       @method ||= begin
@@ -73,7 +73,7 @@ module Duby::AST
         target.inferred_type.get_method(name, arg_types)
       end
     end
-    
+
     def expr?(compiler)
       target.expr?(compiler) &&
           parameters.all? {|p| p.expr?(compiler)} &&
@@ -81,7 +81,7 @@ module Duby::AST
           !method.actual_return_type.void?
     end
   end
-  
+
   class FunctionalCall
     def method(compiler)
       @method ||= begin
@@ -89,7 +89,7 @@ module Duby::AST
         compiler.self_type.get_method(name, arg_types)
       end
     end
-    
+
     def expr?(compiler)
       parameters.all? {|p| p.expr?(compiler)} &&
           (cast? || !method(compiler).actual_return_type.void?)
@@ -110,13 +110,13 @@ module Duby::AST
           !method(compiler).actual_return_type.void?
     end
   end
-  
+
   class EmtpyArray
     def expr?(compiler)
       size.expr?(compiler)
     end
   end
-  
+
   class LocalAssignment
     def expr?(compiler)
       compiler.method.local?(name) && value.expr?(compiler)
@@ -131,40 +131,50 @@ module Duby::AST
       end
     end
   end
-  
+
+  class ToString
+    def expr?(compiler)
+      body.expr?(compiler)
+    end
+
+    def temp(compiler, value=nil)
+      TempValue.new(body, compiler, value)
+    end
+  end
+
+  class StringConcat
+    def expr?(compiler)
+      children.all? {|x| x.expr?(compiler)}
+    end
+  end
+
   class Return
     def expr?(compiler)
       false
     end
   end
-  
+
   class Raise
     def expr?(compiler)
       false
     end
   end
-  
+
   class Rescue
     def expr?(compiler)
       false
     end
   end
-  
+
   class Ensure
     def expr?(compiler)
       false
     end
   end
-  
+
   class FieldAssignment
     def expr?(compiler)
       false
     end
   end
-  
-  class LocalAssignment
-    def expr?(compiler)
-      false
-    end
-  end
 end