mirah 0.0.7-java → 0.0.8-java

data/test/jvm/test_macros.rb

@@ -0,0 +1,147 @@
+# 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 TestMacros < Test::Unit::TestCase
+  def test_defmacro
+    cls, = compile(<<-EOF)
+      defmacro bar(x) do
+        x
+      end
+      
+      def foo
+        bar("bar")
+      end
+    EOF
+
+    assert_equal("bar", cls.foo)
+    assert(!cls.respond_to?(:bar))
+  end
+  
+  
+  def test_instance_macro
+    # TODO fix annotation output and create a duby.anno.Extensions annotation.
+    script, cls = compile(<<-EOF)
+      class InstanceMacros
+        def foobar
+          "foobar"
+        end
+
+        macro def macro_foobar
+          quote {foobar}
+        end
+      
+        def call_foobar
+          macro_foobar
+        end
+      end
+
+      def macro
+        InstanceMacros.new.macro_foobar
+      end
+
+      def function
+        InstanceMacros.new.call_foobar
+      end
+    EOF
+
+    assert_equal("foobar", script.function)
+    assert_equal("foobar", script.macro)
+  end
+
+  def test_unquote
+    # TODO fix annotation output and create a duby.anno.Extensions annotation.
+
+    script, cls = compile(<<-'EOF')
+      class UnquoteMacros
+        macro def make_attr(name_node, type)
+          name = name_node.string_value
+          quote do
+            def `name`
+              @`name`
+            end
+            def `"#{name}_set"`(`name`:`type`)
+              @`name` = `name`
+            end
+          end
+        end
+
+        make_attr :foo, :int
+      end
+
+      x = UnquoteMacros.new
+      puts x.foo
+      x.foo = 3
+      puts x.foo
+    EOF
+    assert_output("0\n3\n") {script.main(nil)}
+  end
+
+  def test_macro_hygene
+    cls, = compile(<<-EOF)
+      macro def doubleIt(arg)
+        quote do
+          x = `arg`
+          x = x + x
+          x
+        end
+      end
+
+      def foo
+        x = "1"
+        puts doubleIt(x)
+        puts x
+      end
+    EOF
+
+    assert_output("11\n1\n") {cls.foo}
+  end
+
+
+  def test_add_args_in_macro
+    cls, = compile(<<-EOF)
+      macro def foo(a)
+        import duby.lang.compiler.Node
+        quote { bar "1", `Node(a.child_nodes.get(0)).child_nodes`, "2"}
+      end
+
+      def bar(a:String, b:String, c:String, d:String)
+        puts "\#{a} \#{b} \#{c} \#{d}"
+      end
+
+      foo(["a", "b"])
+    EOF
+
+    assert_output("1 a b 2\n") do
+      cls.main(nil)
+    end
+  end
+  
+  def test_block_parameter_uses_outer_scope
+    cls, = compile(<<-EOF)
+      macro def foo(&block)
+        quote { z = `block.body`; puts z }
+      end
+      apple = 1
+      foo do
+        apple + 2
+      end
+    EOF
+
+    assert_output("3\n") do
+      cls.main(nil)
+    end
+  end
+
+end

data/test/jvm/test_main_method.rb

@@ -0,0 +1,15 @@
+class TestMainMethod < Test::Unit::TestCase
+  def test_main_generation_for_file_with_class_of_same_name
+    code = <<-EOC
+      class WithMain
+      end
+      puts 'bar'
+    EOC
+    
+    main_class, = compile code, 'with_main'
+    
+    assert_output "bar\n" do
+      main_class.main(nil)
+    end
+  end
+end

data/test/{test_gwt.rb → plugins/test_gwt.rb}

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-
 require 'test/unit'
 require 'mirah'
 require 'jruby'

metadata

@@ -2,7 +2,7 @@
 name: mirah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: java
 authors: 
   - Charles Oliver Nutter
@@ -11,20 +11,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 17:08:55.863000 -05:00
+date: 2011-08-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bitescript
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: 0.0.8
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
 description: |-
   Mirah is a customizable programming language featuring static types,
   local type inference and a heavily Ruby-inspired syntax. Mirah
@@ -37,19 +37,12 @@ executables:
   - mirah
   - mirahc
   - mirahp
-  - duby
-  - dubyc
-  - dubyp
 extensions: []
 
 extra_rdoc_files: 
   - History.txt
   - README.txt
 files: 
-  - bin/duby
-  - bin/dubyc
-  - bin/dubyp
-  - bin/jrubyp
   - bin/mirah
   - bin/mirah.cmd
   - bin/mirahc
@@ -61,14 +54,13 @@ files:
   - lib/mirah_task.rb
   - lib/mirah/appengine_tasks.rb
   - lib/mirah/ast.rb
-  - lib/mirah/class_loader.rb
-  - lib/mirah/compilation_state.rb
+  - lib/mirah/commands.rb
   - lib/mirah/compiler.rb
   - lib/mirah/env.rb
   - lib/mirah/errors.rb
-  - lib/mirah/impl.rb
+  - lib/mirah/generator.rb
+  - lib/mirah/parser.rb
   - lib/mirah/transform.rb
-  - lib/mirah/transform2.rb
   - lib/mirah/typer.rb
   - lib/mirah/version.rb
   - lib/mirah/ast/call.rb
@@ -81,39 +73,77 @@ files:
   - lib/mirah/ast/scope.rb
   - lib/mirah/ast/structure.rb
   - lib/mirah/ast/type.rb
-  - lib/mirah/jvm/base.rb
+  - lib/mirah/commands/base.rb
+  - lib/mirah/commands/compile.rb
+  - lib/mirah/commands/parse.rb
+  - lib/mirah/commands/run.rb
+  - lib/mirah/compiler/call.rb
+  - lib/mirah/compiler/class.rb
+  - lib/mirah/compiler/flow.rb
+  - lib/mirah/compiler/literal.rb
+  - lib/mirah/compiler/local.rb
+  - lib/mirah/compiler/method.rb
+  - lib/mirah/compiler/structure.rb
+  - lib/mirah/compiler/type.rb
   - lib/mirah/jvm/compiler.rb
   - lib/mirah/jvm/method_lookup.rb
-  - lib/mirah/jvm/source_compiler.rb
   - lib/mirah/jvm/typer.rb
   - lib/mirah/jvm/types.rb
+  - lib/mirah/jvm/compiler/base.rb
+  - lib/mirah/jvm/compiler/java_source.rb
+  - lib/mirah/jvm/compiler/jvm_bytecode.rb
   - lib/mirah/jvm/source_generator/builder.rb
   - lib/mirah/jvm/source_generator/loops.rb
   - lib/mirah/jvm/source_generator/precompile.rb
   - lib/mirah/jvm/source_generator/typer.rb
+  - lib/mirah/jvm/types/array_type.rb
   - lib/mirah/jvm/types/basic_types.rb
   - lib/mirah/jvm/types/boolean.rb
+  - lib/mirah/jvm/types/dynamic_type.rb
   - lib/mirah/jvm/types/enumerable.rb
   - lib/mirah/jvm/types/extensions.rb
   - lib/mirah/jvm/types/factory.rb
   - lib/mirah/jvm/types/floats.rb
   - lib/mirah/jvm/types/integers.rb
+  - lib/mirah/jvm/types/interface_definition.rb
   - lib/mirah/jvm/types/intrinsics.rb
   - lib/mirah/jvm/types/literals.rb
+  - lib/mirah/jvm/types/meta_type.rb
   - lib/mirah/jvm/types/methods.rb
+  - lib/mirah/jvm/types/null_type.rb
   - lib/mirah/jvm/types/number.rb
+  - lib/mirah/jvm/types/primitive_type.rb
+  - lib/mirah/jvm/types/source_mirror.rb
+  - lib/mirah/jvm/types/type.rb
+  - lib/mirah/jvm/types/type_definition.rb
+  - lib/mirah/jvm/types/unreachable_type.rb
+  - lib/mirah/jvm/types/void_type.rb
   - lib/mirah/plugin/edb.rb
   - lib/mirah/plugin/gwt.rb
   - lib/mirah/plugin/java.rb
-  - test/test_ast.rb
-  - test/test_compilation.rb
-  - test/test_env.rb
-  - test/test_gwt.rb
-  - test/test_java_typer.rb
-  - test/test_javac_compiler.rb
-  - test/test_jvm_compiler.rb
-  - test/test_macros.rb
-  - test/test_typer.rb
+  - lib/mirah/transform/ast_ext.rb
+  - lib/mirah/transform/error.rb
+  - lib/mirah/transform/helper.rb
+  - lib/mirah/transform/transformer.rb
+  - lib/mirah/typer/base.rb
+  - lib/mirah/typer/simple.rb
+  - lib/mirah/util/argument_processor.rb
+  - lib/mirah/util/class_loader.rb
+  - lib/mirah/util/compilation_state.rb
+  - lib/mirah/util/process_errors.rb
+  - test/core/test_ast.rb
+  - test/core/test_compilation.rb
+  - test/core/test_env.rb
+  - test/core/test_macros.rb
+  - test/core/test_typer.rb
+  - test/jvm/bytecode_test_helper.rb
+  - test/jvm/javac_test_helper.rb
+  - test/jvm/test_enumerable.rb
+  - test/jvm/test_java_typer.rb
+  - test/jvm/test_jvm_compiler.rb
+  - test/jvm/test_macros.rb
+  - test/jvm/test_main_method.rb
+  - test/plugins/test_gwt.rb
   - examples/bintrees.mirah
   - examples/construction.mirah
   - examples/dynamic.mirah
@@ -121,6 +151,7 @@ files:
   - examples/fib.mirah
   - examples/fields.mirah
   - examples/fractal.mirah
+  - examples/interfaces.mirah
   - examples/java_thing.mirah
   - examples/simple_class.mirah
   - examples/sort_closure.mirah
@@ -133,65 +164,38 @@ files:
   - examples/appengine/src/org/mirah/list.dhtml
   - examples/appengine/src/org/mirah/MirahApp.mirah
   - examples/appengine/war/WEB-INF/lib/dubydatastore.jar
+  - examples/macros/square.mirah
+  - examples/macros/square_int.mirah
+  - examples/macros/string-each-char.mirah
+  - examples/maven/pom.xml
+  - examples/maven/README.txt
+  - examples/maven/src/main/mirah/hello_mirah.mirah
   - examples/plugins/appengine/Rakefile
   - examples/plugins/appengine/src/com/google/appengine/ext/duby/db/MetaModel.mirah
   - examples/plugins/appengine/src/com/google/appengine/ext/duby/db/Model.duby
   - examples/plugins/appengine/test/com/google/appengine/ext/duby/db/ModelTest.duby
-  - examples/wiki/Rakefile
-  - examples/wiki/src/org/mirah/wiki/edit.eduby.html
-  - examples/wiki/src/org/mirah/wiki/error.eduby.html
-  - examples/wiki/src/org/mirah/wiki/layout.eduby.html
-  - examples/wiki/src/org/mirah/wiki/MirahWiki.duby
-  - examples/wiki/src/org/mirah/wiki/parser.eduby.html
-  - examples/wiki/src/org/mirah/wiki/view.eduby.html
-  - examples/wiki/war/app.yaml
-  - examples/wiki/war/public/favicon.ico
-  - examples/wiki/war/public/robots.txt
-  - examples/wiki/war/public/images/appengine_duby.png
-  - examples/wiki/war/public/images/back.gif
-  - examples/wiki/war/public/images/dir.gif
-  - examples/wiki/war/public/images/file.gif
-  - examples/wiki/war/public/javascripts/prettify.js
-  - examples/wiki/war/public/stylesheets/main.css
-  - examples/wiki/war/public/stylesheets/prettify.css
-  - examples/wiki/war/public/stylesheets/sh_style.css
-  - examples/wiki/war/public/stylesheets/source.css
-  - examples/wiki/war/public/wmd/showdown.js
-  - examples/wiki/war/public/wmd/wmd-base.js
-  - examples/wiki/war/public/wmd/wmd-plus.js
-  - examples/wiki/war/public/wmd/wmd.js
-  - examples/wiki/war/public/wmd/images/bg-fill.png
-  - examples/wiki/war/public/wmd/images/bg.png
-  - examples/wiki/war/public/wmd/images/blockquote.png
-  - examples/wiki/war/public/wmd/images/bold.png
-  - examples/wiki/war/public/wmd/images/code.png
-  - examples/wiki/war/public/wmd/images/h1.png
-  - examples/wiki/war/public/wmd/images/hr.png
-  - examples/wiki/war/public/wmd/images/img.png
-  - examples/wiki/war/public/wmd/images/italic.png
-  - examples/wiki/war/public/wmd/images/link.png
-  - examples/wiki/war/public/wmd/images/ol.png
-  - examples/wiki/war/public/wmd/images/redo.png
-  - examples/wiki/war/public/wmd/images/separator.png
-  - examples/wiki/war/public/wmd/images/ul.png
-  - examples/wiki/war/public/wmd/images/undo.png
-  - examples/wiki/war/public/wmd/images/wmd-on.png
-  - examples/wiki/war/public/wmd/images/wmd.png
-  - examples/wiki/war/src/org/mirah/wiki/edit.eduby.html
-  - examples/wiki/war/src/org/mirah/wiki/error.eduby.html
-  - examples/wiki/war/src/org/mirah/wiki/layout.eduby.html
-  - examples/wiki/war/src/org/mirah/wiki/MirahWiki.duby
-  - examples/wiki/war/src/org/mirah/wiki/parser.eduby.html
-  - examples/wiki/war/src/org/mirah/wiki/view.eduby.html
-  - examples/wiki/war/WEB-INF/pegdown.jar
-  - examples/wiki/war/WEB-INF/classes/test/HeredocContext.class
-  - examples/wiki/war/WEB-INF/classes/test/MirahParser.class
-  - examples/wiki/war/WEB-INF/lib/appengine-api.jar
-  - examples/wiki/war/WEB-INF/lib/dubydatastore.jar
-  - examples/wiki/war/WEB-INF/lib/jmeta-runtime.jar
-  - examples/wiki/war/WEB-INF/lib/pegdown-stubs.jar
-  - javalib/dynalink-0.1.jar
-  - javalib/jsr292-mock.jar
+  - examples/rosettacode/100-doors.mirah
+  - examples/rosettacode/99-bottles-of-beer.mirah
+  - examples/rosettacode/boolean-values.mirah
+  - examples/rosettacode/comments.mirah
+  - examples/rosettacode/copy-a-string.mirah
+  - examples/rosettacode/count-occurrences-of-a-substring.mirah
+  - examples/rosettacode/create-a-file.mirah
+  - examples/rosettacode/empty-string.mirah
+  - examples/rosettacode/factorial.mirah
+  - examples/rosettacode/fibonacci.mirah
+  - examples/rosettacode/file-size.mirah
+  - examples/rosettacode/fizz-buzz.mirah
+  - examples/rosettacode/flatten-a-list.mirah
+  - examples/rosettacode/guess-the-number.mirah
+  - examples/rosettacode/is-string-numeric.mirah
+  - examples/rosettacode/palindrome.mirah
+  - examples/rosettacode/README.txt
+  - examples/rosettacode/repeat-a-string.mirah
+  - examples/rosettacode/reverse-a-string.mirah
+  - examples/rosettacode/rot-13.mirah
+  - examples/rosettacode/user-input.mirah
+  - javalib/dynalink-0.2.jar
   - javalib/mirah-bootstrap.jar
   - javalib/mirah-parser.jar
   - History.txt
@@ -212,12 +216,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
@@ -227,12 +237,14 @@ signing_key:
 specification_version: 3
 summary: Mirah is a customizable programming language featuring static types, local type inference and a heavily Ruby-inspired syntax
 test_files: 
-  - test/test_ast.rb
-  - test/test_compilation.rb
-  - test/test_env.rb
-  - test/test_gwt.rb
-  - test/test_java_typer.rb
-  - test/test_javac_compiler.rb
-  - test/test_jvm_compiler.rb
-  - test/test_macros.rb
-  - test/test_typer.rb
+  - test/core/test_ast.rb
+  - test/core/test_compilation.rb
+  - test/core/test_env.rb
+  - test/core/test_macros.rb
+  - test/core/test_typer.rb
+  - test/jvm/test_enumerable.rb
+  - test/jvm/test_java_typer.rb
+  - test/jvm/test_jvm_compiler.rb
+  - test/jvm/test_macros.rb
+  - test/jvm/test_main_method.rb
+  - test/plugins/test_gwt.rb