mirah 0.0.4-java → 0.0.5-java

data/lib/mirah_task.rb

@@ -1,5 +1,20 @@
+# 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'
-module Duby
+module Mirah
   class PathArray < Array
     def <<(value)
       super(File.expand_path(value))
@@ -81,27 +96,27 @@ def mirahc(*files)
   else
     options = {}
   end
-  source_dir = options.fetch(:dir, Duby.source_path)
-  dest = File.expand_path(options.fetch(:dest, Duby.dest_path))
+  source_dir = options.fetch(:dir, Mirah.source_path)
+  dest = File.expand_path(options.fetch(:dest, Mirah.dest_path))
   files = files.map {|f| f.sub(/^#{source_dir}\//, '')}
-  flags = options.fetch(:options, Duby.compiler_options)
+  flags = options.fetch(:options, Mirah.compiler_options)
   args = ['-d', dest, *flags] + files
   chdir(source_dir) do
     puts "mirahc #{args.join ' '}"
-    Duby.compile(*args)
-    Duby.reset
+    Mirah.compile(*args)
+    Mirah.reset
   end
 end
 
-rule '.java' => [proc {|n| Duby.dest_to_source_path(n)}] do |t|
+rule '.java' => [proc {|n| Mirah.dest_to_source_path(n)}] do |t|
   mirahc(t.source,
-         :dir=>Duby.find_source(t.source),
-         :dest=>Duby.find_dest(t.name),
+         :dir=>Mirah.find_source(t.source),
+         :dest=>Mirah.find_dest(t.name),
          :options=>['-java'])
 end
 
-rule '.class' => [proc {|n| Duby.dest_to_source_path(n)}] do |t|
+rule '.class' => [proc {|n| Mirah.dest_to_source_path(n)}] do |t|
   mirahc(t.source,
-         :dir=>Duby.find_source(t.source),
-         :dest=>Duby.find_dest(t.name))
+         :dir=>Mirah.find_source(t.source),
+         :dest=>Mirah.find_dest(t.name))
 end

data/test/test_ast.rb

@@ -1,9 +1,24 @@
+# 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'
 require 'test/unit'
 require 'jruby'
 
 class TestAst < Test::Unit::TestCase
-  include Duby
+  include Mirah
 
   def test_args
     new_ast = AST.parse("def foo(a, *c, &d); end").body[0]

data/test/test_compilation.rb

@@ -1,10 +1,25 @@
+# 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'
 require 'mirah/compiler'
 require 'test/unit'
 require 'jruby'
 
 class TestAst < Test::Unit::TestCase
-  include Duby
+  include Mirah
 
   class MockCompiler
     attr_accessor :calls
@@ -81,7 +96,7 @@ class TestAst < Test::Unit::TestCase
 
     new_ast.compile(@compiler, true)
 
-    assert_equal([[:local_assign, a(Duby::AST::StaticScope), "a", nil, true, AST.fixnum(nil, nil, 1)]], @compiler.calls)
+    assert_equal([[:local_assign, a(Mirah::AST::StaticScope), "a", nil, true, AST.fixnum(nil, nil, 1)]], @compiler.calls)
   end
 
   def test_local_typed
@@ -90,7 +105,7 @@ class TestAst < Test::Unit::TestCase
     new_ast.infer(typer)
     new_ast.compile(@compiler, true)
 
-    assert_equal([[:local_assign, a(Duby::AST::StaticScope), "a", AST.type(nil, :fixnum), true, AST.fixnum(nil, nil, 1)]], @compiler.calls)
+    assert_equal([[:local_assign, a(Mirah::AST::StaticScope), "a", AST.type(nil, :fixnum), true, AST.fixnum(nil, nil, 1)]], @compiler.calls)
   end
 
   def test_return

data/test/test_env.rb

@@ -1,42 +1,57 @@
+# 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 'test/unit'
 require 'mirah'
 
 class TestEnv < Test::Unit::TestCase
-  include Duby
+  include Mirah
 
   def test_path_seperator
     # Check that env var PATH_SEPERATOR is used
     RbConfig::CONFIG['PATH_SEPARATOR'] = '*'
-    assert_equal('*', Duby::Env.path_seperator)
+    assert_equal('*', Mirah::Env.path_seperator)
 
     # Check that : (colon) is returned if no PATH_SEPERATOR env var set
     RbConfig::CONFIG['PATH_SEPARATOR'] = ''
-    assert_equal(':', Duby::Env.path_seperator)
+    assert_equal(':', Mirah::Env.path_seperator)
   end
 
   def test_encode_paths
     RbConfig::CONFIG['PATH_SEPARATOR'] = ':'
     
-    assert_equal('a:b:c', Duby::Env.encode_paths(['a','b','c']))
-    assert_equal('a', Duby::Env.encode_paths(['a']))
-    assert_equal('', Duby::Env.encode_paths([]))
+    assert_equal('a:b:c', Mirah::Env.encode_paths(['a','b','c']))
+    assert_equal('a', Mirah::Env.encode_paths(['a']))
+    assert_equal('', Mirah::Env.encode_paths([]))
 
     RbConfig::CONFIG['PATH_SEPARATOR'] = ';'
 
-    assert_equal('a;b;c', Duby::Env.encode_paths(['a','b','c']))
+    assert_equal('a;b;c', Mirah::Env.encode_paths(['a','b','c']))
   end
 
   def test_decode_paths
     RbConfig::CONFIG['PATH_SEPARATOR'] = ':'
 
     path_array = ['1','2']
-    assert_equal(['1','2','a','b','c','d'], Duby::Env.decode_paths('a:b:c:d', path_array))
+    assert_equal(['1','2','a','b','c','d'], Mirah::Env.decode_paths('a:b:c:d', path_array))
     assert_equal(['1','2','a','b','c','d'], path_array)
 
-    assert_equal(['a','b','c','d'], Duby::Env.decode_paths('a:b:c:d'))
-    assert_equal(['a'], Duby::Env.decode_paths('a'))
+    assert_equal(['a','b','c','d'], Mirah::Env.decode_paths('a:b:c:d'))
+    assert_equal(['a'], Mirah::Env.decode_paths('a'))
 
     RbConfig::CONFIG['PATH_SEPARATOR'] = ';'
-    assert_equal(['a','b','c','d'], Duby::Env.decode_paths('a;b;c;d'))
+    assert_equal(['a','b','c','d'], Mirah::Env.decode_paths('a;b;c;d'))
   end
 end

data/test/test_gwt.rb

@@ -1,3 +1,18 @@
+# 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.
+
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
@@ -5,7 +20,7 @@ require 'mirah'
 require 'jruby'
 
 class TestGWT < Test::Unit::TestCase
-  include Duby::AST
+  include Mirah::AST
 
   def test_jsni_static
     new_ast = parse("def_jsni void, _log(), 'hi'").body[0]
@@ -33,7 +48,7 @@ class TestGWT < Test::Unit::TestCase
     assert_equal(body, 'hi')
 
     signature = new_ast.signature
-    return_type = signature[:return] == Duby::AST::TypeReference.new('void')
+    return_type = signature[:return] == Mirah::AST::TypeReference.new('void')
     assert_equal(return_type, true)
 
     has_arguments = new_ast.arguments.args
@@ -43,7 +58,7 @@ class TestGWT < Test::Unit::TestCase
   def test_jsni_one_arg
     new_ast = parse("def_jsni void, _log(message:Object), 'hi'").body[0]
 
-    message_type = new_ast.signature[:message] == Duby::AST::TypeReference.new('Object')
+    message_type = new_ast.signature[:message] == Mirah::AST::TypeReference.new('Object')
     assert_equal(message_type, true)
 
     arg_size = new_ast.arguments.args.size

data/test/test_java_typer.rb

@@ -1,3 +1,18 @@
+# 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.
+
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
@@ -7,12 +22,12 @@ require 'mirah/jvm/compiler'
 require 'mirah/jvm/typer'
 
 class TestJavaTyper < Test::Unit::TestCase
-  include Duby
+  include Mirah
 
   def setup
-    AST.type_factory = Duby::JVM::Types::TypeFactory.new
+    AST.type_factory = Mirah::JVM::Types::TypeFactory.new
     @typer = Typer::JVM.new(nil)
-    compiler = Duby::Compiler::JVM.new
+    compiler = Mirah::Compiler::JVM.new
 
     @java_typer = Typer::JavaTyper.new
   end
@@ -77,7 +92,7 @@ class TestJavaTyper < Test::Unit::TestCase
     end
   end
 
-  include Duby::JVM::MethodLookup
+  include Mirah::JVM::MethodLookup
 
   def test_is_more_specific
     object = java.lang.Object.java_class
@@ -90,14 +105,14 @@ class TestJavaTyper < Test::Unit::TestCase
   end
 
   def test_primitive_convertible
-    boolean = Duby::JVM::Types::Boolean
-    byte = Duby::JVM::Types::Byte
-    short = Duby::JVM::Types::Short
-    char = Duby::JVM::Types::Char
-    int = Duby::JVM::Types::Int
-    long = Duby::JVM::Types::Long
-    float = Duby::JVM::Types::Float
-    double = Duby::JVM::Types::Double
+    boolean = Mirah::JVM::Types::Boolean
+    byte = Mirah::JVM::Types::Byte
+    short = Mirah::JVM::Types::Short
+    char = Mirah::JVM::Types::Char
+    int = Mirah::JVM::Types::Int
+    long = Mirah::JVM::Types::Long
+    float = Mirah::JVM::Types::Float
+    double = Mirah::JVM::Types::Double
 
     assert !primitive_convertible?(boolean, byte)
     assert !primitive_convertible?(boolean, short)

data/test/test_javac_compiler.rb

@@ -1,3 +1,18 @@
+# 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.
+
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
@@ -39,8 +54,8 @@ class TestJavacCompiler < TestJVMCompiler
   def compile(code)
     File.unlink(*@tmp_classes)
     @tmp_classes.clear
-    AST.type_factory = Duby::JVM::Types::TypeFactory.new
-    transformer = Duby::Transform::Transformer.new(Duby::CompilationState.new)
+    AST.type_factory = Mirah::JVM::Types::TypeFactory.new
+    transformer = Mirah::Transform::Transformer.new(Mirah::CompilationState.new)
     Java::MirahImpl::Builtin.initialize_builtins(transformer)
     name = "script" + System.nano_time.to_s
     ast  = AST.parse(code, name, true, transformer)

data/test/test_jvm_compiler.rb

@@ -1,3 +1,18 @@
+# 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.
+
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
@@ -6,13 +21,13 @@ require 'jruby'
 require 'stringio'
 require 'fileutils'
 
-unless Duby::AST.macro "__gloop__"
-  Duby::AST.defmacro "__gloop__" do |transformer, fcall, parent|
-    Duby::AST::Loop.new(parent, parent.position, true, false) do |loop|
+unless Mirah::AST.macro "__gloop__"
+  Mirah::AST.defmacro "__gloop__" do |transformer, fcall, parent|
+    Mirah::AST::Loop.new(parent, parent.position, true, false) do |loop|
       init, condition, check_first, pre, post = fcall.parameters
       loop.check_first = check_first.literal
 
-      nil_t = Duby::AST::Null
+      nil_t = Mirah::AST::Null
       loop.init = init
       loop.pre = pre
       loop.post = post
@@ -20,7 +35,7 @@ unless Duby::AST.macro "__gloop__"
       body = fcall.block.body
       body.parent = loop
       [
-        Duby::AST::Condition.new(loop, parent.position) do |c|
+        Mirah::AST::Condition.new(loop, parent.position) do |c|
           condition.parent = c
           [condition]
         end,
@@ -31,7 +46,7 @@ unless Duby::AST.macro "__gloop__"
 end
 
 class TestJVMCompiler < Test::Unit::TestCase
-  include Duby
+  include Mirah
   import java.lang.System
   import java.io.PrintStream
 
@@ -54,9 +69,9 @@ class TestJVMCompiler < Test::Unit::TestCase
   def compile(code)
     File.unlink(*@tmp_classes)
     @tmp_classes.clear
-    AST.type_factory = Duby::JVM::Types::TypeFactory.new
+    AST.type_factory = Mirah::JVM::Types::TypeFactory.new
     name = "script" + System.nano_time.to_s
-    transformer = Duby::Transform::Transformer.new(Duby::CompilationState.new)
+    transformer = Mirah::Transform::Transformer.new(Mirah::CompilationState.new)
     Java::MirahImpl::Builtin.initialize_builtins(transformer)
     ast  = AST.parse(code, name, true, transformer)
     typer = Typer::JVM.new(transformer)
@@ -65,7 +80,7 @@ class TestJVMCompiler < Test::Unit::TestCase
     compiler = Compiler::JVM.new
     compiler.compile(ast)
     classes = {}
-    loader = DubyClassLoader.new(JRuby.runtime.jruby_class_loader, classes)
+    loader = MirahClassLoader.new(JRuby.runtime.jruby_class_loader, classes)
     compiler.generate do |name, builder|
       bytes = builder.generate
       FileUtils.mkdir_p(File.dirname(name))
@@ -787,6 +802,14 @@ class TestJVMCompiler < Test::Unit::TestCase
         def a
           @a
         end
+        
+        def self.set_b(b:fixnum)
+          @@b = b
+        end
+        
+        def b
+          @@b
+        end
       end
     EOF
     first = cls.new(1)
@@ -795,6 +818,13 @@ class TestJVMCompiler < Test::Unit::TestCase
     second = cls.new(2)
     assert_equal(1, first.a)
     assert_equal(2, second.a)
+    
+    cls.set_b 0
+    assert_equal(0, first.b)
+    assert_equal(0, second.b)
+    assert_equal(1, cls.set_b(1))
+    assert_equal(1, first.b)
+    assert_equal(1, second.b)
   end
 
   def test_object_intrinsics
@@ -894,7 +924,7 @@ class TestJVMCompiler < Test::Unit::TestCase
     assert_equal('B', b.java_class.name)
     assert_equal('C', c.java_class.name)
 
-    assert_raise Duby::Typer::InferenceError do
+    assert_raise Mirah::Typer::InferenceError do
       compile(<<-EOF)
         interface A do
           def a
@@ -911,12 +941,12 @@ class TestJVMCompiler < Test::Unit::TestCase
     end
   end
 
-  def assert_throw(type, message=nil)
+  def assert_throw(type, message="")
     ex = assert_raise(NativeException) do
       yield
     end
     assert_equal type, ex.cause.class
-    assert_equal message, ex.cause.message
+    assert_equal message, ex.cause.message.to_s
   end
 
   def test_raise
@@ -2489,7 +2519,7 @@ class TestJVMCompiler < Test::Unit::TestCase
   end
 
   def test_return_type
-    assert_raise Duby::Typer::InferenceError do
+    assert_raise Mirah::Typer::InferenceError do
       compile(<<-EOF)
         class ReturnsA
           def a:int
@@ -2499,7 +2529,7 @@ class TestJVMCompiler < Test::Unit::TestCase
       EOF
     end
 
-    assert_raise Duby::Typer::InferenceError do
+    assert_raise Mirah::Typer::InferenceError do
       compile(<<-EOF)
         class ReturnsB
           def self.a:String

data/test/test_typer.rb

@@ -1,8 +1,23 @@
+# 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 'test/unit'
 require 'mirah'
 
 class TestTyper < Test::Unit::TestCase
-  include Duby
+  include Mirah
 
   def test_fixnum
     ast = AST.parse("1")