mirah 0.1.4-java → 0.2.0-java

data/test/mirrors/member_test.rb

@@ -15,7 +15,7 @@
 
 require 'test/unit'
 require 'java'
-require 'dist/mirahc.jar'
+require ENV.fetch('MIRAHC_JAR',File.expand_path("../../../dist/mirahc.jar",__FILE__))
 
 class MembersTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.Member'

data/test/mirrors/method_lookup_test.rb

@@ -15,7 +15,7 @@
 
 require 'test/unit'
 require 'java'
-require 'dist/mirahc.jar'
+require ENV.fetch('MIRAHC_JAR',File.expand_path("../../../dist/mirahc.jar",__FILE__))
 
 class BaseMethodLookupTest <  Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
@@ -291,6 +291,7 @@ class MethodLookupTest < BaseMethodLookupTest
     expected_invisible = methods - expected_visible
     set_self_type(type)
     invisible = @lookup.removeInaccessible(methods, @scope, nil)
+
     assert_equal(expected_invisible.map {|m| m.toString}, invisible.map {|m| m.toString})
     assert_equal(expected_visible.map {|m| m.toString}, methods.map {|m| m.toString})
     # TODO: fix protected usage. e.g. Foo can call Object.clone() through a foo instance, but not any Object.
@@ -556,14 +557,15 @@ class FieldTest < BaseMethodLookupTest
     a_foo = @a.add_field("foo")
     a_bar = @a.add_field("bar")
     b_foo = @b.add_field("foo")
-    foos = @lookup.gatherFields(@b, 'foo').to_a
+    foos = @lookup.gatherFields(@b, 'foo', []).to_a
  
     assert_equal([b_foo, a_foo], foos)
-    assert_equal([a_bar], @lookup.gatherFields(@b, 'bar').to_a)
+    assert_equal([a_bar], @lookup.gatherFields(@b, 'bar', []).to_a)
   end
 
   def test_find_super_field
     @a.add_field("foo")
+
     future = @lookup.findMethod(@scope, @b, 'foo', [], nil, nil, false)
 
     assert_equal("LA;", future.resolve.returnType.asm_type.descriptor)
@@ -574,6 +576,7 @@ class FieldTest < BaseMethodLookupTest
     @b.add_field("foo")
 
     future = @lookup.findMethod(@scope, @b, 'foo', [], nil, nil, false)
+
     assert_equal("LB;", future.resolve.returnType.asm_type.descriptor)
   end
 
@@ -583,17 +586,21 @@ class FieldTest < BaseMethodLookupTest
     @b.add_field("foo", Opcodes.ACC_PRIVATE)
     
     future = @lookup.findMethod(@scope, @b, 'foo', [], nil, nil, false)
+
     assert_equal("LA;", future.resolve.returnType.asm_type.descriptor)
   end
 
   def test_inaccessible
     @a.add_field("foo", Opcodes.ACC_PRIVATE)
+
     future = @lookup.findMethod(@scope, @b, 'foo', [], nil, nil, false)
+
     assert(future.resolve.isError, "Expected error, got #{future.resolve}")
   end
 
   def test_field_setter
     @a.add_field("foo")
+
     future = @lookup.findMethod(@scope, @a, 'foo_set', [@a], nil, nil, false)
   end
 end

data/test/mirrors/mirrors_test.rb

@@ -15,7 +15,7 @@
 
 
 require "test_helper"
-require 'dist/mirahc.jar'
+require ENV.fetch('MIRAHC_JAR',File.expand_path("../../../dist/mirahc.jar",__FILE__))
 
 class BaseMirrorsTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
@@ -157,12 +157,12 @@ class MirrorsTest < BaseMirrorsTest
   end
 
   def test_main_type
-    assert_descriptor("LFooBar;", main_type)
+    assert_descriptor("LFooBarTopLevel;", main_type)
   end
   
   def test_main_type2
     set_filename("some_class.mirah")
-    assert_descriptor("LSomeClass;", main_type)
+    assert_descriptor("LSomeClassTopLevel;", main_type)
   end
 
   def test_main_type_is_meta
@@ -171,7 +171,7 @@ class MirrorsTest < BaseMirrorsTest
 
   def test_main_type_with_package
     @scope.package_set("foo.bar")
-    assert_descriptor("Lfoo/bar/FooBar;", main_type)
+    assert_descriptor("Lfoo/bar/FooBarTopLevel;", main_type)
   end
 
   def test_regex
@@ -270,19 +270,19 @@ class MirrorsTest < BaseMirrorsTest
   def test_define_type
     type = define_type("Subclass", main_type)
     assert_descriptor("LSubclass;", type)
-    assert_descriptor("LFooBar;", @types.getSuperClass(type))
+    assert_descriptor("LFooBarTopLevel;", @types.getSuperClass(type))
   end
 
   def test_define_inner_class_type
-    type = define_type("Subclass$Inner", main_type)
-    assert_descriptor("LSubclass$Inner;", type)
-    assert_descriptor("LFooBar;", @types.getSuperClass(type))
+    type = define_type("SubclassTopLevel$Inner", main_type)
+    assert_descriptor("LSubclassTopLevel$Inner;", type)
+    assert_descriptor("LFooBarTopLevel;", @types.getSuperClass(type))
   end
 
   def test_redefine_main_type
     existing = main_type.resolve.unmeta
-    type = @types.defineType(@scope, ClassDefinition.new, "FooBar", nil, [])
-    assert_descriptor("LFooBar;", type)
+    type = @types.defineType(@scope, ClassDefinition.new, "FooBarTopLevel", nil, [])
+    assert_descriptor("LFooBarTopLevel;", type)
     assert_same(existing, type.resolve)
   end
 
@@ -339,16 +339,16 @@ class MirrorsTest < BaseMirrorsTest
   end
 
   def test_classname_from_filename
-    assert_equal("SomeClass",
+    assert_equal("SomeClassTopLevel",
                  MirrorTypeSystem.classnameFromFilename("SomeClass.mirah"))
-    assert_equal("FooBar",
+    assert_equal("FooBarTopLevel",
                  MirrorTypeSystem.classnameFromFilename("FooBar.mirah"))
-    assert_equal("SomeClass",
+    assert_equal("SomeClassTopLevel",
                  MirrorTypeSystem.classnameFromFilename("some_class.mirah"))
-    assert_equal("FooBar",
+    assert_equal("FooBarTopLevel",
                  MirrorTypeSystem.classnameFromFilename("foo-bar.mirah"))
     assert_equal(
-        "SomeClass",
+        "SomeClassTopLevel",
         MirrorTypeSystem.classnameFromFilename("foo/bar/some_class.mirah"))
   end
 
@@ -423,7 +423,7 @@ class MTS_MethodLookupTest < BaseMirrorsTest
     @types.getMethodDefType(main_type, 'foobar', [], @types.getVoidType, nil)
     type = @types.getMethodType(
         CallFuture.new(@types, @scope, main_type, true, 'foobar', [], [], nil))
-    assert_resolved_to('LFooBar;', type.resolve.returnType)
+    assert_resolved_to('LFooBarTopLevel;', type.resolve.returnType)
   end
 
   def test_multiple_method_defs
@@ -432,7 +432,7 @@ class MTS_MethodLookupTest < BaseMirrorsTest
     type = @types.getMethodType(
         CallFuture.new(@types, @scope, main_type, true, 'foobar', [], [], nil))
     assert_not_error(type)
-    assert_resolved_to('LFooBar;', type.resolve.returnType)
+    assert_resolved_to('LFooBarTopLevel;', type.resolve.returnType)
     type = @types.getMethodType(
         CallFuture.new(@types, @scope, main_type, true, 'foo', [], [], nil))
     assert_not_error(type)
@@ -489,7 +489,7 @@ class MTS_MethodLookupTest < BaseMirrorsTest
   end
 
   def test_async_arguments
-    type = @types.wrap(Type.getType("LFooBar;"))
+    type = @types.wrap(Type.getType("LFooBarTopLevel;"))
     @scope.selfType_set(type)
     int = @types.wrap(Type.getType("I"))
     short = @types.wrap(Type.getType("S"))
@@ -680,7 +680,7 @@ class MTS_MethodLookupTest < BaseMirrorsTest
 
     method = CallFuture.new(
         @types, @scope, main_type, true, 'class', [], [], nil)
-    assert_equal('java.lang.Class<FooBar>', method.resolve.toString)
+    assert_equal('java.lang.Class<FooBarTopLevel>', method.resolve.toString)
   end
 
   def test_generic_method
@@ -691,7 +691,7 @@ class MTS_MethodLookupTest < BaseMirrorsTest
     set = @types.get(@scope, typeref('java.util.Set'))
     checked = CallFuture.new(
         @types, @scope, collections, true, 'checkedSet', [set, klass], [], nil)
-    assert_equal('java.util.Set<FooBar>', checked.resolve.toString)
+    assert_equal('java.util.Set<FooBarTopLevel>', checked.resolve.toString)
   end
 
   def test_wildcard_return

data/test/mirrors/simple_async_mirror_loader_test.rb

@@ -15,7 +15,7 @@
 
 require 'test/unit'
 require 'java'
-require 'dist/mirahc.jar'
+require ENV.fetch('MIRAHC_JAR',File.expand_path("../../../dist/mirahc.jar",__FILE__))
 
 class SimpleAsyncMirrorLoaderTest < Test::Unit::TestCase
   java_import 'org.objectweb.asm.Type'

data/test/mirrors/simple_mirror_loader_test.rb

@@ -15,7 +15,7 @@
 
 require 'test/unit'
 require 'java'
-require 'dist/mirahc.jar'
+require ENV.fetch('MIRAHC_JAR',File.expand_path("../../../dist/mirahc.jar",__FILE__))
 
 java_import 'org.mirah.jvm.mirrors.SimpleMirrorLoader'
 java_import 'org.mirah.jvm.mirrors.BaseType'

data/test/test_helper.rb

@@ -53,7 +53,8 @@ module CommonAssertions
     begin
       yield
       output.rewind
-      output.read
+      text = output.read
+      text.gsub("\r",'')
     ensure
       System.setOut(saved_output)
       System.setErr(saved_err)
@@ -62,6 +63,12 @@ module CommonAssertions
     end
   end
 
+  def assert_run_output(expected, cls)
+    assert_output expected do
+      cls.main nil
+    end
+  end
+
   def assert_output(expected, &block)
     assert_equal(expected, capture_output(&block))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirah
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: java
 authors:
 - Charles Oliver Nutter
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Mirah is a customizable programming language featuring static types,
@@ -29,29 +29,27 @@ extra_rdoc_files:
 - History.txt
 - README.md
 files:
-- bin/bundler
 - bin/mirah
 - bin/mirah.cmd
 - bin/mirahc
 - bin/mirahc.cmd
-- bin/rake
 - lib/duby.rb
 - lib/mirah.rb
 - lib/mirah_task.rb
 - lib/mirah/appengine_tasks.rb
-- lib/mirah/compiler.rb
 - lib/mirah/env.rb
 - lib/mirah/errors.rb
-- lib/mirah/parser.rb
 - lib/mirah/transform.rb
 - lib/mirah/typer.rb
 - lib/mirah/version.rb
 - lib/mirah/plugin/edb.rb
 - lib/mirah/transform/ast_ext.rb
 - lib/mirah/transform/transformer.rb
-- lib/mirah/util/delegate.rb
 - lib/mirah/util/logging.rb
 - lib/mirah/util/process_errors.rb
+- test/A.class
+- test/newMirahClass$Closure2.class
+- test/newMirahClass.class
 - test/test_helper.rb
 - test/artifacts/jar_test.rb
 - test/artifacts/jruby_test.rb
@@ -63,16 +61,24 @@ files:
 - test/core/util/class_loader_test.rb
 - test/core/util/jvm_version_test.rb
 - test/core/util/mirah_arguments_test.rb
+- test/fixtures/cp1251_test.mirah
 - test/fixtures/my.properties
+- test/fixtures/utf8_test.mirah
 - test/fixtures/org/foo/A.class
+- test/fixtures/org/foo/AbstractExecutorJava8.java
+- test/fixtures/org/foo/ClassWithSelfReferencingTypeParameter.java
 - test/fixtures/org/foo/ImplicitClassRetAnno.java
+- test/fixtures/org/foo/InnerInterfaceClass.java
+- test/fixtures/org/foo/IntAnno.class
 - test/fixtures/org/foo/IntAnno.java
 - test/fixtures/org/foo/LowerCaseInnerClass.java
+- test/fixtures/org/foo/TypeFixtureJava8.java
+- test/jvm/access_levels_test.rb
 - test/jvm/annotations_test.rb
 - test/jvm/blocks_test.rb
 - test/jvm/cast_test.rb
+- test/jvm/closure_test.rb
 - test/jvm/constructors_test.rb
-- test/jvm/enumerable_test.rb
 - test/jvm/example_test.rb
 - test/jvm/generics_test.rb
 - test/jvm/hash_test.rb
@@ -80,17 +86,24 @@ files:
 - test/jvm/interface_test.rb
 - test/jvm/jvm_commands_test.rb
 - test/jvm/jvm_compiler_test.rb
-- test/jvm/list_extensions_test.rb
 - test/jvm/macros_test.rb
 - test/jvm/main_method_test.rb
-- test/jvm/mirror_compilation_test_helper.rb
 - 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/string_test.rb
 - test/jvm/varargs_test.rb
+- test/jvm/extensions/array_extensions_test.rb
+- test/jvm/extensions/collection_extensions_test.rb
+- test/jvm/extensions/enumerable_test.rb
+- test/jvm/extensions/hash_extensions_test.rb
+- test/jvm/extensions/list_extensions_test.rb
+- test/jvm/extensions/lock_extensions_test.rb
+- test/jvm/extensions/numeric_extensions_test.rb
+- test/jvm/extensions/numeric_operators_test.rb
+- test/jvm/extensions/object_extensions_test.rb
+- test/jvm/extensions/string_builder_extensions_test.rb
+- test/jvm/extensions/string_extensions_test.rb
 - test/mirrors/base_type_test.rb
 - test/mirrors/bytecode_mirror_test.rb
 - test/mirrors/generics_test.rb
@@ -101,10 +114,10 @@ files:
 - test/mirrors/simple_mirror_loader_test.rb
 - examples/bintrees.mirah
 - examples/construction.mirah
-- examples/edb.mirah
 - examples/fib.mirah
 - examples/fields.mirah
 - examples/fractal.mirah
+- examples/fractal.rb
 - examples/interfaces.mirah
 - examples/java_thing.mirah
 - examples/literals.mirah
@@ -112,9 +125,7 @@ files:
 - examples/sort_closure.mirah
 - examples/swing.mirah
 - examples/tak.mirah
-- examples/test.edb
 - examples/ant/example-build.xml
-- examples/ant/example-build.xml~
 - examples/ant/README.md
 - examples/ant/build/Fib.class
 - examples/appengine/Rakefile
@@ -158,12 +169,16 @@ files:
 - examples/rosettacode/reverse-a-string.mirah
 - examples/rosettacode/rot-13.mirah
 - examples/rosettacode/secure-temporary-file.mirah
+- examples/rosettacode/simple_character_math.mirah
 - examples/rosettacode/sleep.mirah
 - examples/rosettacode/sort-integer-array.mirah
 - examples/rosettacode/string-case.mirah
 - examples/rosettacode/string-length.mirah
 - examples/rosettacode/user-input.mirah
 - dist/mirahc.jar
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- extensions_and_macros.md
 - README.md
 - TODO.md
 - History.txt

data/bin/bundler

@@ -1,16 +0,0 @@
-#!/usr/bin/env jruby
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('bundler', 'bundler')

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env jruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/examples/ant/example-build.xml~

@@ -1,7 +0,0 @@
-<project name="test">
-  <taskdef name="dubyc" classname="org.mirah.ant.Compile"/>
-
-  <target name="blah">
-    <dubyc src="examples/fib.duby" target="build"/>
-  </target>
-</project>

data/examples/test.edb

@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title><%= @message %></title>
-  </head>
-  <body>
-  <h1><%= @message %></h1>
-  </body>
-</html>
-

data/lib/mirah/compiler.rb

@@ -1,67 +0,0 @@
-# Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
-# All contributing project authors may be found in the NOTICE file.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-module Mirah
-  module Compiler
-    class ASTCompiler
-      def initialize(config, compiler_class, logging)
-        @config = config
-        @compiler_class = compiler_class
-        @logging = logging
-      end
-
-      attr_accessor :compiler_class, :compiler, :logging
-
-      def compile_asts(nodes, scoper, typer)
-        results = []
-        puts "Compiling..." if logging
-        nodes.each do |ast|
-          puts "  #{ast.position.source.name}" if logging
-          compile_ast(ast, scoper, typer) do |filename, builder|
-            if builder.respond_to?(:class_name)
-              class_name = builder.class_name
-              bytes = builder.generate
-            else
-              class_name = filename
-              bytes = String.from_java_bytes(builder)
-              filename = class_name.tr('.', '/') + ".class"
-            end
-            results << CompilerResult.new(filename, class_name, bytes)
-          end
-        end
-        results
-      end
-
-      def compile_ast(ast, scoper, typer, &block)
-        @compiler = compiler_class.new(@config, scoper, typer)
-        compiler.visit(ast, nil)
-        compiler.generate(&block)
-      rescue java.lang.UnsupportedOperationException => ex
-        raise MirahError.new(ex.message)
-      rescue java.lang.Throwable => ex
-        ex.cause.printStackTrace if ex.cause
-        raise ex
-      end
-    end
-
-    class CompilerResult
-      def initialize(filename, classname, bytes)
-        @filename, @classname, @bytes = filename, classname, bytes
-      end
-
-      attr_accessor :filename, :classname, :bytes
-    end
-  end
-end