mirah 0.1.1-java → 0.1.2-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 94bd269f142b48ceb3d74a18a8b55830d23abef4
+  data.tar.gz: db296eba09334207d811878f5c703ca7dafd8167
+SHA512:
+  metadata.gz: 103411eeafff8608f3ee284ef2298fd85f14b065c70b69799ed94d5c2650e3a7806fa9aaabe327a3db73fdccb1e46c64d3d7161c0d971ec5bf35ee9210fb7af9
+  data.tar.gz: 591ed4759862e3ecf0b9c33a4332a87639ea82c761b925ea7b56a961610af0f0fb3a7efd8ccd1b2e3aef602d521fcac9b49bf05e4a2590b688984977e4870607

data/History.txt

@@ -1,3 +1,136 @@
+=== 0.1.2 New Year, New Release / 2014-01-05
+
+8421140 add desc'd rake task for building mirahc.jar
+325ec54 replace deprecated import usage w/ java_import in test helper
+f3c7911 move classpath-> Java URLs helper to Env module
+7e738c3 add passed classpath to run classpath when running with mirah
+1766599 split out test class file destinations for fixtures vs test classes
+e4e6f49 don't use platform dependent path separator literals in jvm type factory classpath munging
+223042f clean up run command
+66f8b24 rm puts in jvm base compiler
+0bb156e fix gem task definition ordering
+c2e59b4 add apache 2 license to gemspec
+3480594 move a few local variable assignments in the typer closer to their usage
+68d883e clean up Rakefile & fix gem task so that it depends on bootstrap
+e46edc7 add tests for type future classes, fix a couple associated bugs
+860f87f do some c&p to maybe get CallCompiler reliably building on CI
+8cf13b1 reorder call_compiler initializers to see if that'll fix it (annoyingly)
+331005e reformat initialize args for CallCompiler
+8e86d54 comment out non local return support so that this branch can be merged into master
+cedd8c2 break out multi arg block tests into typed and untyped
+9e19a49 have CallFuture log resolved target as well as args
+c9321ae add custom inspect for MirahError
+044f7ef improve scope inspect st it includes capture info
+8ab9e91 try removing unused var / move replace self down
+b8aac8a replace manually created lists with literals
+89c71f7 refactor node replacement into an extracted method
+ce7817a pull out more common code from macro expansion
+ca1a4e0 begin cleaning up macro expansion in typer
+8ced4e7 consolidate field type inference
+bbf8356 extract common target type lookup for fields
+81ec8ad extract helper for defaultExceptionTypeName
+3dffc61 extract inferring annotations
+d011167 extract inferring params
+5dbd367 consolidate call method type future creation
+71b731e consolidate workaround methods via widened type
+39a66ee extract creating scopes w/ selfType
+52723e9 extract adding nested scopes in typer
+f2410e6 collapse a couple more getTypeOfs
+88fe75a add widened getLocalType helper that works for any Named node
+062b55a refactor typer method def: reorg declaration to usage
+a38ae97 extract common call target inference
+21b7307 remove unnecessary temp vars from Typer.getLocalType
+5af117d pull out helper for adding new scope to typer
+71616c9 use type helper in a couple non-obvious places
+80cc787 wrap getting types from the typesystem in a helper
+150b91c typer: rm unneeded temp vars named outer_scope
+d2eff01 wrap scope getting w/ a helper method in typer
+f4f25f2 extract helper for argument types that works for all but rest args
+4f83d90 pushing more helper code around in typer
+e301bab oops. types for getLocalType helper were wrong. Fixed them, and added scope back
+114421a more reformatting of MethodDefinition typing
+b4ebaa6 add helper for constructing local type for args
+a632bae extract some helper methods for methoddefinition typing
+951c7a3 add some newline formatting in the typer
+e9e6b5e replace todos w/ methods noted w/ todos
+a5f7e63 Merge branch 'master' into closure_changes
+41640bc add cli help for new options
+c0d557b Merge branch 'string_ext' of git://github.com/altamic/mirah
+59fc3a8 closure work continues
+ea86178 Minor patches + Merge branch 'master' into closure_changes :/
+8e0f9b8 Fix jruby jar path
+c7e537e Fix double expansion of macros in FunctionalCall
+b61f5bf Fix return types.
+b30d7eb Fix for field assignment as a method call.
+084366d Add a pass to fix unitialized locals.
+35abdad merge
+b534cb6 Add a target to bootstrap using javalib/mirahc.jar.
+c2f8bb9 Expose the correct type system to macros.
+b783d57 Fix ambiguity for nil method parameters.
+e7b7f2b More fixes to compile with the selfhosted mirahc.jar
+3fe8e4b Fix vararg generic methods.
+0429eb6 Typo
+9b4655e Better error reporting.
+8efd6b2 Bug fixes
+e472901 ScriptCleanup is not reusable.
+c9ce542 Fixes to get code compiling with mirahc.jar
+1584448 Fix for macro compilation.
+343ac03 Fix for overrides with optional arguments.
+1c4dbde Fix calls to protected methods using super.
+a6bac61 Fix for recompiling a class that is also on the classpath.
+21fdfd9 add method def internal support, get a few more tests passing
+fed5aa6 use bundled mirahc instead of just built mirahc
+5ad5b1a added << operator to StringBuilder (somewhat fixes #40)
+079ded9 Added include? method to String (closes #133)
+41de27f added =~ operator to String (closes #160)
+ab10d98 use the jruby jar in javalib instead of the in-use one
+8dc1bd6 beginnings of a better way to build closures -- still has problems
+068b248 rm the compiler jar on clean
+ac45fa0 add more nlr tests
+9c9eaa7 wrap rescue around parent node list
+2cc0cd5 first pass at non local return
+5bdeca4 download jruby jar instead of keeping it in git
+02cee59 bump version to 0.1.2.dev
+1b74e54 Hack to support covariant return types.
+4f0ba15 Try to make debug info a little more sane
+f356201 Optional arguments don't need a declaration.
+a5cd63c Mirah methods should not return generic types
+0c1feee Another missing import
+1b326e2 Print the number of errors.
+d863176 Fix some override bugs.
+162848b Guard against concurrent modification in BaseType.notifyOfIncompatibleChange
+36a0635 Fix test_method_requiring_subclass_of_abstract_class_finds_abstract_method
+60dcf76 Add missing file
+d895ad2 Better support for overridden methods.
+82b089f Fix expansion order for macros.
+4eabcc5 Ensure method changes from supertypes get propagated
+5388d85 Don't consider macros when inferring overridden method types.
+9036f24 More debug logging to track down unhelpful error messages during inference.
+31c9cee bump history again
+33afd17 bump bitescript dependency
+98f57da bump 0.1.1 history
+af66397 bump bitescript version to 0.1.3
+776b74f when bundled in a jar, add the jar to the classpath
+71d3b82 rm dynalink from zip/jar dist
+383c615 bump version to 0.1.1; update history
+97d46fc add tests to nail down super behavior
+4ef8b3b add inherited lookup to static fields
+dabe54d fix missing conversion for implicit returns in new backend
+754cc38 fix primitive conversion errors in code generation for implicit return in methods
+d565657 update maven release instructions
+9d7529f the gem now relies on mirrors and the new backend
+8a781fc Merge branch 'master' of https://github.com/mirah/mirah
+0ef465c More missing imports
+ac60613 bump history again
+00e481f Missing import
+ff8c5b3 Show inference error messages from multiple classes.
+ea7a434 Support inferring overridden types when the same override is contained in multiple supertypes.
+ba84b9c Better error handling in generic method processing
+fc831a8 Guard against concurrent modification
+b214f8f Typo
+bdba3fc Support missing selfType in MethodLookup.
+aeaa4bc Fix compilation of extensions inside a package.
+
 === 0.1.1 Summer Summit / 2013-08-05
 
 e94e5be bump bitescript dependency

data/Rakefile

@@ -22,6 +22,11 @@ require 'java'
 require 'jruby/compiler'
 require 'ant'
 
+# this definition ensures that the bootstrap tasks will be completed before
+# building the .gem file. Otherwise, the gem may not contain the jars.
+task :gem => [:bootstrap,
+              "javalib/mirah-compiler.jar",
+              "javalib/mirah-mirrors.jar"]
 Gem::PackageTask.new Gem::Specification.load('mirah.gemspec') do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
@@ -29,14 +34,16 @@ end
 
 bitescript_lib_dir = File.dirname Gem.find_files('bitescript').first
 
-task :gem => ['jar:bootstrap', "javalib/mirah-compiler.jar", "javalib/mirah-mirrors.jar"]
-task :bootstrap => ['javalib/mirah-bootstrap.jar', 'javalib/mirah-builtins.jar', 'javalib/mirah-util.jar']
+task :bootstrap => ['javalib/mirah-bootstrap.jar',
+                    'javalib/mirah-builtins.jar',
+                    'javalib/mirah-util.jar']
 
 
 task :default => :bytecode_ci
 
 desc "run bytecode backend ci"
-task :bytecode_ci => [:'test:core', :'test:jvm:bytecode']
+task :bytecode_ci => [:'test:core',
+                      :'test:jvm:bytecode']
 desc "run new backend ci"
 task :new_ci => [:'test:core', :'test:jvm:new']
 
@@ -86,7 +93,9 @@ namespace :test do
     task :test_setup =>  [:clean_tmp_test_directory, :build_test_fixtures]
 
     desc "run jvm tests compiling to bytecode"
-    Rake::TestTask.new :bytecode => [:bootstrap, :test_setup] do |t|
+    Rake::TestTask.new :bytecode => [:bootstrap, 
+                                     "javalib/mirah-compiler.jar",
+                                      :test_setup] do |t|
       t.libs << 'test' <<'test/jvm'
       t.ruby_opts.concat ["-r", "bytecode_test_helper"]
       t.test_files = FileList["test/jvm/**/*test.rb"]
@@ -119,10 +128,12 @@ end
 task :clean_tmp_test_directory do
   FileUtils.rm_rf "tmp_test"
   FileUtils.mkdir_p "tmp_test"
+  FileUtils.mkdir_p "tmp_test/test_classes"
+  FileUtils.mkdir_p "tmp_test/fixtures"
 end
 
 task :build_test_fixtures do
-  ant.javac 'destdir' => "tmp_test", 'srcdir' => 'test/fixtures',
+  ant.javac 'destdir' => "tmp_test/fixtures", 'srcdir' => 'test/fixtures',
     'includeantruntime' => false, 'debug' => true, 'listfiles' => true
 end
 
@@ -136,8 +147,10 @@ task :clean do
   ant.delete 'quiet' => true, 'dir' => 'build'
   ant.delete 'quiet' => true, 'dir' => 'dist'
   rm_f 'javalib/mirah-bootstrap.jar'
+  rm_f 'javalib/mirah-compiler.jar'
   rm_f 'javalib/mirah-builtins.jar'
   rm_f 'javalib/mirah-util.jar'
+  rm_f 'javalib/mirah-mirrors.jar'
   rm_rf 'tmp'
 end
 
@@ -163,8 +176,11 @@ task :jar => :compile do
 end
 
 namespace :jar do
+  desc "build mirahc.jar"
+  task :mirahc => 'javalib/mirahc.jar'
+
   desc "build self-contained, complete jar"
-  task :complete => :jar do
+  task :complete => [:jar, 'javalib/jruby-complete.jar'] do
     ant.jar 'jarfile' => 'dist/mirah-complete.jar' do
       zipfileset 'src' => 'dist/mirah.jar'
       zipfileset 'src' => 'javalib/jruby-complete.jar'
@@ -174,9 +190,6 @@ namespace :jar do
       end
     end
   end
-
-  desc "build bootstrap jar used by the gem"
-  task :bootstrap => 'javalib/mirah-bootstrap.jar'
 end
 
 desc "Build a distribution zip file"
@@ -201,6 +214,16 @@ end
 desc "Build all redistributable files"
 task :dist => [:gem, :zip]
 
+file_create 'javalib/jruby-complete.jar' do
+  require 'open-uri'
+  puts "Downloading jruby-complete.jar"
+  open('http://jruby.org.s3.amazonaws.com/downloads/1.7.4/jruby-complete-1.7.4.jar', 'rb') do |src|
+    open('javalib/jruby-complete.jar', 'wb') do |dest|
+      dest.write(src.read)
+    end
+  end
+end
+
 file_create 'javalib/mirah-newast-transitional.jar' do
   require 'open-uri'
   puts "Downloading mirah-newast-transitional.jar"
@@ -243,6 +266,43 @@ file 'javalib/mirah-bootstrap.jar' => ['javalib/mirah-newast-transitional.jar',
   end
 end
 
+file 'javalib/mirahc-2.jar' => ['javalib/mirahc.jar'] do
+  build_dir = 'build/bootstrap'
+  rm_rf build_dir
+  mkdir_p build_dir
+
+  # Compile annotations and class loader
+  ant.javac 'source' => '1.5', 'destdir' => build_dir, 'srcdir' => 'src',
+    'includeantruntime' => false, 'debug' => true, 'listfiles' => true
+
+  # Compile the Typer and Macro compiler
+  stage1_files = Dir['src/org/mirah/{builtins,jvm/types,macros,util,}/*.mirah',
+                     'src/org/mirah/typer/**/*.mirah']
+  runjava('javalib/mirahc.jar',
+          '-d', build_dir,
+          '-classpath', 'javalib/mirah-parser.jar',
+          *stage1_files)
+  
+  add_quote_macro                    
+  cp Dir['src/org/mirah/macros/*.tpl'], "#{build_dir}/org/mirah/macros"
+
+  stage2_files = Dir['src/org/mirah/jvm/{compiler,mirrors,model}/**/*.mirah',
+                     'src/org/mirah/tool/*.mirah']
+  runjava('javalib/mirahc.jar',
+          '-d', build_dir,
+          '-classpath', "javalib/mirah-parser.jar:#{build_dir}",
+          *stage2_files)
+
+  # Build the jar                    
+  ant.jar 'jarfile' => 'javalib/mirahc-2.jar' do
+    fileset 'dir' => build_dir
+    zipfileset :src => 'javalib/jruby-complete.jar', :includes => 'org/jruby/org/objectweb/**/*'
+    zipfileset :src => 'javalib/mirah-parser.jar'
+    manifest do
+      attribute :name => 'Main-Class', :value => 'org.mirah.tool.Mirahc'
+    end
+  end
+end
 
 file 'javalib/mirah-util.jar' do
   require 'mirah'
@@ -260,7 +320,7 @@ file 'javalib/mirah-util.jar' do
 
   # compile ant stuff
   ant_classpath = $CLASSPATH.grep(/ant/).map{|x| x.sub(/^file:/,'')}.join(File::PATH_SEPARATOR)
-  sh *%W(jruby -Ilib bin/mirahc --classpath #{ant_classpath}:#{build_dir} --dest #{build_dir} src/org/mirah/ant)
+  sh *%W(jruby -S mirahc --classpath #{ant_classpath}:#{build_dir} --dest #{build_dir} src/org/mirah/ant)
 
   # compile invokedynamic stuff
   ant.javac 'destdir' => build_dir, 'srcdir' => 'src',
@@ -279,7 +339,7 @@ file 'javalib/mirah-builtins.jar' => ['javalib/mirah-bootstrap.jar'] + Dir['src/
   rm_f 'javalib/mirah-builtins.jar'
   rm_rf 'build/builtins'
   mkdir_p 'build/builtins'
-  sh *%w(jruby -Ilib bin/mirahc --dest build/builtins src/org/mirah/builtins)
+  sh *%w(jruby -S mirahc --dest build/builtins src/org/mirah/builtins)
   ant.jar 'jarfile' => 'javalib/mirah-builtins.jar' do
     fileset 'dir' => 'build/builtins'
   end
@@ -293,29 +353,28 @@ file 'javalib/mirah-compiler.jar' => ['javalib/mirah-builtins.jar'] + Dir['src/o
   phase3_files = Dir['src/org/mirah/jvm/compiler/{class,interface,script}_compiler.mirah'] + ['src/org/mirah/jvm/compiler/backend.mirah']
   phase2_files = Dir['src/org/mirah/jvm/compiler/{condition,method,string}_compiler.mirah']
   phase1_files = Dir['src/org/mirah/jvm/compiler/*.mirah'] - phase2_files - phase3_files
-  sh *(%w(jruby -Ilib bin/mirahc --dest build/compiler ) +
+  sh *(%w(jruby -S mirahc --dest build/compiler ) +
        %w(--classpath javalib/mirah-parser.jar:javalib/mirah-bootstrap.jar) +
        %w(src/org/mirah/util src/org/mirah/jvm/types src/org/mirah/jvm/compiler/base_compiler.mirah))
-  sh *(%w(jruby -Ilib bin/mirahc --dest build/compiler ) +
+  sh *(%w(jruby -S mirahc --dest build/compiler ) +
        %w(--classpath javalib/mirah-parser.jar:javalib/mirah-bootstrap.jar:build/compiler) +
        %w(src/org/mirah/util/context.mirah) + phase1_files)
-  sh *(%w(jruby -Ilib bin/mirahc --dest build/compiler ) +
+  sh *(%w(jruby -S mirahc --dest build/compiler ) +
        %w(--classpath javalib/mirah-parser.jar:javalib/mirah-bootstrap.jar:build/compiler) +
        %w(src/org/mirah/util/context.mirah) + phase2_files)
-  sh *(%w(jruby -Ilib bin/mirahc --dest build/compiler ) +
+  sh *(%w(jruby -S mirahc --dest build/compiler ) +
        %w(--classpath javalib/mirah-parser.jar:javalib/mirah-bootstrap.jar:build/compiler) +
        %w(src/org/mirah/util/context.mirah) + phase3_files)
   ant.jar 'jarfile' => 'javalib/mirah-compiler.jar' do
     fileset 'dir' => 'build/compiler'
   end
-  rm_rf 'build/compiler'
 end
 
 file 'javalib/mirah-mirrors.jar' => ['javalib/mirah-compiler.jar'] + Dir['src/org/mirah/jvm/mirrors/**/*.mirah','src/org/mirah/jvm/model/**/*.mirah'] do
   rm_f 'javalib/mirah-mirrors.jar'
   rm_rf 'build/mirrors'
   mkdir_p 'build/mirrors'
-  sh *(%w(jruby -Ilib bin/mirahc -N --dest build/mirrors ) +
+  sh *(%w(jruby -S mirahc -N --dest build/mirrors ) +
        %w(--classpath javalib/mirah-parser.jar:javalib/mirah-bootstrap.jar:javalib/mirah-compiler.jar) +
        %w(src/org/mirah/jvm/mirrors/ src/org/mirah/jvm/model/))
   ant.jar 'jarfile' => 'javalib/mirah-mirrors.jar' do
@@ -324,21 +383,13 @@ file 'javalib/mirah-mirrors.jar' => ['javalib/mirah-compiler.jar'] + Dir['src/or
   rm_rf 'build/mirrors'
 end
 
-def find_jruby_jar
-  require 'java'
-  java_import 'org.jruby.Ruby'
-  path = Ruby.java_class.resource('Ruby.class').toString
-  path =~ %r{^jar:file:(.+)!/org/jruby/Ruby.class}
-  $1
-end
-
 file 'javalib/mirahc.jar' => ['javalib/mirah-mirrors.jar',
                               'src/org/mirah/tool/mirahc.mirah',
                               ] do
   rm_f 'javalib/mirahc.jar'
   rm_rf 'build/mirahc'
   mkdir_p 'build/mirahc'
-  sh *(%w(jruby -Ilib bin/mirahc -N --dest build/mirahc ) +
+  sh *(%w(jruby -S mirahc -N --dest build/mirahc ) +
        %w(--classpath javalib/mirah-parser.jar:javalib/mirah-bootstrap.jar:javalib/mirah-compiler.jar:javalib/mirah-mirrors.jar) +
        %w(src/org/mirah/tool/))
   ant.jar :jarfile => 'javalib/mirahc.jar' do
@@ -348,7 +399,7 @@ file 'javalib/mirahc.jar' => ['javalib/mirah-mirrors.jar',
     zipfileset :src => 'javalib/mirah-util.jar'
     zipfileset :src => 'javalib/mirah-compiler.jar'
     zipfileset :src => 'javalib/mirah-mirrors.jar'
-    zipfileset :src => find_jruby_jar, :includes => 'org/jruby/org/objectweb/**/*'
+    zipfileset :src => 'javalib/jruby-complete.jar', :includes => 'org/jruby/org/objectweb/**/*'
     zipfileset :src => 'javalib/mirah-parser.jar'
     manifest do
       attribute :name => 'Main-Class', :value => 'org.mirah.tool.Mirahc'

data/lib/mirah/ast/scope.rb

@@ -46,7 +46,8 @@ module Mirah
       end
 
       def to_s
-        "#<StaticScope node=#{@scope_node.inspect}>"
+        #"#<StaticScope node=#{@scope_node.to_s}>"
+        inspect
       end
 
       def inspect
@@ -54,6 +55,7 @@ module Mirah
         result << "parent=#{@parent}\n  " if @parent
         result << "vars=#{locals.inspect}\n  " if @vars.size > 0
         result << "shadowed=#{@shadowed.keys.inspect}\n  " if @shadowed.size > 0
+        result << "captured=#{capturedLocals.inspect}\n  " if capturedLocals.size > 0
         result << "temps=#{@temps.keys.inspect}\n  " if @temps.size > 0
         result << "package=#{@package}\n  " if @package
         result << "imports=#{@imports.inspect}\n  " if @imports.size > 0
@@ -92,7 +94,7 @@ module Mirah
       end
 
       def temp(name="tmp")
-        "$#{name}$#{@temps[name] += 1}"
+        "#{name}$#{@temps[name] += 1}"
       end
 
       def local_type(name, position=nil)

data/lib/mirah/commands/run.rb

@@ -21,20 +21,12 @@ module Mirah
     class Run < Base
       def execute
         execute_base do
-          main = nil
-          class_map = {}
+          class_map = generate_classes
+          $CLASSPATH << Mirah::Env.decode_paths(@state.classpath) if @state.classpath
+          class_loader = load_classes class_map
 
-          # generate all bytes for all classes
-          generator = Mirah::Generator.new(@state, @state.compiler_class, false, @state.verbose)
+          main = find_main class_map, class_loader
 
-          generator.generate(args).each do |result|
-            class_map[result.classname.gsub(/\//, '.')] = Mirah::Util::ClassLoader.binary_string result.bytes
-          end
-
-          # load all classes
-          main = load_classes_and_find_main(class_map)
-
-          # run the main method we found
           run_main(main)
         end
       end
@@ -45,15 +37,18 @@ module Mirah
 
       private
 
-      def load_classes_and_find_main(class_map)
-        main = nil
-        dcl = Mirah::Util::ClassLoader.new(JRuby.runtime.jruby_class_loader, class_map)
-        class_map.each do |name,|
-          cls = dcl.load_class(name)
-          # TODO: using first main; find correct one?
-          main ||= cls.get_method("main", java::lang::String[].java_class)
+      def load_classes(class_map)
+        Mirah::Util::ClassLoader.new(JRuby.runtime.jruby_class_loader, class_map)
+      end
+
+      def find_main class_map, class_loader
+        # TODO: using first main; find correct one?
+        class_map.keys.each do |name|
+          cls = class_loader.load_class(name)
+          main = cls.get_method("main", java::lang::String[].java_class)
+          return main if main
         end
-        main
+        nil
       end
 
       def run_main(main)
@@ -68,6 +63,16 @@ module Mirah
           puts "No main found" unless @state.version_printed || @state.help_printed
         end
       end
+
+      def generate_classes
+        # generate all bytes for all classes
+        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
     end
   end
 end