bitescript 0.0.9 → 0.1.0

data/lib/bitescript/asm3/signature.rb

@@ -0,0 +1,133 @@
+require 'java'
+
+module BiteScript
+  module JavaTypes
+    java_import java.lang.Object
+    java_import java.lang.Byte
+    java_import java.lang.Boolean
+    java_import java.lang.Short
+    java_import java.lang.Character
+    java_import java.lang.Integer
+    java_import java.lang.Long
+    java_import java.lang.Float
+    java_import java.lang.Double
+    java_import java.lang.Void
+  end
+  module Signature
+    def classname(path)
+      path.gsub('/', '.')
+    end
+    module_function :classname
+
+    def type_insn_path(cls)
+      descriptor = class_id(cls)
+      if descriptor[0, 1] == '['
+        descriptor
+      else
+        path(cls)
+      end
+    end
+    alias tipath type_insn_path
+    module_function :type_insn_path, :tipath
+
+    def path(cls)
+      case cls
+      when Symbol
+        return cls
+      when Class, Module
+        cls_name = cls.java_class.to_s || cls.java_class.name
+      else
+        cls_name = cls.name
+      end
+      cls_name.gsub('.', '/')
+    end
+    module_function :path
+    
+    def class_id(cls)
+      return cls.descriptor if cls.kind_of?(BiteScript::ASM::Type)
+      return cls.type.descriptor if cls.kind_of?(BiteScript::ASM::ClassMirror)
+
+      cls = cls.java_class if Class === cls
+      
+      if !cls || cls == java.lang.Void.java_class || Java::void == cls
+        return "V"
+      end
+      
+      if Module === cls || Symbol === cls
+        return "L#{path(cls)};"
+      end
+      
+      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"
+          when JavaTypes::Boolean::TYPE
+            return "[Z"
+          when JavaTypes::Short::TYPE
+            return "[S"
+          when JavaTypes::Character::TYPE
+            return "[C"
+          when JavaTypes::Integer::TYPE
+            return "[I"
+          when JavaTypes::Long::TYPE
+            return "[J"
+          when JavaTypes::Float::TYPE
+            return "[F"
+          when JavaTypes::Double::TYPE
+            return "[D"
+          else
+            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"
+          when JavaTypes::Boolean::TYPE
+            return "Z"
+          when JavaTypes::Short::TYPE
+            return "S"
+          when JavaTypes::Character::TYPE
+            return "C"
+          when JavaTypes::Integer::TYPE
+            return "I"
+          when JavaTypes::Long::TYPE
+            return "J"
+          when JavaTypes::Float::TYPE
+            return "F"
+          when JavaTypes::Double::TYPE
+            return "D"
+          when JavaTypes::Void::TYPE, java.lang.Void
+            return "V"
+          else
+            raise "Unknown type in compiler: #{cls.name}"
+          end
+        else
+          return "L#{path(cls)};"
+        end
+      end
+    end
+    alias ci class_id
+    module_function :class_id, :ci
+    
+    def signature(*sig_classes)
+      if sig_classes.size == 0
+        return "()V"
+      end
+      
+      return_class = sig_classes.shift
+      sig_string = "("
+      sig_classes.each {|arg_class| sig_string << class_id(arg_class)}
+      sig_string << ")#{class_id(return_class)}"
+    end
+    alias sig signature
+    module_function :signature, :sig
+  end
+end

data/lib/bitescript/builder.rb

@@ -298,12 +298,22 @@ module BiteScript
           field(Opcodes::ACC_#{modifier.upcase}, name, type)
         end
       ", binding, __FILE__, __LINE__
+      eval "
+        def #{modifier}_final_field(name, type)
+          field(Opcodes::ACC_#{modifier.upcase} | Opcodes::ACC_FINAL, name, type)
+        end
+      ", binding, __FILE__, __LINE__
       # static fields
       eval "
         def #{modifier}_static_field(name, type)
           field(Opcodes::ACC_STATIC | Opcodes::ACC_#{modifier.upcase}, name, type)
         end
       ", binding, __FILE__, __LINE__
+      eval "
+        def #{modifier}_static_final_field(name, type)
+          field(Opcodes::ACC_STATIC | Opcodes::ACC_#{modifier.upcase} | Opcodes::ACC_FINAL, name, type)
+        end
+      ", binding, __FILE__, __LINE__
       # instance methods; also defines a "this" local at index 0
       eval "
         def #{modifier}_method(name, exceptions=[], *signature, &block)

data/lib/bitescript/bytecode.rb

@@ -282,12 +282,12 @@ module BiteScript
         end
         OpcodeInstructions['TABLESWITCH'] = 'tableswitch'
 
-      when "MH_INVOKESPECIAL", "MH_INVOKESTATIC", "MH_PUTSTATIC", "MH_GETSTATIC", "MH_PUTFIELD",
-          "MH_GETFIELD", "MH_INVOKEVIRTUAL", "MH_INVOKEINTERFACE",
-          "MH_NEWINVOKESPECIAL"
+      when "H_INVOKESPECIAL", "H_INVOKESTATIC", "H_PUTSTATIC", "H_GETSTATIC", "H_PUTFIELD",
+          "H_GETFIELD", "H_INVOKEVIRTUAL", "H_INVOKEINTERFACE",
+          "H_NEWINVOKESPECIAL"
         line = __LINE__; eval "
             def #{const_down}(cls, name, *call_sig)
-              MethodHandle.new(Opcodes::#{const_name}, path(cls), name, sig(*call_sig))
+              Handle.new(Opcodes::#{const_name}, path(cls), name, sig(*call_sig))
             end
           ", b, __FILE__, line
         OpcodeInstructions[const_name] = const_down
@@ -299,7 +299,7 @@ module BiteScript
           "T_DOUBLE", "DOUBLE", "ACC_STRICT", "NULL", "T_FLOAT", "ACC_FINAL",
           "F_SAME1", "ACC_NATIVE", "F_NEW", "T_CHAR", "T_INT", "ACC_VOLATILE",
           "V1_6", "V1_5", "V1_4", "V1_3", "V1_2", "V1_1", "UNINITIALIZED_THIS",
-          "TOP", "T_SHORT", "INVOKEDYNAMIC_OWNER", "V1_7"
+          "TOP", "T_SHORT", "INVOKEDYNAMIC_OWNER", "V1_7", "ASM4"
           
         # non-instructions
 

data/lib/bitescript/mirror.rb

@@ -58,7 +58,7 @@ module BiteScript::ASM
       end
     end
 
-    class Builder
+    class Builder < BiteScript::ASM::AnnotationVisitor
       class ValueArray
         attr_reader :parent
         def initialize(annotation, array)
@@ -71,10 +71,9 @@ module BiteScript::ASM
         end
       end
 
-      include BiteScript::ASM::AnnotationVisitor
-
       attr_reader :annotation
       def initialize(desc, visible)
+        super(BiteScript::ASM::Opcodes::ASM4)
         @current = @annotation = AnnotationMirror.new(Type.getType(desc))
       end
 
@@ -289,10 +288,11 @@ module BiteScript::ASM
       result << "}"
     end
 
-    class Builder
-      include BiteScript::ASM::ClassVisitor
-      include BiteScript::ASM::FieldVisitor
-      include BiteScript::ASM::MethodVisitor
+    class Builder < BiteScript::ASM::ClassVisitor
+      
+      def initialize
+        super(BiteScript::ASM::Opcodes::ASM4)
+      end
 
       def visit(version, access, name, signature, super_name, interfaces)
         @current = @class = ClassMirror.new(Type.getObjectType(name), access)
@@ -323,9 +323,9 @@ module BiteScript::ASM
 
       def visitField(flags, name, desc, signature, value)
         signature = GenericTypeBuilder.read(signature)
-        @current = FieldMirror.new(@class.type, flags, name, Type.getType(desc), signature, value)
-        @class.addField(@current)
-        self
+        mirror = FieldMirror.new(@class.type, flags, name, Type.getType(desc), signature, value)
+        @class.addField(mirror)
+        FieldMirror::Builder.new(mirror)
       end
 
       def visitMethod(flags, name, desc, signature, exceptions)
@@ -333,11 +333,11 @@ module BiteScript::ASM
         parameters = Type.getArgumentTypes(desc).to_a
         exceptions = (exceptions || []).map {|e| Type.getObjectType(e)}
         signature = SignatureMirror.new(signature) if signature
-        @current = MethodMirror.new(
+        mirror = MethodMirror.new(
             @class.type, flags, return_type, name, parameters, exceptions, signature)
-        @class.addMethod(@current)
+        @class.addMethod(mirror)
         # TODO parameter annotations, default value, etc.
-        self  # This isn't legal is it?
+        MethodMirror::Builder.new(mirror)
       end
 
       def visitAnnotationDefault(*args);end
@@ -347,7 +347,7 @@ module BiteScript::ASM
       end
     end
   end
-
+    
   class FieldMirror
     include Modifiers
     include Annotated
@@ -369,6 +369,21 @@ module BiteScript::ASM
     def inspect
       inspect_annotations + "#{modifier_string}#{type.getClassName} #{name};"
     end
+    
+    class Builder < BiteScript::ASM::FieldVisitor
+      def initialize(mirror)
+        super(BiteScript::ASM::Opcodes::ASM4)
+        @current = @mirror
+      end
+
+      def mirror
+        @current
+      end
+  
+      def to_s
+        "FieldBuilder(#{type.class_name})"
+      end
+    end
   end
 
   class MethodMirror
@@ -412,10 +427,26 @@ module BiteScript::ASM
         argument_types.map {|x| x.class_name}.join(', '),
       ]
     end
+    
+    class Builder < BiteScript::ASM::MethodVisitor
+      
+      def initialize(mirror)
+        super(BiteScript::ASM::Opcodes::ASM4)
+        @current = mirror
+      end
+
+      def mirror
+        @current
+      end
+
+      def to_s
+        "MethodBuilder(#{type.class_name})"
+      end
+    end
+
   end
 
-  class SignatureMirror
-    include BiteScript::ASM::SignatureVisitor
+  class SignatureMirror < BiteScript::ASM::SignatureVisitor
 
     attr_reader :type_parameters
     attr_reader :parameter_types, :return_type, :exception_types
@@ -430,6 +461,7 @@ module BiteScript::ASM
     end
 
     def initialize(signature=nil)
+      super(BiteScript::ASM::Opcodes::ASM4)
       @type_parameters = []
       @parameter_types = []
       @exception_types = []
@@ -570,8 +602,7 @@ module BiteScript::ASM
     end
   end
 
-  class GenericTypeBuilder
-    include BiteScript::ASM::SignatureVisitor
+  class GenericTypeBuilder < BiteScript::ASM::SignatureVisitor
     attr_reader :result
 
     def self.read(signature)
@@ -584,6 +615,7 @@ module BiteScript::ASM
     end
 
     def initialize(&block)
+      super(BiteScript::ASM::Opcodes::ASM4)
       @block = block
     end
 

data/test/test_builder.rb

@@ -305,21 +305,27 @@ class TestBuilder < Test::Unit::TestCase
 
     cb.public_field('inst_field', JString)
     cb.public_static_field('static_field', JString)
+    cb.public_static_final_field('static_final_field', JString)
 
     cb.public_method('set_inst', [], cb.void) {aload 0; ldc 'instance'; putfield this, 'inst_field', JString; returnvoid}
     cb.public_method('set_static', [], cb.void) {ldc 'static'; putstatic this, 'static_field', JString; returnvoid}
+    cb.public_method('set_static_final', [], cb.void){ldc 'static final'; putstatic this, 'static_final_field', JString; returnvoid}
     cb.public_method('get_inst', [], JString) {aload 0; getfield this, 'inst_field', JString; areturn}
     cb.public_method('get_static', [], JString) {getstatic this, 'static_field', JString; areturn}
+    cb.public_method('get_static_final', [], JString) {getstatic this, 'static_final_field', JString; areturn}
 
     dummy_constructor(cb)
     obj = load_and_construct(@class_name, cb);
 
     assert_equal nil, obj.get_inst
     assert_equal nil, obj.get_static
+    assert_equal nil, obj.get_static_final
     obj.set_inst
     obj.set_static
+    obj.set_static_final
     assert_equal 'instance', obj.get_inst
     assert_equal 'static', obj.get_static
+    assert_equal 'static final', obj.get_static_final
   end
 
   def test_arrays

metadata

@@ -2,7 +2,7 @@
 name: bitescript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
   - Charles Oliver Nutter
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -05:00
-default_executable: 
+date: 2011-12-21 00:00:00 Z
 dependencies: []
 
 description: BiteScript is a Ruby DSL for generating Java bytecode and classes.
@@ -47,6 +46,11 @@ files:
   - lib/bitescript/bytecode.rb
   - lib/bitescript/mirror.rb
   - lib/bitescript/signature.rb
+  - lib/bitescript/asm3/asm.rb
+  - lib/bitescript/asm3/builder.rb
+  - lib/bitescript/asm3/bytecode.rb
+  - lib/bitescript/asm3/mirror.rb
+  - lib/bitescript/asm3/signature.rb
   - nbproject/project.properties
   - nbproject/project.xml
   - test/test_bitescript.rb
@@ -60,7 +64,6 @@ files:
   - README.txt
   - bitescript.gemspec
   - Rakefile
-has_rdoc: true
 homepage: http://github.com/headius/bitescript
 licenses: []
 
@@ -85,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.5.1
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: BiteScript is a Ruby DSL for generating Java bytecode.