mirah 0.0.4-java → 0.0.5-java

data/History.txt

@@ -1,3 +1,26 @@
+=== 0.0.5 / 2010-12-22
+
+8e00222 Update mirah-parser.jar to one built from mirah-parser project.
+466a21c Update mirah-bootstrap.jar for re-namespaced Mirah classes and modules.
+b62603f Fix a bug in __ruby_eval caused by a fix for JRUBY-5163.
+d17af25 NullType is assignable from any non-primitive type.
+805586f add rake gem task
+3be367b update readme install instructions
+6ac3fb1 add descriptions to rake tasks
+0ca5b96 use the JRuby classloader as parent for the Mirah class loader. Otherwise it doesn't load th
+e6c95c3 add license to the pom and parent to release artifacts into the sonatype repository
+c767233 mirah-complete already includes jruby-complete, so it's not a dependency
+f7d36af variable versions mess the pom descriptor
+137e859 fix distribution directory and allow maven to complete the package lifecycle
+52ff7d1 add maven descriptor files to publish mirah into a maven repository
+
+=== 0.0.4 / 2010-11-17
+
+* Lots of cleanup, bugs fixed
+* New parser written in Mirah
+* Improved annotation support
+* New macro syntax
+
 === 0.0.3 / 2010-06-09
 
 * Even more language features!

data/README.txt

@@ -32,15 +32,23 @@ mirahc -java -e "inline script" # produces DashE.java
 
 == INSTALL:
 
-If your "gem" command is the one from JRuby:
+If your gem and rake are not from from JRuby, prefix the commands with jruby -S
 
-* gem install mirah
+$ gem install mirah
 
-Otherwise:
+To build and install from source,
 
-* jruby -S gem install mirah
+$ 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
+$ rake gem
+$ gem install pkg/mirah-*
+$ cd -
 
-Only JRuby is supported at this time.
 
 == For Java tools:
 

data/Rakefile

@@ -1,11 +1,35 @@
+# 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 'rake'
 require 'rake/testtask'
+require 'rubygems'
+require 'rubygems/package_task'
 require 'java'
 $: << './lib'
 require 'mirah'
 require 'jruby/compiler'
 require 'ant'
 
+Gem::PackageTask.new Gem::Specification.load('mirah.gemspec') do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+task :gem => 'jar:bootstrap'
+
 task :default => :test
 
 Rake::TestTask.new :test do |t|
@@ -21,6 +45,7 @@ task :init do
   mkdir_p 'build'
 end
 
+desc "clean up build artifacts"
 task :clean do
   ant.delete :quiet => true, :dir => 'build'
   ant.delete :quiet => true, :dir => 'dist'
@@ -38,13 +63,13 @@ task :compile => :init do
   # build the Mirah sources
   puts "Compiling Mirah sources"
   Dir.chdir 'src' do
-    classpath = Duby::Env.encode_paths([
+    classpath = Mirah::Env.encode_paths([
         'javalib/jruby-complete.jar',
         'javalib/JRubyParser.jar',
         'build',
         '/usr/share/ant/lib/ant.jar'
       ])
-    Duby.compile(
+    Mirah.compile(
       '-c', classpath,
       '-d', '../build',
       'org/mirah',
@@ -54,6 +79,7 @@ task :compile => :init do
   end
 end
 
+desc "build basic jar for distribution"
 task :jar => :compile do
   ant.jar :jarfile => 'dist/mirah.jar' do
     fileset :dir => 'lib'
@@ -67,6 +93,7 @@ task :jar => :compile do
 end
 
 namespace :jar do
+  desc "build self-contained, complete jar"
   task :complete => :jar do
     ant.jar :jarfile => 'dist/mirah-complete.jar' do
       zipfileset :src => 'dist/mirah.jar'
@@ -78,6 +105,7 @@ namespace :jar do
     end
   end
 
+  desc "build bootstrap jar used by the gem"
   task :bootstrap => :compile do
     ant.jar :jarfile => 'javalib/mirah-bootstrap.jar' do
       fileset :dir => 'build'

data/bin/duby

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 begin
   require 'mirah'
 rescue LoadError

data/bin/dubyc

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 begin
   require 'mirah'
 rescue LoadError

data/bin/dubyp

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 begin
   require 'mirah'
 rescue LoadError

data/bin/jrubyp

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 $: << File.dirname(File.dirname(__FILE__)) + '/lib'
 require 'mirah'
 

data/bin/mirah

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 begin
   require 'mirah'
 rescue LoadError
@@ -6,4 +22,4 @@ rescue LoadError
   require 'mirah'
 end
 
-Duby.run(*ARGV)
+Mirah.run(*ARGV)

data/bin/mirah.cmd

@@ -1 +1,16 @@
+REM Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+REM All contributing project authors may be found in the NOTICE file.
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
 @jruby "%~dpn0" %*

data/bin/mirahc

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 begin
   require 'mirah'
 rescue LoadError
@@ -6,4 +22,4 @@ rescue LoadError
   require 'mirah'
 end
 
-Duby.compile(*ARGV)
+Mirah.compile(*ARGV)

data/bin/mirahc.cmd

@@ -1 +1,16 @@
-@jruby "%~dpn0" %*
+REM Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+REM All contributing project authors may be found in the NOTICE file.
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+@jruby "%~dpn0" %*

data/bin/mirahp

@@ -1,4 +1,20 @@
 #!/usr/bin/env jruby
+
+# 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.
+
 begin
   require 'mirah'
 rescue LoadError
@@ -6,4 +22,4 @@ rescue LoadError
   require 'mirah'
 end
 
-puts Duby.parse(*ARGV).inspect
+puts Mirah.parse(*ARGV).inspect

data/bin/mirahp.cmd

@@ -1 +1,16 @@
-@jruby "%~dpn0" %*
+REM Copyright (c) 2010 The Mirah project authors. All Rights Reserved.
+REM All contributing project authors may be found in the NOTICE file.
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+@jruby "%~dpn0" %*

data/examples/appengine/Rakefile

@@ -1,3 +1,18 @@
+# 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.
+
 # Hack to use the latest version instead of the gems when developing Mirah
 if File.exist?('../../lib/mirah.rb')
   $: << File.expand_path('../../lib')
@@ -9,8 +24,8 @@ require 'mirah/appengine_tasks'
 
 appengine_app :app
 
-MIRAH_APP = "#{Duby.dest_path}/org/mirah/MirahApp.class"
-LIST = "#{Duby.source_path}/org/mirah/list.dhtml"
+MIRAH_APP = "#{Mirah.dest_path}/org/mirah/MirahApp.class"
+LIST = "#{Mirah.source_path}/org/mirah/list.dhtml"
 
 # We want to recompile the app if the template gets modified
 Rake::Task[MIRAH_APP].enhance([LIST])

data/examples/appengine/src/org/mirah/MirahApp.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 import java.util.HashMap
 import java.util.regex.Pattern
 

data/examples/bintrees.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 class BinaryTrees
   def self.main(args:String[])
     n = 0

data/examples/construction.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 import "java.lang.StringBuffer"
 import "java.util.ArrayList"
 

data/examples/dynamic.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 # Example of using a dynamic type in a method definition
 def foo(a:dynamic)
   puts "I got a #{a.getClass.getName} of size #{a.size}"

data/examples/edb.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 def_edb :render, 'test.edb'
 @message = "Hello"
 puts render

data/examples/fib.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 def fib(a:int)
   if a < 2
     a

data/examples/fields.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 import 'java.util.ArrayList'
 
 class Bar

data/examples/fractal.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 def run
   puts "Rendering"
   y = -39.0

data/examples/java_thing.mirah

@@ -1,3 +1,18 @@
+# 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.
+
 import "java.lang.System"
 
 def foo

data/examples/plugins/appengine/Rakefile

@@ -1,3 +1,18 @@
+# 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 'ant'
 require 'appengine-sdk'
 
@@ -9,7 +24,7 @@ TESTING_JARS = [AppEngine::SDK::API_JAR, AppEngine::SDK::LABS_JAR, JUNIT_JAR] +
   AppEngine::SDK::RUNTIME_JARS.reject {|j| j =~ /appengine-local-runtime/}
 TESTING_JARS.each {|jar| $CLASSPATH << jar}
 
-# Duby.compiler_options = ['-V']
+# Mirah.compiler_options = ['-V']
 
 task :default => :test
 
@@ -24,13 +39,13 @@ task :clean do
 end
 
 task :compile => :init do
-  # build the Duby sources
-  puts "Compiling Duby sources"
+  # build the Mirah sources
+  puts "Compiling Mirah sources"
   mirahc 'com/google/appengine', :dir => 'src', :dest => 'build'
 end
 
 task :compile_test => :jar do
-  puts "Compiling Duby tests"
+  puts "Compiling Mirah tests"
   mirahc 'com/google/appengine', :dir => 'test', :dest => 'test',
          :options => ['--classpath', Dir.pwd + "/dist/dubydatastore.jar"]
 end