Permalink
Browse files

merge master into new ast. It's crazy awesome.

  • Loading branch information...
1 parent 7c76dd9 commit 46422d33723802f9c5f6afed09ad62ffb87d526d @baroquebobcat baroquebobcat committed Feb 12, 2012
Showing with 4,900 additions and 1,049 deletions.
  1. +1 −0 .gitignore
  2. +9 −0 Gemfile
  3. +241 −0 History.txt
  4. +10 −0 NOTICE
  5. +3 −8 README.txt
  6. +83 −23 Rakefile
  7. +2 −0 bin/mirah
  8. +2 −0 bin/mirahc
  9. +2 −0 bin/mirahp
  10. +27 −0 examples/macros/square.mirah
  11. +27 −0 examples/macros/square_int.mirah
  12. +29 −0 examples/macros/string-each-char.mirah
  13. +60 −0 examples/rosettacode/100-doors.mirah
  14. +29 −0 examples/rosettacode/99-bottles-of-beer.mirah
  15. +9 −0 examples/rosettacode/README.txt
  16. +21 −0 examples/rosettacode/arrays.mirah
  17. +44 −0 examples/rosettacode/boolean-values.mirah
  18. +21 −0 examples/rosettacode/comments.mirah
  19. +26 −0 examples/rosettacode/copy-a-string.mirah
  20. +56 −0 examples/rosettacode/count-occurrences-of-a-substring.mirah
  21. +22 −0 examples/rosettacode/create-a-file.mirah
  22. +24 −0 examples/rosettacode/empty-string.mirah
  23. +25 −0 examples/rosettacode/factorial.mirah
  24. +36 −0 examples/rosettacode/fibonacci.mirah
  25. +21 −0 examples/rosettacode/file-size.mirah
  26. +37 −0 examples/rosettacode/fizz-buzz.mirah
  27. +39 −0 examples/rosettacode/flatten-a-list.mirah
  28. +36 −0 examples/rosettacode/guess-the-number.mirah
  29. +49 −0 examples/rosettacode/hamming-numbers.mirah
  30. +17 −0 examples/rosettacode/host-introspection.mirah
  31. +18 −0 examples/rosettacode/hostname.mirah
  32. +142 −0 examples/rosettacode/is-string-numeric.mirah
  33. +29 −0 examples/rosettacode/palindrome.mirah
  34. +25 −0 examples/rosettacode/random-numbers.mirah
  35. +25 −0 examples/rosettacode/repeat-a-string.mirah
  36. +21 −0 examples/rosettacode/reverse-a-string.mirah
  37. +35 −0 examples/rosettacode/rot-13.mirah
  38. +23 −0 examples/rosettacode/secure-temporary-file.mirah
  39. +22 −0 examples/rosettacode/sleep.mirah
  40. +35 −0 examples/rosettacode/sort-integer-array.mirah
  41. +19 −0 examples/rosettacode/string-case.mirah
  42. +31 −0 examples/rosettacode/string-length.mirah
  43. +19 −0 examples/rosettacode/user-input.mirah
  44. BIN javalib/dynalink-0.1.jar
  45. BIN javalib/dynalink-0.2.jar
  46. BIN javalib/mirah-bootstrap.jar
  47. +3 −6 lib/mirah.rb
  48. +1 −0 lib/mirah/ast.rb
  49. +1 −1 lib/mirah/ast/call.rb
  50. +4 −0 lib/mirah/ast/class.rb
  51. +40 −14 lib/mirah/ast/flow.rb
  52. +33 −18 lib/mirah/ast/intrinsics.rb
  53. +9 −3 lib/mirah/ast/method.rb
  54. +3 −3 lib/mirah/ast/scope.rb
  55. +63 −17 lib/mirah/ast/structure.rb
  56. +4 −0 lib/mirah/ast/type.rb
  57. +6 −2 lib/mirah/commands/base.rb
  58. +1 −1 lib/mirah/commands/run.rb
  59. +4 −6 lib/mirah/env.rb
  60. +3 −2 lib/mirah/jvm/compiler/base.rb
  61. +16 −5 lib/mirah/jvm/compiler/java_source.rb
  62. +1 −1 lib/mirah/jvm/compiler/jvm_bytecode.rb
  63. +4 −4 lib/mirah/jvm/method_lookup.rb
  64. +12 −1 lib/mirah/jvm/source_generator/builder.rb
  65. +41 −0 lib/mirah/jvm/types/bitescript_ext.rb
  66. +33 −0 lib/mirah/jvm/types/boolean.rb
  67. +1 −14 lib/mirah/jvm/types/integers.rb
  68. +10 −14 lib/mirah/jvm/types/intrinsics.rb
  69. +1 −1 lib/mirah/jvm/types/methods.rb
  70. +2 −1 lib/mirah/parser.rb
  71. +2 −2 lib/mirah/plugin/gwt.rb
  72. +5 −0 lib/mirah/transform/ast_ext.rb
  73. +765 −0 lib/mirah/transform/helper.rb
  74. +2 −0 lib/mirah/transform/transformer.rb
  75. +377 −0 lib/mirah/typer/simple.rb
  76. +5 −4 lib/mirah/util/argument_processor.rb
  77. +5 −33 lib/mirah/util/class_loader.rb
  78. +2 −1 lib/mirah/util/process_errors.rb
  79. +1 −1 lib/mirah/version.rb
  80. +1 −1 lib/mirah_task.rb
  81. +2 −2 maven/mirah-complete/pom.xml
  82. +2 −2 maven/mirah/pom.xml
  83. +1 −1 mirah.gemspec
  84. +1 −1 pom.xml
  85. +9 −1 src/mirah/impl/builtins.mirah
  86. +0 −36 src/org/mirah/DynalangBootstrap.java
  87. +28 −8 src/org/mirah/ant/{compile.duby → compile.mirah}
  88. +38 −0 src/org/mirah/class_loader.mirah
  89. +9 −6 src/org/mirah/mirah_command.rb
  90. +382 −0 test/core/ast_test.rb
  91. +85 −0 test/core/commands_test.rb
  92. +130 −0 test/core/compilation_test.rb
  93. +25 −28 test/{test_env.rb → core/env_test.rb}
  94. +15 −5 test/{test_macros.rb → core/macros_test.rb}
  95. +15 −7 test/{test_typer.rb → core/typer_test.rb}
  96. +58 −0 test/jvm/annotations_test.rb
  97. +62 −0 test/jvm/blocks_test.rb
  98. +199 −0 test/jvm/bytecode_test_helper.rb
  99. +110 −0 test/jvm/constructors_test.rb
  100. +304 −0 test/jvm/enumerable_test.rb
  101. +0 −2 test/{test_java_typer.rb → jvm/java_typer_test.rb}
  102. +30 −35 test/{test_javac_compiler.rb → jvm/javac_test_helper.rb}
  103. +103 −723 test/{test_jvm_compiler.rb → jvm/jvm_compiler_test.rb}
  104. +160 −0 test/jvm/macros_test.rb
  105. +15 −0 test/jvm/main_method_test.rb
  106. +183 −0 test/jvm/rescue_test.rb
  107. +1 −5 test/{test_gwt.rb → plugins/gwt_test.rb}
  108. +19 −0 test/test_helper.rb
  109. +1 −0 tools/gen_authors.sh
View
@@ -8,3 +8,4 @@ examples/appengine/war/
target
.redcar
.DS_Store
+Gemfile.lock
View
@@ -0,0 +1,9 @@
+source :rubygems
+
+gemspec
+
+gem "rake"
+gem "bitescript", :git => 'https://github.com/headius/bitescript.git'
+# To test against a local copy of bitescript,
+# replace ":git => ''" with ":path => '<path to your local copy>'"
+gem 'turn'
View
@@ -1,3 +1,244 @@
+=== 0.0.10 / 2011-11-20
+
+f6035d0 set version to 0.0.10
+3b06353 use test_helper in gwt test
+4d29eeb turns out a number of things rely on MirahCommands being truthy on success
+46e6719 fixes 156 for real, also do the ant lowercase thing
+9e40121 don't exit on successful compile
+1155765 move comment about class loader to line it refers to
+985c70f add jvm_version option to Compile ant task w/ 1.6 default
+e5a60b2 replace duby with mirah in lib/mirah/ast/flow.rb
+5690e6f split rescue error tests to deal w/ caching expression value
+1f77ed8 add some white space, use #empty? instead of size==0
+677e4aa fixes #52 by raising an inference error when types arent compat
+81be877 add assert_raise_java to get around the NativeException thing
+d744f44 use assert_raise instead of begin;fail/rescue
+05afc6e pull out rescue tests for jvm into separate file
+7a933f3 raise an inference error when method has same name as macro. fixes #123
+6517a90 clean up the Block#add_methods method a bit
+0a826dd ensure that a block body is created even when the block is empty
+d8b0641 change duby to mirah in Binding#binding_type
+47883e9 change duby to mirah in StaticScope#binding_type
+8f3fddf Fix whitespace.
+74b6195 use turn for prettying up test output
+23d0693 add license header to test_macros
+143ac6c add a test_helper to put global test config in
+6fe3241 fix #149 exit 1 when there are errors
+31074c6 fix #146 by not reassigning self to Builtin
+8fb471e s/duby/mirah/ in jvm types intrinsics
+ff06791 s/qote/quote/
+972a9f9 refactor void checking on method return into method
+605c377 fix #148 in the simplest way possible
+f1b5c19 fix inspect_children typo
+4140fa7 use case statements instead of === & if elses in UnquotedValueAssign#node
+b82bbeb in Node#inspect_children, replace if elses w/ a case statement
+049a4cf clean up body inference a little
+d9e92b4 Merge remote branch 'thomaslee/master' into thomaslee
+0c72195 fix name of compilation test
+cfbf4c5 bump versions to 0.0.10{.dev,-SNAPSHOT}
+8c0ecec Fix test_empty_array.
+
+=== 0.0.9 / 2011-09-12
+
+a5963ef use self hosted classloader fixes #144
+a858a2f fix for #114
+989fd1b fix #119, add transform for empty array literal
+a474b84 fix #120, java source now prints out longs as <n>L
+0e25733 bump version to 0.0.9{dev, -SNAPSHOT}
+fb34f03 fix #138, underscores and dashes both act the same
+cffd819 Merge pull request #143 from hackergarten/master
+0f3af83 sorting lists and arrays examples
+59662e2 string 'character' length example
+9e541df string case example
+f8174ac sleep example
+04399d3 secure temporary file example
+d77902c host instrospection example
+c0433a5 hostname example
+ab134aa hamming numbers example
+d468081 arrays examples
+e8425f3 random number example
+e974827 Merge pull request #142 from consiliens/master
+084aa65 Update NOTICE.
+735983f Merge pull request #140 from abscondment/140-ant-compile
+d2a4010 Allow for false case too. #140
+a7925ed Fixes #140 by * Raising an Exception in MirahCommand.compile if Mirah.compile fails (i.e. it returns nil) * Allowing that exception to pass through the two layers of scope in the ant task so Ant will actually see it and fail accordingly.
+7244e11 Merge pull request #139 from hackergarten/master
+f0ef0d5 added apache license to all samples files.
+a4f8cf0 added multiline comments example
+
+=== 0.0.8 / 2011-08-31
+
+af43b77 Merge pull request #132 from hackergarten/master
+416e130 readme file
+fbf6ddc fix #129 call next anyway if there is no block arg
+18cef56 s/duby/mirah/ in a test
+945558b pull enumerable/loop tests into separate file
+585856e s/duby/mirah/ in transformer
+f0cc410 adding a couple method docs
+11dac9a push some code around and do a few s/duby/mirah/ s
+17b0031 wrap the bodies of blocks passed to macros as well
+02e5cbe clean up tests some
+794d61d pull macro tests into separate file
+ae1b942 flatten a list example
+98ccad9 create a file example
+9dc8981 file size example
+fddd3e2 count occurrences of a substring examples
+2297cd7 is string numeric example
+6ccaf02 empty string
+4c58e5a fizz buzz example
+e1e107a empty string example
+643e80a added copy a string sample
+b3c35a5 fibonacci example
+abdf45c factorial example
+cd3eb03 how to do comments
+9af53ee boolean value examples
+973ef14 some macro examples
+121b654 square with strings
+095773d hahahah guess what
+c8c4465 reading user input
+ddf8eda Palindrome
+df01492 reverse a string
+186c333 rot 13 example
+13f4a10 initial version of the 100 doors
+da29d35 removed unneeded parameter
+09ded03 99 bottles of beer
+f1b490c added repeating a string sample
+ba99754 update issues link on readme
+785c6c7 further tets helper factorization
+051854b make javac helper's compile almost the same as bytecode's
+1d9648b refactor javac tests parsing and infering steps
+ba44c0d default args are evaled on call
+3ebe9f3 use some of the helper methods defined in bytecode's helper in javac's
+5c2b47c fix main in files w/ classes of same name contained in them
+3b69287 file name should also be configurable for javac compilation
+e3d2dc7 pulling out a couple assertion definitions into a helper file
+c0112a4 overall task should fail if any tests failed
+2da4ca2 annotate new rake tasks
+5ae27b7 making all tests run even if some fail
+ae6d8e6 fixing up helpers for jvm tests a bit
+66e87d9 tease apart test #compile method for bytecode
+dbbcf8e split bytecode and javac tests
+aa21dc9 split tests into multiple dirs and tasks
+feb8028 Remove unnecessary, broken 'super' call in BlockArgument.
+02101c3 Update the bootstrap JAR to incorporate the new loop macro in builtins.mirah
+de68299 test fallout from top level changes, loop test still fails
+2786cfd sometimes children can be nil
+1b9b018 Merge in loop macro from techomancy.
+fa13c03 Merge pull request #53 from ashee/master
+be84d53 Merge pull request #82 from baroquebobcat/use_bundler
+2ba1932 Merge pull request #85 from rdp/mergeable2
+b4e3106 Merge pull request #88 from baroquebobcat/fix_up_env_tests_and_a_typo
+7212065 Merge pull request #89 from jabr/master
+71c7c3f Merge pull request #90 from baroquebobcat/test_reorg
+50d37d5 Merge pull request #91 from baroquebobcat/fix_syntax_error_not_providing_messages
+e206d90 Merge pull request #92 from baroquebobcat/update_compile_ant_class_from_duby
+4a9d8e2 Merge pull request #93 from szegedi/dynalang-0.2
+688fe7d Update to use dynalink-0.2.
+9f96ab0 mirah-ify ant compile task
+b6b92d6 wrap jmeta syntax errors w/ mirah ones
+2d48ca2 unshift of lib unnecessary as it is put on the path by the test task
+fbae14b modularize assert_include
+b0c05c8 move compile methods out of respective classes and into helper
+a563f4a added test helper for jvm tests
+d4070fe moved jvm tests into subdirectory
+688c18d Call original create_method_builder in default case when patching the JVM compiler in the GWT plugin.
+f3c7a7d Only generate a main function when we really need it (i.e. not when the source only has imports, class definitions, and interface declarations).
+c001130 Add require 'rubygems' to scripts so bitescript gem can be found.
+34c19d3 typo s/seperator/separator/
+0886a72 fix the env tests I broke in ac92625bf76dc00d
+922d5eb Merge pull request #84 from baroquebobcat/use_1_6_bytecode
+57dc505 Merge pull request #78 from sd/master
+10709cd Merge pull request #86 from baroquebobcat/use_file_path_separator_instead_of_rbconfig
+ac92625 use File::PATH_SEPARATOR instead of RbConfig
+23d77ef use java 1.6 bytecode. the recompiled jar didn't work for me with 1.5
+10b2b18 warn users instead of outputting "...done" when nothing actually occurs
+4033268 partial fix for issue #23 don't ICE when parsing after a node verify error
+6ea2da8 remove rescue around dev bitescript require
+d105b97 use bundler to manage dev dependencies
+7a3127e use right date formatting
+7cb39eb try to help them know what is happening better
+0f5287a make it more explicit what compile mode means
+8cb8e41 Fix bootstrapping
+14559d3 Fix method lookup for java.lang.Class objects
+bde76f8 Merge branch 'newast'
+16db63e Fix bugs with interfaces and error types
+778ec51 Fix strange transform error
+7c76776 Merge pull request #80 from baroquebobcat/closure_fix_2
+7f83fb0 fix closure scope issue, javac issue
+0c4ea99 Macro enhancement
+705a907 Macro enhancement
+e395169 Add a class mirror to the NullType
+4cff3f8 nodes
+00d223d Fix block return values
+2fed449 Merge commit '6b3ce537'
+6b3ce53 test for creating anonymous class method that uses no args and returns a value
+489d4aa Updates to current invokedynamic logic.
+af717c6 Add an Unreachable JVM type
+46a1bea Merge branch 'master' of github.com:mirah/mirah
+c4c8afb Fix begin...rescue with no body
+73172c8 Try to ignore assignments to nil during type inference
+e2e5c56 Fix rescue block inference
+a073480 Fix link to issue tracker.
+681c274 Add support for rescue - else. Fix bug with rescue when the body always raises an exception but the rescue clauses return a result.
+d486090 More efficient new_hash macro
+b78e3a8 Macro bugfixes.
+fa40e47 Add missing .java parser
+237f16c Fix line numbers in debug info
+9b163c0 Add support for circular references between java and mirah files
+726ad63 Merge branch 'master' of github.com:mirah/mirah
+d974e04 Fix typo
+8c2bffa Fix #31: mirahc -h regression
+fac6bd5 Fix #44: Failure on 'rake gem'
+ac79807 corrected reference for "jar:bootstrap" in Rakefile
+1d07018 Present an error when using -j/--java with non-compile commands. Fixes #62.
+9dc3345 Ensure the JVM type has been initialized before calling methods on it in JVM::Types::Type. Fixes #65.
+551deac Use catch/throw to terminate the compiler early, since SystemExit bubbles out MirahCommand and makes noise. Fixes #66.
+fb401fa Fix bad call to compile_asts (does not need transformer now).
+961551d Add missing cast to Integer.
+d43cfc7 Fix -V and error processing
+4b67a11 Merge
+cf4f2de Small changes to README feature list.
+1d003c5 clean the pom file
+521bbd9 Add a trivial example Maven project that uses the Maven plugin.
+88838bc add maven release process readme
+8f37529 update pom descriptors to pass maven release requirements
+5c7a690 Fix a couple vars I missed in mirah.bat and mirahc.bat.
+59409a1 Add missing .bat files to dist.
+bb39a69 Put .zip contents into a mirah-VERSION directory (d'oh!).
+e12fbe8 Fix references to duby scripts in gemspec and trim out wiki from examples (for size).
+a395dbf Make zip task depend on jar:complete again.
+4e89a03 Add examples dir to zip distribution.
+7c06633 Oops. Add missing distbin dir with bin scripts for the zip distribution.
+690f82b Add zip, gem, and dist targets to Rakefile, to build a zip'ed distribution, gem file, and everything.
+53d8e16 Restore lost destination when writing compiled output.
+3b181f5 Back off on overzealous trimming of @state; it's still used a few places I can't eliminate.
+b0c6ce8 Remove out-of-date duby and jrubyp-related commands.
+963140c Remove duby.gemspec. We're done with this, yes?
+5b923e5 Move mirah/jvm/base to mirah/jvm/compiler/base
+c89ed22 Move JVMCompilerBase to Base.
+cd1ae11 Move JVM bytecode compiler to appropriate file structure.
+b27a57a Move JVMBytecode and JVMCompilerBase to Mirah::JVM::Compiler namespace.
+ffc2d18 Move Mirah::Compiler::JVM to Mirah::Compiler::JVMBytecode
+3d510fb Move jvm/source_compiler.rb into jvm/compiler/java_source.rb
+a28852a Move Mirah::Compiler::JavaSource to Mirah::JVM::Compiler::JavaSource
+8ff25a5 Move Mirah::Typer::JVM to Mirah::JVM::Typer
+0809140 Refactor jvm/types.rb into jvm/types subdir files.
+898cb63 Refactor transform and transform2 into transform/{ast_ext,error,helper,transformer}.
+e68eb22 Refactor typer.rb into typer/base and typer/simple.
+a05e503 Forcibly nuke randomly-named xform classes generated during test_javac_compiler.
+0da5b73 Missed a few ClassLoader and CompilationState references.
+e357957 Move a few more classes under util and clean up some requires.
+fd2f0bf More OO decomposition of Mirah command-line logic and compiler/generator/parser workflow.
+5762c5d Restructure commands into their own classes and files.
+3075d8e Reorg main three entry points into Mirah command a bit.
+c129e57 Add .DS_Store to .gitignore
+db7aa1e Restructure compiler.rb into mirah/compiler subdir, mirroring mirah/ast subdir.
+330a1c2 Add a simple example of declaring an interface.
+723416f Add covariance for one-dimensional arrays (see #55). Multi-dimensional arrays still need work.
+356d896 Roll versions to 0.0.8{.dev,-SNAPSHOT).
+3b6bb81 Fixed an issue with mirah_task
+ebd0ab2 Add casting support to the Call node.
+
=== 0.0.7 / 2011-03-20
248368c Fix assignability of dynamic type; only target of Object should be allowed.
View
@@ -1,21 +1,31 @@
# This file is automatically generated from the git commit history
# by tools/gen_authors.sh.
+Amitava Shee <amitava.shee@gmail.com>
Anthony Richardson <anthony@anthonyrichardson.com>
+Attila Szegedi <szegedia@gmail.com>
Bob Zoller <bob@zoller.us>
+Brendan Ribera <brendan.ribera@gmail.com>
Charles Oliver Nutter <headius@headius.com>
consiliens <consiliens@gmail.com>
+Daniel Jackoway <danjdel@gmail.com>
David Calavera <david.calavera@gmail.com>
+Hamlet D'Arcy <hamletdrc@gmail.com>
headius@cnutter.local <none@none>
headius@localhost <none@none>
headius <none@none>
Ian Dees <undees@gmail.com>
+Justin Bradford <jabradford@gmail.com>
Marko Kocic <marko.kocic@gmail.com>
Nathan Weizenbaum <nex342@gmail.com>
Nick Howard <ndh@baroquebobcat.com>
Nick Howard <nick@gnipcentral.com>
Phil Hagelberg <technomancy@gmail.com>
+ribrdb <ribrdb@gmail.com>
+rogerdpack <rogerpack2005@gmail.com>
Ryan Brown <ribrdb@gmail.com>
Ryan Brown <ribrdb@google.com>
+Sebastian Delmont <sd@notso.net>
Sébastien Le Callonnec <sebastien@weblogism.com>
+Thomas Lee <me@tomlee.co>
xraid <xraid@iprobot.com>
View
@@ -1,7 +1,7 @@
= mirah
* http://groups.google.com/group/mirah
-* http://code.google.com/p/mirah/issues/list
+* http://github.com/mirah/mirah/issues
== DESCRIPTION:
@@ -39,16 +39,11 @@ $ gem install mirah
To build and install from source,
-$ git clone http://github.com/headius/bitescript.git
$ git clone http://github.com/mirah/mirah.git
-$ cd bitescript
-$ gem build bitescript.gemspec
-$ gem install bitescript-*
-$ cd -
$ cd mirah
+$ bundle install
$ rake gem
-$ gem install pkg/mirah-*
-$ cd -
+$ gem install pkg/mirah-*.gem
== For Java tools:
Oops, something went wrong.

0 comments on commit 46422d3

Please sign in to comment.