bitescript 0.0.4 → 0.0.5

data/History.txt

@@ -1,18 +1,12 @@
+=== 0.0.5 / 2010-02-04
+
+* Get tests and examples all working nicely again
+* Clean up some -w noise from mangled ASM path
+* Annotations, exceptions, many other Java features added
+
 === 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.
+* Numeric fixes and feature additions to support Duby and other consumers
 
 === 0.0.3 / 2009-06-14
 

data/Rakefile

@@ -1,17 +1,11 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'hoe'
 $: << './lib'
-require 'bitescript.rb'
-
-Hoe.new('bitescript', BiteScript::VERSION) do |p|
-  p.rubyforge_name = 'jruby-extras'
-  p.url = "http://kenai.com/projects/jvmscript"
-  p.author = "charles.nutter@sun.com"
-  p.summary = "BiteScript is a Ruby DSL for generating Java bytecode."
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.developer('Charles Oliver Nutter', 'charles.nutter@sun.com')
-end
 
 task :default => :test
+
+Rake::TestTask.new :test do |t|
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*.rb"]
+end

data/bitescript.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{bitescript}
+  s.version = "0.0.5"
+  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.}
+  s.email = ["headius@headius.com", "ribrdb@gmail.com"]
+  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.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{jruby-extras}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{BiteScript is a Ruby DSL for generating Java bytecode.}
+  s.test_files = Dir["test/test*.rb"]
+end

data/examples/fib.bs

@@ -58,7 +58,7 @@ main do
   returnvoid
 end
 
-public_static_method "fib", int, int do
+public_static_method "fib", [], int, int do
   iload 0
   ldc 2
   recurse = label

data/examples/hello_world.bs

@@ -0,0 +1,5 @@
+main do
+  ldc "Hello, world!"
+  aprintln
+  returnvoid
+end

data/examples/hello_world_macro.bs

@@ -0,0 +1,23 @@
+import java.lang.System
+import java.io.PrintStream
+
+macro :aprintln do
+  getstatic System, :out, PrintStream
+  swap
+  invokevirtual PrintStream, println, [Object]
+end
+
+macro :aprint do
+  getstatic System, :out, PrintStream
+  swap
+  invokevirtual PrintStream, print, [Object]
+end
+
+main do
+  ldc "Hello, "
+  aprint
+  aload 0
+  aaload 0
+  aprintln
+  returnvoid
+end

data/examples/indy.bs

@@ -0,0 +1 @@
+main { aload 0; invokedynamic object, 'foo', [object]; returnvoid }

data/examples/mixed_bag.rb

@@ -10,7 +10,7 @@ builder = BiteScript::FileBuilder.build("somefile.source") do
     public_class "MyClass", object do
       public_field "list", ArrayList
 
-      public_constructor string, ArrayList do
+      public_constructor [], string, ArrayList do
         aload 0
         invokespecial object, "<init>", [void]
         aload 0
@@ -23,7 +23,7 @@ builder = BiteScript::FileBuilder.build("somefile.source") do
         returnvoid
       end
 
-      public_static_method "foo", this, string do
+      public_static_method "foo", [], this, string do
         new this
         dup
         aload 0
@@ -34,7 +34,7 @@ builder = BiteScript::FileBuilder.build("somefile.source") do
         areturn
       end
 
-      public_method "bar", ArrayList, string, ArrayList do
+      public_method "bar", [], ArrayList, string, ArrayList do
         aload 1
         invokevirtual(string, "toLowerCase", string)
         aload 2
@@ -44,13 +44,13 @@ builder = BiteScript::FileBuilder.build("somefile.source") do
         areturn
       end
 
-      public_method("getList", ArrayList) do
+      public_method("getList", [], ArrayList) do
         aload 0
         getfield this, "list", ArrayList
         areturn
       end
 
-      public_static_method("main", void, string[]) do
+      public_static_method("main", [], void, string[]) do
         aload 0
         ldc_int 0
         aaload

data/examples/simple_loop.rb

@@ -4,7 +4,7 @@ include BiteScript
 
 fb = FileBuilder.build(__FILE__) do
   public_class "SimpleLoop" do
-    public_static_method "main", void, string[] do
+    public_static_method "main", [], void, string[] do
       aload 0
       push_int 0
       aaload

data/examples/using_ruby.bs

@@ -0,0 +1,7 @@
+main do
+  5.times do
+    ldc "Wow!"
+    aprintln
+  end
+  returnvoid
+end

data/lib/bitescript/asm.rb

@@ -4,6 +4,9 @@ module BiteScript
   module ASM
     begin
       # try mangled names for the version included with JRuby
+      java.lang.Class.for_name 'jruby.objectweb.asm.Opcodes'
+      
+      # no error, proceed with mangled name
       asm_package = Java::jruby.objectweb.asm
       java_import asm_package.Opcodes
     rescue Exception
@@ -13,5 +16,6 @@ module BiteScript
     end
     java_import asm_package.Label
     java_import asm_package.Type
+    java_import asm_package.ClassWriter
   end
 end

data/lib/bitescript/builder.rb

@@ -58,6 +58,29 @@ module BiteScript
       nil
     end
   end
+
+  module Annotatable
+    java_import "java.lang.annotation.Retention"
+    def annotate(cls, runtime=nil)
+      if Java::JavaClass === cls
+        java_class = cls
+      else
+        java_class = cls.java_class
+      end
+      
+      if runtime.nil?
+        retention = java_class.annotation(Retention.java_class)
+        return if retention && retention.value.name == 'CLASS'
+        runtime = retention && retention.value.name == 'RUNTIME'
+      end
+
+      annotation = visit_annotation(Signature.ci(java_class), runtime)
+      annotation.extend AnnotationBuilder
+
+      yield annotation
+      annotation.visit_end
+    end
+  end
   
   class FileBuilder
     include Util
@@ -173,14 +196,8 @@ module BiteScript
   class ClassBuilder
     include Util
     include QuickTypes
-
-    begin
-      java_import "jruby.objectweb.asm.Opcodes"
-      java_import "jruby.objectweb.asm.ClassWriter"
-    rescue
-      java_import "org.objectweb.asm.Opcodes"
-      java_import "org.objectweb.asm.ClassWriter"
-    end
+    include Annotatable
+    include ASM
     
     java_import java.lang.Object
     java_import java.lang.Void
@@ -202,7 +219,7 @@ module BiteScript
       @interface = opts[:interface]
       flags = Opcodes::ACC_SUPER
       if @interface
-        flags |= Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
+        flags = Opcodes::ACC_INTERFACE | Opcodes::ACC_ABSTRACT
       end
       
       @class_writer = ClassWriter.new(ClassWriter::COMPUTE_MAXS)
@@ -271,32 +288,32 @@ module BiteScript
       ", binding, __FILE__, __LINE__
       # instance methods; also defines a "this" local at index 0
       eval "
-        def #{modifier}_method(name, exceptions, *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, exceptions, *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, exceptions, *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(exceptions, *signature, &block)
+        def #{modifier}_constructor(exceptions=[], *signature, &block)
           @constructor = method(Opcodes::ACC_#{modifier.upcase}, \"<init>\", [nil, *signature], exceptions, &block)
         end
       ", binding, __FILE__, __LINE__
     end
 
     def static_init(&block)
-      method(Opcodes::ACC_STATIC, "<clinit>", [void], &block)
+      method(Opcodes::ACC_STATIC, "<clinit>", [void], [], &block)
     end
     
     def method(flags, name, signature, exceptions, &block)
@@ -350,7 +367,8 @@ module BiteScript
     end
     
     def field(flags, name, type)
-      @class_writer.visit_field(flags, name, ci(type), nil, nil)
+      field = @class_writer.visit_field(flags, name, ci(type), nil, nil)
+      field.extend Annotatable
     end
     
     # name for signature generation using the class being generated
@@ -372,9 +390,15 @@ module BiteScript
       self
     end
     
+    def visit_annotation(*args)
+      @class_writer.visit_annotation(*args)
+    end
+    
     def new_method(modifiers, name, signature, exceptions)
       exceptions ||= []
-      raise ArgumentError unless exceptions.kind_of?(Array)
+      unless exceptions.kind_of?(Array)
+        raise ArgumentError, "Expected array of exceptions, got #{exceptions.inspect}"
+      end
       exceptions = exceptions.map {|e| path(e)}
       @class_writer.visit_method(modifiers, name, sig(*signature), nil, exceptions.to_java(:string))
     end
@@ -385,14 +409,10 @@ module BiteScript
   end
   
   class MethodBuilder
-    begin
-      java_import "jruby.objectweb.asm.Opcodes"
-    rescue
-      java_import "org.objectweb.asm.Opcodes"
-    end
-
     include QuickTypes
+    include Annotatable
     include BiteScript::Bytecode
+    include ASM
     
     attr_reader :method_visitor
     attr_reader :static
@@ -458,7 +478,7 @@ module BiteScript
       @class_builder
     end
     
-    def local(name, type)
+    def local(name, type=nil)
       if name == "this" && @static
         raise "'this' attempted to load from static method"
       end
@@ -466,6 +486,7 @@ module BiteScript
       if @locals[name]
         return @locals[name][-1][0]
       else
+        raise ArgumentError, 'Local type required' unless type
         return push_local(name, type, @start_label)
       end
     end
@@ -508,22 +529,13 @@ module BiteScript
       @locals[name][-1][-1] = here if @locals[name].size > 0
     end
 
-    def annotate(cls, runtime = false)
-      if Java::JavaClass == cls
-        java_class = cls
-      else
-        java_class = cls.java_class
-      end
-
-      annotation = @method_visitor.visit_annotation(ci(java_class), true)
-      annotation.extend AnnotationBuilder
-
-      yield annotation
-      annotation.visit_end
+    def visit_annotation(*args)
+      @method_visitor.visit_annotation(*args)
     end
   end
 
   module AnnotationBuilder
+    include Signature
     def method_missing(name, val)
       name_str = name.to_s
       if name_str[-1] == ?=
@@ -543,7 +555,7 @@ module BiteScript
       visit k, v
     end
     def annotation(name, cls)
-      if Java::JavaClass == cls
+      if Java::JavaClass === cls
         java_class = cls
       else
         java_class = cls.java_class

data/lib/bitescript.rb

@@ -5,8 +5,6 @@ require 'bitescript/bytecode'
 require 'bitescript/builder'
 
 module BiteScript
-  VERSION = '0.0.4'
-
   include BiteScript::ASM
   JAVA1_4 = Opcodes::V1_4
   JAVA1_5 = Opcodes::V1_5

data/nbproject/private/private.properties

@@ -0,0 +1,3 @@
+file.reference.jvmscript-lib=/Users/headius/projects/bitescript/lib
+file.reference.jvmscript-test=/Users/headius/projects/bitescript/test
+platform.active=default

data/nbproject/private/private.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>

data/nbproject/project.properties

@@ -0,0 +1,9 @@
+file.reference.jvmscript-lib=lib
+file.reference.jvmscript-test=test
+javac.classpath=
+main.file=
+platform.active=default
+source.encoding=UTF-8
+src.examples.dir=examples
+src.lib.dir=lib
+test.test.dir=test

data/nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ruby.rubyproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+            <name>BiteScript</name>
+            <source-roots>
+                <root id="src.examples.dir"/>
+                <root id="src.lib.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.test.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

data/test/test_builder.rb

@@ -20,7 +20,7 @@ class TestBuilder < Test::Unit::TestCase
   end
 
   def dummy_constructor(class_builder)
-    class_builder.public_constructor do
+    class_builder.public_constructor([]) do
       aload local 'this'
       invokespecial object, '<init>', [void]
       returnvoid
@@ -43,7 +43,7 @@ class TestBuilder < Test::Unit::TestCase
   def try(return_type, &b)
     class_name = new_class_name
     cb = @builder.public_class(class_name, @builder.object);
-    cb.public_static_method("foo", return_type, &b)
+    cb.public_static_method("foo", [], return_type, &b)
     dummy_constructor(cb)
     cls = load(class_name, cb)
     cls.foo
@@ -75,7 +75,6 @@ class TestBuilder < Test::Unit::TestCase
       pop
       aload 0
 #      monitorexit
-      label :end
       trycatch(:begin, :finally, :finally, nil)
       trycatch(:finally, :end, :finally, nil)
       after.set!
@@ -171,7 +170,6 @@ class TestBuilder < Test::Unit::TestCase
       label :catch
       ldc 2
       ireturn
-      label :end
       trycatch(:begin, :catch, :catch, java.lang.Exception)
     }
   end
@@ -248,10 +246,10 @@ class TestBuilder < Test::Unit::TestCase
 
   def test_instance_method_this
     cb = @builder.public_class(@class_name, @builder.object);
-    method = cb.public_method("foo", cb.this) {aload local 'this'; areturn}
+    method = cb.public_method("foo", [], cb.this) {aload local 'this'; areturn}
 
     # ensure "this" is taking slot zero
-    method.local('another')
+    method.local('another', Java::int)
     assert_equal(method.local('this'), 0)
     assert_equal(method.local('another'), 1)
 
@@ -264,7 +262,7 @@ class TestBuilder < Test::Unit::TestCase
   def test_constructor_this
     cb = @builder.public_class(@class_name, @builder.object);
     cb.private_field "self", cb.this
-    constructor = cb.public_constructor do
+    constructor = cb.public_constructor([]) do
       aload 0
       dup
       invokespecial object, "<init>", [void]
@@ -273,14 +271,14 @@ class TestBuilder < Test::Unit::TestCase
       returnvoid
     end
 
-    cb.public_method "get_self", cb.this do
+    cb.public_method "get_self", [], cb.this do
       aload 0
       getfield this, "self", this
       areturn
     end
 
     # ensure "this" is taking slot zero
-    constructor.local('another')
+    constructor.local('another', Java::int)
     assert_equal(constructor.local('this'), 0)
     assert_equal(constructor.local('another'), 1)
 
@@ -292,7 +290,7 @@ class TestBuilder < Test::Unit::TestCase
     cb = @builder.public_class(@class_name, @builder.object);
     
     body_called = false
-    cb.public_native_method("yoohoo") {body_called = true}
+    cb.public_native_method("yoohoo", []) {body_called = true}
 
     assert !body_called
 
@@ -309,10 +307,10 @@ class TestBuilder < Test::Unit::TestCase
     cb.public_field('inst_field', JString)
     cb.public_static_field('static_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('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('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('get_inst', [], JString) {aload 0; getfield this, 'inst_field', JString; areturn}
+    cb.public_method('get_static', [], JString) {getstatic this, 'static_field', JString; areturn}
 
     dummy_constructor(cb)
     obj = load_and_construct(@class_name, cb);
@@ -328,15 +326,15 @@ class TestBuilder < Test::Unit::TestCase
   def test_arrays
     cb = @builder.public_class(@class_name, @builder.object);
 
-    cb.public_method("newbooleanarray", cb.boolean[]) {ldc 5; newbooleanarray; dup; ldc 1; ldc true; bastore; dup; dup; ldc 2; swap; ldc 1; baload; bastore; areturn}
-    cb.public_method("newbytearray", cb.byte[]) {ldc 5; newbytearray; dup; ldc 1; ldc 1; bastore; dup; dup; ldc 2; swap; ldc 1; baload; bastore; areturn}
-    cb.public_method("newshortarray", cb.short[]) {ldc 5; newshortarray; dup; ldc 1; ldc 1; sastore; dup; dup; ldc 2; swap; ldc 1; saload; sastore; areturn}
-    cb.public_method("newchararray", cb.char[]) {ldc 5; newchararray; dup; ldc 1; ldc 1; castore; dup; dup; ldc 2; swap; ldc 1; caload; castore; areturn}
-    cb.public_method("newintarray", cb.int[]) {ldc 5; newintarray; dup; ldc 1; ldc 1; iastore; dup; dup; ldc 2; swap; ldc 1; iaload; iastore; areturn}
-    cb.public_method("newlongarray", cb.long[]) {ldc 5; newlongarray; dup; ldc 1; ldc_long 1; lastore; dup; dup; ldc 2; swap; ldc 1; laload; lastore; areturn}
-    cb.public_method("newfloatarray", cb.float[]) {ldc 5; newfloatarray; dup; ldc 1; ldc_float 1.0; fastore; dup; dup; ldc 2; swap; ldc 1; faload; fastore; areturn}
-    cb.public_method("newdoublearray", cb.double[]) {ldc 5; newdoublearray; dup; ldc 1; ldc 1.0; dastore; dup; dup; ldc 2; swap; ldc 1; daload; dastore; areturn}
-    cb.public_method("anewarray", cb.string[]) {ldc 5; anewarray JString; dup; ldc 1; ldc 'foo'; aastore; dup; dup; ldc 2; swap; ldc 1; aaload; aastore; areturn}
+    cb.public_method("newbooleanarray", [], cb.boolean[]) {ldc 5; newbooleanarray; dup; ldc 1; ldc true; bastore; dup; dup; ldc 2; swap; ldc 1; baload; bastore; areturn}
+    cb.public_method("newbytearray", [], cb.byte[]) {ldc 5; newbytearray; dup; ldc 1; ldc 1; bastore; dup; dup; ldc 2; swap; ldc 1; baload; bastore; areturn}
+    cb.public_method("newshortarray", [], cb.short[]) {ldc 5; newshortarray; dup; ldc 1; ldc 1; sastore; dup; dup; ldc 2; swap; ldc 1; saload; sastore; areturn}
+    cb.public_method("newchararray", [], cb.char[]) {ldc 5; newchararray; dup; ldc 1; ldc 1; castore; dup; dup; ldc 2; swap; ldc 1; caload; castore; areturn}
+    cb.public_method("newintarray", [], cb.int[]) {ldc 5; newintarray; dup; ldc 1; ldc 1; iastore; dup; dup; ldc 2; swap; ldc 1; iaload; iastore; areturn}
+    cb.public_method("newlongarray", [], cb.long[]) {ldc 5; newlongarray; dup; ldc 1; ldc_long 1; lastore; dup; dup; ldc 2; swap; ldc 1; laload; lastore; areturn}
+    cb.public_method("newfloatarray", [], cb.float[]) {ldc 5; newfloatarray; dup; ldc 1; ldc_float 1.0; fastore; dup; dup; ldc 2; swap; ldc 1; faload; fastore; areturn}
+    cb.public_method("newdoublearray", [], cb.double[]) {ldc 5; newdoublearray; dup; ldc 1; ldc 1.0; dastore; dup; dup; ldc 2; swap; ldc 1; daload; dastore; areturn}
+    cb.public_method("anewarray", [], cb.string[]) {ldc 5; anewarray JString; dup; ldc 1; ldc 'foo'; aastore; dup; dup; ldc 2; swap; ldc 1; aaload; aastore; areturn}
 
     dummy_constructor(cb)
     obj = load_and_construct(@class_name, cb);
@@ -404,7 +402,7 @@ class TestBuilder < Test::Unit::TestCase
   def test_annotation
     cb = @builder.public_class(@class_name, @builder.object);
     
-    cb.public_method("annotated", cb.void) do
+    cb.public_method("annotated", [], cb.void) do
       annotate(JRubyMethod, true) do |anno|
         anno.name = ["foo"]
         anno.required = 1

data/test/test_bytecode.rb

@@ -70,8 +70,8 @@ class TestBytecode < Test::Unit::TestCase
 
     assert_equal([:visit_int_insn, Opcodes::SIPUSH, -129], @dummy.single {ldc(-129)})
     assert_equal([:visit_int_insn, Opcodes::SIPUSH, 128], @dummy.single {ldc(128)})
-    assert_equal([:visit_ldc_insn, -65537], @dummy.single {ldc(-65537)})
-    assert_equal([:visit_ldc_insn, 65536], @dummy.single {ldc(65536)})
+    assert_equal([:visit_ldc_insn, java.lang.Integer.new(-32769)], @dummy.single {ldc(-32769)})
+    assert_equal([:visit_ldc_insn, java.lang.Integer.new(32768)], @dummy.single {ldc(32768)})
     assert_equal([:visit_ldc_insn, java.lang.Integer::MIN_VALUE - 1], @dummy.single {ldc(java.lang.Integer::MIN_VALUE - 1)})
     assert_equal([:visit_ldc_insn, java.lang.Integer::MAX_VALUE + 1], @dummy.single {ldc(java.lang.Integer::MAX_VALUE + 1)})
     
@@ -394,7 +394,8 @@ class TestBytecode < Test::Unit::TestCase
   
   def test_label
     l1 = label
-    assert_equal([:visit_label, l1.label], l1.set!)
+    l1.set!
+    assert_equal([:visit_label, l1.label], @dummy.all.first)
   end
   
   def test_aprintln

data/test/test_java_class.rb

@@ -19,8 +19,8 @@ class TestJavaClass < Test::Unit::TestCase
         assert_equal [java.lang.String.java_class], cons2.parameter_types
 
         cls = BiteScript::FileBuilder.new('x').#{visibility}_class('y')
-        cls.public_constructor()
-        cls.public_constructor(java.lang.String.java_class)
+        cls.public_constructor([])
+        cls.public_constructor([], java.lang.String.java_class)
 
         cons1 = cls.constructor()
         cons2 = cls.constructor(java.lang.String.java_class)
@@ -47,8 +47,8 @@ class TestJavaClass < Test::Unit::TestCase
         assert_equal [java.lang.Object.java_class], m2.parameter_types
 
         cls = BiteScript::FileBuilder.new('x').#{visibility}_class('y')
-        cls.public_method('toString', java.lang.String.java_class)
-        cls.public_method('equals', Java::boolean.java_class, java.lang.Object.java_class)
+        cls.public_method('toString', [], java.lang.String.java_class)
+        cls.public_method('equals', [], Java::boolean.java_class, java.lang.Object.java_class)
 
         m1 = cls.java_method('toString')
         m2 = cls.java_method('equals', java.lang.Object.java_class)

metadata

@@ -1,30 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: bitescript
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
-  - charles.nutter@sun.comCharles Oliver Nutter
+  - Charles Oliver Nutter
+  - Ryan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -05:00
+date: 2010-02-15 12:41:28.313000 -06: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: 
+dependencies: []
+
 description: BiteScript is a Ruby DSL for generating Java bytecode and classes.
 email: 
-  - charles.nutter@sun.com
+  - headius@headius.com
+  - ribrdb@gmail.com
 executables: 
   - bite
   - bitec
@@ -33,29 +26,37 @@ extensions: []
 extra_rdoc_files: 
   - 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/hello_world.bs
+  - examples/hello_world_macro.bs
+  - examples/indy.bs
   - examples/mixed_bag.rb
   - examples/simple_loop.rb
+  - examples/using_ruby.bs
   - lib/bitescript.rb
   - lib/bitescript/asm.rb
   - lib/bitescript/builder.rb
   - lib/bitescript/bytecode.rb
   - lib/bitescript/signature.rb
+  - nbproject/project.properties
+  - nbproject/project.xml
+  - nbproject/private/config.properties
+  - nbproject/private/private.properties
+  - nbproject/private/private.xml
   - test/test_bitescript.rb
   - test/test_builder.rb
   - test/test_bytecode.rb
   - test/test_java_class.rb
   - test/test_signature.rb
+  - History.txt
+  - LICENSE.txt
+  - README.txt
+  - bitescript.gemspec
+  - Rakefile
 has_rdoc: true
 homepage: http://kenai.com/projects/jvmscript
 licenses: []

data/Manifest.txt

@@ -1,20 +0,0 @@
-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