RubyGems - mirah - Versions diffs - 0.0.4-java → 0.0.5-java - Mend

mirah 0.0.4-java → 0.0.5-java

Files changed (96) hide show

data/History.txt +23 -0
data/README.txt +13 -5
data/Rakefile +30 -2
data/bin/duby +16 -0
data/bin/dubyc +16 -0
data/bin/dubyp +16 -0
data/bin/jrubyp +16 -0
data/bin/mirah +17 -1
data/bin/mirah.cmd +15 -0
data/bin/mirahc +17 -1
data/bin/mirahc.cmd +16 -1
data/bin/mirahp +17 -1
data/bin/mirahp.cmd +16 -1
data/examples/appengine/Rakefile +17 -2
data/examples/appengine/src/org/mirah/MirahApp.mirah +15 -0
data/examples/bintrees.mirah +15 -0
data/examples/construction.mirah +15 -0
data/examples/dynamic.mirah +15 -0
data/examples/edb.mirah +15 -0
data/examples/fib.mirah +15 -0
data/examples/fields.mirah +15 -0
data/examples/fractal.mirah +15 -0
data/examples/java_thing.mirah +15 -0
data/examples/plugins/appengine/Rakefile +19 -4
data/examples/plugins/appengine/lib/com/google/appengine/ext/duby/db/datastore.rb +21 -6
data/examples/plugins/appengine/src/com/google/appengine/ext/duby/db/Model.duby +15 -0
data/examples/plugins/appengine/test/com/google/appengine/ext/duby/db/ModelTest.duby +15 -0
data/examples/simple_class.mirah +16 -1
data/examples/sort_closure.mirah +15 -0
data/examples/swing.mirah +17 -2
data/examples/tak.mirah +15 -0
data/examples/wiki/Rakefile +17 -2
data/examples/wiki/src/org/mirah/wiki/MirahWiki.duby +15 -0
data/examples/wiki/war/src/org/mirah/wiki/MirahWiki.duby +339 -0
data/examples/wiki/war/src/org/mirah/wiki/edit.eduby.html +42 -0
data/examples/wiki/war/src/org/mirah/wiki/error.eduby.html +2 -0
data/examples/wiki/war/src/org/mirah/wiki/layout.eduby.html +69 -0
data/examples/wiki/war/src/org/mirah/wiki/parser.eduby.html +7 -0
data/examples/wiki/war/src/org/mirah/wiki/view.eduby.html +15 -0
data/javalib/mirah-bootstrap.jar +0 -0
data/javalib/mirah-parser.jar +0 -0
data/lib/duby.rb +15 -0
data/lib/mirah/appengine_tasks.rb +20 -6
data/lib/mirah/ast/call.rb +19 -4
data/lib/mirah/ast/class.rb +19 -4
data/lib/mirah/ast/flow.rb +16 -1
data/lib/mirah/ast/intrinsics.rb +36 -21
data/lib/mirah/ast/literal.rb +16 -1
data/lib/mirah/ast/local.rb +16 -1
data/lib/mirah/ast/method.rb +18 -3
data/lib/mirah/ast/scope.rb +19 -4
data/lib/mirah/ast/structure.rb +16 -1
data/lib/mirah/ast/type.rb +24 -9
data/lib/mirah/ast.rb +24 -9
data/lib/mirah/compiler.rb +16 -1
data/lib/mirah/env.rb +16 -1
data/lib/mirah/jvm/base.rb +18 -3
data/lib/mirah/jvm/compiler.rb +35 -21
data/lib/mirah/jvm/method_lookup.rb +16 -1
data/lib/mirah/jvm/source_compiler.rb +29 -14
data/lib/mirah/jvm/source_generator/builder.rb +21 -6
data/lib/mirah/jvm/source_generator/loops.rb +16 -1
data/lib/mirah/jvm/source_generator/precompile.rb +17 -2
data/lib/mirah/jvm/source_generator/typer.rb +17 -2
data/lib/mirah/jvm/typer.rb +19 -4
data/lib/mirah/jvm/types/basic_types.rb +16 -1
data/lib/mirah/jvm/types/boolean.rb +17 -2
data/lib/mirah/jvm/types/enumerable.rb +21 -6
data/lib/mirah/jvm/types/extensions.rb +16 -1
data/lib/mirah/jvm/types/factory.rb +18 -3
data/lib/mirah/jvm/types/floats.rb +16 -1
data/lib/mirah/jvm/types/integers.rb +22 -7
data/lib/mirah/jvm/types/intrinsics.rb +29 -14
data/lib/mirah/jvm/types/literals.rb +16 -1
data/lib/mirah/jvm/types/methods.rb +24 -9
data/lib/mirah/jvm/types/number.rb +16 -1
data/lib/mirah/jvm/types.rb +23 -4
data/lib/mirah/nbcompiler.rb +19 -4
data/lib/mirah/plugin/edb.rb +18 -3
data/lib/mirah/plugin/gwt.rb +22 -7
data/lib/mirah/plugin/java.rb +18 -3
data/lib/mirah/transform.rb +35 -20
data/lib/mirah/transform2.rb +20 -5
data/lib/mirah/typer.rb +23 -8
data/lib/mirah/version.rb +18 -0
data/lib/mirah.rb +101 -50
data/lib/mirah_task.rb +27 -12
data/test/test_ast.rb +16 -1
data/test/test_compilation.rb +18 -3
data/test/test_env.rb +26 -11
data/test/test_gwt.rb +18 -3
data/test/test_java_typer.rb +27 -12
data/test/test_javac_compiler.rb +17 -2
data/test/test_jvm_compiler.rb +44 -14
data/test/test_typer.rb +16 -1
metadata +203 -193

data/examples/wiki/war/src/org/mirah/wiki/layout.eduby.html ADDED Viewed

@@ -0,0 +1,69 @@
+<!doctype html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <title><%=h @title %></title>
+    <link type="text/css" rel="stylesheet" href="/stylesheets/main.css">
+    <link href="/stylesheets/prettify.css" type="text/css" rel="stylesheet" />
+    <script type="text/javascript" src="/javascripts/prettify.js"></script>
+  </head>
+  <body onload="prettyPrint()">
+    <div id="page">
+      <div id="sidebar">
+        <h1>Mirah</h1>
+        <ul id="sidebar-items">
+          <li>
+            <h3>Join the community</h3>
+            <ul class="links">
+              <li><a href="/">Home Page</a></li>
+              <li><a href="http://github.com/mirah/mirah">github</a></li>
+              <li><a href="/wiki/Resources">Resources</a></li>
+              <li><a href="/wiki/MirahHowto">Howto</a></li>
+              <li><a
+      href="http://groups.google.com/group/mirah/"
+      target="_new">Send Feedback</a></li>
+            </ul>
+          </li>
+          <li>
+            <h3>Sample Apps</h3>
+            <ul class="links">
+              <li><a href="http://github.com/mirah/mirah/tree/master/examples/appengine/">Guestbook</a> |
+                  <a href="http://github.com/jacortinas/appengine-rails-jquery-demo">Mustache</a></li>
+            </ul>
+            <a href="/wiki/MirahSamples">Sample Code</a>
+          </li>
+          <li>
+            <h3>Mirah Videos</h3>
+            <ul class="links">
+              <li><a href="http://www.youtube.com/watch?v=08rNKxW0PPo">ribrdb</a> |
+                  <a href="http://confreaks.net/videos/196-rubyconf2009-ruby-mutants">headius</a></li>
+            </ul>
+          </li>
+      </div>
+      <div id="content">
+        <div id=hlinks>
+          <% if user %>
+            <%=h user.getEmail %>&nbsp;|&nbsp;
+            <% extra_links.each do |_pair|;pair = List(_pair) %>
+              <a href="<%=h pair.get(1)%>"><%=h pair.get(0)%></a>&nbsp;|&nbsp;
+            <% end %>
+            <a href="<%=h users.createLogoutURL('/')%>">Sign Out</a>
+          <% else %>
+            <a href="<%=users.createLoginURL(url)%>">Sign In</a>
+          <% end %>
+        </div>
+        <div id=wikicontent>
+          <%= @content %>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

data/examples/wiki/war/src/org/mirah/wiki/parser.eduby.html ADDED Viewed

@@ -0,0 +1,7 @@
+<form method=post>
+  <p><textarea name="code" cols=80 rows=20><%=h @code %></textarea><br>
+     <input type="submit" value="Parse"/>
+  </p>
+</form>
+<h2>Parsed:</h2>
+<div><tt><%=h @parsed %></tt></div>

data/examples/wiki/war/src/org/mirah/wiki/view.eduby.html ADDED Viewed

@@ -0,0 +1,15 @@
+<script>
+function newPage() {
+  var p=prompt('Page name', '')
+  if (p) {
+    document.location = '/edit/' + p
+  }
+}
+</script>
+<% if @page %>
+  <%= markdown @page.body %>
+<% else %>
+  <h1><%=h @name%></h1>
+  <p>That page does not exist. Click <a href="/edit/<%=h @name%>">here</a>
+    to create it.</p>
+<% end%>

data/javalib/mirah-bootstrap.jar CHANGED Viewed

Binary file

data/javalib/mirah-parser.jar CHANGED Viewed

Binary file

data/lib/duby.rb CHANGED Viewed

@@ -1,2 +1,17 @@
+# 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.
 puts "WARNING: Duby is now Mirah. Please require 'mirah'."
 require File.dirname(__FILE__) + '/mirah'

data/lib/mirah/appengine_tasks.rb CHANGED Viewed

@@ -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 'appengine-sdk'
 require 'mirah_task'
 require 'java'
@@ -6,8 +21,7 @@ require 'rake'
 require 'yaml'
 module AppEngine::Rake
-  SERVLET = AppEngine::SDK::SDK_ROOT +
-            '/lib/shared/geronimo-servlet_2.5_spec-1.2.jar'
+  SERVLET = AppEngine::SDK::SDK_ROOT + '/lib/shared/servlet-api.jar'
   APIS = AppEngine::SDK::API_JAR
   TOOLS = AppEngine::SDK::TOOLS_JAR
@@ -30,8 +44,8 @@ module AppEngine::Rake
       webinf_lib_jars.each do |jar|
         $CLASSPATH << jar unless $CLASSPATH.include?(jar)
       end
-      Duby.source_paths << src
-      Duby.dest_paths << webinf_classes
+      Mirah.source_paths << src
+      Mirah.dest_paths << webinf_classes
       directory(webinf_classes)
       directory(webinf_lib)
@@ -108,7 +122,7 @@ module AppEngine::Rake
     end
     def app_yaml
-      @war + '/app.yaml'
+      @war + '/WEB-INF/app.yaml'
     end
     def webinf_classes
@@ -143,4 +157,4 @@ def appengine_app(*args, &block)
   war = File.expand_path(war || 'war')
   task.init(src, war)
   task
-end
+end

data/lib/mirah/ast/call.rb CHANGED Viewed

@@ -1,6 +1,21 @@
+# 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 'delegate'
-module Duby::AST
+module Mirah::AST
   class NodeProxy < DelegateClass(Node)
     include Java::DubyLangCompiler::Node
     def __inline__(node)
@@ -89,7 +104,7 @@ module Duby::AST
           typer.infer(param) || should_defer = true
         end
-        parameter_types << Duby::AST.block_type if block
+        parameter_types << Mirah::AST.block_type if block
         unless should_defer
           if parameters.size == 1 && typer.known_type(scope, name)
@@ -189,7 +204,7 @@ module Duby::AST
           typer.infer(param) || should_defer = true
         end
-        parameter_types << Duby::AST.block_type if block
+        parameter_types << Mirah::AST.block_type if block
         unless should_defer
           @inferred_type = typer.method_type(receiver_type, name,
@@ -254,7 +269,7 @@ module Duby::AST
       begin
         typer.type_reference(scope, class_name, array)
       rescue NameError => ex
-        typer.known_types[class_name] = Duby::AST.error_type
+        typer.known_types[class_name] = Mirah::AST.error_type
         raise ex
       end
     end

data/lib/mirah/ast/class.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+module Mirah::AST
   class ClassDefinition < Node
     include Annotated
     include Named
@@ -19,8 +34,8 @@ module Duby::AST
       @interface_nodes = []
       @name = name
       self.parent = parent
-      if Duby::AST.type_factory.respond_to? :define_type
-        Duby::AST.type_factory.define_type(self)
+      if Mirah::AST.type_factory.respond_to? :define_type
+        Mirah::AST.type_factory.define_type(self)
       end
       # We need somewhere to collect nodes that get appended during
       # the transform phase.
@@ -103,7 +118,7 @@ module Duby::AST
     def implements(*types)
       raise ArgumentError if types.any? {|x| x.nil?}
       types.each do |type|
-        if Duby::AST::TypeReference === type
+        if Mirah::AST::TypeReference === type
           @interfaces << type
         else
           @interface_nodes << type

data/lib/mirah/ast/flow.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby
+# 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.
+module Mirah
   module AST
     class Condition < Node
       child :predicate

data/lib/mirah/ast/intrinsics.rb CHANGED Viewed

@@ -1,6 +1,21 @@
+# 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 'fileutils'
-module Duby::AST
+module Mirah::AST
   class Unquote < Node
     child :value
@@ -39,19 +54,19 @@ module Duby::AST
     end
     def self.__extracted
-      Thread.current[:'Duby::AST::Unqote.extracted']
+      Thread.current[:'Mirah::AST::Unqote.extracted']
     end
     def self.__extracted=(value)
-      Thread.current[:'Duby::AST::Unqote.extracted'] = value
+      Thread.current[:'Mirah::AST::Unqote.extracted'] = value
     end
     def self.__injected
-      Thread.current[:'Duby::AST::Unqote.injected']
+      Thread.current[:'Mirah::AST::Unqote.injected']
     end
     def self.__injected=(value)
-      Thread.current[:'Duby::AST::Unqote.injected'] = value
+      Thread.current[:'Mirah::AST::Unqote.injected'] = value
     end
     def self.extract_values
@@ -80,7 +95,7 @@ module Duby::AST
     def name
       case value
-      when Duby::AST::String
+      when Mirah::AST::String
         value.literal
       when ::String
         value
@@ -235,7 +250,7 @@ module Duby::AST
         else
           # TODO support typed args. Also there should be a way
           # to accept any AST node.
-          Duby::JVM::Types::Object
+          Mirah::JVM::Types::Object
         end
       end
     end
@@ -249,19 +264,19 @@ module Duby::AST
     end
     def build_and_load_extension(parent, name, state)
-      transformer = Duby::Transform::Transformer.new(state)
+      transformer = Mirah::Transform::Transformer.new(state)
       transformer.filename = name.gsub(".", "/")
-      orig_factory = Duby::AST.type_factory
+      orig_factory = Mirah::AST.type_factory
       new_factory = orig_factory.dup
-      Duby::AST.type_factory = new_factory
+      Mirah::AST.type_factory = new_factory
       ast = build_ast(name, parent, transformer)
       puts ast.inspect if state.verbose
       classes = compile_ast(name, ast, transformer)
-      loader = DubyClassLoader.new(
+      loader = MirahClassLoader.new(
           JRuby.runtime.jruby_class_loader, classes)
       klass = loader.loadClass(name, true)
       annotate(parent, name)
-      Duby::AST.type_factory = orig_factory
+      Mirah::AST.type_factory = orig_factory
       klass
     end
@@ -289,10 +304,10 @@ module Duby::AST
     end
     def compile_ast(name, ast, transformer)
-      typer = Duby::Typer::JVM.new(transformer)
+      typer = Mirah::Typer::JVM.new(transformer)
       typer.infer(ast)
       typer.resolve(true)
-      compiler = Duby::Compiler::JVM.new
+      compiler = Mirah::Compiler::JVM.new
       ast.compile(compiler, false)
       class_map = {}
       compiler.generate do |outfile, builder|
@@ -311,25 +326,25 @@ module Duby::AST
     def build_ast(name, parent, transformer)
       # TODO should use a new type factory too.
-      ast = Duby::AST.parse_ruby("begin;end")
+      ast = Mirah::AST.parse_ruby("begin;end")
       ast = transformer.transform(ast, nil)
       # Start building the extension class
       extension = transformer.define_class(position, name)
-      #extension.superclass = Duby::AST.type(nil, 'duby.lang.compiler.Macro')
-      extension.implements(Duby::AST.type(nil, 'duby.lang.compiler.Macro'))
+      #extension.superclass = Mirah::AST.type(nil, 'duby.lang.compiler.Macro')
+      extension.implements(Mirah::AST.type(nil, 'duby.lang.compiler.Macro'))
       extension.static_scope.import('duby.lang.compiler.Node', 'Node')
       # The constructor just saves the state
       extension.define_constructor(
           position,
-          ['mirah', Duby::AST.type(nil, 'duby.lang.compiler.Compiler')],
-          ['call', Duby::AST.type(nil, 'duby.lang.compiler.Call')]) do |c|
+          ['mirah', Mirah::AST.type(nil, 'duby.lang.compiler.Compiler')],
+          ['call', Mirah::AST.type(nil, 'duby.lang.compiler.Call')]) do |c|
         transformer.eval("@mirah = mirah;@call = call", '-', c, 'mirah', 'call')
       end
-      node_type = Duby::AST.type(nil, 'duby.lang.compiler.Node')
+      node_type = Mirah::AST.type(nil, 'duby.lang.compiler.Node')
       # expand() parses the arguments out of call and then passes them off to
       # _expand
@@ -350,7 +365,7 @@ module Duby::AST
       end
       actual_args = arguments.map do |arg|
         type = if arg.kind_of?(BlockArgument)
-          Duby::AST.type(nil, 'duby.lang.compiler.Block')
+          Mirah::AST.type(nil, 'duby.lang.compiler.Block')
         else
           node_type
         end

data/lib/mirah/ast/literal.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+module Mirah::AST
   class Array < Node
     def initialize(parent, line_number, &block)
       super(parent, line_number, &block)

data/lib/mirah/ast/local.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+module Mirah::AST
   class LocalDeclaration < Node
     include Named
     include Typed

data/lib/mirah/ast/method.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+module Mirah::AST
   class Arguments < Node
     child :required
     child :opt_args
@@ -241,7 +256,7 @@ module Duby::AST
           if !abstract? &&
               forced_type != typer.no_type &&
               !actual_type.is_parent(inferred_type)
-            raise Duby::Typer::InferenceError.new(
+            raise Mirah::Typer::InferenceError.new(
                 "Inferred return type %s is incompatible with declared %s" %
                 [inferred_type, actual_type], self)
           end
@@ -259,7 +274,7 @@ module Duby::AST
         # even if we can't infer the body yet.
         type ||= signature[:return] if argument_types && argument_types.all?
         if type
-          argument_types ||= [Duby::AST.error_type] if type.error?
+          argument_types ||= [Mirah::AST.error_type] if type.error?
           typer.learn_method_type(defining_class, name, argument_types, type, signature[:throws])
           # learn the other overloads as well

data/lib/mirah/ast/scope.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby
+# 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.
+module Mirah
   module AST
     module Scoped
       def scope
@@ -79,7 +94,7 @@ module Duby
         existing_type = local_type(name)
         if existing_type
           unless existing_type.assignable_from?(type)
-            raise Duby::Typer::InferenceError.new(
+            raise Mirah::Typer::InferenceError.new(
                 "Can't assign #{type.full_name} to " \
                 "variable of type #{existing_type.full_name}")
           end
@@ -147,11 +162,11 @@ module Duby
             parent.binding_type(defining_class, duby)
           else
             name = "#{defining_class.name}$#{duby.tmp}"
-            factory = Duby::AST.type_factory
+            factory = Mirah::AST.type_factory
             if factory
               factory.declare_type(@scope_node, name)
             else
-              Duby::AST::TypeReference.new(name, false, false)
+              Mirah::AST::TypeReference.new(name, false, false)
             end
           end
         end

data/lib/mirah/ast/structure.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+module Mirah::AST
   class Body < Node
     def initialize(parent, line_number, &block)
       super(parent, line_number, &block)

data/lib/mirah/ast/type.rb CHANGED Viewed

@@ -1,4 +1,19 @@
-module Duby::AST
+# 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.
+module Mirah::AST
   class Import < Node
     include Scoped
     attr_accessor :short
@@ -18,7 +33,7 @@ module Duby::AST
       begin
         typer.type_reference(scope, @long)
       rescue NameError => ex
-        typer.known_types[short] = Duby::AST.error_type
+        typer.known_types[short] = Mirah::AST.error_type
         raise ex
       end
       typer.no_type
@@ -47,7 +62,7 @@ module Duby::AST
           arg = node.parameters[0]
           unless (FunctionalCall === arg &&
                   arg.name == 'as' && arg.parameters.size == 1)
-            raise Duby::TransformError.new("unknown import syntax", fcall)
+            raise Mirah::TransformError.new("unknown import syntax", fcall)
           end
           short = arg.parameters[0].name
           pieces = [node.name]
@@ -57,16 +72,16 @@ module Duby::AST
           end
           long = pieces.reverse.join '.'
         else
-          raise Duby::TransformError.new("unknown import syntax", fcall)
+          raise Mirah::TransformError.new("unknown import syntax", fcall)
         end
       else
-        raise Duby::TransformError.new("unknown import syntax", fcall)
+        raise Mirah::TransformError.new("unknown import syntax", fcall)
       end
     when 2
       short = fcall.parameters[0].literal
       long = fcall.parameters[1].literal
     else
-      raise Duby::TransformError.new("unknown import syntax", fcall)
+      raise Mirah::TransformError.new("unknown import syntax", fcall)
     end
     Import.new(parent, fcall.position, short, long)
   end
@@ -90,10 +105,10 @@ module Duby::AST
       name = node.name
       block ||= node.block
     else
-      raise Duby::TransformError.new("unknown package syntax", fcall)
+      raise Mirah::TransformError.new("unknown package syntax", fcall)
     end
     if block
-      raise Duby::TransformError.new("unknown package syntax", block)
+      raise Mirah::TransformError.new("unknown package syntax", block)
       new_scope = ScopedBody.new(parent, fcall.position)
       new_scope.static_scope.package = name
       new_scope << block.body
@@ -124,7 +139,7 @@ module Duby::AST
   class Builtin < Node
     def infer(typer)
-      resolve_if(typer) {Duby::AST.type(nil, 'mirah.impl.Builtin')}
+      resolve_if(typer) {Mirah::AST.type(nil, 'mirah.impl.Builtin')}
     end
   end
 end