bitescript 0.0.2 → 0.0.3

data/lib/bitescript/bytecode.rb

@@ -100,7 +100,7 @@ module BiteScript
           ", b, __FILE__, line
         OpcodeInstructions[const_name] = const_down
           
-      when "INVOKESTATIC", "INVOKEVIRTUAL", "INVOKEINTERFACE", "INVOKESPECIAL"
+      when "INVOKESTATIC", "INVOKEVIRTUAL", "INVOKEINTERFACE", "INVOKESPECIAL", "INVOKEDYNAMIC"
         # method instructions
         line = __LINE__; eval "
             def #{const_down}(type, name, call_sig)
@@ -191,16 +191,17 @@ module BiteScript
 
       when "NEWARRAY"
         # newaray has its own peculiarities
-        {
-          :boolean => 'Opcodes::T_BOOLEAN',
-          :byte => 'Opcodes::T_BYTE',
-          :short => 'Opcodes::T_SHORT',
-          :char => 'Opcodes::T_CHAR',
-          :int => 'Opcodes::T_INT',
-          :long => 'Opcodes::T_LONG',
-          :float => 'Opcodes::T_FLOAT',
-          :double => 'Opcodes::T_DOUBLE'
-        }.each do |type, op_type|
+       NEWARRAY_TYPES = {
+          :boolean => Opcodes::T_BOOLEAN,
+          :byte => Opcodes::T_BYTE,
+          :short => Opcodes::T_SHORT,
+          :char => Opcodes::T_CHAR,
+          :int => Opcodes::T_INT,
+          :long => Opcodes::T_LONG,
+          :float => Opcodes::T_FLOAT,
+          :double => Opcodes::T_DOUBLE
+        }
+        NEWARRAY_TYPES.each do |type, op_type|
           line = __LINE__; eval "
               def new#{type}array()
                 method_visitor.visit_int_insn(Opcodes::#{const_name}, #{op_type})
@@ -208,6 +209,10 @@ module BiteScript
               end
             ", b, __FILE__, line
         end
+        def newarray(type)
+          t_type = NEWARRAY_TYPES[path(type).intern]
+          method_visitor.visit_int_insn(Opcodes::NEWARRAY, t_type)
+        end
         OpcodeInstructions[const_name] = const_down
           
       when "GETFIELD", "PUTFIELD", "GETSTATIC", "PUTSTATIC"
@@ -303,7 +308,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"
+          "TOP", "T_SHORT", "INVOKEDYNAMIC_OWNER", "V1_7"
         # non-instructions
 
       else

data/lib/bitescript.rb

@@ -5,12 +5,13 @@ require 'bitescript/bytecode'
 require 'bitescript/builder'
 
 module BiteScript
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   include BiteScript::ASM
   JAVA1_4 = Opcodes::V1_4
   JAVA1_5 = Opcodes::V1_5
   JAVA1_6 = Opcodes::V1_6
+  JAVA1_7 = Opcodes::V1_7
 
   class << self
     attr_accessor :bytecode_version

data/test/test_bytecode.rb

@@ -285,6 +285,15 @@ class TestBytecode < Test::Unit::TestCase
     assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_LONG], @dummy.single {newlongarray})
     assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_FLOAT], @dummy.single {newfloatarray})
     assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_DOUBLE], @dummy.single {newdoublearray})
+
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_BOOLEAN], @dummy.single {newarray Java::boolean})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_BYTE], @dummy.single {newarray Java::byte})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_SHORT], @dummy.single {newarray Java::short})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_CHAR], @dummy.single {newarray Java::char})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_INT], @dummy.single {newarray Java::int})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_LONG], @dummy.single {newarray Java::long})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_FLOAT], @dummy.single {newarray Java::float})
+    assert_equal([:visit_int_insn, Opcodes::NEWARRAY, Opcodes::T_DOUBLE], @dummy.single {newarray Java::double})
   end
   
   def test_field_insns

metadata

@@ -66,7 +66,7 @@ requirements: []
 
 authors: 
 - charles.nutter@sun.comCharles Oliver Nutter
-date: 2009-05-14 05:00:00 +00:00
+date: 2009-06-14 05:00:00 +00:00
 platform: ruby
 test_files: 
 - test/test_bitescript.rb
@@ -75,7 +75,7 @@ test_files:
 - test/test_java_class.rb
 - test/test_signature.rb
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 require_paths: 
 - lib
 dependencies: