bitescript 0.1.0 → 0.1.2

data/History.txt

@@ -1,3 +1,29 @@
+=== 0.1.2 / 2013-02-24
+
+3ff2e52 ensure that frame setting is updated when bytecode version is
+24e8363 add aliases for h_* opcodes for asm3 support
+67e22e6 fix up test for 1.7
+1e7add0 oops there's no assert_false
+83d5862 clean up rake file
+8a72f8e add varargs support to mirrors
+a8e2b4d ignore parameter annotations instead of blowing up when building a mirror
+
+=== 0.1.1 / 2012-11-02
+
+ba61804 Fixes for printing generics
+99176d7 Fix another typo
+c92f2a1 Fix generics typo
+0a44001 Fix using ClassMirrors as an annotation type
+fc7b508 Fix typo in generics
+3fdbf72 Modify asm3 stuff to configure frame/stack computation too.
+f473192 Allow configuring frame and stack computation.
+79efa1e Update history again for 0.1.0.
+e47bf31 port the to_widen functionality to asm3
+7e51ec9 Merge remote-tracking branch 'origin'
+e8eb48e Update history again for 0.1.0.
+8db7cc8 Merge branch 'master' of github.com:headius/bitescript
+b26d74a Add support for overriding getCommonSuperClass for writing frames
+
 === 0.1.0 / 2011-11-10
 
 be71f3f Re-add old ASM3 versions of everything for backward compat.

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-$: << './lib'
+require 'rdoc/task'
 
 task :default => :test
 

data/bitescript.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitescript}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
   s.authors = ["Charles Oliver Nutter", "Ryan Brown"]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.description = %q{BiteScript is a Ruby DSL for generating Java bytecode and classes.}

data/lib/bitescript.rb

@@ -22,10 +22,24 @@ module BiteScript
   JAVA1_8 = defined?(Opcodes::V1_8) ? Opcodes::V1_8 : Opcodes::V1_7
 
   class << self
-    attr_accessor :bytecode_version
+    attr_reader :bytecode_version
+    attr_accessor :compute_frames
+    attr_accessor :compute_maxs
+
+    def bytecode_version= version
+      case version
+      when JAVA1_4, JAVA1_5, JAVA1_6
+        BiteScript.compute_frames = false
+      else
+        BiteScript.compute_frames = true
+      end
+      @bytecode_version = version
+    end
 
     # Default to JVM version we're running on
     spec_version = ENV_JAVA['java.specification.version']
     BiteScript.bytecode_version = BiteScript.const_get("JAVA#{spec_version.gsub('.', '_')}")
+    
+    BiteScript.compute_maxs = true
   end
 end

data/lib/bitescript/asm3/builder.rb

@@ -126,6 +126,7 @@ module BiteScript
 
     def define_class(class_name, opts, &block)
       pkg = opts[:package] || @package.dup || []
+      opts[:widen] ||= @widen_proc
 
       class_name = pkg.empty? ? class_name : "#{pkg.join('/')}/#{class_name}"
       class_builder = ClassBuilder.new(self, class_name, @file_name, opts)
@@ -141,6 +142,10 @@ module BiteScript
         return class_builder
       end
     end
+
+    def to_widen(&block)
+      @widen_proc = block
+    end
     
     def public_class(class_name, superclass = java.lang.Object, *interfaces, &block)
       define_class(class_name, :visibility => :public, :superclass => superclass, :interfaces => interfaces, &block)
@@ -202,6 +207,22 @@ module BiteScript
     end
   end
   
+
+  class CustomClassWriter < BiteScript::ASM::ClassWriter
+    def initialize(*args, &block)
+      super(*args)
+      @widen_proc = block
+    end
+    def getCommonSuperClass(a, b)
+      if @widen_proc
+        result = @widen_proc.call(a, b)
+        result
+      else
+        super
+      end
+    end
+  end
+
   class ClassBuilder
     include Util
     include QuickTypes
@@ -232,7 +253,11 @@ module BiteScript
         flags = Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
       end
 
-      @class_writer = ClassWriter.new(ClassWriter::COMPUTE_FRAMES | ClassWriter::COMPUTE_MAXS)
+      @class_writer = CustomClassWriter.new(
+          0 |
+          (BiteScript.compute_frames ? ClassWriter::COMPUTE_FRAMES : 0) |
+          (BiteScript.compute_maxs ? ClassWriter::COMPUTE_MAXS : 0),
+          &opts[:widen])
       
       interface_paths = []
       (@interfaces).each {|interface| interface_paths << path(interface)}
@@ -594,7 +619,7 @@ module BiteScript
       visit k, v
     end
     def annotation(name, cls)
-      if Java::JavaClass === cls || BiteScript::ASM::Type === cls
+      if Java::JavaClass === cls || BiteScript::ASM::Type === cls || BiteScript::ClassMirror === cls
         java_class = cls
       else
         java_class = cls.java_class

data/lib/bitescript/asm3/bytecode.rb

@@ -289,6 +289,7 @@ module BiteScript
             def #{const_down}(cls, name, *call_sig)
               MethodHandle.new(Opcodes::#{const_name}, path(cls), name, sig(*call_sig))
             end
+            alias #{const_down[1..-1]} #{const_down}
           ", b, __FILE__, line
         OpcodeInstructions[const_name] = const_down
       when "F_FULL", "ACC_ENUM", "ACC_SYNTHETIC", "ACC_INTERFACE", "ACC_PUBLIC",

data/lib/bitescript/asm3/mirror.rb

@@ -113,6 +113,20 @@ module BiteScript::ASM
     end
   end
 
+  module Generics
+    def inspect_type(type)
+      if type.kind_of?(BiteScript::ASM::Type)
+        type.class_name
+      else
+        type.to_s
+      end
+    end
+    
+    def inspect_generic(type, generic_type)
+      inspect_type(generic_type || type)
+    end
+  end
+
   module Annotated
     def annotations
       @annotations ||= {}
@@ -154,6 +168,8 @@ module BiteScript::ASM
       code << "modifiers << '#{name.downcase} ' if #{name.downcase}?\n"
     end
 
+    add_modifier 'varargs'
+
     class_eval <<-EOF
       def modifier_string
         modifiers = ''
@@ -166,6 +182,7 @@ module BiteScript::ASM
   class ClassMirror
     include Annotated
     include Modifiers
+    include Generics
 
     attr_reader :type, :interfaces
     attr_accessor :superclass, :signature
@@ -249,7 +266,7 @@ module BiteScript::ASM
     end
 
     def type_parameters
-      signature.type_parameters is signature
+      signature.type_parameters if signature
     end
 
     def generic_superclass
@@ -271,10 +288,12 @@ module BiteScript::ASM
         kind = "class"
       end
       if superclass && !enum? && !interface?
-        extends = "extends #{superclass.getClassName} "
+        extends = "extends #{inspect_generic(superclass, generic_superclass)} "
       end
       if self.interfaces && !self.interfaces.empty?
-        interfaces = self.interfaces.map{|i| i.class_name}.join(', ')
+        interfaces = (self.generic_interfaces || self.interfaces).map do |i|
+          inspect_type(i)
+        end.join(', ')
         if interface?
           extends = "extends #{interfaces} "
         else
@@ -282,7 +301,8 @@ module BiteScript::ASM
         end
       end
       result = "#{inspect_annotations}#{modifier_string}#{kind} "
-      result << "#{type.class_name} #{extends}{\n"
+      typevars = "<#{type_parameters.map{|p| p.to_s}.join ', '}>" if type_parameters && type_parameters.size != 0
+      result << "#{type.class_name}#{typevars} #{extends}{\n"
       (getDeclaredFields + getConstructors + getDeclaredMethods).each do |f|
         result << f.inspect << "\n"
       end
@@ -321,6 +341,8 @@ module BiteScript::ASM
         builder
       end
 
+      def visitParameterAnnotation(paramIndex, desc, visible);end
+
       def visitField(flags, name, desc, signature, value)
         signature = GenericTypeBuilder.read(signature)
         @current = FieldMirror.new(@class.type, flags, name, Type.getType(desc), signature, value)
@@ -350,6 +372,7 @@ module BiteScript::ASM
 
   class FieldMirror
     include Modifiers
+    include Generics
     include Annotated
 
     attr_reader :declaring_class, :name, :type, :value, :signature
@@ -367,13 +390,15 @@ module BiteScript::ASM
     end
 
     def inspect
-      inspect_annotations + "#{modifier_string}#{type.getClassName} #{name};"
+      typename = inspect_generic(type, signature)
+      inspect_annotations + "#{modifier_string}#{typename} #{name};"
     end
   end
 
   class MethodMirror
     include Modifiers
     include Annotated
+    include Generics
 
     attr_reader :declaring_class, :name, :return_type
     attr_reader :argument_types, :exception_types, :signature
@@ -385,6 +410,7 @@ module BiteScript::ASM
       @return_type = return_type
       @argument_types = parameters
       @exception_types = exceptions
+      @signature = signature
     end
 
     def generic_parameter_types
@@ -400,16 +426,18 @@ module BiteScript::ASM
     end
 
     def type_parameters
-      signature.type_parameters is signature
+      signature.type_parameters if signature
     end
 
     def inspect
-      "%s%s%s %s(%s);" % [
+      typevars = "<#{type_parameters.map{|p| p.to_s}.join ', '}> " if type_parameters && type_parameters.size != 0
+      "%s%s%s%s %s(%s);" % [
         inspect_annotations,
         modifier_string,
-        return_type.class_name,
+        typevars,
+        inspect_generic(return_type, generic_return_type),
         name,
-        argument_types.map {|x| x.class_name}.join(', '),
+        (generic_parameter_types || argument_types).map {|x| inspect_type(x)}.join(', '),
       ]
     end
   end
@@ -474,6 +502,7 @@ module BiteScript::ASM
   end
 
   class GenericTypeMirror
+    include Generics
     def array?
       false
     end
@@ -529,11 +558,11 @@ module BiteScript::ASM
     def wildcard?
       true
     end
-    def to_s?
+    def to_s
       if lower_bound
-        "? super #{lower_bound}"
+        "? super #{inspect_type(lower_bound)}"
       elsif upper_bound
-        "? extends #{upper_bound}"
+        "? extends #{inspect_type(upper_bound)}"
       else
         "?"
       end
@@ -646,4 +675,4 @@ module BiteScript::ASM
       end
     end
   end
-end
+end

data/lib/bitescript/builder.rb

@@ -126,6 +126,7 @@ module BiteScript
 
     def define_class(class_name, opts, &block)
       pkg = opts[:package] || @package.dup || []
+      opts[:widen] ||= @widen_proc
 
       class_name = pkg.empty? ? class_name : "#{pkg.join('/')}/#{class_name}"
       class_builder = ClassBuilder.new(self, class_name, @file_name, opts)
@@ -141,7 +142,11 @@ module BiteScript
         return class_builder
       end
     end
-    
+
+    def to_widen(&block)
+      @widen_proc = block
+    end
+
     def public_class(class_name, superclass = java.lang.Object, *interfaces, &block)
       define_class(class_name, :visibility => :public, :superclass => superclass, :interfaces => interfaces, &block)
     end
@@ -201,7 +206,22 @@ module BiteScript
       false
     end
   end
-  
+
+  class CustomClassWriter < BiteScript::ASM::ClassWriter
+    def initialize(*args, &block)
+      super(*args)
+      @widen_proc = block
+    end
+    def getCommonSuperClass(a, b)
+      if @widen_proc
+        result = @widen_proc.call(a, b)
+        result
+      else
+        super
+      end
+    end
+  end
+
   class ClassBuilder
     include Util
     include QuickTypes
@@ -232,7 +252,11 @@ module BiteScript
         flags = Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
       end
 
-      @class_writer = ClassWriter.new(ClassWriter::COMPUTE_FRAMES | ClassWriter::COMPUTE_MAXS)
+      @class_writer = CustomClassWriter.new(
+          0 |
+          (BiteScript.compute_frames ? ClassWriter::COMPUTE_FRAMES : 0) |
+          (BiteScript.compute_maxs ? ClassWriter::COMPUTE_MAXS : 0),
+          &opts[:widen])
       
       interface_paths = []
       (@interfaces).each {|interface| interface_paths << path(interface)}
@@ -604,7 +628,7 @@ module BiteScript
       visit k, v
     end
     def annotation(name, cls)
-      if Java::JavaClass === cls || BiteScript::ASM::Type === cls
+      if Java::JavaClass === cls || BiteScript::ASM::Type === cls || BiteScript::ClassMirror === cls
         java_class = cls
       else
         java_class = cls.java_class

data/lib/bitescript/mirror.rb

@@ -112,6 +112,20 @@ module BiteScript::ASM
     end
   end
 
+  module Generics
+    def inspect_type(type)
+      if type.kind_of?(BiteScript::ASM::Type)
+        type.class_name
+      else
+        type.to_s
+      end
+    end
+    
+    def inspect_generic(type, generic_type)
+      inspect_type(generic_type || type)
+    end
+  end
+
   module Annotated
     def annotations
       @annotations ||= {}
@@ -153,6 +167,8 @@ module BiteScript::ASM
       code << "modifiers << '#{name.downcase} ' if #{name.downcase}?\n"
     end
 
+    add_modifier 'varargs'
+
     class_eval <<-EOF
       def modifier_string
         modifiers = ''
@@ -165,6 +181,7 @@ module BiteScript::ASM
   class ClassMirror
     include Annotated
     include Modifiers
+    include Generics
 
     attr_reader :type, :interfaces
     attr_accessor :superclass, :signature
@@ -248,7 +265,7 @@ module BiteScript::ASM
     end
 
     def type_parameters
-      signature.type_parameters is signature
+      signature.type_parameters if signature
     end
 
     def generic_superclass
@@ -270,22 +287,18 @@ module BiteScript::ASM
         kind = "class"
       end
       if superclass && !enum? && !interface?
-        extends = "extends #{superclass.getClassName} "
+        extends = "extends #{inspect_generic(superclass, generic_superclass)} "
       end
       if self.interfaces && !self.interfaces.empty?
-        interfaces = self.interfaces.map{|i| i.class_name}.join(', ')
+        interfaces = (self.generic_interfaces || self.interfaces).map do |i|
+          inspect_type(i)
+        end.join(', ')
         if interface?
           extends = "extends #{interfaces} "
         else
           implements = "implements #{interfaces} "
         end
       end
-      result = "#{inspect_annotations}#{modifier_string}#{kind} "
-      result << "#{type.class_name} #{extends}{\n"
-      (getDeclaredFields + getConstructors + getDeclaredMethods).each do |f|
-        result << f.inspect << "\n"
-      end
-      result << "}"
     end
 
     class Builder < BiteScript::ASM::ClassVisitor
@@ -321,6 +334,8 @@ module BiteScript::ASM
         builder
       end
 
+      def visitParameterAnnotation(paramIndex, desc, visible);end
+
       def visitField(flags, name, desc, signature, value)
         signature = GenericTypeBuilder.read(signature)
         mirror = FieldMirror.new(@class.type, flags, name, Type.getType(desc), signature, value)
@@ -350,6 +365,7 @@ module BiteScript::ASM
     
   class FieldMirror
     include Modifiers
+    include Generics
     include Annotated
 
     attr_reader :declaring_class, :name, :type, :value, :signature
@@ -367,7 +383,8 @@ module BiteScript::ASM
     end
 
     def inspect
-      inspect_annotations + "#{modifier_string}#{type.getClassName} #{name};"
+      typename = inspect_generic(type, signature)
+      inspect_annotations + "#{modifier_string}#{typename} #{name};"
     end
     
     class Builder < BiteScript::ASM::FieldVisitor
@@ -389,6 +406,7 @@ module BiteScript::ASM
   class MethodMirror
     include Modifiers
     include Annotated
+    include Generics
 
     attr_reader :declaring_class, :name, :return_type
     attr_reader :argument_types, :exception_types, :signature
@@ -400,6 +418,7 @@ module BiteScript::ASM
       @return_type = return_type
       @argument_types = parameters
       @exception_types = exceptions
+      @signature = signature
     end
 
     def generic_parameter_types
@@ -415,16 +434,18 @@ module BiteScript::ASM
     end
 
     def type_parameters
-      signature.type_parameters is signature
+      signature.type_parameters if signature
     end
 
     def inspect
-      "%s%s%s %s(%s);" % [
+      typevars = "<#{type_parameters.map{|p| p.to_s}.join ', '}> " if type_parameters && type_parameters.size != 0
+      "%s%s%s%s %s(%s);" % [
         inspect_annotations,
         modifier_string,
-        return_type.class_name,
+        typevars,
+        inspect_generic(return_type, generic_return_type),
         name,
-        argument_types.map {|x| x.class_name}.join(', '),
+        (generic_parameter_types || argument_types).map {|x| inspect_type(x)}.join(', '),
       ]
     end
     
@@ -506,6 +527,7 @@ module BiteScript::ASM
   end
 
   class GenericTypeMirror
+    include Generics
     def array?
       false
     end
@@ -561,11 +583,11 @@ module BiteScript::ASM
     def wildcard?
       true
     end
-    def to_s?
+    def to_s
       if lower_bound
-        "? super #{lower_bound}"
+        "? super #{inspect_type(lower_bound)}"
       elsif upper_bound
-        "? extends #{upper_bound}"
+        "? extends #{inspect_type(upper_bound)}"
       else
         "?"
       end
@@ -678,4 +700,4 @@ module BiteScript::ASM
       end
     end
   end
-end
+end

data/test/test_builder.rb

@@ -296,8 +296,7 @@ class TestBuilder < Test::Unit::TestCase
     dummy_constructor(cb)
     obj = load_and_construct(@class_name, cb);
     
-    # expect NativeException (UnsatisfiedLinkError)
-    assert_raises(NativeException) {obj.yoohoo}
+    assert_raises(Java::JavaLang::UnsatisfiedLinkError) {obj.yoohoo}
   end
 
   def test_fields

data/test/test_generics.rb

@@ -124,4 +124,12 @@ class TestGenerics < Test::Unit::TestCase
     assert_equal "java.lang.Comparable<T>", t.bounds[0].to_s
     assert_equal "java.lang.Iterable<T>", t.bounds[1].to_s
   end
+  
+  def test_generic_parameter_types
+    mirror = BiteScript::ClassMirror.load('java.util.ArrayList')
+    method = mirror.getDeclaredMethods('add')[0]
+    assert_not_nil method.generic_parameter_types
+    puts method.generic_parameter_types
+    
+  end
 end

data/test/test_mirror.rb

@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'bitescript/mirror'
+
+class TestMirror < Test::Unit::TestCase
+  include BiteScript
+
+  def test_varargs_true_on_varargs_method
+    cmirror = ClassMirror.load 'java.lang.String'
+    mmirror = cmirror.getDeclaredMethods('format').first
+    assert mmirror.varargs?
+  end
+
+  def test_varargs_false_on_non_varargs_method
+    cmirror = ClassMirror.load 'java.lang.String'
+    mmirror = cmirror.getDeclaredMethods('copyValueOf').first
+    assert !mmirror.varargs?
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: bitescript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
   - Charles Oliver Nutter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2013-02-25 00:00:00 Z
 dependencies: []
 
 description: BiteScript is a Ruby DSL for generating Java bytecode and classes.
@@ -58,6 +58,7 @@ files:
   - test/test_bytecode.rb
   - test/test_generics.rb
   - test/test_java_class.rb
+  - test/test_mirror.rb
   - test/test_signature.rb
   - History.txt
   - LICENSE.txt
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BiteScript is a Ruby DSL for generating Java bytecode.
@@ -98,4 +99,5 @@ test_files:
   - test/test_bytecode.rb
   - test/test_generics.rb
   - test/test_java_class.rb
+  - test/test_mirror.rb
   - test/test_signature.rb