bitescript 0.0.6 → 0.0.7

data/bitescript.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitescript}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   s.authors = ["Charles Oliver Nutter", "Ryan Brown"]
   s.date = Time.now.strftime('YYYY-MM-DD')
   s.description = %q{BiteScript is a Ruby DSL for generating Java bytecode and classes.}
@@ -10,8 +10,7 @@ Gem::Specification.new do |s|
   s.executables = ["bite", "bitec"]
   s.extra_rdoc_files = Dir['*.txt']
   s.files = Dir['{bin,examples,lib,nbproject,test}/**/*'] + Dir['{*.txt,*.gemspec,Rakefile}']
-  puts s.files
-  s.homepage = %q{http://kenai.com/projects/jvmscript}
+  s.homepage = %q{http://github.com/headius/bitescript}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{jruby-extras}

data/lib/bitescript/builder.rb

@@ -78,6 +78,9 @@ module BiteScript
     def find_retention(cls)
       if cls.kind_of?(BiteScript::ASM::ClassMirror)
         retention = cls.getDeclaredAnnotation('java.lang.annotation.Retention')
+      elsif cls.kind_of?(BiteScript::ASM::Type)
+        mirror = BiteScript::ASM::ClassMirror.for_name(cls.class_name) rescue nil
+        return find_retention(mirror) if mirror
       elsif Java::JavaClass === cls
         retention = cls.annotation(Retention.java_class)
       else
@@ -224,15 +227,12 @@ module BiteScript
       @interfaces = opts[:interfaces] || []
       @interface = opts[:interface]
       flags = Opcodes::ACC_SUPER
+      flags |= Opcodes::ACC_ABSTRACT if opts[:abstract]
       if @interface
         flags = Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
       end
 
       @class_writer = ClassWriter.new(ClassWriter::COMPUTE_MAXS)
-      if ENV['BS_CHECK_CLASSES']
-        @real_class_writer = @class_writer
-        @class_writer = CheckClassAdapter.new(@class_writer)
-      end
       
       interface_paths = []
       (@interfaces).each {|interface| interface_paths << path(interface)}
@@ -280,12 +280,15 @@ module BiteScript
     end
     
     def generate
+      bytes = @class_writer.to_byte_array
       if ENV['BS_CHECK_CLASSES']
-        class_writer = @real_class_writer
-      else
-        class_writer = @class_writer
+        BiteScript::ASM::CheckClassAdapter.verify(
+            BiteScript::ASM::ClassReader.new(bytes),
+            JRuby.runtime.jruby_class_loader,
+            false,
+            java.io.PrintWriter.new(java.lang.System.out, true))
       end
-      String.from_java_bytes(class_writer.to_byte_array)
+      String.from_java_bytes(bytes)
     end
 
     %w[public private protected].each do |modifier|
@@ -330,7 +333,28 @@ module BiteScript
     def static_init(&block)
       method(Opcodes::ACC_STATIC, "<clinit>", [void], [], &block)
     end
-    
+
+    def build_method(name, visibility, static, exceptions, type, *args)
+      flags =
+        case visibility
+        when :public; Opcodes::ACC_PUBLIC
+        when :private; Opcodes::ACC_PRIVATE
+        when :protected; Opcodes::ACC_PROTECTED
+        end
+      flags |= Opcodes::ACC_STATIC if static
+      method(flags, name, [type, *args], exceptions)
+    end
+
+    def build_constructor(visibility, exceptions, *args)
+      flags =
+        case visibility
+        when :public; Opcodes::ACC_PUBLIC
+        when :private; Opcodes::ACC_PRIVATE
+        when :protected; Opcodes::ACC_PROTECTED
+        end
+      @constructor = method(flags, "<init>", [nil, *args], exceptions)
+    end
+
     def method(flags, name, signature, exceptions, &block)
       flags |= Opcodes::ACC_ABSTRACT if interface?
       mb = MethodBuilder.new(self, flags, name, exceptions, signature)
@@ -448,8 +472,8 @@ module BiteScript
       @next_local = 0
       
       @static = (modifiers & Opcodes::ACC_STATIC) != 0
-      @start_label = labels[:start] = self.label
-      @end_label = labels[:end] = self.label
+      @start_label = labels[:_start] = self.label
+      @end_label = labels[:_end] = self.label
       @exceptions = exceptions || []
     end
 

data/lib/bitescript/bytecode.rb

@@ -65,9 +65,7 @@ module BiteScript
         def ldc_float(value); method_visitor.visit_ldc_insn(java.lang.Float.new(value)); 1; end
         def ldc_double(value); method_visitor.visit_ldc_insn(java.lang.Double.new(value)); 2; end
         def ldc_class(value)
-          value = value.java_class unless Java::JavaClass === value
-          method_visitor.visit_ldc_insn(ASM::Type.get_type(value))
-          1
+          method_visitor.visit_ldc_insn(ASM::Type.get_type(ci(value)))
         end
         line = __LINE__; eval "
             def #{const_down}(value)
@@ -183,7 +181,7 @@ module BiteScript
         # type instructions
         line = __LINE__; eval "
             def #{const_down}(type)
-              method_visitor.visit_type_insn(Opcodes::#{const_name}, path(type))
+              method_visitor.visit_type_insn(Opcodes::#{const_name}, tipath(type))
               #{OpcodeStackDeltas[const_name]}
             end
           ", b, __FILE__, line

data/lib/bitescript/mirror.rb

@@ -1,3 +1,5 @@
+require 'jruby'
+
 module BiteScript::ASM
   class EnumValue
     attr_reader :declaring_type, :name
@@ -180,10 +182,20 @@ module BiteScript::ASM
 
     def self.load(name_or_bytes)
       builder = BiteScript::ASM::ClassMirror::Builder.new
+      if name_or_bytes.kind_of?(String)
+        classname = name_or_bytes.tr('.', '/') + ".class"
+        stream = JRuby.runtime.jruby_class_loader.getResourceAsStream(
+            classname)
+        raise NameError, "Class '#{name_or_bytes}' not found." unless stream
+        name_or_bytes = stream
+      end
       BiteScript::ASM::ClassReader.new(name_or_bytes).accept(builder, 3)
       builder.mirror
     end
-    alias for_name load
+
+    def self.for_name(name)
+      load(name)
+    end
 
     def getConstructor(*arg_types)
       @constructors[arg_types]

data/lib/bitescript/signature.rb

@@ -18,7 +18,18 @@ module BiteScript
       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
@@ -42,7 +53,7 @@ module BiteScript
         return "V"
       end
       
-      if Module === cls
+      if Module === cls || Symbol === cls
         return "L#{path(cls)};"
       end
       

data/test/test_builder.rb

@@ -60,7 +60,6 @@ class TestBuilder < Test::Unit::TestCase
   def test_sync_ops
     # TODO figure out what's wrong with this and add error cases
     assert_equal 'ok', try(JString) {
-      after = label
       ldc 'ok'
       astore 0
       ldc 'ok'
@@ -70,14 +69,14 @@ class TestBuilder < Test::Unit::TestCase
       label :begin
       ldc 'ok'
       astore 1
-      goto after
+      goto :after
       label :finally
       pop
       aload 0
 #      monitorexit
       trycatch(:begin, :finally, :finally, nil)
-      trycatch(:finally, :end, :finally, nil)
-      after.set!
+      trycatch(:finally, :after, :finally, nil)
+      label :after
       aload 1
       areturn
     }

data/test/test_bytecode.rb

@@ -82,6 +82,8 @@ class TestBytecode < Test::Unit::TestCase
     assert_equal([:visit_ldc_insn, java.lang.Double.new(1)], @dummy.single {ldc(1.0)})
 
     assert_equal([:visit_ldc_insn, BiteScript::ASM::Type.get_type(System.java_class)], @dummy.single {ldc(System)})
+    type = BiteScript::ASM::Type.get_type('Lcom.example.Test;')
+    assert_equal([:visit_ldc_insn, type], @dummy.single {ldc(type)})
   end
 
   def test_int_insns

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 6
-  version: 0.0.6
+    - 7
+  version: 0.0.7
 platform: ruby
 authors: 
   - Charles Oliver Nutter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 09:15:57.264000 -04:00
+date: 2010-11-10 08:48:06.220000 +01:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
   - bin/bitep
   - examples/fib.bs
   - examples/hello_world.bs
+  - examples/hello_world.class
   - examples/hello_world_macro.bs
   - examples/indy.bs
   - examples/mixed_bag.rb
@@ -64,7 +65,7 @@ files:
   - bitescript.gemspec
   - Rakefile
 has_rdoc: true
-homepage: http://kenai.com/projects/jvmscript
+homepage: http://github.com/headius/bitescript
 licenses: []
 
 post_install_message: