mirah 0.0.12-java → 0.1.0-java

data/History.txt

@@ -1,3 +1,375 @@
+=== 0.1.0 Steamboating / 2013-02-24
+
+db38a8d make tests 1.6.8 compatible
+57835f1 raise an error attempting to compile mirah using jruby before 1.7
+ea04a51 stop using turn gem
+46f603e when the source mirror doesn't work (1.6.8 on java 7), continue
+9bb9f29 bump version to 0.1.0 from 0.1.0.pre / 0.1.0-SNAPSHOT
+06dff98 bump bitescript version required to 0.1.2 or higher
+e74bc53 reenable dynamic, raise nice errors when on jvm < 1.7
+8bb7728 rename generator's extension compiler to @extension_compiler
+4936c8c remove dynamic type assignment test
+c44c78e use the test name as part of the class name of anon Mirah classes in tests
+56a10ef fix some whitespace in test/jvm/bytecode_test_helper.rb
+0471e49 clean tmp directory as it's used in building distribution artifacts
+3824dcc add mirah-util.jar to bootstrap task
+c78cd1b also rm the mirah-util jar on clean
+76bc6ef don't blow up if the source mirror can't work. (Java 7-15 appears to have removed an internal class)
+5ee433f fix java version of class files compiled for 7 instead of 6
+400b718 Recompile mmeta.BaseParser for Java 6
+91f4974 Add missing file
+76facfc Fix DynamicType.superclass. This fixes the tests, but I still think dynamic is generally broken.
+9057240 Closes #206
+79c400c Merge https://github.com/mirah/mirah into fix
+586bfc3 Fix abstract Closes #207
+d90563f merge
+9164bf2 Implement static imports with new syntax.
+09c4a4b Rebuild lexer for Java 6
+91d3a6a Really update the parser jar this time
+53fccff Update the parser.
+1595e89 start a test suite for the examples
+6d61273 fix string_each_char to work with new ast
+cec675b clean up import related tests
+cd17b50 add tests for static macros
+c9f8bcd fix lower case inner class lookup.
+69085e8 add lowercase inner class test that fails, add java test fixture for it
+400d549 don't use Ruby string interpolation on test that uses Mirah interpolation
+36a5a84 add whitespace to ErrorType
+d62cfda bump cast_test copyright year to 2013
+dd9048a fix raise assertion in rescue tests
+7135761 fix java exception assertion method
+cacd537 move interface tests into own test case
+7247dde ensure we don't try cleaning up a class file twice it tests
+2dc065e move casting tests to their own file
+23712cb add toString to LocalFuture
+652179b add to string to CallFuture
+f968291 primitives shouldn't be convertible to arrays of that primitive
+5e55644 fix whitespace in factory/ note possibly dead code
+84262c2 remove array_type if statement that had both sides commented out
+1fcd805 clean up method_lookup.rb a little, fix printing bitescript mirrors on ambiguity errors
+f0765f4 move jvm ensure tests to rescue_test
+884645e add check to make sure gem build fails when generated jars not present
+6241541 Access RubyGems via SSL so it'll stop whining.
+9541f01 Bundler uses `vendor` for gems. Ignore it.
+1a1a68d Fix class_loader_test
+5414ac3 Fix typer_test.
+332f4a9 pick primitives last in typer to avoid assuming things are meta as much
+fe73423 Revert "make typer vcall test pass again." Turns out the test is pointing out a real bug
+ea265ee make typer vcall test pass again.
+6fe3c28 add toString to MethodType
+28e184b Merge pull request #204 from tychobrailleur/maven-fix
+dd0cba1 Clean up Maven poms.
+fbbcdb8 Ignore backup files.
+b11dcfe give super test class better name
+2fe9b84 don't include minitest, as we don't use it, clean up .class file cleanup
+0d5691f first pass at doing autoboxing
+c1a070e rename some block test classes to ensure they don't conflict
+8479db5 fix dash e, add regression test
+cb33c59 if a varargs method is passed a matching array, use that as the varargs array
+9e35eac test cleanup: remove unnecessary clear, add/remove whitespace
+dcbb4fb missed a varargs method definition
+c1886fc add varargs support
+f56c38d add support for referring to macros that have already been compiled.
+0d866a4 clean up byte code test helper a bit
+01b6c3b Merge remote-tracking branch 'tychobrailleur/fix_compile'
+4ad6a4d Ensure resolve return type is ResolvedType.
+f0fd6b0 Really fix the parser jar this time.
+f856785 Merge from master
+3182a90 Recompile some parser classes for java 6.
+931f041 note that you need jruby 1.7.0 to compile mirah
+d7bd6a1 Fix bootstrap under jruby 1.7.0
+9967d48 Fix some tests.
+af0a9ee Try to get rid of a warning about ambiguos methods
+aedab51 Fix bootstrap under jruby 1.7.0
+fadf3c8 Fix widening for stack frames.
+1b16915 Fix macro loading in 1.7.0
+5d5ce53 More jruby 1.7.0 fixes (but these break 1.6.x)
+83a5ce9 Fix interface ambiguity
+a7283f3 Merge in better parser error handling
+3a2bbfa Fix for classes which change package.
+1bd8200 Support declaring a method before the parameter types are resolved.
+636fe73 Lookup return type for overrides with no declared return type
+c5a02e1 Fix infinite recursion in AssignableTypeFuture
+c9e8433 Better error message when method args are missing the type declaration.
+9438dfc More fixes for better error messages.
+2631f2c Fix typo
+c7c8559 Fix error propagation to better show the source of errors.
+765e50a Fix bug where a local variable foo loads class Foo
+e4fb346 Remove reference to AST.type_factory
+978611b don't remove the build dir after finishing the build.
+02da6ed remove unused constant
+2c50acb remove references in README to java source generation as it is no longer supported
+bebcfa4 fix class path for generating ant task
+1a54f0c add util jar containing ant task, add it to classpath for gem
+645253b consolidate classpath munging into mirah.rb
+15483bf some 1.9 fixes: each_with_index => each.with_index / each_line.with_index / zip
+6a2bd1b Merge pull request #193 from SaberUK/patch-1
+0a9d165 Merge branch 'master' of https://github.com/mirah/mirah
+d7f39b8 Compile the ant task.
+fd25564 rm_f so we can clean even if the file is already missing.
+90ac5b9 Fix small typo in help message.
+
+=== 0.1.0.pre RubyConf newast preview release / 2012-11-02
+
+a104440 change version to 0.1.0.pre
+afe5384 Add attr_{reader,writer,accessor} builtins.
+8e31256 Generify array literals and reimplement hash literals the same way as arrays.
+8976381 Fix hygene for all? and any? builtins.
+a8c5d60 Fix test_void_chain
+f9ba709 Fix test_implements
+9f55cbb Support references to primitive types
+3aaac97 Support for static macros and casts to array types.
+179ea1f Fix test_super_constructor
+cf3e040 Fix test_optional_args
+6de0a1c Fix test_block_with_method_def
+dcbb840 Fix a couple macro tests
+f4102d6 Fixes for trying to compile the typer.
+fcfc448 Allow widening to the other type, not just its ancestors.
+939a155 Fixes for mirah-complete.jar
+e2228bf Bug fixes and better error handling.
+a6e9cc8 Fix assignable_from?(NullType)
+fe75374 Remove mirah-builtins.jar in the 'clean' task.
+4e67815 Merge pull request #192 from nuclearsandwich/whitespace
+64da41e Strip trailing whitespace from test directory.
+d61a535 Strip trailing whitespace from examples.
+a48641b Strip trailing whitespace from lib directory.
+ce169d2 Strip trailing whitespace from src directory.
+f9c1910 clean up some debugging code
+f12db8a Merge branch 'master' of https://github.com/mirah/mirah
+9e03b1a Fix test_constructor_chaining
+2b86e38 fix typer rescue test
+32e1658 add [], []= support to List
+1dc2d5c rake clean should rm the bootstrap jar
+7879e20 fix class name of NumericExtensionTest
+6536e0b add some documentation to the macro builder
+d72cbe0 Generate missing arguments for blocks
+f0792db Revert "Remove obsolete test_block_with_no_params_on_interface_with"
+6fa6472 Fix test_void_chain
+33dc95a Remove obsolete test_block_with_no_params_on_interface_with
+0cb1f6a Fix test_parameter_used_in_block
+1150c0a Implement closures.
+2875d54 add license/ whitespace to transformer
+4538141 actually lib/mirah/transform/error.rb isn't used anymore, so deleting it
+cbf7b6c add license to lib/mirah/transform/error.rb
+3b66952 add license header to errors file
+29e8edb clean up underlining
+8a492b2 unwind some nested logic in jvm method lookup
+e45e21b put the 0.0.12 history back in
+26224db Merge branch 'master' into newast
+93cb158 bump to 0.1.0.dev, because 0.0.x is oldast
+9e10f98 bump versions to 0.0.13.dev
+83a021c remove win JAVA_HOME lookup because it has problems with spaces in the PATH
+b97b567 Add file headers
+81e94e0 Split up types.mirah
+9439368 Split up simple.mirah
+a5384f9 Split up futures.mirah and add some documentation
+c1ebe5c More quick test fixes
+c8c28b9 Fix test_interface_declaration
+b13b84a Fix "Cannot assign #<IntegerType int> to #<VoidType void>" error from void methods
+ca875de More test fixes
+1c5542f Fix test_block_with_mirah_interface
+2e13c9f Fix scope for block args (test_block_with_abstract_from_object)
+6fe2e59 Fix test_block_impling_interface_w_multiple_methods
+65dd342 Infer arg types from superclasses or interfaces
+2329074 Constant narrowing for AttrAssign and ElemAssign nodes
+1d225d9 Fix test_argument_widening
+d62ad67 Fix macro inheritance on generic types
+de79c6f Implement ZSuper
+e84f525 Delete test_arg_bootclasspath_sets_bootclasspath_on_type_factory_ugh
+257eb93 Merge
+c7fdf60 Mostly fix typer tests.
+ddc1498 Remove the broken java source backend
+03cbb4b fix #186 on newast, ignore implemented methods in getAbstractMethods on factory
+65520ec actually use bootclasspath in the generator
+16647d4 ignore generated/ downloaded jar files
+4301fc5 actually use the bootclasspath in the bootstrap_loader
+2ece709 convert IsolatedResouceLoader to Java, put MirahClassLoader's mirah src in a comment, test class loaders.
+e54d183 add tests for MirahClassLoader
+8a7f943 add some comments on class loaders
+39cf42b test that bootclasspath arg sets the bootclasspath
+b5afc07 add tab to cli help for bootclasspath
+34af825 Support specifying --bootclasspath
+e31ed58 fixes #185 ScopedBody's generated by macros outside methods should work
+b32a286 Merge pull request #184 from pepijndevos/newast
+cae497b add power macro test
+9178182 Merge branch 'newast' of https://github.com/mirah/mirah into newast
+e9da596 Delete dead code
+81d7b58 basic power macro
+05615cf Duplicate DelegateClass logic from Ruby 1.8, for consistency.
+11ec687 update version to 0.0.12.dev
+2f5ac6c missed the SNAPSHOT in a couple pom.xmls
+862c760 update history for 0.0.11
+17814eb set version to 0.0.11
+e00ab4b comment out bootclasspath test--there is no bootclasspath yet
+1e46765 add needed breaks in to args processor
+79c6c66 clean up arg processor interface a bit
+040d276 rename test classes to match their filenames
+59a0ccb clean up build_string in java_source
+b9550e7 fixes #175. wrap string interp prior to calling method on it.
+54526f5 Merge pull request #174 from nighthacker/master
+f396297 add test for nested closures, touch struct method where changes were added in master
+fe53909 previous change was insufficiently argy.
+0f1cd70 complain if blocks don't have the right number of arguments
+9b88275 add zip install instructions
+167c9c2 Update README.txt. Fixes #163
+f5fdb07 Array.each
+57faaca add missing files
+b33ae42 Merge branch 'newast' of github.com:mirah/mirah into newast
+0291c24 Iterable builtins
+65c726d Don't run javac backend tests by default -- they're completely broken
+9541d76 Test fixes
+bc6b158 Loops
+6ebe8da Merge branch 'newast' of github.com:mirah/mirah into newast
+6223111 Re-enable hash_test.rb
+c43ce7a Hash support
+1ff787d Clean up trailing newlines.
+bbc8e4d Handle one level of nesting on return types, and arbitrary nesting on parameters. Also handle wildcards in parameters. Support single 'extends' or 'implements' bounds, but not 'implements' with multiple interfaces.
+b3cf443 Start implementing hashes
+8803dd7 Fix test_instance_macro_call
+41fcca0 Fix test_block_parameter_uses_outer_scope
+9eca828 Fix test_add_args_in_macro
+a6f8a07 Some macro fixes
+d83daa8 Merge branch 'newast' of https://github.com/mirah/mirah into newast
+63c2101 Basic generics support. Handles only the case where the method parameter or return type are simple type variables.
+82cf35c puts. Sweet. Except JRuby can't find it most of the time. Cry.
+8d0df92 Fix package for main type
+f0499f5 Don't auto-generate a class or a main method unless needed
+632a453 Add missing file logging.rb
+5f31337 Add gensym and disable test for hygenic macros
+34a15a9 Fix macros with arguments
+ea73382 Write macro annotations
+ce77a0e Use java logging everywhere
+7dc94c8 Fix the quote macro
+fff3962 Fix Call and FunctionalCall macros
+77cd6f2 fix printing of unqutoes in TypePrinter
+808b52d Fix vcall macros; one macro test passing.
+191062e Macro lookup. So close...
+bced9fa Re-enable macro tests
+330bfbb Start implementing macro loading
+b5a61ad Quote macro implementation
+ec1b520 Add missing file MirahClassLoader.java
+f0cba97 Macro compilation
+0ffaa55 Fix compilation of mirah-bootstrap.jar
+8c594e5 Start implementing macro compilation
+64dce74 Add missing file
+4703e7b Fix test_block_with_abstract_from_object
+c8d613d Move block tests to block_test.rb and split them up
+6bd8de3 Basic block support
+18c6d26 Fix mirahp and error processing
+f3bd920 Start typer support for blocks and macros
+a272f7b Update parser
+6d0821f Add Rakefile support for building typer.jar
+87f1ce5 Merge branch 'newast' of github.com:mirah/mirah into newast
+4622581 jmeta is mmeta.
+f0672e1 Fix compiling implicit nil
+a6b59f6 Disable hash tests
+a3497cb Fix return type for methods that always raise an exception
+8238ee7 Fix array return types
+d1e6f05 Fix loops
+0f646f7 Fix loops
+506fb9c test fix
+fec18f0 Fix long constants
+a1129c8 fix static method listeners
+9213d89 Disable enumerable tests for now
+45a3c43 Fix default constructors
+a37e0b9 Fix test_inexact_constructor
+04d02ef Fix constructor chaining
+6f08cf4 Fix blocks_test
+eb5e74c Fix annotations
+1d0062c Cleanup merge issues
+9b4733f Merge pull request #171 from baroquebobcat/masterful_newast
+46422d3 merge master into new ast. It's crazy awesome.
+7c76dd9 Test fixes part 2
+b6d511f Test fixes
+4cc953e fix test_not
+e33454b Fix test_nil_assign
+af78bd2 Fix test_literal_array
+cfa426d Fix test_interface_declaration
+1f942fc Fix test_import, test_import_package
+16e550c fix test_implements
+053b89a Fix test_ensure
+30e6517 Fix test_rescue_scope
+b33c4dc Fix test_rescue
+a123bd4 Work on fixing exceptions
+0f0cbc0 Fix type in rescue support
+b3bc74e Fix test_class_append_self
+5a02c90 Fix test_array_with_dynamic_size
+fc469af Fix test_array_return_type
+264bd9a Fix test_literal_regexp
+4e62d93 Fix test_annotations
+5611920 Fix test_colon2
+bb12fb0 Fix test_string_concat and test_string_interpolation
+408fae2 Fix test_super_constructor
+7a1000e Fix test_super
+50fb396 Fix test_constructor
+f1d8eb3 Partial fix for test_return_type
+5e0c9b3 Update mirah-parser
+de71d88 Work on fixing test_cast
+9d19812 Support the AttrAssign node
+bfda51d Fix 2nd testcase in test_and
+f786982 Fix first testcase in test_and
+118697f Fix some bad method calls
+a93ca0b Use imports when resolving type names
+a5770f3 disable filename tagging
+478b921 Work on fixing method lookup
+d411915 Add the typer .jar
+bd4cdef Work on getting super to work
+3bca242 Use System.out.println instead of puts
+28b2015 Fix more tests
+4c4dd4b Fix superclass tracking and no-arg block calls
+cc687c8 Fix arrays
+7dc7ab4 Get addition working
+959b435 Start working on test_jvm_compiler
+5108278 Fix some more compilation errors
+8b33dab Work around bug in RubyArray.hashCode
+92db094 Add some more logging during type inference
+61d3f2f Get hello world compiling
+df1f9db Start getting jvm compiler to work
+bbb3423 Mostly fix test_java_typer
+ada7948 Fix test_typer
+570efac Work on getting test_typer to pass
+7203e19 Start using the new typer
+88a047d Get the typer to compile
+e246b53 Unquote fixes
+6f170d8 Fix typo
+486f70f Implement UnquoteAssign
+e822c5f Fix some compilation errors
+0fafe68 Start new inference engine
+dafc7ca Fix custom scopes on locals
+b24f54e Fix test_add_args_in_macro
+bcdef19 Fix test_self_call_preserves_scope
+428c493 Fix hash literals
+1f2f4a4 Fix generator
+2f46511 Fix merge error
+5eb7bde Merge
+79a5cc6 Rebuild bootrap jar
+b08d2bb Fix scope for self_call macros
+3dfb2f4 Fix some more tests
+5edb785 Fix some tests
+ef1f7f6 Serialize AST as text instead of using Marshal.  This seems a bit fragile, but it should be enough to bootstrap the new AST.
+c28a393 Get rid of ScopedBody nodes
+
+=== 0.0.12 Working Jars / 2012-07-22
+
+c06e1df bump versions to 0.0.12
+827434c remove win JAVA_HOME lookup because it has problems with spaces in the PATH
+cb10541 update maven instructions to use deploy instead of release.
+1e57c10 If we're in a jar, look in the jar for our classes.
+3b49e48 drop maven versions back to 0.0.12-SNAPSHOT
+c0b15d5 [maven-release-plugin] prepare for next development iteration
+fed593b [maven-release-plugin] prepare release shared-0.0.12
+5b1c8b1 fix #186 improving abstract class based closure support
+40a0c94 remove some more debugging puts
+6ec7338 fixes #185 ScopedBody's generated by macros outside methods should work
+a86c365 use logging instead of puts on giving up in typer
+b267200 Merge parser-support w/o puts'
+42830b9 Duplicate DelegateClass logic from Ruby 1.8, for consistency.
+fa3b2a3 Duplicate Ruby 1.8 DelegateClass logic to get back to tests passing.
+9ca8517 Remove logging I left in.
+02b5c48 Fixes to get Mirah working with JRuby master in 1.8 and 1.9 modes.
+9e0c2d1 update version to 0.0.12.dev
+8a9a644 missed the SNAPSHOT in a couple pom.xmls
+
 === 0.0.11 Pre-Hackathon Edition / 2012-04-09
 
 235e887 set version to 0.0.11

data/README.txt

@@ -8,12 +8,12 @@
 Mirah is a customizable programming language featuring static types,
 local type inference and a heavily Ruby-inspired syntax. Mirah
 currently includes a typer/compiler backend for the JVM which can
-output either JVM bytecode or Java source files.
+output JVM bytecode.
 
 == FEATURES:
 
 * Ruby-like syntax
-* Compiles to .class or .java
+* Compiles to .class
 * Fast as Java
 * No runtime library
 
@@ -23,8 +23,6 @@ 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
 
 == REQUIREMENTS:
 
@@ -46,7 +44,8 @@ Extract it, and add `bin` to your `$PATH` to be able to use `mirah`, `mirahc`, e
 
 === SOURCE:
 
-To build and install from source,
+To build and install from source, you'll need jruby 1.7.0 or
+higher. Then just follow these commands.
 
 $ git clone http://github.com/mirah/mirah.git
 $ cd mirah

data/Rakefile

@@ -30,8 +30,8 @@ end
 bitescript_lib_dir = File.dirname Gem.find_files('bitescript').first
 
 task :gem => 'jar:bootstrap'
-
-task :default => :test
+task :bootstrap => ['javalib/mirah-bootstrap.jar', 'javalib/mirah-builtins.jar', 'javalib/mirah-util.jar']
+task :default => :'test:jvm:bytecode'
 def run_tests tests
   results = tests.map do |name|
     begin
@@ -52,17 +52,18 @@ desc "run full test suite"
 task :test do
   run_tests [ 'test:core', 'test:plugins', 'test:jvm' ]
 end
+
 namespace :test do
 
   desc "run the core tests"
-  Rake::TestTask.new :core do |t|
+  Rake::TestTask.new :core  => :bootstrap do |t|
     t.libs << 'test'
     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|
+  Rake::TestTask.new :plugins  => :bootstrap do |t|
     t.libs << 'test'
     t.test_files = FileList["test/plugins/**/*test.rb"]
     java.lang.System.set_property("jruby.duby.enabled", "true")
@@ -70,27 +71,27 @@ namespace :test do
 
   desc "run jvm tests, both bytecode and java source"
   task :jvm do
-    run_tests ["test:jvm:bytecode", "test:jvm:javac"]
+    run_tests ["test:jvm:bytecode"]
   end
 
   namespace :jvm do
     desc "run jvm tests compiling to bytecode"
-    Rake::TestTask.new :bytecode do |t|
+    Rake::TestTask.new :bytecode => [:bootstrap, :clean_tmp_test_directory, :build_test_fixtures] do |t|
       t.libs << 'test' <<'test/jvm'
       t.ruby_opts.concat ["-r", "bytecode_test_helper"]
       t.test_files = FileList["test/jvm/**/*test.rb"]
-      java.lang.System.set_property("jruby.duby.enabled", "true")
     end
+  end
+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"]
-      java.lang.System.set_property("jruby.duby.enabled", "true")
-    end
+task :clean_tmp_test_directory do
+  FileUtils.rm_rf "tmp_test"
+  FileUtils.mkdir_p "tmp_test"
+end
 
-  end
+task :build_test_fixtures do
+  ant.javac :destdir => "tmp_test", :srcdir => 'test/fixtures',
+    :includeantruntime => false, :debug => true, :listfiles => true
 end
 
 task :init do
@@ -102,43 +103,14 @@ desc "clean up build artifacts"
 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-builtins.jar'
+  rm_f 'javalib/mirah-util.jar'
+  rm_rf 'tmp'
 end
 
-task :compile => :init do
-  require 'mirah'
-  # build the Ruby sources
-  puts "Compiling Ruby sources"
-  JRuby::Compiler.compile_argv([
-    '-t', 'build',
-    '--javac',
-    'src/org/mirah/mirah_command.rb'
-  ])
-
-  # build the Mirah sources
-  puts "Compiling Mirah sources"
-  Dir.chdir 'src' do
-    classpath = Mirah::Env.encode_paths([
-        'javalib/jruby-complete.jar',
-        'javalib/JRubyParser.jar',
-        'build',
-        '/usr/share/ant/lib/ant.jar'
-      ])
-    Mirah.compile(
-      '-c', classpath,
-      '-d', '../build',
-      '--jvm', '1.6',
-      'org/mirah',
-      'duby/lang',
-      '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',
-    :includeantruntime => false
-end
+task :compile => [:init, :bootstrap, :util]
+task :util => 'javalib/mirah-util.jar'
 
 desc "build basic jar for distribution"
 task :jar => :compile do
@@ -147,6 +119,9 @@ task :jar => :compile do
     fileset :dir => 'build'
     fileset :dir => '.', :includes => 'bin/*'
     fileset :dir => bitescript_lib_dir
+    zipfileset :src => 'javalib/mirah-bootstrap.jar'
+    zipfileset :src => 'javalib/mirah-builtins.jar'
+    zipfileset :src => 'javalib/mirah-util.jar'
     manifest do
       attribute :name => 'Main-Class', :value => 'org.mirah.MirahCommand'
     end
@@ -168,11 +143,7 @@ namespace :jar do
   end
 
   desc "build bootstrap jar used by the gem"
-  task :bootstrap => :compile do
-    ant.jar :jarfile => 'javalib/mirah-bootstrap.jar' do
-      fileset :dir => 'build'
-    end
-  end
+  task :bootstrap => 'javalib/mirah-bootstrap.jar'
 end
 
 desc "Build a distribution zip file"
@@ -196,3 +167,155 @@ end
 
 desc "Build all redistributable files"
 task :dist => [:gem, :zip]
+
+file_create 'javalib/mirah-newast-transitional.jar' do
+  require 'open-uri'
+  puts "Downloading mirah-newast-transitional.jar"
+  open('http://mirah.googlecode.com/files/mirah-newast-transitional.jar', 'rb') do |src|
+    open('javalib/mirah-newast-transitional.jar', 'wb') do |dest|
+      dest.write(src.read)
+    end
+  end
+end
+
+file 'javalib/mirah-bootstrap.jar' => ['javalib/mirah-newast-transitional.jar',
+                                       'src/org/mirah/MirahClassLoader.java',
+                                       'src/org/mirah/IsolatedResourceLoader.java',
+                                       'src/org/mirah/MirahLogFormatter.mirah',
+                                       'src/org/mirah/util/simple_diagnostics.mirah'] + 
+                                      Dir['src/org/mirah/{macros,typer}/*.mirah'] +
+                                      Dir['src/org/mirah/typer/simple/*.mirah'] +
+                                      Dir['src/org/mirah/macros/anno/*.java'] do
+  build_dir = 'build/bootstrap'
+  rm_rf build_dir
+  mkdir_p build_dir
+
+  # Compile annotations and class loader
+  ant.javac :destdir => build_dir, :srcdir => 'src',
+    :includeantruntime => false, :debug => true, :listfiles => true
+
+  # Compile the Typer and Macro compiler
+  bootstrap_mirahc('src/org/mirah/macros', 'src/org/mirah/MirahLogFormatter.mirah', 'src/org/mirah/typer',
+                   'src/org/mirah/util/simple_diagnostics.mirah',
+                   :classpath => ['javalib/mirah-parser.jar', 'build/bootstrap'],
+                   :dest => build_dir
+#                  :options => ['-V']
+                   )
+  add_quote_macro                    
+  cp Dir['src/org/mirah/macros/*.tpl'], "#{build_dir}/org/mirah/macros"
+
+  # Build the jar                    
+  ant.jar :jarfile => 'javalib/mirah-bootstrap.jar' do
+    fileset :dir => build_dir
+  end
+end
+
+
+file 'javalib/mirah-util.jar' do
+  require 'mirah'
+  build_dir = 'build/util'
+  rm_rf build_dir
+  mkdir_p build_dir
+
+  # build the Ruby sources
+  puts "Compiling Ruby sources"
+  JRuby::Compiler.compile_argv([
+    '-t', build_dir,
+    '--javac',
+    'src/org/mirah/mirah_command.rb'
+  ])
+
+  # 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)
+
+  # compile invokedynamic stuff
+  ant.javac :destdir => build_dir, :srcdir => 'src',
+    :includes => 'org/mirah/DynalangBootstrap.java',
+    :classpath => 'javalib/dynalink-0.1.jar:javalib/jsr292-mock.jar',
+    :includeantruntime => false
+
+  # Build the jar
+  ant.jar :jarfile => 'javalib/mirah-util.jar' do
+    fileset :dir => build_dir
+  end
+end
+
+
+file 'javalib/mirah-builtins.jar' => ['javalib/mirah-bootstrap.jar'] + Dir['src/org/mirah/builtins/*.mirah'] do
+  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)
+  ant.jar :jarfile => 'javalib/mirah-builtins.jar' do
+    fileset :dir => 'build/builtins'
+  end
+  rm_rf 'build/builtins'
+end
+
+
+if Float(JRUBY_VERSION[0..2]) >= 1.7
+  require 'bitescript'
+  class Annotater < BiteScript::ASM::ClassVisitor
+    def initialize(filename, &block)
+      cr = BiteScript::ASM::ClassReader.new(java.io.FileInputStream.new(filename))
+      cw = BiteScript::ASM::ClassWriter.new(0)
+      super(BiteScript::ASM::Opcodes::ASM4, cw)
+      @block = block
+      cr.accept(self, 0)
+      f = java.io.FileOutputStream.new(filename)
+      f.write(cw.toByteArray)
+      f.close
+    end
+    def visitSource(*args); end
+    def visit(version, access, name, sig, superclass, interfaces)
+      super
+      @block.call(self)
+    end
+  end
+end
+
+def add_quote_macro
+  raise "Can't compile on JRuby less than 1.7" unless defined?(Annotater)
+  Annotater.new('build/bootstrap/org/mirah/macros/QuoteMacro.class') do |klass|
+    av = klass.visitAnnotation('Lorg/mirah/macros/anno/MacroDef;', true)
+    av.visit("name", "quote")
+    args = av.visitAnnotation('arguments', 'Lorg/mirah/macros/anno/MacroArgs;')
+    req = args.visitArray('required')
+    req.visit(nil, 'mirah.lang.ast.Block')
+    req.visitEnd
+    args.visitEnd
+    av.visitEnd
+  end
+  Annotater.new('build/bootstrap/org/mirah/macros/Macro.class') do |klass|
+    av = klass.visitAnnotation('Lorg/mirah/macros/anno/Extensions;', false)
+    macros = av.visitArray('macros')
+    macros.visit(nil, 'org.mirah.macros.QuoteMacro')
+    macros.visitEnd
+    av.visitEnd
+  end
+end
+
+def bootstrap_mirahc(*paths)
+  options = if paths[-1].kind_of?(Hash)
+    paths.pop
+  else
+    {}
+  end
+  args = options[:options] || []
+  if options[:classpath]
+    args << '--classpath' << options[:classpath].map {|p| File.expand_path(p)}.join(File::PATH_SEPARATOR)
+  end
+  args << '-d' << File.expand_path(options[:dest])
+  jarfile = File.expand_path('javalib/mirah-newast-transitional.jar')
+  Dir.chdir(options[:dir] || '.') do
+    runjava(jarfile, 'compile', *(args + paths))
+  end
+end
+
+def runjava(jar, *args)
+  sh 'java', '-jar', jar, *args
+  unless $?.success?
+    exit $?.exitstatus
+  end
+end