bitescript 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,23 @@
+=== 0.0.4 / 2009-10-27
+
+* Multiple improvements to support Duby (thanks to Ryan Brown!):
+  * Add support for shadowing local variables
+  * Interface and "throws" support.
+  * Add an accessor for ClassBuilder.interfaces
+  * ignore nil line numbers
+  * Fix typo in line numbering
+  * Improve debug info support
+  * Fix class.stop to generate a valid constructor when one is not defined.
+  * Fix void comparison bugs
+  * Fix string concat
+  * Allow custom classes to represent primitive types
+  * Add support for big locals (long/double)
+  * Add a static? accessor to MethodBuilder.
+
+=== 0.0.3 / 2009-06-14
+
+* Support for Java 1.7 and invokedynamic
+
 === 0.0.2 / 2009-05-14
 
 * Improve use support for packages, make it more API-friendly

data/lib/bitescript/builder.rb

@@ -114,6 +114,10 @@ module BiteScript
       define_class(class_name, :visibility => :public, :superclass => superclass, :interfaces => interfaces, &block)
     end
     
+    def public_interface(class_name, *interfaces, &block)
+      define_class(class_name, :visibility => :public, :interface => true, :interfaces => interfaces, &block)
+    end
+    
     def protected_class(class_name, superclass = java.lang.Object, *interfaces, &block)
       define_class(class_name, :visibility => :protected, :superclass => superclass, :interfaces => interfaces, &block)
     end
@@ -188,16 +192,23 @@ module BiteScript
     attr_accessor :methods
     attr_accessor :imports
     attr_accessor :fields
+    attr_accessor :interfaces
 
     def initialize(file_builder, class_name, file_name, opts) 
       @parent = file_builder
       @class_name = class_name
       @superclass = opts[:superclass] || Object
+      @interfaces = opts[:interfaces] || []
+      @interface = opts[:interface]
+      flags = Opcodes::ACC_SUPER
+      if @interface
+        flags |= Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
+      end
       
       @class_writer = ClassWriter.new(ClassWriter::COMPUTE_MAXS)
       
       interface_paths = []
-      (opts[:interfaces] || []).each {|interface| interface_paths << path(interface)}
+      (@interfaces).each {|interface| interface_paths << path(interface)}
 
       visibility = case (opts[:visibility] && opts[:visibility].to_sym)
         when nil
@@ -214,7 +225,7 @@ module BiteScript
           raise "Unknown visibility: #{opts[:visibility]}"
       end
 
-      @class_writer.visit(BiteScript.bytecode_version, visibility | Opcodes::ACC_SUPER, class_name, nil, path(superclass), interface_paths.to_java(:string))
+      @class_writer.visit(BiteScript.bytecode_version, visibility | flags, class_name, nil, path(superclass), interface_paths.to_java(:string))
       @class_writer.visit_source(file_name, nil)
 
       @constructor = nil
@@ -231,11 +242,11 @@ module BiteScript
 
     def stop
       # if we haven't seen a constructor, generate a default one
-      unless @constructor
-        method = MethodBuilder.new(self, Opcodes::ACC_PUBLIC, "<init>", [])
+      unless @constructor || @interface
+        method = public_constructor([])
         method.start
         method.aload 0
-        method.invokespecial @superclass, "<init>", Void::TYPE
+        method.invokespecial @superclass, "<init>", [Void::TYPE]
         method.returnvoid
         method.stop
       end
@@ -260,26 +271,26 @@ module BiteScript
       ", binding, __FILE__, __LINE__
       # instance methods; also defines a "this" local at index 0
       eval "
-        def #{modifier}_method(name, *signature, &block)
-          method(Opcodes::ACC_#{modifier.upcase}, name, signature, &block)
+        def #{modifier}_method(name, exceptions, *signature, &block)
+          method(Opcodes::ACC_#{modifier.upcase}, name, signature, exceptions, &block)
         end
       ", binding, __FILE__, __LINE__
       # static methods
       eval "
-        def #{modifier}_static_method(name, *signature, &block)
-          method(Opcodes::ACC_STATIC | Opcodes::ACC_#{modifier.upcase}, name, signature, &block)
+        def #{modifier}_static_method(name, exceptions, *signature, &block)
+          method(Opcodes::ACC_STATIC | Opcodes::ACC_#{modifier.upcase}, name, signature, exceptions, &block)
         end
       ", binding, __FILE__, __LINE__
       # native methods
       eval "
-        def #{modifier}_native_method(name, *signature)
-          method(Opcodes::ACC_NATIVE | Opcodes::ACC_#{modifier.upcase}, name, signature)
+        def #{modifier}_native_method(name, exceptions, *signature)
+          method(Opcodes::ACC_NATIVE | Opcodes::ACC_#{modifier.upcase}, name, signature, exceptions)
         end
       ", binding, __FILE__, __LINE__
       # constructors; also defines a "this" local at index 0
       eval "
-        def #{modifier}_constructor(*signature, &block)
-          method(Opcodes::ACC_#{modifier.upcase}, \"<init>\", [nil, *signature], &block)
+        def #{modifier}_constructor(exceptions, *signature, &block)
+          @constructor = method(Opcodes::ACC_#{modifier.upcase}, \"<init>\", [nil, *signature], exceptions, &block)
         end
       ", binding, __FILE__, __LINE__
     end
@@ -288,8 +299,9 @@ module BiteScript
       method(Opcodes::ACC_STATIC, "<clinit>", [void], &block)
     end
     
-    def method(flags, name, signature, &block)
-      mb = MethodBuilder.new(self, flags, name, signature)
+    def method(flags, name, signature, exceptions, &block)
+      flags |= Opcodes::ACC_ABSTRACT if interface?
+      mb = MethodBuilder.new(self, flags, name, exceptions, signature)
 
       if name == "<init>"
         constructors[signature[1..-1]] = mb
@@ -299,9 +311,9 @@ module BiteScript
       end
 
       # non-static methods reserve index 0 for 'this'
-      mb.local 'this' if (flags & Opcodes::ACC_STATIC) == 0
+      mb.local 'this', self if (flags & Opcodes::ACC_STATIC) == 0
       
-      if block_given?
+      if block_given? && !interface?
         mb.start
         if block.arity == 1
           block.call(mb)
@@ -325,7 +337,7 @@ module BiteScript
     def main(&b)
       raise "already defined main" if methods[name]
 
-      public_static_method "main", void, string[], &b
+      public_static_method "main", [], void, string[], &b
     end
 
     def constructor(*params)
@@ -334,7 +346,7 @@ module BiteScript
 
     def interface?
       # TODO: interface types
-      false
+      @interface
     end
     
     def field(flags, name, type)
@@ -360,8 +372,11 @@ module BiteScript
       self
     end
     
-    def new_method(modifiers, name, signature)
-      @class_writer.visit_method(modifiers, name, sig(*signature), nil, nil)
+    def new_method(modifiers, name, signature, exceptions)
+      exceptions ||= []
+      raise ArgumentError unless exceptions.kind_of?(Array)
+      exceptions = exceptions.map {|e| path(e)}
+      @class_writer.visit_method(modifiers, name, sig(*signature), nil, exceptions.to_java(:string))
     end
 
     def macro(name, &b)
@@ -381,21 +396,26 @@ module BiteScript
     
     attr_reader :method_visitor
     attr_reader :static
+    alias :static? :static
     attr_reader :signature
     attr_reader :name
     attr_reader :class_builder
     
-    def initialize(class_builder, modifiers, name, signature)
+    def initialize(class_builder, modifiers, name, exceptions, signature)
       @class_builder = class_builder
       @modifiers = modifiers
       @name = name
       @signature = signature
       
-      @method_visitor = class_builder.new_method(modifiers, name, signature)
+      @method_visitor = class_builder.new_method(modifiers, name, signature, exceptions)
       
       @locals = {}
+      @next_local = 0
       
       @static = (modifiers & Opcodes::ACC_STATIC) != 0
+      @start_label = labels[:start] = self.label
+      @end_label = labels[:end] = self.label
+      @exceptions = exceptions || []
     end
 
     def parameter_types
@@ -438,17 +458,54 @@ module BiteScript
       @class_builder
     end
     
-    def local(name)
+    def local(name, type)
       if name == "this" && @static
         raise "'this' attempted to load from static method"
       end
       
       if @locals[name]
-        local_index = @locals[name]
+        return @locals[name][-1][0]
+      else
+        return push_local(name, type, @start_label)
+      end
+    end
+    
+    def push_local(name, type, start=nil)
+      start ||= self.label.set!
+      type = ci(type)
+      big = "JD".include? type
+      match = @locals[name].find {|local| !big || local[1]} if @locals[name]
+      if match
+        index = match[0]
+      else
+        index = @next_local
+        @next_local += 1
+        @next_local += 1 if big
+      end
+      
+      if @locals[name] && @locals[name].size > 0
+        local_debug_info(name, @locals[name][-1])
       else
-        local_index = @locals[name] = @locals.size
+        @locals[name] = []
       end
-      local_index
+      @locals[name] << [index, big, type, start]
+      index
+    end
+    
+    def local_debug_info(name, local, end_label=nil)
+      return unless local
+      index, big, type, start = local
+      end_label ||= self.label.set!
+      method_visitor.visit_local_variable(name, type, nil,
+                                          start.label,
+                                          end_label.label,
+                                          index)
+    end
+    
+    def pop_local(name)
+      here = self.label.set!
+      local_debug_info(name, @locals[name].pop, here)
+      @locals[name][-1][-1] = here if @locals[name].size > 0
     end
 
     def annotate(cls, runtime = false)

data/lib/bitescript/bytecode.rb

@@ -319,9 +319,14 @@ module BiteScript
     
     def start
       method_visitor.visit_code
+      @start_label.set!
     end
     
     def stop
+      @end_label.set!
+      @locals.each do |name, locals|
+        local_debug_info(name, locals[-1], @end_label)
+      end
       method_visitor.visit_maxs(1,1)
       method_visitor.visit_end
     end
@@ -344,6 +349,7 @@ module BiteScript
       
       def set!
         @method_visitor.visit_label(@label)
+        self
       end
     end
 
@@ -385,7 +391,10 @@ module BiteScript
     end
     
     def line(num)
-      method_visitor.visit_line_number num, ASM::Label.new
+      if num && num != @line_num
+        method_visitor.visit_line_number(num, label.set!.label)
+      end
+      @line_num = num
     end
 
     def push_int(num)

data/lib/bitescript/signature.rb

@@ -35,7 +35,7 @@ module BiteScript
     def class_id(cls)
       cls = cls.java_class if Class === cls
       
-      if !cls || cls == java.lang.Void || cls == Java::void
+      if !cls || cls == java.lang.Void.java_class || Java::void == cls
         return "V"
       end
       
@@ -46,6 +46,7 @@ module BiteScript
       if cls.array?
         cls = cls.component_type
         if cls.primitive?
+          cls = cls.primitive_type if cls.respond_to? :primitive_type
           case cls
           when JavaTypes::Byte::TYPE
             return "[B"
@@ -64,13 +65,14 @@ module BiteScript
           when JavaTypes::Double::TYPE
             return "[D"
           else
-            raise "Unknown type in compiler: " + cls.name
+            raise "Unknown type in compiler: #{cls.name}"
           end
         else
           return "[#{class_id(cls)}"
         end
       else
         if cls.primitive?
+          cls = cls.primitive_type if cls.respond_to? :primitive_type
           case cls
           when JavaTypes::Byte::TYPE
             return "B"
@@ -91,7 +93,7 @@ module BiteScript
           when JavaTypes::Void::TYPE, java.lang.Void
             return "V"
           else
-            raise "Unknown type in compiler: " + cls.name
+            raise "Unknown type in compiler: #{cls.name}"
           end
         else
           return "L#{path(cls)};"

data/lib/bitescript.rb

@@ -5,7 +5,7 @@ require 'bitescript/bytecode'
 require 'bitescript/builder'
 
 module BiteScript
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   include BiteScript::ASM
   JAVA1_4 = Opcodes::V1_4

metadata

@@ -1,93 +1,93 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-email: 
-- charles.nutter@sun.com
+name: bitescript
+version: !ruby/object:Gem::Version 
+  version: 0.0.4
+platform: ruby
+authors: 
+  - charles.nutter@sun.comCharles Oliver Nutter
+autorequire: 
+bindir: bin
 cert_chain: []
 
-summary: BiteScript is a Ruby DSL for generating Java bytecode.
-post_install_message: 
+date: 2009-10-27 00:00:00 -05:00
+default_executable: 
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.3
+      version: 
+description: BiteScript is a Ruby DSL for generating Java bytecode and classes.
+email: 
+  - charles.nutter@sun.com
+executables: 
+  - bite
+  - bitec
+extensions: []
+
 extra_rdoc_files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
+files: 
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
+  - Rakefile
+  - bin/bite
+  - bin/bitec
+  - examples/fib.bs
+  - examples/mixed_bag.rb
+  - examples/simple_loop.rb
+  - lib/bitescript.rb
+  - lib/bitescript/asm.rb
+  - lib/bitescript/builder.rb
+  - lib/bitescript/bytecode.rb
+  - lib/bitescript/signature.rb
+  - test/test_bitescript.rb
+  - test/test_builder.rb
+  - test/test_bytecode.rb
+  - test/test_java_class.rb
+  - test/test_signature.rb
+has_rdoc: true
 homepage: http://kenai.com/projects/jvmscript
-signing_key: 
-name: bitescript
-rdoc_options: 
-- --main
-- README.txt
-rubyforge_project: jruby-extras
-autorequire: 
 licenses: []
 
-executables: 
-- bite
-- bitec
-description: BiteScript is a Ruby DSL for generating Java bytecode and classes.
-specification_version: 3
-default_executable: 
-files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- bin/bite
-- bin/bitec
-- examples/fib.bs
-- examples/mixed_bag.rb
-- examples/simple_loop.rb
-- lib/bitescript.rb
-- lib/bitescript/asm.rb
-- lib/bitescript/builder.rb
-- lib/bitescript/bytecode.rb
-- lib/bitescript/signature.rb
-- test/test_bitescript.rb
-- test/test_builder.rb
-- test/test_bytecode.rb
-- test/test_java_class.rb
-- test/test_signature.rb
+post_install_message: 
+rdoc_options: 
+  - --main
+  - README.txt
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
-extensions: []
-
-rubygems_version: 1.3.3
 requirements: []
 
-authors: 
-- charles.nutter@sun.comCharles Oliver Nutter
-date: 2009-06-14 05:00:00 +00:00
-platform: ruby
+rubyforge_project: jruby-extras
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: BiteScript is a Ruby DSL for generating Java bytecode.
 test_files: 
-- test/test_bitescript.rb
-- test/test_builder.rb
-- test/test_bytecode.rb
-- test/test_java_class.rb
-- test/test_signature.rb
-version: !ruby/object:Gem::Version 
-  version: 0.0.3
-require_paths: 
-- lib
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: 1.12.1
-    version: 
-  type: :development
-  version_requirement: 
-  name: hoe
-bindir: bin
-has_rdoc: true
+  - test/test_bitescript.rb
+  - test/test_builder.rb
+  - test/test_bytecode.rb
+  - test/test_java_class.rb
+  - test/test_signature.rb