mirah 0.0.10-java → 0.0.11-java

data/History.txt

@@ -1,3 +1,47 @@
+=== 0.0.11 Pre-Hackathon Edition / 2012-04-09
+
+235e887 set version to 0.0.11
+d11f694 actually use the bootclasspath in the bootstrap_loader
+6f293d8 fix and test(barely) IsolatedResourceLoader
+cff273c add tests for MirahClassLoader
+98adac4 add some comments on class loaders
+e1ddf6a reorg run a little, ensure fail has non-zero exit
+6a7f2c4 add needed breaks in to args processor
+72c0031 clean up arg processor interface a bit
+886bc5f test that bootclasspath arg sets the bootclasspath
+141aceb add small test for args processor
+b981088 removing an accidental X from annotations test
+4361a10 rename test classes to match their filenames
+7312718 use git bitescript by default
+2642a28 add tab to cli help for bootclasspath
+97cee78 Support specifying --bootclasspath
+6b05845 clean up build_string in java_source
+ab5c6ac fixes #175. wrap string interp prior to calling method on it.
+b5148ed Merge pull request #174 from nighthacker/master
+5bb1d2a fixed mistaken command line flags in synopsis
+96a9074 closures in closures fixes: 155
+77f110f move block tests into block_test
+6e6bfaf previous change was insufficiently argy.
+98acfef complain if blocks don't have the right number of arguments
+7076279 add zip install instructions
+2930ff3 Update README.txt. Fixes #163
+9a06b83 Merge pull request #166 from keithcelt/master
+737c01c Silence ant runtime errors on systems building with ant 1.8
+f8e3edf Fixes 162 by requiring java.lang.System as a string
+f7c5bee rename tests so test is suffix instead of prefix
+0caf3d0 pull bitescript exts out into their own file
+d680a33 fixes #13. adding == & != on bools
+1a3da9f if no args & -v specified, exit with status 0
+a044d7b Remove conflicting "Exception" import and move "System" import to class body. Fixes #159.
+0d0b350 move constructor tests into their own file
+b351c13 don't raise errors on empty files
+84c2a83 have Mirah::Parser use the same code path as tests do
+56bee53 Tests. Fixes #157
+2fddffe Treat the expression as resolved if the primary_type is nil, as in `return`. #157
+1a5c40e Don't treat Ensure as an expression; it can never have a return type. #157
+e04c70f bump versions to 0.0.11.dev
+
+
 === 0.0.10 / 2011-11-20
 
 f6035d0 set version to 0.0.10

data/README.txt

@@ -23,8 +23,8 @@ mirah <script.mirah>
 mirah -e "inline script"
 mirahc <script.mirah>
 mirahc -e "inline script" # produces DashE.class
-mirahc -java <script.mirah>
-mirahc -java -e "inline script" # produces DashE.java
+mirahc --java <script.mirah>
+mirahc --java -e "inline script" # produces DashE.java
 
 == REQUIREMENTS:
 
@@ -33,10 +33,19 @@ mirahc -java -e "inline script" # produces DashE.java
 
 == INSTALL:
 
+=== RUBY:
 If your gem and rake are not from from JRuby, prefix the commands with jruby -S
 
 $ gem install mirah
 
+=== ZIP:
+
+You can also install Mirah from a zip file. Download the latest stable
+release from https://github.com/mirah/mirah/downloads. 
+Extract it, and add `bin` to your `$PATH` to be able to use `mirah`, `mirahc`, etc.
+
+=== SOURCE:
+
 To build and install from source,
 
 $ git clone http://github.com/mirah/mirah.git
@@ -47,8 +56,4 @@ $ gem install pkg/mirah-*.gem
 
 == For Java tools:
 
-To build the Mirah jars from source you should have a checkout of both jruby and
-bitescript in Mirah's parent directory. Run "ant jar-complete" in jruby, then in
-the mirah directory "../jruby/bin/jruby -S rake jar" to build the Mirah jar. Use
-"jar:complete" instead to produce a free-standing jar file with JRuby and the
-JRubyParser libraries included.
+To build the Mirah jar from source run "rake jar" in the mirah directory.

data/Rakefile

@@ -39,7 +39,7 @@ def run_tests tests
     rescue Exception
     end
   end
-  
+
   tests.zip(results).each do |name, passed|
     unless passed
       puts "Errors in #{name}"
@@ -47,7 +47,7 @@ def run_tests tests
   end
   fail if results.any?{|passed|!passed}
 end
-  
+
 desc "run full test suite"
 task :test do
   run_tests [ 'test:core', 'test:plugins', 'test:jvm' ]
@@ -57,14 +57,14 @@ namespace :test do
   desc "run the core tests"
   Rake::TestTask.new :core do |t|
     t.libs << 'test'
-    t.test_files = FileList["test/core/**/test*.rb"]
+    t.test_files = FileList["test/core/**/*test.rb"]
     java.lang.System.set_property("jruby.duby.enabled", "true")
   end
-  
+
   desc "run tests for plugins"
   Rake::TestTask.new :plugins do |t|
     t.libs << 'test'
-    t.test_files = FileList["test/plugins/**/test*.rb"]
+    t.test_files = FileList["test/plugins/**/*test.rb"]
     java.lang.System.set_property("jruby.duby.enabled", "true")
   end
 
@@ -72,24 +72,24 @@ namespace :test do
   task :jvm do
     run_tests ["test:jvm:bytecode", "test:jvm:javac"]
   end
-  
+
   namespace :jvm do
     desc "run jvm tests compiling to bytecode"
     Rake::TestTask.new :bytecode do |t|
       t.libs << 'test' <<'test/jvm'
       t.ruby_opts.concat ["-r", "bytecode_test_helper"]
-      t.test_files = FileList["test/jvm/**/test*.rb"]
+      t.test_files = FileList["test/jvm/**/*test.rb"]
       java.lang.System.set_property("jruby.duby.enabled", "true")
     end
-    
+
     desc "run jvm tests compiling to java source, then bytecode"
     Rake::TestTask.new :javac do |t|
       t.libs << 'test' <<'test/jvm'
       t.ruby_opts.concat ["-r", "javac_test_helper"]
-      t.test_files = FileList["test/jvm/**/test*.rb"]
+      t.test_files = FileList["test/jvm/**/*test.rb"]
       java.lang.System.set_property("jruby.duby.enabled", "true")
     end
-    
+
   end
 end
 
@@ -132,11 +132,12 @@ task :compile => :init do
       'mirah'
       )
   end
-  
+
   # compile invokedynamic stuff
   ant.javac :destdir => 'build', :srcdir => 'src',
     :includes => 'org/mirah/DynalangBootstrap.java',
-    :classpath => 'javalib/dynalink-0.1.jar:javalib/jsr292-mock.jar'
+    :classpath => 'javalib/dynalink-0.1.jar:javalib/jsr292-mock.jar',
+    :includeantruntime => false
 end
 
 desc "build basic jar for distribution"

data/lib/mirah/appengine_tasks.rb

@@ -25,9 +25,10 @@ module AppEngine::Rake
   APIS = AppEngine::SDK::API_JAR
   TOOLS = AppEngine::SDK::TOOLS_JAR
 
-  $CLASSPATH << SERVLET
-  $CLASSPATH << APIS
-  $CLASSPATH << TOOLS
+  CLASSPATH = []
+  CLASSPATH << SERVLET
+  CLASSPATH << APIS
+  CLASSPATH << TOOLS
 
   class AppEngineTask < Rake::Task
     def initialize(*args, &block)
@@ -38,14 +39,15 @@ module AppEngine::Rake
     def init(src, war)
       @src = src
       @war = war
-      unless $CLASSPATH.include?(webinf_classes)
-        $CLASSPATH << webinf_classes
+      unless CLASSPATH.include?(webinf_classes)
+        CLASSPATH << webinf_classes
       end
       webinf_lib_jars.each do |jar|
-        $CLASSPATH << jar unless $CLASSPATH.include?(jar)
+        CLASSPATH << jar unless CLASSPATH.include?(jar)
       end
       Mirah.source_paths << src
       Mirah.dest_paths << webinf_classes
+      Mirah.compiler_options = ['--classpath', Mirah::Env.encode_paths(CLASSPATH)]
       directory(webinf_classes)
       directory(webinf_lib)
 

data/lib/mirah/ast/flow.rb

@@ -344,7 +344,7 @@ module Mirah
           if types.any? {|t| t.nil?}
             typer.defer(self)
           else
-            if !expression || clause_types.all?{ |t| primary_type.compatible? t}
+            if !expression || primary_type.nil? || clause_types.all?{ |t| primary_type.compatible? t}
               resolved!
               types.each do |type|
                 @inferred_type ||= type unless type.unreachable?
@@ -373,9 +373,9 @@ module Mirah
       def infer(typer, expression)
         resolve_if(typer) do
           typer.infer(clause, false)
-          typer.infer(body, true)
+          typer.infer(body, false)
         end
       end
     end
   end
-end
+end

data/lib/mirah/ast/structure.rb

@@ -145,7 +145,7 @@ module Mirah::AST
       mirah = typer.transformer
       interface = method.argument_types[-1]
       outer_class = scope.defining_class
-      
+
       binding = scope.binding_type(mirah)
       
       name = "#{outer_class.name}$#{mirah.tmp}"
@@ -157,6 +157,8 @@ module Mirah::AST
           mirah.eval("@binding = binding", '-', c, 'binding')
       end
 
+      @defining_class = klass.static_scope.self_type
+
       # TODO We need a special scope here that allows access to the
       # outer class.
       static_scope.self_type = typer.infer(klass, true)
@@ -174,6 +176,15 @@ module Mirah::AST
       typer.infer(instance, true)
     end
 
+    def defining_class
+      @defining_class
+    end
+
+    # TODO extract this & matching methods into a module
+    def binding_type(mirah=nil)
+      static_scope.binding_type(defining_class, mirah)
+    end
+
     def add_methods(klass, binding, typer)
       method_definitions = body.select{ |node| node.kind_of? MethodDefinition }
       
@@ -183,8 +194,10 @@ module Mirah::AST
         # TODO warn if there are non method definition nodes
         # they won't be used at all currently--so it'd be nice to note that.
         method_definitions.each do |node|
+          
           node.static_scope = static_scope
           node.binding_type = binding
+#          node.children.each {|child| child.instance_variable_set '@scope', nil }
           klass.append_node(node)
         end
       end
@@ -206,8 +219,16 @@ module Mirah::AST
         next false
       end
 
-      raise "Multiple abstract methods found within given interface [#{impl_methods.map(&:name).join(', ')}]; cannot use block" if impl_methods.size > 1
+      # It could also just define all the methods w/ the block as the implementation, assuming the args check out
+      # instead of it being an error.
+      if impl_methods.size > 1
+        raise Mirah::NodeError.new("Multiple abstract methods found within interface #{klass.interfaces.map(&:name).inspect} [#{impl_methods.map(&:name).join(', ')}]; cannot use block", self)
+      end
+
       impl_methods.each do |method|
+        if args.args.length != method.argument_types.length
+          raise Mirah::NodeError.new("Block can't implement #{method.name}: wrong number of arguments. Expected #{method.argument_types.length}, but was #{args.args.length}", self)
+        end
         mdef = klass.define_method(position,
                             method.name,
                             method.return_type,

data/lib/mirah/commands/base.rb

@@ -32,12 +32,15 @@ module Mirah
       attr_accessor :state, :args, :argument_processor
       
       def execute_base
+        argument_processor.process
+        if argument_processor.exit?
+          exit argument_processor.exit_status_code
+        end
         # because MirahCommand is a JRuby Java class, SystemExit bubbles through and makes noise
         # so we use a catch/throw to early exit instead
         # see util/process_errors.rb
         status = catch(:exit) do
           begin
-            argument_processor.process
             yield
           rescue Mirah::InternalCompilerError => ice
             Mirah.print_error(ice.message, ice.position) if ice.node
@@ -55,4 +58,4 @@ module Mirah
       end
     end
   end
-end
+end

data/lib/mirah/commands/base.rb~

@@ -0,0 +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 'mirah/jvm/types'
+require 'mirah/util/compilation_state'
+require 'mirah/util/argument_processor'
+require 'mirah/errors'
+
+module Mirah
+  module Commands
+    class Base
+      def initialize(args)
+        Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new
+        @state = Mirah::Util::CompilationState.new
+        @state.command = command_name
+        @args = args
+        @argument_processor = Mirah::Util::ArgumentProcessor.new(@state, @args)
+      end
+      
+      attr_accessor :state, :args, :argument_processor
+      
+      def execute_base
+        # because MirahCommand is a JRuby Java class, SystemExit bubbles through and makes noise
+        # so we use a catch/throw to early exit instead
+        # see util/process_errors.rb
+        status = catch(:exit) do
+          begin
+            argument_processor.process
+            yield
+          rescue Mirah::InternalCompilerError => ice
+            Mirah.print_error(ice.message, ice.position) if ice.node
+            raise ice.cause if (ice.cause && state.verbose)
+            raise ice
+          rescue Mirah::MirahError => ex
+            Mirah.print_error(ex.message, ex.position)
+            puts ex.backtrace if state.verbose
+            throw :exit, 1
+          end
+          0
+        end
+        exit status if status > 0
+      end
+    end
+  end
+end

data/lib/mirah/commands/run.rb

@@ -22,14 +22,10 @@ module Mirah
       def execute
         execute_base do
           main = nil
-          class_map = {}
+
           
           # generate all bytes for all classes
-          generator = Mirah::Generator.new(@state, @state.compiler_class, false, @state.verbose)
-          
-          generator.generate(args).each do |result|
-            class_map[result.classname.gsub(/\//, '.')] = Mirah::Util::ClassLoader.binary_string result.bytes
-          end
+          class_map = generate_class_map 
           
           # load all classes
           main = load_classes_and_find_main(class_map)
@@ -44,6 +40,16 @@ module Mirah
       end
       
       private
+
+      def generate_class_map
+        generator = Mirah::Generator.new(@state, @state.compiler_class, false, @state.verbose)
+
+        class_map = {}
+        generator.generate(args).each do |result|
+          class_map[result.classname.gsub(/\//, '.')] = Mirah::Util::ClassLoader.binary_string result.bytes
+        end
+        class_map
+      end
       
       def load_classes_and_find_main(class_map)
         main = nil
@@ -65,9 +71,10 @@ module Mirah
             raise e
           end
         else
-          puts "No main found" unless @state.version_printed || @state.help_printed
+          $stderr.puts "No main found"
+          exit 1
         end
       end
     end
   end
-end
+end

data/lib/mirah/jvm/compiler/java_source.rb

@@ -609,7 +609,9 @@ module Mirah
             method.call(self, call, expression)
             return
           else
+            @method.print "("             if Mirah::AST::StringConcat === target
             target.compile(self, true)
+            @method.print ")"             if Mirah::AST::StringConcat === target
             @method.print ".#{method.name}("
           end
 
@@ -700,20 +702,22 @@ module Mirah
           if expression
             nodes = precompile_nodes(orig_nodes)
             simple = nodes.equal?(orig_nodes)
-            if !simple
+
+            unless simple
               @method.print(lvalue)
             end
-            first = true
-            unless nodes[0].kind_of?(Mirah::AST::String)
-              @method.print '""'
-              first = false
-            end
-            nodes.each do |node|
-              @method.print ' + ' unless first
-              first = false
+
+            @method.print '"" + ' unless nodes.first.kind_of?(Mirah::AST::String)
+
+            nodes.first.compile(self, true)
+
+            nodes[1..-1].each do |node|
+              @method.print ' + '
               node.compile(self, true)
             end
-            @method.puts ';' unless simple
+            unless simple
+              @method.puts ';'
+            end
           else
             orig_nodes.each {|n| n.compile(self, false)}
           end
@@ -776,4 +780,4 @@ module Mirah
       end
     end
   end
-end
+end