mirah 0.1.2-java → 0.1.3-java

data/test/mirrors/generics_test.rb

@@ -15,7 +15,8 @@
 
 require 'java'
 require 'test/unit'
-require 'mirah'
+require 'java'
+require 'dist/mirahc.jar'
 
 class GenericsTest < Test::Unit::TestCase
   java_import 'java.util.HashSet'
@@ -31,7 +32,7 @@ class GenericsTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.model.Cycle'
   java_import 'org.mirah.jvm.model.IntersectionType'
   java_import 'org.mirah.typer.BaseTypeFuture'
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Type'
   java_import 'javax.lang.model.util.Types'
 
   def setup
@@ -717,6 +718,14 @@ class GenericsTest < Test::Unit::TestCase
       ], m.values.map{|x| x.toString})
   end
 
+  def test_raw_lub
+    a = g('java.lang.Iterable', [type('java.lang.String')])
+    b = a.erasure
+    lub = LubFinder.new(@types.context)
+    c = lub.leastUpperBound([a, b])
+    assert_equal(b.toString, c.toString)
+  end
+
   def test_minimizeErasedCandidates
     lub = LubFinder.new(@types.context)
     t = set(@types.getStringType.resolve)
@@ -727,7 +736,7 @@ class GenericsTest < Test::Unit::TestCase
     lub.minimizeErasedCandidates(candidates.key_set)
     assert_equal(['java.util.Collection'],
                  candidates.key_set.map{|x| x.toString})
-    candidates = HashSet.new(candidates.values.iterator.next.map {|x| x.toString})
+    candidates = HashSet.new(candidates.values.first.map {|x| x.toString})
     assert_equal(HashSet.new(
     ["java.util.Collection<java.lang.String>",
       "java.util.Collection<java.lang.CharSequence>"
@@ -746,7 +755,7 @@ class GenericsTest < Test::Unit::TestCase
 
     a = set(string)
     lub = finder.leastUpperBound([a, a])
-    assert_equal(a, lub, lub.toString)
+    assert(a.isSameType(lub), lub.toString)
 
     b = g('java.lang.Iterable', [type('java.io.Serializable')])
     lub = finder.leastUpperBound([a, b])
@@ -763,7 +772,7 @@ class GenericsTest < Test::Unit::TestCase
     string = type('java.lang.String')
     integer = type('java.lang.Integer')
     lub = finder.leastUpperBound([string, integer])
-    assert_match(/\? extends java\.lang\.Comparable<\? extends ...>/,
+    assert_match(/java\.lang\.Comparable<\? extends ...>/,
                  lub.toString)
   end
 

data/test/mirrors/member_test.rb

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 require 'test/unit'
-require 'mirah'
+require 'java'
+require 'dist/mirahc.jar'
 
 class MembersTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.Member'

data/test/mirrors/method_lookup_test.rb

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 require 'test/unit'
-require 'mirah'
+require 'java'
+require 'dist/mirahc.jar'
 
 class BaseMethodLookupTest <  Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
@@ -25,11 +26,13 @@ class BaseMethodLookupTest <  Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.FakeMember'
   java_import 'org.mirah.jvm.mirrors.Member'
   java_import 'org.mirah.jvm.mirrors.MetaType'
+  java_import 'org.mirah.jvm.mirrors.MirrorProxy'
+  java_import 'org.mirah.jvm.mirrors.NullType'
   java_import 'org.mirah.jvm.types.MemberKind'
   java_import 'org.mirah.typer.BaseTypeFuture'
   java_import 'org.mirah.typer.ErrorType'
-  java_import 'org.jruby.org.objectweb.asm.Opcodes'
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Opcodes'
+  java_import 'org.objectweb.asm.Type'
 
   class FakeMirror < BaseType
     def initialize(desc, superclass=nil, flags=Opcodes.ACC_PUBLIC)
@@ -166,6 +169,13 @@ class MethodLookupTest < BaseMethodLookupTest
                      array("Ljava/util/AbstractMap;"))
   end
 
+  def test_null_subtype
+    null = MirrorProxy.new(NullType.new)
+    object = wrap("Ljava/lang/Object;")
+    assert(MethodLookup.isSubType(null, object))
+    assert(MethodLookup.isSubType(null, wrap("Ljava/lang/String;")))
+  end
+
   def test_subtype_comparison
     double = wrap('D')
     int = wrap('I')
@@ -323,9 +333,11 @@ class MethodLookupTest < BaseMethodLookupTest
     type = @lookup.findMethod(@scope, wrap('Ljava/lang/Object;'), 'registerNatives', [], nil, nil, false).resolve
     assert(type.isError)
     assert_equal('Cannot access java.lang.Object.registerNatives() from Foo', type.message[0][0])
-    type = @lookup.findMethod(@scope, wrap('Ljava/lang/Object;'), 'clone', [], nil, nil, false).resolve
-    assert(type.isError)
-    assert_equal('Cannot access java.lang.Object.clone() from Foo', type.message[0][0])
+    pend "Can't tell the difference between 'super' random protected methods" do
+      type = @lookup.findMethod(@scope, wrap('Ljava/lang/Object;'), 'clone', [], nil, nil, false).resolve
+      assert(type.isError)
+      assert_equal('Cannot access java.lang.Object.clone() from Foo', type.message[0][0])
+    end
     # TODO test ambiguous
     # TODO check calling instance method from static scope.
   end

data/test/mirrors/mirrors_test.rb

@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'test/unit'
-require 'mirah'
+
+require "test_helper"
+require 'dist/mirahc.jar'
 
 class BaseMirrorsTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
@@ -31,8 +32,8 @@ class BaseMirrorsTest < Test::Unit::TestCase
   java_import 'mirah.lang.ast.Script'
   java_import 'mirah.lang.ast.StringCodeSource'
   java_import 'mirah.lang.ast.TypeRefImpl'
-  java_import 'org.jruby.org.objectweb.asm.Opcodes'
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Opcodes'
+  java_import 'org.objectweb.asm.Type'
 
   def setup
     @types = MirrorTypeSystem.new
@@ -47,8 +48,8 @@ class BaseMirrorsTest < Test::Unit::TestCase
 
   def assert_descriptor(descriptor, type)
     assert(type.isResolved, type.resolve.toString)
-    assert_resolved_to(descriptor, type.resolve)
     assert_not_error(type)
+    assert_resolved_to(descriptor, type.resolve)
   end
 
   def assert_resolved_to(descriptor, resolved)
@@ -57,7 +58,7 @@ class BaseMirrorsTest < Test::Unit::TestCase
   end
 
   def assert_error(type)
-    assert_block("Excpected #{type.resolve} to be an error") {
+    assert_block("Expected #{type.resolve} to be an error") {
       type.resolve.isError
     }
   end
@@ -217,13 +218,13 @@ class MirrorsTest < BaseMirrorsTest
 
   def test_meta_resolved
     type = @types.getStringType.resolve
-    assert_false(type.isMeta)
+    assert(!type.isMeta)
     assert(@types.getMetaType(type).isMeta)
   end
 
   def test_meta_future
     type = @types.getStringType
-    assert_false(type.resolve.isMeta)
+    assert(!type.resolve.isMeta)
     assert(@types.getMetaType(type).resolve.isMeta)
   end
 
@@ -395,6 +396,14 @@ class MTS_MethodLookupTest < BaseMirrorsTest
     assert_resolved_to('I', type.resolve.returnType)
   end
 
+  def test_method_def_nil
+    @types.getMethodDefType(main_type, 'foobar', [], @types.getNullType, nil)
+    type = @types.getMethodType(
+        CallFuture.new(@types, @scope, main_type, true, 'foobar', [], [], nil))
+    assert_not_equal('null', type.resolve.returnType.name)
+    assert_resolved_to('Ljava/lang/Object;', type.resolve.returnType)
+  end
+
   def test_async_return_type
     future = BaseTypeFuture.new
     @types.getMethodDefType(main_type, 'foo', [], future, nil)
@@ -478,24 +487,74 @@ class MTS_MethodLookupTest < BaseMirrorsTest
     assert_resolved_to('S', call_future.resolve)
   end
 
-  def test_async_param_superclass
+  def test_main_type_not_error
     assert_not_error(main_type)
+  end
+
+  def test_when_superclass_unresolved_then_call_futures_in_error
     super_future = BaseTypeFuture.new
-    b = @types.defineType(@scope, ClassDefinition.new, "B", super_future, [])
-    a = @types.defineType(@scope, ClassDefinition.new, "A", b, [])
-    c = @types.defineType(@scope, ClassDefinition.new, "C", nil, [])
+    subclass   = @types.defineType(@scope, ClassDefinition.new, "Subclass", super_future, [])
+    superclass = @types.defineType(@scope, ClassDefinition.new, "UltimateSuperClass", nil, [])
     decl = AssignableTypeFuture.new(nil)
-    decl.declare(c, nil)
+    decl.declare(superclass, nil)
     
     @types.getMethodDefType(main_type, 'foobar', [decl],
                             @types.getFixnumType(0), nil)
-    type1 = CallFuture.new(@types, @scope, main_type, true, 'foobar', [b], [], nil)
-    assert_error(type1)
-    type2 = CallFuture.new(@types, @scope, main_type, true, 'foobar', [b], [], nil)
-    assert_error(type2)
-    super_future.resolved(c.resolve)
-    assert_descriptor("I", type1)
-    assert_descriptor("I", type2)
+    type = CallFuture.new(@types, @scope, main_type, true, 'foobar', [subclass], [], nil)
+    assert_error(type)
+  end
+
+  def test_when_superclass_of_superclass_unresolved_then_call_future_in_error
+    super_future = BaseTypeFuture.new
+    subclass     = @types.defineType(@scope, ClassDefinition.new, "Subclass", super_future, [])
+    sub_subclass = @types.defineType(@scope, ClassDefinition.new, "SubSubclass", super_future, [])
+    superclass   = @types.defineType(@scope, ClassDefinition.new, "UltimateSuperClass", nil, [])
+    decl = AssignableTypeFuture.new(nil)
+    decl.declare(superclass, nil)
+
+    @types.getMethodDefType(main_type, 'foobar', [decl],
+                            @types.getFixnumType(0), nil)
+    type = CallFuture.new(@types, @scope, main_type, true, 'foobar', [sub_subclass], [], nil)
+    assert_error(type)
+  end
+
+  def test_after_unresolved_superclass_resolves_then_call_future_not_error
+    super_future = BaseTypeFuture.new
+    subclass   = @types.defineType(@scope, ClassDefinition.new, "Subclass", super_future, [])
+    superclass = @types.defineType(@scope, ClassDefinition.new, "UltimateSuperClass", nil, [])
+    decl = AssignableTypeFuture.new(nil)
+    decl.declare(superclass, nil)
+
+    @types.getMethodDefType(main_type, 'foobar', [decl],
+                            @types.getFixnumType(0), nil)
+
+    type = CallFuture.new(@types, @scope, main_type, true, 'foobar', [subclass], [], nil)
+
+    super_future.resolved(superclass.resolve)
+
+    assert_descriptor("I", type)
+  end
+
+  def test_after_unresolved_superclass_of_superclass_resolves_then_call_future_not_error
+    super_future = BaseTypeFuture.new
+    subclass     = @types.defineType(@scope, ClassDefinition.new, "Subclass", super_future, [])
+    sub_subclass = @types.defineType(@scope, ClassDefinition.new, "SubSubclass", super_future, [])
+    superclass   = @types.defineType(@scope, ClassDefinition.new, "UltimateSuperClass", nil, [])
+    decl = AssignableTypeFuture.new(nil)
+    decl.declare(superclass, nil)
+    @types.getMethodDefType(main_type, 'foobar', [decl],
+                            @types.getFixnumType(0), nil)
+    type = CallFuture.new(@types, @scope, main_type, true, 'foobar', [sub_subclass], [], nil)
+
+    super_future.resolved(superclass.resolve)
+
+    assert_descriptor("I", type)
+  end
+
+  def test_nulltype_methods
+    type = CallFuture.new(@types, @scope, @types.getNullType, true, 'nil?', [], [], nil)
+    assert_not_error(type)
+    assert_descriptor('Z', type)
   end
 
   def test_super_in_constructor
@@ -591,6 +650,14 @@ class MTS_MethodLookupTest < BaseMirrorsTest
     assert_equal('java.util.Set<FooBar>', checked.resolve.toString)
   end
 
+  def test_wildcard_return
+    loader = @types.get(@scope, typeref('java.lang.ClassLoader'))
+    klass = CallFuture.new(
+        @types, @scope, loader, true, 'loadClass',
+        [@types.getStringType], [], nil)
+    assert(klass.resolve.assignableFrom(klass.resolve), klass.resolve.toString)
+  end
+
   def test_nil_argument
     sb = @types.get(@scope, typeref('java.lang.StringBuilder'))
     result = CallFuture.new(@types, @scope, sb, true, 'append', [@types.getNullType], [], nil)

data/test/mirrors/simple_async_mirror_loader_test.rb

@@ -14,16 +14,16 @@
 # limitations under the License.
 
 require 'test/unit'
-require 'mirah'
+require 'java'
+require 'dist/mirahc.jar'
 
 class SimpleAsyncMirrorLoaderTest < Test::Unit::TestCase
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Type'
   java_import 'org.mirah.jvm.mirrors.BaseType'
   java_import 'org.mirah.jvm.mirrors.MirrorType'
   java_import 'org.mirah.jvm.mirrors.SimpleAsyncMirrorLoader'
   java_import 'org.mirah.jvm.mirrors.AsyncLoaderAdapter'
   java_import 'org.mirah.jvm.mirrors.PrimitiveLoader'
-  java_import 'org.mirah.jvm.mirrors.ClassPath'
   java_import 'org.mirah.jvm.types.JVMTypeUtils'
   java_import 'org.mirah.typer.BaseTypeFuture'
   java_import 'org.mirah.typer.ErrorType'
@@ -94,6 +94,8 @@ class SimpleAsyncMirrorLoaderTest < Test::Unit::TestCase
   end
 
   def test_array
+    pend "undefined ClassPath class" do
+    
     context = Context.new
     classpath = ClassPath.new
     classpath.bytecode_loader_set PrimitiveLoader.new(context)
@@ -106,5 +108,7 @@ class SimpleAsyncMirrorLoaderTest < Test::Unit::TestCase
     assert(JVMTypeUtils.isArray(future.resolve))
     assert_equal('LA;', future.resolve.getComponentType.asm_type.descriptor)
     assert(!future.resolve.getComponentType.isError)
+
+    end
   end
 end

data/test/mirrors/simple_mirror_loader_test.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 require 'test/unit'
-require 'mirah'
-
+require 'java'
+require 'dist/mirahc.jar'
 
 java_import 'org.mirah.jvm.mirrors.SimpleMirrorLoader'
 java_import 'org.mirah.jvm.mirrors.BaseType'
@@ -34,7 +34,7 @@ class ParentLoader < SimpleMirrorLoader
 end
 
 class SimpleMirrorLoaderTest < Test::Unit::TestCase
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Type'
 
   def setup
     @parent = ParentLoader.new
@@ -63,7 +63,7 @@ end
 
 class PrimitiveLoaderTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.PrimitiveLoader'
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Type'
 
   def test_primitives
     loader = PrimitiveLoader.new(nil)
@@ -85,7 +85,7 @@ end
 
 class OrErrorLoaderTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.OrErrorLoader'
-  java_import 'org.jruby.org.objectweb.asm.Type'
+  java_import 'org.objectweb.asm.Type'
 
   def test_loader
     loader = OrErrorLoader.new(nil)

data/test/test_helper.rb

@@ -12,7 +12,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-require 'bundler/setup'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts "couldn't load bundler. Check your environment."
+end
 require 'test/unit'
 require 'mirah'
 require 'jruby'
@@ -38,10 +42,12 @@ module CommonAssertions
 
   def capture_output
     saved_output = System.out
+    saved_err = System.err
     saved_stdout = $stdout
     saved_stderr = $stderr
     output = StringIO.new
     System.setOut(PrintStream.new(output.to_outputstream))
+    System.setErr(PrintStream.new(output.to_outputstream))
     $stdout = output
     $stderr = output
     begin
@@ -50,6 +56,7 @@ module CommonAssertions
       output.read
     ensure
       System.setOut(saved_output)
+      System.setErr(saved_err)
       $stdout = saved_stdout
       $stderr = saved_stderr
     end
@@ -59,8 +66,25 @@ module CommonAssertions
     assert_equal(expected, capture_output(&block))
   end
 
+  def pend_on_jruby version
+    if JRUBY_VERSION ==  version
+      pend("doesn't work on #{version}") { yield }
+    else
+      yield
+    end
+  end
+end
+
+module DebuggingHelp
+  def with_finest_logging
+    Mirah::Logging::MirahLogger.level = Mirah::Logging::Level::FINEST
+    yield
+  ensure
+    Mirah::Logging::MirahLogger.level = Mirah::Logging::Level::INFO
+  end
 end
 
 class Test::Unit::TestCase
   include CommonAssertions
+  include DebuggingHelp
 end

metadata

@@ -1,30 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mirah
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: java
 authors:
 - Charles Oliver Nutter
 - Ryan Brown
+- Nick Howard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bitescript
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  prerelease: false
-  type: :runtime
+date: 2014-08-07 00:00:00.000000000 Z
+dependencies: []
 description: |-
   Mirah is a customizable programming language featuring static types,
   local type inference and a heavily Ruby-inspired syntax. Mirah
@@ -33,108 +20,66 @@ description: |-
 email:
 - headius@headius.com
 - ribrdb@google.com
+- ndh@baroquebobcat.com
 executables:
 - mirah
 - mirahc
-- mirahp
 extensions: []
 extra_rdoc_files:
 - History.txt
 - README.md
 files:
+- bin/bundler
 - bin/mirah
 - bin/mirah.cmd
 - bin/mirahc
 - bin/mirahc.cmd
-- bin/mirahp
-- bin/mirahp.cmd
+- bin/rake
 - lib/duby.rb
 - lib/mirah.rb
 - lib/mirah_task.rb
 - lib/mirah/appengine_tasks.rb
-- lib/mirah/ast.rb
-- lib/mirah/commands.rb
 - lib/mirah/compiler.rb
 - lib/mirah/env.rb
 - lib/mirah/errors.rb
-- lib/mirah/generator.rb
 - lib/mirah/parser.rb
 - lib/mirah/transform.rb
 - lib/mirah/typer.rb
 - lib/mirah/version.rb
-- lib/mirah/ast/scope.rb
-- lib/mirah/commands/base.rb
-- lib/mirah/commands/compile.rb
-- lib/mirah/commands/parse.rb
-- lib/mirah/commands/run.rb
-- lib/mirah/jvm/compiler.rb
-- lib/mirah/jvm/method_lookup.rb
-- lib/mirah/jvm/types.rb
-- lib/mirah/jvm/compiler/base.rb
-- lib/mirah/jvm/compiler/jvm_bytecode.rb
-- lib/mirah/jvm/types/array_type.rb
-- lib/mirah/jvm/types/ast_ext.rb
-- lib/mirah/jvm/types/basic_types.rb
-- lib/mirah/jvm/types/bitescript_ext.rb
-- lib/mirah/jvm/types/block_type.rb
-- lib/mirah/jvm/types/boolean.rb
-- lib/mirah/jvm/types/enumerable.rb
-- lib/mirah/jvm/types/extensions.rb
-- lib/mirah/jvm/types/factory.rb
-- lib/mirah/jvm/types/floats.rb
-- lib/mirah/jvm/types/generic_type.rb
-- lib/mirah/jvm/types/implicit_nil_type.rb
-- lib/mirah/jvm/types/integers.rb
-- lib/mirah/jvm/types/interface_definition.rb
-- lib/mirah/jvm/types/intrinsics.rb
-- lib/mirah/jvm/types/literals.rb
-- lib/mirah/jvm/types/meta_type.rb
-- lib/mirah/jvm/types/methods.rb
-- lib/mirah/jvm/types/null_type.rb
-- lib/mirah/jvm/types/number.rb
-- lib/mirah/jvm/types/primitive_type.rb
-- lib/mirah/jvm/types/source_mirror.rb
-- lib/mirah/jvm/types/type.rb
-- lib/mirah/jvm/types/type_definition.rb
-- lib/mirah/jvm/types/void_type.rb
 - lib/mirah/plugin/edb.rb
 - lib/mirah/transform/ast_ext.rb
 - lib/mirah/transform/transformer.rb
 - lib/mirah/util/argument_processor.rb
 - lib/mirah/util/class_loader.rb
-- lib/mirah/util/compilation_state.rb
 - lib/mirah/util/delegate.rb
 - lib/mirah/util/logging.rb
 - lib/mirah/util/process_errors.rb
 - test/test_helper.rb
-- test/core/commands_test.rb
+- test/artifacts/jar_test.rb
+- test/artifacts/jruby_test.rb
 - test/core/env_test.rb
-- test/core/generator_test.rb
 - test/core/typer_test.rb
 - test/core/typer/assignable_type_future_test.rb
 - test/core/typer/error_type_test.rb
 - test/core/typer/simple_type_test.rb
 - test/core/util/argument_processor_test.rb
 - test/core/util/class_loader_test.rb
-- test/core/util/compilation_state_test.rb
+- test/core/util/jvm_version_test.rb
 - test/fixtures/my.properties
 - test/fixtures/org/foo/A.class
-- test/fixtures/org/foo/LowerCaseInnerClass$inner.class
-- test/fixtures/org/foo/LowerCaseInnerClass.class
+- test/fixtures/org/foo/ImplicitClassRetAnno.java
+- test/fixtures/org/foo/IntAnno.java
 - test/fixtures/org/foo/LowerCaseInnerClass.java
 - test/jvm/annotations_test.rb
 - test/jvm/blocks_test.rb
-- test/jvm/bytecode_test_helper.rb
 - test/jvm/cast_test.rb
 - test/jvm/constructors_test.rb
 - test/jvm/enumerable_test.rb
 - test/jvm/example_test.rb
-- test/jvm/factory_test.rb
 - test/jvm/generics_test.rb
 - test/jvm/hash_test.rb
 - test/jvm/import_test.rb
 - test/jvm/interface_test.rb
-- test/jvm/java_typer_test.rb
 - test/jvm/jvm_commands_test.rb
 - test/jvm/jvm_compiler_test.rb
 - test/jvm/list_extensions_test.rb
@@ -144,6 +89,7 @@ files:
 - test/jvm/new_backend_test_helper.rb
 - test/jvm/numeric_extensions_test.rb
 - test/jvm/rescue_test.rb
+- test/jvm/static_fields_test.rb
 - test/jvm/string_builder_extensions_test.rb
 - test/jvm/string_extensions_test.rb
 - test/jvm/varargs_test.rb
@@ -158,14 +104,13 @@ files:
 - examples/bintrees.mirah
 - examples/construction.mirah
 - examples/edb.mirah
-- examples/Fib.class
 - examples/fib.mirah
 - examples/fields.mirah
 - examples/fractal.mirah
 - examples/interfaces.mirah
 - examples/java_thing.mirah
+- examples/literals.mirah
 - examples/simple_class.mirah
-- examples/simple_class.mirah~
 - examples/sort_closure.mirah
 - examples/swing.mirah
 - examples/tak.mirah
@@ -217,16 +162,11 @@ files:
 - examples/rosettacode/string-case.mirah
 - examples/rosettacode/string-length.mirah
 - examples/rosettacode/user-input.mirah
-- javalib/mirah-bootstrap.jar
-- javalib/mirah-builtins.jar
-- javalib/mirah-compiler.jar
-- javalib/mirah-mirrors.jar
-- javalib/mirah-newast-transitional.jar
-- javalib/mirah-parser.jar
-- javalib/mirah-util.jar
+- dist/mirahc.jar
+- README.md
+- TODO.md
 - History.txt
 - Rakefile
-- README.md
 homepage: http://www.mirah.org/
 licenses:
 - Apache-2.0
@@ -249,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mirah
-rubygems_version: 2.1.11
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Mirah is a customizable programming language featuring static types, local type inference and a heavily Ruby-inspired syntax