mirah 0.1.4-java → 0.2.0-java

data/examples/rosettacode/palindrome.mirah

@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-def reverse(s:string)
+def reverse(s:String)
     StringBuilder.new(s).reverse.toString()
 end
 
-def palindrome?(s:string)
+def palindrome?(s:String)
     s.equals(reverse(s))
 end
 

data/examples/rosettacode/reverse-a-string.mirah

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-def reverse(s:string)
+def reverse(s:String)
     StringBuilder.new(s).reverse
 end
 

data/examples/rosettacode/rot-13.mirah

@@ -15,7 +15,7 @@
 
 
 
-def rot13 (value:string)
+def rot13 (value:String)
     result = ""
     d = ' '.toCharArray[0]
     value.toCharArray.each do |c|

data/examples/{edb.mirah → rosettacode/simple_character_math.mirah}

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+# Copyright (c) 2015 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,6 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-def_edb :render, 'test.edb'
-@message = "Hello"
-puts render
+
+# A simple example of counting
+# the characters in a name.  Part of a test
+# to kick the tires - @aspleenic
+
+puts "Enter a name: "
+
+s = System.console.readLine()
+puts "The name you entered was #{s}"
+
+name_length = s.length
+puts "Your Name is #{name_length} characters long (that includes spaces)"

data/examples/rosettacode/string-case.mirah

@@ -15,5 +15,5 @@
 
 
 str = "alphaBETA"
-puts str.toUpperCase()
-puts str.toLowerCase()
+puts str.toUpperCase
+puts str.toLowerCase

data/examples/rosettacode/string-length.mirah

@@ -21,7 +21,7 @@
 */
 
 s = "Hello, world!"
-puts s.length() * 2
+puts s.length * 2
 
 /**
 * Another way to know the byte length of a string is to explicitly

data/examples/swing.mirah

@@ -16,20 +16,15 @@
 import javax.swing.JFrame
 import javax.swing.JButton
 
-# FIXME blocks need to be inside a MethodDefinition, but main doesn't
-# have one.
-def self.run
-  frame = JFrame.new "Welcome to Mirah"
-  frame.setSize 300, 300
-  frame.setVisible true
+frame = JFrame.new "Welcome to Mirah"
+frame.setSize 300, 300
 
-  button = JButton.new "Press me"
-  frame.add button
-  frame.show
+button = JButton.new "Press me"
+frame.add button
+frame.show
 
-  button.addActionListener do |event|
-    JButton(event.getSource).setText "Mirah Rocks!"
-  end
+button.addActionListener do |event|
+  JButton(event.getSource).setText "Mirah Rocks!"
 end
-
-run
+frame.setVisible true
+frame.setDefaultCloseOperation JFrame.EXIT_ON_CLOSE

data/extensions_and_macros.md

@@ -0,0 +1,117 @@
+Extensions and Macros
+==============
+
+
+macro compile & load:
+
+compile klass$Extension1,
+load  klass$Extension1,
+1..n
+*hand wave*
+
+if encounter klass with annotation $Extensions,
+then
+  - strip $Extensions
+  - create klass$Extensions with just the annotation
+  - compile to macrodest
+
+compile klass$Extensions referring to Extension1..n, so that it can be loaded from bytecode later
+
+
+macro load from bytecode:
+look up klass$Extensions
+gather Extension1..n
+
+Maybe could do:
+
+klass$Extensions
+klass$Extensions$Macro1
+
+instead of Extension...
+
+$Extensions(....)
+class klass$Extensions
+  
+end
+
+
+#-------
+
+
+extension compile &load
+
+extension AExt
+  for_class A
+
+  def aa: String
+    toString
+  end
+end
+
+transform ->
+
+
+class AExt
+  def self.aa(zelf: A)
+    zelf.toString
+  end
+
+  macro def aa
+    quote {`@call.target`.toString}
+  end
+  macro_register A
+end
+
+$Extensions[....]
+class AExt$Extensions;end
+
+compile 
+
+macro loading:
+
+load klass
+look in macroclasspath for klass$mirahExtensions, which has references to all the extensions
+
+
+class A
+  macro def a
+    quote { puts "a" }
+  end
+end
+
+->
+
+options:
+->
+$Extensions[A$Extension1]
+class A
+#...
+end
+
+-> $Extensions ->
+
+mirah -d classes --macro-dest macro-classes
+classes/A.class
+macro-classes/A$mirahExtensions.class
+macro-classes/A$Extension1.class
+
+loading macros / extensions
+
+
+macros on classpath
+macros on macroclasspath
+extensions on classpath
+extensions on macroclasspath
+
+
+extension decomposition
+
+extension Foo of String
+  def hello
+    puts "hello, #{self}"
+  end
+end
+
+->
+
+class

data/lib/mirah.rb

@@ -16,7 +16,7 @@
 require 'fileutils'
 require 'rbconfig'
 
-$CLASSPATH << File.dirname(__FILE__) + '/../dist/mirahc.jar'
+$CLASSPATH << ENV.fetch('MIRAHC_JAR',File.expand_path("../../dist/mirahc.jar",__FILE__))
 
 require 'mirah/version'
 require 'mirah/transform'

data/lib/mirah/errors.rb

@@ -16,11 +16,13 @@
 module Mirah
   class MirahError < StandardError
     attr_accessor :position
+    attr_accessor :diagnostic
     attr_accessor :cause
 
-    def initialize(message, position=nil)
+    def initialize(message, position=nil, diagnostic=nil)
       super(message)
       @position = position
+      @diagnostic = diagnostic
     end
 
     def inspect

data/lib/mirah/transform/ast_ext.rb

@@ -16,10 +16,11 @@ module Mirah
       #filename = transformer.tag_filename(src, filename)
       parser = MirahParser.new
       source = StringCodeSource.new(filename, src)
-      parser.diagnostics = SimpleDiagnostics.new(true)
+      diagnostics = SimpleDiagnostics.new(true)
+#     parser.diagnostics = diagnostics # Field "diagnostics" does not seem to exist in the current mirah/mmeta source code, but it did exist in an ancient mmeta.jar.
       begin
         ast = parser.parse(source)
-        if parser.diagnostics.error_count > 0
+        if diagnostics.error_count > 0
           puts "#{parser.diagnostics.error_count} errors, exiting"
           throw :exit, 1
         end

data/lib/mirah/util/process_errors.rb

@@ -51,8 +51,7 @@ module Mirah
           @typer = typer
         end
         def exitDefault(node, arg)
-          type = @typer.getInferredType(node)
-          type = type.resolve if type
+          type = @typer.getResolvedType(node)
           if (type && type.isError)
             @errors[type] ||= begin
               if type.message.size == 1

data/lib/mirah/version.rb

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

data/test/core/util/jvm_version_test.rb

@@ -36,6 +36,16 @@ class JvmVersionTest < Test::Unit::TestCase
 		end
   end
 
+  def test_java_8_supports_default_methods
+    jvm_version = JvmVersion.new "1.8"
+    assert jvm_version.supports_default_interface_methods
+  end
+
+  def test_java_7_does_not_support_default_methods
+    jvm_version = JvmVersion.new "1.7"
+    assert !jvm_version.supports_default_interface_methods
+  end
+
   def opcode spec_version
     Opcodes.const_get("V#{spec_version.sub('.','_')}")
   end

data/test/core/util/mirah_arguments_test.rb

@@ -16,6 +16,8 @@ require 'test_helper'
 
 class MirahArgumentsTest < Test::Unit::TestCase
   java_import 'org.mirah.tool.MirahArguments'
+  java_import 'java.io.File'
+  
   def test_arg_dash_v_prints_version_and_has_exit_0
     arg_processor = MirahArguments.new
 
@@ -27,7 +29,6 @@ class MirahArgumentsTest < Test::Unit::TestCase
     assert_equal 0, arg_processor.exit_status
   end
 
-
   def test_on_invalid_arg_prints_error_and_exits_1
     arg_processor = MirahArguments.new
 
@@ -40,13 +41,52 @@ class MirahArgumentsTest < Test::Unit::TestCase
   end
 
   def test_arg_bootclasspath_sets_bootclasspath_with_absolute_paths
-    path = "class:path"
+    path = Mirah::Env.encode_paths %w[class path]
     arg_processor = MirahArguments.new
     
     arg_processor.apply_args ["--bootclasspath", path]
 
-    assert_equal path.split(":").map{|p|"file:%s" % File.expand_path(p) }.join(":"),
-                 arg_processor.real_bootclasspath.map{|u| u.to_s }.join(":")
+    assert_equal_classpaths path,
+                 arg_processor.real_bootclasspath
+  end
+
+  def test_flag_classpath_overrides_env
+    env = { "CLASSPATH" => Mirah::Env.encode_paths(%w[some classpath]) }
+            
+    path = Mirah::Env.encode_paths %w[class path]
+    
+    arg_processor = MirahArguments.new env
+    arg_processor.apply_args ["--classpath", path]
+
+    assert_equal_classpaths path,
+                 arg_processor.real_classpath
+  end
+
+  def test_classpath_is_from_env_without_flag
+    path = Mirah::Env.encode_paths %w[class path]
+    env = { "CLASSPATH" => path }
+    
+    arg_processor = MirahArguments.new env
+    arg_processor.apply_args []
+
+    assert_equal_classpaths path,
+                 arg_processor.real_classpath
+  end
+
+  def test_classpath_defaults_to_cwd
+    arg_processor = MirahArguments.new({})
+    arg_processor.apply_args []
+
+    assert_equal_classpaths ".",
+                 arg_processor.real_classpath
+  end
+
+  def test_classpath_is_destination_when_no_flag_or_env
+    arg_processor = MirahArguments.new({})
+    arg_processor.apply_args ["-d", "some/path"]
+
+    assert_equal_classpaths "some/path",
+                 arg_processor.real_classpath
   end
 
   def test_dash_h_prints_help_and_exits
@@ -62,4 +102,11 @@ class MirahArgumentsTest < Test::Unit::TestCase
     assert arg_processor.exit?
     assert_equal 0, arg_processor.exit_status
   end
+
+  def assert_equal_classpaths expected, actual_classpath_list
+    normalized_expected = Mirah::Env.decode_paths(expected).
+      map { |p| "#{File.new(::File.expand_path(p)).toURI.toURL}#{"./" if p == "." }" }
+    assert_equal Mirah::Env.encode_paths(normalized_expected),
+                 Mirah::Env.encode_paths(actual_classpath_list.map{ |u| u.to_s })
+  end
 end

data/test/fixtures/cp1251_test.mirah

@@ -0,0 +1,7 @@
+class ��������1251
+  def ����
+  end
+  def self.main(args:String[]):void
+    puts 'cp1251 encoding test'
+  end
+end

data/test/fixtures/org/foo/AbstractExecutorJava8.java

@@ -0,0 +1,30 @@
+/*
+  Copyright (c) 2015 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.
+  */
+package org.foo;
+
+import java.util.Arrays;
+
+public abstract class AbstractExecutorJava8 {
+
+    public abstract void execute();
+
+    public static void execute(AbstractExecutorJava8 o){
+        //to test inner classes generated by lambda do not prevent abstract method lookup
+        Arrays.asList(1, 2, 3).stream().filter((v) -> v > 1);
+        o.execute();
+    }
+}

data/test/fixtures/org/foo/ClassWithSelfReferencingTypeParameter.java

@@ -0,0 +1,24 @@
+package org.foo;
+
+public class ClassWithSelfReferencingTypeParameter<P extends ClassWithSelfReferencingTypeParameter<P>> {
+	
+	P self;
+	
+	@SuppressWarnings("unchecked")
+	public ClassWithSelfReferencingTypeParameter() {
+		this.self = (P) this;
+	}
+	
+	public P foo() {
+		return self;
+	}
+	
+	public P bar() {
+		return self;
+	}
+	
+	public void baz() {
+		System.out.println("baz");
+	}
+}
+