mirah 0.1.3-java → 0.1.4-java

data/test/jvm/interface_test.rb

@@ -95,4 +95,18 @@ class InterfaceTest < Test::Unit::TestCase
       end
     EOF
   end
+
+
+  def test_interface_adds_to_list
+    interface, a_impl = compile(<<-EOF)
+      interface Stringy
+        def act(messages:String):void; end
+      end
+
+      class Something implements Stringy
+        def initialize; @a = []; end
+        def act(messages) @a.add(messages); puts @a ;end
+      end
+    EOF
+  end
 end

data/test/jvm/jvm_compiler_test.rb

@@ -1832,4 +1832,15 @@ class JVMCompilerTest < Test::Unit::TestCase
     assert_output("2\n") { cls.foo(arg.new)}
   end
 
+  def test_incompatible_return_type_error_message
+    e = assert_raise_kind_of Mirah::MirahError do
+      compile(<<-EOF)
+      def a: int
+        return 1.2 if true
+        1
+      end
+      EOF
+    end
+    assert_equal "Invalid return type double, expected int",e.message
+  end
 end

data/test/jvm/new_backend_test_helper.rb

@@ -89,7 +89,7 @@ module JVMCompiler
   end
 
   def tmp_script_name
-    "script#{name.gsub(/\)|\(/,'_').capitalize}#{System.nano_time}"
+    "#{name.gsub(/\)|\(/,'_').capitalize}#{System.nano_time.to_s[10..15]}"
   end
 
   def assert_raise_java(type, message=nil)

data/test/jvm/static_fields_test.rb

@@ -16,7 +16,7 @@ require 'test_helper'
 
 class StaticFieldsTest < Test::Unit::TestCase
   def test_static_field_inheritance_lookup_with_dot
-    cls, = with_finest_logging{compile(<<-EOF)}
+    cls, = compile(<<-EOF)
       import java.util.GregorianCalendar
       puts GregorianCalendar.AM
     EOF
@@ -39,4 +39,14 @@ class StaticFieldsTest < Test::Unit::TestCase
     end
     }
   end
+
+  def test_create_constant
+    cls, = compile(<<-EOF)
+      CONSTANT = 1
+      puts CONSTANT
+    EOF
+    assert_output "1\n" do
+      cls.main(nil)
+    end
+  end
 end

data/test/mirrors/method_lookup_test.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+# Copyright (c) 2010-2014 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");
@@ -19,7 +19,7 @@ require 'dist/mirahc.jar'
 
 class BaseMethodLookupTest <  Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
-  java_import 'org.mirah.jvm.mirrors.JVMScope'
+  java_import 'org.mirah.jvm.mirrors.BetterScopeFactory'
   java_import 'org.mirah.jvm.mirrors.BaseType'
   java_import 'org.mirah.jvm.mirrors.MethodLookup'
   java_import 'org.mirah.jvm.mirrors.LookupState'
@@ -31,6 +31,8 @@ class BaseMethodLookupTest <  Test::Unit::TestCase
   java_import 'org.mirah.jvm.types.MemberKind'
   java_import 'org.mirah.typer.BaseTypeFuture'
   java_import 'org.mirah.typer.ErrorType'
+  java_import 'org.mirah.typer.simple.SimpleScoper'
+  java_import 'mirah.lang.ast.Script'
   java_import 'org.objectweb.asm.Opcodes'
   java_import 'org.objectweb.asm.Type'
 
@@ -41,7 +43,6 @@ class BaseMethodLookupTest <  Test::Unit::TestCase
     end
 
     def add_field(name, flags=Opcodes.ACC_PUBLIC)
-      
       kind = if (flags & Opcodes.ACC_STATIC) == 0
         MemberKind::FIELD_ACCESS
       else
@@ -57,10 +58,14 @@ class BaseMethodLookupTest <  Test::Unit::TestCase
 
   def setup
     @types = MirrorTypeSystem.new
-    @scope = JVMScope.new
+    @scope = new_scope
     @lookup = MethodLookup.new(@types.context)
   end
 
+  def new_scope opts={}
+    BetterScopeFactory.new.newScope(SimpleScoper.new, opts[:context] || Script.new)
+  end
+
   def jvmtype(internal_name, flags=0, superclass=nil)
     BaseType.new(@types.context, Type.getObjectType(internal_name), flags, superclass || wrap('Ljava/lang/Object;'))
   end
@@ -83,10 +88,13 @@ class MethodLookupTest < BaseMethodLookupTest
     main_future = @types.getMainType(nil, nil)
     object = @types.getSuperClass(main_future).resolve
     main = main_future.resolve
+
     assert(MethodLookup.isSubType(main, main))
     assert(MethodLookup.isSubType(main, object))
     assert_false(MethodLookup.isSubType(object, main))
+
     error = ErrorType.new([['Error']])
+
     assert(MethodLookup.isSubType(error, main))
     assert(MethodLookup.isSubType(main, error))
   end
@@ -123,6 +131,7 @@ class MethodLookupTest < BaseMethodLookupTest
     char = wrap('C')
     byte = wrap('B')
     bool = wrap('Z')
+
     check_supertypes(double, double)
     check_not_supertypes(double, float, long, int, short, char, byte, bool)
     check_supertypes(float, double, float)
@@ -180,6 +189,7 @@ class MethodLookupTest < BaseMethodLookupTest
     double = wrap('D')
     int = wrap('I')
     short = wrap('S')
+
     assert_equal(0.0, MethodLookup.subtypeComparison(double, double))
     assert_equal(0.0, MethodLookup.subtypeComparison(int, int))
     assert_equal(1.0, MethodLookup.subtypeComparison(int, double))
@@ -188,6 +198,7 @@ class MethodLookupTest < BaseMethodLookupTest
     assert_equal(1.0, MethodLookup.subtypeComparison(short, int))
     
     main = @types.getMainType(nil, nil).resolve
+
     assert_equal(0.0, MethodLookup.subtypeComparison(main, main))
     assert(MethodLookup.subtypeComparison(double, main).nan?)
     assert(MethodLookup.subtypeComparison(main, int).nan?)
@@ -197,6 +208,7 @@ class MethodLookupTest < BaseMethodLookupTest
     a = @types.getBooleanType.resolve
     b = @types.wrap(Type.getType('Ljava/lang/Boolean;')).resolve
     c = @types.getFixnumType(1).resolve
+
     assert(!MethodLookup.isSubType(a, b))
     assert(!MethodLookup.isSubType(b, a))
     assert(MethodLookup.isSubTypeWithConversion(a, b))
@@ -534,7 +546,7 @@ class FieldTest < BaseMethodLookupTest
     super
     @a = FakeMirror.new('LA;')
     @b = FakeMirror.new('LB;', @a)
-    @scope = JVMScope.new
+    @scope = new_scope
     @selfType = BaseTypeFuture.new
     @selfType.resolved(@b)
     @scope.selfType_set(@selfType)
@@ -545,15 +557,16 @@ class FieldTest < BaseMethodLookupTest
     a_bar = @a.add_field("bar")
     b_foo = @b.add_field("foo")
     foos = @lookup.gatherFields(@b, 'foo').to_a
+ 
     assert_equal([b_foo, a_foo], foos)
-    
     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)    
+
+    assert_equal("LA;", future.resolve.returnType.asm_type.descriptor)
   end
 
   def test_field_override

data/test/mirrors/mirrors_test.rb

@@ -19,13 +19,14 @@ require 'dist/mirahc.jar'
 
 class BaseMirrorsTest < Test::Unit::TestCase
   java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
-  java_import 'org.mirah.jvm.mirrors.JVMScope'
+  java_import 'org.mirah.jvm.mirrors.BetterScopeFactory'
   java_import 'org.mirah.jvm.types.JVMType'
   java_import 'org.mirah.jvm.types.JVMTypeUtils'
   java_import 'org.mirah.typer.AssignableTypeFuture'
   java_import 'org.mirah.typer.BaseTypeFuture'
   java_import 'org.mirah.typer.CallFuture'
   java_import 'org.mirah.typer.TypeFuture'
+  java_import 'org.mirah.typer.simple.SimpleScoper'
   java_import 'mirah.lang.ast.ClassDefinition'
   java_import 'mirah.lang.ast.ConstructorDefinition'
   java_import 'mirah.lang.ast.PositionImpl'
@@ -37,10 +38,14 @@ class BaseMirrorsTest < Test::Unit::TestCase
 
   def setup
     @types = MirrorTypeSystem.new
-    @scope = JVMScope.new
+    @scope = new_scope
     set_filename('foo-bar.mirah')
   end
 
+  def new_scope opts={}
+    BetterScopeFactory.new.newScope(SimpleScoper.new, opts[:context] || Script.new)
+  end
+
   def set_filename(filename)
     @script = Script.new(PositionImpl.new(StringCodeSource.new(filename, ""),
                          0, 0, 0, 0, 0, 0))
@@ -251,7 +256,7 @@ class MirrorsTest < BaseMirrorsTest
 
   def test_multiple_scopes
     type1 = @types.getLocalType(@scope, "a", nil)
-    type2 = @types.getLocalType(JVMScope.new, "a", nil)
+    type2 = @types.getLocalType(new_scope, "a", nil)
     assert_error(type1)
     assert_error(type2)
     type1.assign(@types.getFixnumType(0), nil)
@@ -268,6 +273,12 @@ class MirrorsTest < BaseMirrorsTest
     assert_descriptor("LFooBar;", @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))
+  end
+
   def test_redefine_main_type
     existing = main_type.resolve.unmeta
     type = @types.defineType(@scope, ClassDefinition.new, "FooBar", nil, [])
@@ -353,15 +364,47 @@ class MirrorsTest < BaseMirrorsTest
         '[S', @types.getArrayType(@types.get(@scope, typeref('short'))))
   end
 
-  def test_field
-    # TODO use instance field from static method
+
+  # TODO write test checking
+  # use of instance field from static method
+
+  def test_field_before_declaration
     a = @types.getFieldType(main_type, 'a', nil)
     b = @types.getFieldType(main_type, 'b', nil)
     assert_not_same(a, b)
     assert_same(a, @types.getFieldType(main_type, 'a', nil))
+
+    field = main_type.resolve.getDeclaredField('a')
+    assert(field.nil?, "expected field to be undeclared yet")
+  end
+
+  def test_separate_fields_without_declare_return_separate_futures
+    a = @types.getFieldType(main_type, 'a', nil)
+    b = @types.getFieldType(main_type, 'b', nil)
+    assert_not_same(a, b)
+  end
+
+  def test_separate_fields_with_declare_return_separate_futures
+    a = @types.getFieldTypeOrDeclare(main_type, 'a', nil)
+    b = @types.getFieldTypeOrDeclare(main_type, 'b', nil)
+    assert_not_same(a, b)
+  end
+
+  def test_declared_field_is_same_as_get_field_when_declared_first
+    a = @types.getFieldTypeOrDeclare(main_type, 'a', nil)
+    assert_same(a, @types.getFieldType(main_type, 'a', nil))
+  end
+
+  def test_declared_field_is_same_as_get_field_when_declared_second
+    a = @types.getFieldType(main_type, 'a', nil)
+    assert_same(a, @types.getFieldTypeOrDeclare(main_type, 'a', nil))
+  end
+
+  def test_field_attrs_of_declared_field
+    a = @types.getFieldTypeOrDeclare(main_type, 'a', nil)
     
     field = main_type.resolve.getDeclaredField('a')
-    assert_not_nil(field)
+
     assert_same(a, field.async_return_type)
     assert_equal("STATIC_FIELD_ACCESS", field.kind.name)
     
@@ -558,8 +601,9 @@ class MTS_MethodLookupTest < BaseMirrorsTest
   end
 
   def test_super_in_constructor
+    @scope = new_scope context: ConstructorDefinition.new
     @scope.selfType_set(main_type)
-    @scope.context_set(ConstructorDefinition.new)
+
     future = CallFuture.new(
         @types, @scope,
         @types.getSuperClass(main_type), true, 'initialize', [], [], nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirah
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: java
 authors:
 - Charles Oliver Nutter
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Mirah is a customizable programming language featuring static types,
@@ -49,8 +49,6 @@ files:
 - 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/delegate.rb
 - lib/mirah/util/logging.rb
 - lib/mirah/util/process_errors.rb
@@ -62,9 +60,9 @@ files:
 - 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/jvm_version_test.rb
+- test/core/util/mirah_arguments_test.rb
 - test/fixtures/my.properties
 - test/fixtures/org/foo/A.class
 - test/fixtures/org/foo/ImplicitClassRetAnno.java
@@ -116,6 +114,9 @@ files:
 - 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
 - examples/appengine/Readme
 - examples/appengine/src/org/mirah/list.dhtml

data/lib/mirah/util/argument_processor.rb

@@ -1,150 +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.
-
-require 'mirah/jvm/compiler'
-require 'mirah/util/logging'
-
-module Mirah
-  module Util
-
-    class ArgumentProcessor
-      def initialize(state, args)
-        @state = state
-        @args = args
-      end
-
-      attr_accessor :state, :args, :exit_status_code
-
-      alias exit? exit_status_code
-
-      def process
-        state.args = args
-        while args.length > 0 && args[0] =~ /^-/
-          case args[0]
-          when '--classpath', '-c'
-            args.shift
-            state.classpath = args.shift
-          when '--bootclasspath'
-            args.shift
-            state.bootclasspath = args.shift
-          when '--cd'
-            args.shift
-            Dir.chdir(args.shift)
-          when '--dest', '-d'
-            args.shift
-            state.destination = File.join(File.expand_path(args.shift), '')
-          when '-e'
-            break
-          when '--explicit-packages'
-            args.shift
-            Mirah::AST::Script.explicit_packages = true
-          when '--help', '-h'
-            args.shift
-            print_help
-
-            self.exit_status_code = 0
-            break
-          when '--jvm'
-            args.shift
-            state.set_jvm_version(args.shift)
-          when '-I'
-            args.shift
-            $: << args.shift
-          when '--plugin', '-p'
-            args.shift
-            plugin = args.shift
-            require "mirah/plugin/#{plugin}"
-          when '--verbose', '-V'
-            Mirah::Logging::MirahLogger.level = Mirah::Logging::Level::FINE
-            state.verbose = true
-            args.shift
-          when '--vmodule'
-            args.shift
-            spec = args.shift
-            spec.split(',').each do |item|
-              logger, level = item.split("=")
-              logger = java.util.logging.Logger.getLogger(logger)
-              (state.loggers ||= []) << logger
-              level = java.util.logging.Level.parse(level)
-              logger.setLevel(level)
-            end
-          when '--no-color'
-            args.shift
-            Mirah::Logging::MirahHandler.formatter = Mirah::Logging::LogFormatter.new(false)
-          when '--version', '-v'
-            args.shift
-            print_version
-
-            self.exit_status_code = 0 if args.empty?
-            break
-          when '--no-save-extensions'
-            args.shift
-            state.save_extensions = false
-          when '--new-backend', '-N'
-            args.shift
-            state.compiler_class = Mirah::JVM::Compiler::Backend
-          when '--new-types', '-T'
-            args.shift
-            java_import 'org.mirah.jvm.mirrors.MirrorTypeSystem'
-            state.type_system = MirrorTypeSystem.new
-          else
-            $stderr.puts "unrecognized flag: " + args[0]
-
-            self.exit_status_code = 1
-            break
-          end
-        end
-
-        return if exit?
-
-        state.destination ||= File.join(File.expand_path('.'), '')
-        state.compiler_class ||= Mirah::JVM::Compiler::JVMBytecode
-      end
-
-      def print_help
-        puts help_message
-        state.help_printed = true
-      end
-
-      def help_message
-        "#{$0} [flags] <files or -e SCRIPT>
-        -c, --classpath PATH\tAdd PATH to the Java classpath for compilation
-        --bootclasspath PATH\tSet the Java bootclasspath to PATH for compilation
-        --cd DIR\t\tSwitch to the specified DIR before compilation
-        -d, --dest DIR\t\tUse DIR as the dir to place the generated class files
-        -e CODE\t\tCompile or run the inline script following -e
-        \t\t\t  (the class will be named \"DashE\")
-        --explicit-packages\tRequire explicit 'package' lines in source
-        -h, --help\t\tPrint this help message
-        -I DIR\t\tAdd DIR to the Ruby load path before running
-        --jvm VERSION\t\tEmit JVM bytecode targeting specified JVM
-        \t\t\t  version (1.4, 1.5, 1.6, 1.7)
-        --no-save-extensions\tDon't write macro classes to files
-        --no-color\t\tDon't use color when writing logs
-        -N, --new-backend\tUse the new backend
-        -T, --new-types\tUse the new type system
-        -p, --plugin PLUGIN\trequire 'mirah/plugin/PLUGIN' before running
-        -v, --version\t\tPrint the version of Mirah to the console
-        -V, --verbose\t\tVerbose logging
-        --vmodule logger.name=LEVEL[,...]\t\tSet the Level for the specified Java loggers"
-      end
-
-      def print_version
-        puts "Mirah v#{Mirah::VERSION}"
-        state.version_printed = true
-      end
-    end
-  end
-end