mirah 0.0.7-java → 0.0.8-java

data/lib/mirah/util/class_loader.rb

@@ -0,0 +1,37 @@
+# This is a custom classloader impl to allow loading classes with
+# interdependencies by having findClass retrieve classes as needed from the
+# collection of all classes generated by the target script.
+module Mirah
+  module Util
+    class ClassLoader < java::security::SecureClassLoader
+      def initialize(parent, class_map)
+        super(parent)
+        @class_map = class_map
+      end
+
+      def findClass(name)
+        if @class_map[name]
+          bytes = @class_map[name].to_java_bytes
+          defineClass(name, bytes, 0, bytes.length)
+        else
+          raise java.lang.ClassNotFoundException.new(name)
+        end
+      end
+
+      def loadClass(name, resolve)
+        cls = findLoadedClass(name)
+        if cls == nil
+          if @class_map[name]
+            cls = findClass(name)
+          else
+            cls = super(name, false)
+          end
+        end
+
+        resolveClass(cls) if resolve
+
+        cls
+      end
+    end
+  end
+end

data/lib/mirah/util/compilation_state.rb

@@ -0,0 +1,51 @@
+# 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 'bitescript'
+
+module Mirah
+  module Util
+    class CompilationState
+      def initialize
+        @save_extensions = true
+      end
+
+      attr_accessor :verbose, :destination
+      attr_accessor :version_printed
+      attr_accessor :help_printed
+      attr_accessor :save_extensions
+      attr_accessor :running
+      alias running? running
+      attr_accessor :compiler_class
+      attr_accessor :args
+      attr_accessor :command
+
+      def set_jvm_version(ver_str)
+        case ver_str
+        when '1.4'
+          BiteScript.bytecode_version = BiteScript::JAVA1_4
+        when '1.5'
+          BiteScript.bytecode_version = BiteScript::JAVA1_5
+        when '1.6'
+          BiteScript.bytecode_version = BiteScript::JAVA1_6
+        when '1.7'
+          BiteScript.bytecode_version = BiteScript::JAVA1_7
+        else
+          $stderr.puts "invalid bytecode version specified: #{ver_str}"
+        end
+      end
+    end
+  end
+end

data/lib/mirah/util/process_errors.rb

@@ -0,0 +1,33 @@
+# 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 Util
+    module ProcessErrors
+      def process_errors(errors)
+        errors.each do |ex|
+          puts ex
+          if ex.node
+            Mirah.print_error(ex.message, ex.position)
+          else
+            puts ex.message
+          end
+          puts ex.backtrace if @verbose
+        end
+        throw :exit unless errors.empty?
+      end
+    end
+  end
+end

data/lib/mirah/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module Mirah
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/mirah_task.rb

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 require 'mirah'
+
 module Mirah
   class PathArray < Array
     def <<(value)
@@ -98,12 +99,12 @@ def mirahc(*files)
   end
   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}\//, '')}
+  files = files.map {|f| File.expand_path(f).sub(/^#{source_dir}\//, '')}
   flags = options.fetch(:options, Mirah.compiler_options)
   args = ['-d', dest, *flags] + files
   chdir(source_dir) do
     puts "mirahc #{args.join ' '}"
-    Mirah.compile(*args)
+    Mirah.compile(*args) || exit(1)
     Mirah.reset
   end
 end

data/test/{test_ast.rb → core/test_ast.rb}

@@ -371,4 +371,10 @@ class TestAst < Test::Unit::TestCase
     assert(AST::Fixnum === new_ast)
     assert_equal(1, new_ast.literal)
   end
+  
+  def test_incorrect_syntax_raises_syntax_error
+    assert_raises SyntaxError do
+      AST.parse("puts( 'aoue'")
+    end
+  end
 end

data/test/{test_env.rb → core/test_env.rb}

@@ -19,39 +19,38 @@ require 'mirah'
 class TestEnv < Test::Unit::TestCase
   include Mirah
 
-  def test_path_seperator
-    # Check that env var PATH_SEPERATOR is used
-    RbConfig::CONFIG['PATH_SEPARATOR'] = '*'
-    assert_equal('*', Mirah::Env.path_seperator)
-
-    # Check that : (colon) is returned if no PATH_SEPERATOR env var set
-    RbConfig::CONFIG['PATH_SEPARATOR'] = ''
-    assert_equal(':', Mirah::Env.path_seperator)
+  def test_use_file_path_separator
+    assert_equal(File::PATH_SEPARATOR, Mirah::Env.path_separator)
   end
 
-  def test_encode_paths
-    RbConfig::CONFIG['PATH_SEPARATOR'] = ':'
-    
-    assert_equal('a:b:c', Mirah::Env.encode_paths(['a','b','c']))
+  def test_encode_paths_joins_paths_with_path_separator
+    abc = %w[a b c]
+    assert_equal(abc.join(Mirah::Env.path_separator), Mirah::Env.encode_paths(abc))
+  end
+  
+  def test_encode_paths_with_single_element
     assert_equal('a', Mirah::Env.encode_paths(['a']))
-    assert_equal('', Mirah::Env.encode_paths([]))
-
-    RbConfig::CONFIG['PATH_SEPARATOR'] = ';'
-
-    assert_equal('a;b;c', Mirah::Env.encode_paths(['a','b','c']))
   end
 
-  def test_decode_paths
-    RbConfig::CONFIG['PATH_SEPARATOR'] = ':'
+  def test_encode_paths_with_empty_list
+    assert_equal('', Mirah::Env.encode_paths([]))
+  end
 
+  def test_decode_paths_appends_to_second_arg
+    paths_to_append = %w[a b c d]
+    encoded_paths = paths_to_append.join Mirah::Env.path_separator
     path_array = ['1','2']
-    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'], Mirah::Env.decode_paths(encoded_paths, path_array))
     assert_equal(['1','2','a','b','c','d'], path_array)
-
-    assert_equal(['a','b','c','d'], Mirah::Env.decode_paths('a:b:c:d'))
+  end
+  
+  def test_decode_paths_with_empty_list
+    assert_equal([], Mirah::Env.decode_paths(''))
+  end
+  
+  def test_decode_paths_with_single_element
     assert_equal(['a'], Mirah::Env.decode_paths('a'))
-
-    RbConfig::CONFIG['PATH_SEPARATOR'] = ';'
-    assert_equal(['a','b','c','d'], Mirah::Env.decode_paths('a;b;c;d'))
   end
+  
 end

data/test/{test_macros.rb → core/test_macros.rb}

@@ -1,7 +1,5 @@
 # TODO refactor this and test_jvm_compiler to use mirah.rb
 
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-
 require 'test/unit'
 require 'mirah'
 
@@ -11,12 +9,12 @@ class TestMacros < Test::Unit::TestCase
   def parse(code)
     Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new
     name = "script" + System.nano_time.to_s
-    state = Mirah::CompilationState.new
+    state = Mirah::Util::CompilationState.new
     state.save_extensions = false
     transformer = Mirah::Transform::Transformer.new(state)
     Java::MirahImpl::Builtin.initialize_builtins(transformer)
     ast  = Mirah::AST.parse(code, name, true, transformer)
-    typer = Mirah::Typer::JVM.new(transformer)
+    typer = Mirah::JVM::Typer.new(transformer)
     ast.infer(typer, true)
     typer.resolve(true)
     ast

data/test/{test_typer.rb → core/test_typer.rb}

@@ -14,9 +14,6 @@
 # limitations under the License.
 
 require 'test/unit'
-
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-
 require 'mirah'
 
 class TestTyper < Test::Unit::TestCase

data/test/jvm/bytecode_test_helper.rb

@@ -0,0 +1,181 @@
+# 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 'bundler/setup'
+require 'test/unit'
+require 'mirah'
+require 'jruby'
+require 'stringio'
+require 'fileutils'
+
+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 = Mirah::AST::Null
+      loop.init = init
+      loop.pre = pre
+      loop.post = post
+
+      body = fcall.block.body
+      body.parent = loop
+      [
+        Mirah::AST::Condition.new(loop, parent.position) do |c|
+          condition.parent = c
+          [condition]
+        end,
+        body
+      ]
+    end
+  end
+end
+
+
+
+module JVMCompiler
+  import java.lang.System
+  import java.io.PrintStream
+  include Mirah
+  
+  def create_transformer
+    state = Mirah::Util::CompilationState.new
+    state.save_extensions = false
+    
+    transformer = Mirah::Transform::Transformer.new(state)
+    Java::MirahImpl::Builtin.initialize_builtins(transformer)
+    transformer
+  end
+  
+  def reset_type_factory
+    AST.type_factory = Mirah::JVM::Types::TypeFactory.new
+  end
+  
+  def clear_tmp_files
+    File.unlink(*@tmp_classes)
+    @tmp_classes.clear
+  end
+  
+  def create_compiler
+    JVM::Compiler::JVMBytecode.new
+  end
+  
+  def parse name, code, transformer
+    AST.parse(code, name, true, transformer)
+  end
+  
+  def infer_and_resolve_types ast, transformer
+    typer = JVM::Typer.new(transformer)
+    
+    ast.infer(typer, true)
+    
+    typer.resolve(true)
+  end
+  
+  def parse_and_resolve_types name, code    
+    transformer = create_transformer
+    
+    ast  = parse name, code, transformer
+    
+    infer_and_resolve_types ast, transformer
+    
+    ast
+  end
+    
+  
+  def generate_classes compiler
+    classes = {}
+
+    compiler.generate do |filename, builder|
+      bytes = builder.generate
+      FileUtils.mkdir_p(File.dirname(filename))
+      open("#{filename}", "wb") do |f|
+        f << bytes
+      end
+      classes[filename[0..-7]] = bytes
+    end
+
+    loader = Mirah::Util::ClassLoader.new(JRuby.runtime.jruby_class_loader, classes)
+    classes.keys.map do |name|
+      cls = loader.load_class(name.tr('/', '.'))
+      proxy = JavaUtilities.get_proxy_class(cls.name)
+      @tmp_classes << "#{name}.class"
+      proxy
+    end
+
+  end
+  
+  def compile_ast  ast
+    compiler = create_compiler
+    compiler.compile(ast)
+    compiler
+  end
+  
+  def compile(code, name = "script" + System.nano_time.to_s)
+    clear_tmp_files
+    reset_type_factory
+    
+    ast = parse_and_resolve_types name, code
+    
+    compiler = compile_ast ast
+    
+    generate_classes compiler
+  end
+end
+
+
+module CommonAssertions
+  import java.lang.System
+  import java.io.PrintStream
+
+  def assert_include(value, array, message=nil)
+    message = build_message message, '<?> does not include <?>', array, value
+    assert_block message do
+      array.include? value
+    end
+  end
+  
+  def capture_output
+    saved_output = System.out
+    output = StringIO.new
+    System.setOut(PrintStream.new(output.to_outputstream))
+    begin
+      yield
+      output.rewind
+      output.read
+    ensure
+      System.setOut(saved_output)
+    end
+  end
+
+  def assert_output(expected, &block)
+    assert_equal(expected, capture_output(&block))
+  end
+
+end
+
+class Test::Unit::TestCase
+  include JVMCompiler
+  include CommonAssertions
+  
+  def setup
+    @tmp_classes = []
+  end
+
+  def teardown
+    reset_type_factory
+    clear_tmp_files
+  end
+end