mirah 0.1.2-java → 0.1.3-java

data/TODO.md

@@ -0,0 +1,100 @@
+
+0.1.3 checklist
+=============
+
+- check jar CLI
+org.mirah:mirah doesn't work w/o JRuby currently
+org.mirah:mirah-complete jar is also broken in 0.1.2, 0.1.1
+:/
+otoh, probably no one is using them since they don't work
+
+- check jruby gem
+0.1.2 is the broken :(
+
+- done: silence run compiler logging
+- done: make sure in run mode we don't drop things on the filesystem
+- silence logging by default in RunCommand, w/ options overriding it.
+
+
+- Java 8
+-- make asm new d/l dependency
+-- find usages of org.jruby...asm & change them
+-- rm jruby-complete asa d/l dep
+-- add asm license file to dist bundle
+
+- mirah-parser CI (ish)
+- automated tests for distribution artifacts
+- CI passing
+
+
+------------------
+
+
+
+
+
+- Check mvn compile plugin
+- move build artifacts to javalib for gem
+
+- verify bytecode version of compiler
+- silence logging from JRuby interfaces, unless overridden.
+
+Misc
+===========
+- mirah-parser maven artifact
+
+- java 9
+- implicit void methods w/ explicit return generate incorrect bytecode. Let's see if that's true of explicit. nope.
+- get rid of all outputs that escape from tests
+- default toString?
+
+etc
+=========
+
+- Reflection Macros
+- AST formatter that converts back to something the parser can parse
+
+- switch to minitest
+
+from notes, uncategorized
+============================
+#fuzzy aka cast scoping
+for rescue clauses
+eg
+e = nil
+begin
+rescue X => e
+  # e is "X" here
+rescue Y => e
+  # e is "Y" here
+end
+puts e # e is LUB(X, Y)
+
+#behavior literate, exec spec
+list o example code + what the compiler says when you give it to the compiler
+things like errors, & behavior
+
+feature requests
+----------------
+- goto: headius wants it
+- synchronize intrinsic ala java's
+- file scoped macros
+- move macro / mirahc anno to separate class dir to improve javac interop
+
+parser
+-------
+
+foo {|a| !a || ''.equals(a) }
+doesn't parse
+
+does now :)
+
+
+blocks don't introduce new scopes when they are part of a macro currently :/
+
+
+Release management
+------------------
+
+keep version in fewer places
+whew

data/bin/bundler

@@ -0,0 +1,16 @@
+#!/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

@@ -0,0 +1,16 @@
+#!/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/appengine/Readme

@@ -3,7 +3,6 @@ Run rake to compile the application and start the development server:
 $ jruby -I `pwd`/../../lib -S rake
 
 Requirements:
- - jruby -S gem install bitescript
  - jruby -S gem install appengine-sdk -v=1.3.5.pre
 
 Datastore API:

data/examples/literals.mirah

@@ -0,0 +1,17 @@
+str = 'non-interpolated string'
+str2 = "interpolated is better than #{str}"
+heredoc = <<EOS
+this is a here doc
+EOS
+int = 42
+char = ?a
+float = 3.14159265358979323846264
+regex = /\d(cow)+\w\\/  # in Java, this would be "\\\\d(cow)+\\\\w\\\\\\\\"
+regex2 = /interpolated #{regex}/
+list = [1, 2, 3]
+list[2] = 4
+array = byte[5]
+array[0] = byte(0)
+hash = { "one" => 1, "two" => 2 }
+hash["three"] = 3
+

data/examples/macros/string_each_char.mirah

@@ -16,7 +16,7 @@
 
 macro def eachChar(value, block:Block)
     quote {
-        `value`.toCharArray.each do |`block.arguments` |
+        `value`.toCharArray.each do |`block.arguments`|
             `block.body`
         end
     }

data/lib/mirah.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");
@@ -15,41 +15,30 @@
 
 require 'fileutils'
 require 'rbconfig'
-require 'bitescript'
 
-$CLASSPATH << File.dirname(__FILE__) + '/../javalib/mirah-builtins.jar'
-$CLASSPATH << File.dirname(__FILE__) + '/../javalib/mirah-parser.jar'
-$CLASSPATH << File.dirname(__FILE__) + '/../javalib/mirah-bootstrap.jar'
-$CLASSPATH << File.dirname(__FILE__) + '/../javalib/mirah-util.jar'
-$CLASSPATH << File.dirname(__FILE__) + '/../javalib/mirah-compiler.jar'
-$CLASSPATH << File.dirname(__FILE__) + '/../javalib/mirah-mirrors.jar'
+$CLASSPATH << File.dirname(__FILE__) + '/../dist/mirahc.jar'
 
 require 'mirah/version'
 require 'mirah/transform'
-require 'mirah/ast'
-require 'mirah/compiler'
 require 'mirah/env'
 require 'mirah/errors'
 require 'mirah/typer'
-require 'mirah/jvm/types'
 
-require 'mirah/jvm/compiler'
-#Dir[File.dirname(__FILE__) + "/mirah/plugin/*"].each {|file| require "#{file}" if file =~ /\.rb$/}
-require 'jruby'
+require "mirah/util/process_errors"
+require "mirah/util/logging"
+require "mirah/util/class_loader"
 
-require 'mirah/commands'
 
 module Mirah
+  java_import 'org.mirah.tool.RunCommand'
+  java_import 'org.mirah.tool.Mirahc'
+
   def self.run(*args)
-    Mirah::Commands::Run.new(args).execute
+    Mirah::RunCommand.run(args)
   end
 
   def self.compile(*args)
-    Mirah::Commands::Compile.new(args).execute
-  end
-
-  def self.parse(*args)
-    Mirah::Commands::Parse.new(args).execute
+    Mirah::Mirahc.new.compile(args)
   end
 
   def self.plugins
@@ -102,6 +91,7 @@ module Mirah
       endcol = end_col if lineno == end_line
 
       result << "^" * [endcol - start, 1].max
+
       result << "\n"
     end
     result

data/lib/mirah/transform/transformer.rb

@@ -25,12 +25,11 @@ module Mirah
       attr_reader :errors, :state
       attr_accessor :filename
 
-      def initialize(state, typer)
+      def initialize(typer)
         @errors = []
         @tmp_count = 0
         @annotations = []
         @extra_body = nil
-        @state = state
         @typer = typer
         @types = typer.type_system if typer
         @files = {""=>{:filename => "", :line => 0, :code => ""}}

data/lib/mirah/util/class_loader.rb

@@ -5,7 +5,7 @@ module Mirah
 
     # converts string to a java string w/ binary encoding
     # might be able to avoid this in 1.9 mode
-    def ClassLoader.binary_string string
+    def self.binary_string string
         java.lang.String.new string.to_java_bytes, "ISO-8859-1"
     end
 

data/lib/mirah/util/logging.rb

@@ -6,69 +6,6 @@ module Mirah
     java_import 'java.util.logging.Level'
 
     MirahLogger = Logger.getLogger('org.mirah')
-    MirahHandler = ConsoleHandler.new
-    MirahLogger.addHandler(MirahHandler)
-    MirahLogger.use_parent_handlers = false
-    MirahHandler.level = Level::ALL
-
-    class LogFormatter < Formatter
-      def initialize(use_color=true)
-        @color = use_color
-        @names = {}
-        @inverse_names = {}
-      end
-
-      def format_name(sb, level, name)
-        sb.append("\e[1m") if @color
-        sb.append("* [")
-        if @color && level > 800
-          if level > 900
-            sb.append("\e[31m")
-          else
-            sb.append("\e[34m")
-          end
-        end
-        sb.append(shorten(name))
-        sb.append("\e[39m") if @color
-        sb.append('] ')
-        sb.append("\e[0m") if @color
-      end
-
-      def shorten(name)
-        short = @names[name]
-        return short if short
-        pieces = name.split('.')
-        pieces.size.times do |i|
-          key = pieces[-i - 1, i + 1]
-          existing = @inverse_names[key]
-          if existing.nil? || existing == [name]
-            @inverse_names[key] = [name]
-            return @names[name] = key.join('.')
-          else
-            existing.each {|i| @names[i] = nil}
-            existing << name unless existing.include?(name)
-          end
-        end
-        return name
-      end
-
-      def format(record)
-        sb = java.lang.StringBuilder.new
-        format_name(sb, record.level.int_value, record.logger_name)
-        sb.append(formatMessage(record))
-        sb.append("\n")
-        if record.thrown
-          sw = java.io.StringWriter.new
-          pw = java.io.PrintWriter.new(sw)
-          record.thrown.printStackTrace(pw)
-          pw.close
-          sb.append(sw.toString)
-        end
-        sb.toString
-      end
-    end
-
-    MirahHandler.formatter = LogFormatter.new
 
     module Logged
       VLEVELS = [Level::CONFIG, Level::FINE, Level::FINER, Level::FINEST]

data/lib/mirah/util/process_errors.rb

@@ -92,6 +92,7 @@ module Mirah
           end
         end
       end
+
     end
   end
 end

data/lib/mirah/version.rb

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

data/{examples/simple_class.mirah~ → test/artifacts/jar_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");
@@ -13,15 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Foo
-  def initialize
-    puts 'constructor'
-    @hello = 'Hello, '
-  end
+require 'test_helper'
 
-  def hello(a:string)
-    puts @hello; puts a
+class JarTest < Test::Unit::TestCase
+  def test_happy_path
+  	out = `java -jar dist/mirahc.jar run -e 'puts 1'`
+    assert_equal "1\n", out
   end
-end
-
-Foo.new.hello('Mirah')
+end

data/{lib/mirah/commands.rb → test/artifacts/jruby_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");
@@ -13,7 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mirah/commands/base'
-require 'mirah/commands/run'
-require 'mirah/commands/compile'
-require 'mirah/commands/parse'
+require 'test_helper'
+
+class JrubyTest < Test::Unit::TestCase
+  def test_happy_path_works
+    Mirah.compile '-e', '1+1'
+  end
+end

data/test/core/typer_test.rb

@@ -42,7 +42,7 @@ class TyperTest < Test::Unit::TestCase
   def new_typer(n)
     @types = SimpleTypes.new(n.to_s)
     @typer = Mirah::Typer::Typer.new(@types, @scopes, nil, nil)
-    @mirah = Transform::Transformer.new(Mirah::Util::CompilationState.new, @typer)
+    @mirah = Transform::Transformer.new(@typer)
     @typer
   end
 
@@ -214,12 +214,15 @@ class TyperTest < Test::Unit::TestCase
     assert_equal(@types.getFloatType(1.0), inferred_type(ast.get(1)).returnType)
   end
 
-  def test_if
-    ast = parse("if true; 1.0; else; ''; end").body
+  def test_if_incompatible_body_types_float_string
+    pend_on_jruby "1.7.13" do
+      ast = parse("if true; 1.0; else; ''; end").body
 
-    # incompatible body types
-    assert_equal(':error', infer(ast).name)
+      assert_equal(':error', infer(ast).name)
+    end
+  end
 
+  def test_if_not_error_on_same_type_float
     ast = parse("if true; 1.0; else; 2.0; end").body.get(0)
 
     assert_not_equal(':error', infer(ast).name)
@@ -227,7 +230,9 @@ class TyperTest < Test::Unit::TestCase
     assert_equal(@types.getBooleanType, inferred_type(ast.condition))
     assert_equal(@types.getFloatType(1.0), inferred_type(ast.body))
     assert_equal(@types.getFloatType(1.0), inferred_type(ast.elseBody))
+  end
 
+  def test_if
     typer = new_typer(:Bar)
 
     ast = parse("if foo; bar; else; baz; end").body.get(0)
@@ -266,9 +271,11 @@ class TyperTest < Test::Unit::TestCase
   end
 
   def test_rescue_w_different_type_raises_inference_error_when_expression
-    ast = parse("1 + begin true; 1.0; rescue; ''; end")
-    infer(ast, true)
-    assert_errors_including "Incompatible types", @typer, ast
+    pend_on_jruby "1.7.13" do
+      ast = parse("1 + begin true; 1.0; rescue; ''; end")
+      infer(ast, true)
+      assert_errors_including "Incompatible types", @typer, ast
+    end
   end
 
   def test_rescue_w_different_type_doesnt_raise_inference_error_when_statement
@@ -280,7 +287,7 @@ class TyperTest < Test::Unit::TestCase
   def test_colon2
     ast = parse("java::lang::System.out")
     infer(ast)
-    target_type = inferred_type(ast.body(0).target)
+    target_type = inferred_type(ast.body(0).get(0).target)
     assert_equal('java.lang.System', target_type.name)
   end
 
@@ -296,7 +303,18 @@ class TyperTest < Test::Unit::TestCase
     infer(ast)
     assert_equal(@types.getFixnumType(1), inferred_type(ast.body(2)))
     assert_equal(@types.getNullType, inferred_type(ast.body(3)))
-    assert_kind_of(LocalAccess, ast.body(2))
-    assert_kind_of(FunctionalCall, ast.body(3))
+
+    assert_kind_of(LocalAccess, ast.body(2).get(0))
+    assert_kind_of(FunctionalCall, ast.body(3).get(0).get(0))
+  end
+
+  def test_import
+    pend_on_jruby "1.7.13" do
+      ast = parse("import FooBar")
+      assert_equal("Void", infer(ast).name)
+      ast = parse("import foobar")
+      infer(ast)
+      assert_errors_including("Cannot find class foobar", @typer, ast)
+    end
   end
 end