mirah 0.0.4-java → 0.0.5-java

data/lib/mirah/jvm/types/basic_types.rb

@@ -1,4 +1,19 @@
-module Duby::JVM::Types
+# 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::JVM::Types
   Boolean = BooleanType.new('boolean', java.lang.Boolean)
   Byte = IntegerType.new('byte', java.lang.Byte)
   Char = IntegerType.new('char', java.lang.Character)

data/lib/mirah/jvm/types/boolean.rb

@@ -1,4 +1,19 @@
-module Duby::JVM::Types
+# 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::JVM::Types
   class BooleanType < PrimitiveType
     def init_value(builder)
       builder.iconst_0
@@ -9,7 +24,7 @@ module Duby::JVM::Types
     end
 
     def box(builder)
-      box_type = Duby::AST::type(nil, 'java.lang.Boolean')
+      box_type = Mirah::AST::type(nil, 'java.lang.Boolean')
       builder.invokestatic box_type, "valueOf", [box_type, self]
     end
 

data/lib/mirah/jvm/types/enumerable.rb

@@ -1,7 +1,22 @@
-module Duby::JVM::Types
+# 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::JVM::Types
   class Type
     def expand_each(transformer, call)
-      arg_types = [Duby::AST.block_type]
+      arg_types = [Mirah::AST.block_type]
       code = intrinsics['each'][arg_types].return_type
       code.inline(transformer, call)
     end
@@ -36,11 +51,11 @@ module Duby::JVM::Types
         
         # Loops don't have a return value, so we need somewhere to
         # put the result.
-        result = Duby::AST::Body.new(call.parent, call.position)
+        result = Mirah::AST::Body.new(call.parent, call.position)
         result << forloop << transformer.eval("#{all}", '', nil, all)
       end
       add_macro('all?', &all_proc)
-      add_macro('all?', Duby::AST.block_type, &all_proc)
+      add_macro('all?', Mirah::AST.block_type, &all_proc)
 
       any_proc = proc do |transformer, call|
         if !call.block
@@ -55,11 +70,11 @@ module Duby::JVM::Types
         body.condition.predicate = call.block.body
         forloop.body = call.block.body.parent = body
         
-        result = Duby::AST::Body.new(call.parent, call.position)
+        result = Mirah::AST::Body.new(call.parent, call.position)
         result << forloop << transformer.eval("#{any}", '', nil, any)
       end
       add_macro('any?', &any_proc)
-      add_macro('any?', Duby::AST.block_type, &any_proc)
+      add_macro('any?', Mirah::AST.block_type, &any_proc)
     end
   end
 end

data/lib/mirah/jvm/types/extensions.rb

@@ -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::JVM::Types
+module Mirah::JVM::Types
   class ExtendedType < DelegateClass(Type)
     def initialize(*args)
       super

data/lib/mirah/jvm/types/factory.rb

@@ -1,5 +1,20 @@
+# 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 'jruby'
-module Duby::JVM::Types
+module Mirah::JVM::Types
   class TypeFactory
     BASIC_TYPES = {
       "boolean" => Boolean,
@@ -45,7 +60,7 @@ module Duby::JVM::Types
     def initialize_copy(other)
       @known_types = other.known_types.dup
       @known_types.delete_if do |key, value|
-        value.basic_type.kind_of?(Duby::JVM::Types::TypeDefinition)
+        value.basic_type.kind_of?(Mirah::JVM::Types::TypeDefinition)
       end
       @declarations = []
     end
@@ -160,7 +175,7 @@ module Duby::JVM::Types
         existing.node ||= node
         existing
       else
-        if Duby::AST::InterfaceDeclaration === node
+        if Mirah::AST::InterfaceDeclaration === node
           klass = InterfaceDefinition
         else
           klass = TypeDefinition

data/lib/mirah/jvm/types/floats.rb

@@ -1,4 +1,19 @@
-module Duby::JVM::Types
+# 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::JVM::Types
   class FloatType < Number
     def prefix
       'f'

data/lib/mirah/jvm/types/integers.rb

@@ -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 BiteScript::MethodBuilder
   def inot
     iconst_m1
@@ -13,7 +28,7 @@ class BiteScript::MethodBuilder
   end
 end
 
-module Duby::JVM::Types
+module Mirah::JVM::Types
   class IntegerType < Number
     def literal(builder, value)
       builder.push_int(value)
@@ -68,7 +83,7 @@ module Duby::JVM::Types
         op = "-="
       end
       comparison << "=" if inclusive
-      forloop = Duby::AST::Loop.new(parent, position, true, false) do |forloop|
+      forloop = Mirah::AST::Loop.new(parent, position, true, false) do |forloop|
         first, last = duby.tmp, duby.tmp
         init = duby.eval("#{first} = 0; #{last} = 0;")
         init.children[-2].value = first_value
@@ -82,7 +97,7 @@ module Duby::JVM::Types
         end
         forloop.post << duby.eval("#{first} #{op} 1")
         [
-          Duby::AST::Condition.new(forloop, position) do |c|
+          Mirah::AST::Condition.new(forloop, position) do |c|
             [duby.eval("#{first} #{comparison} #{last}",
                        '', forloop, first, last)]
           end,
@@ -103,17 +118,17 @@ module Duby::JVM::Types
       math_operator('^', 'xor')
       unary_operator('~', 'not')
 
-      add_macro('downto', Int, Duby::AST.block_type) do |transformer, call|
+      add_macro('downto', Int, Mirah::AST.block_type) do |transformer, call|
         build_loop(call.parent, call.position, transformer,
                    call.block, call.target, call.parameters[0], false, true)
       end
-      add_macro('upto', Int, Duby::AST.block_type) do |transformer, call|
+      add_macro('upto', Int, Mirah::AST.block_type) do |transformer, call|
         build_loop(call.parent, call.position, transformer,
                    call.block, call.target, call.parameters[0], true, true)
       end
-      add_macro('times', Duby::AST.block_type) do |transformer, call|
+      add_macro('times', Mirah::AST.block_type) do |transformer, call|
         build_loop(call.parent, call.position, transformer,
-                   call.block, Duby::AST::fixnum(nil, call.position, 0),
+                   call.block, Mirah::AST::fixnum(nil, call.position, 0),
                    call.target, true, false)
       end
     end

data/lib/mirah/jvm/types/intrinsics.rb

@@ -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 'bitescript'
 require 'mirah/jvm/types/enumerable'
 
@@ -15,7 +30,7 @@ class BiteScript::MethodBuilder
   end
 end
 
-module Duby::JVM::Types
+module Mirah::JVM::Types
   class Type
 
     def load(builder, index)
@@ -51,7 +66,7 @@ module Duby::JVM::Types
     end
 
     def add_macro(name, *args, &block)
-      type = Duby::AST::InlineCode.new(&block)
+      type = Mirah::AST::InlineCode.new(&block)
       intrinsics[name][args] = Intrinsic.new(self, name, args, type) do
         raise "Macro should be expanded, no called!"
       end
@@ -63,7 +78,7 @@ module Duby::JVM::Types
         ast = expander.expand
         if ast
           if call.target
-            body = Duby::AST::ScopedBody.new(call.parent, call.position)
+            body = Mirah::AST::ScopedBody.new(call.parent, call.position)
             body.static_scope.self_type = call.target.inferred_type!
             body.static_scope.self_node = call.target
             body << ast
@@ -72,7 +87,7 @@ module Duby::JVM::Types
             ast
           end
         else
-          Duby::AST::Noop.new(call.parent, call.position)
+          Mirah::AST::Noop.new(call.parent, call.position)
         end
       end
     end
@@ -98,7 +113,7 @@ module Duby::JVM::Types
     def load_extensions(klass=nil)
       mirror = nil
       if klass
-        factory = Duby::AST.type_factory
+        factory = Mirah::AST.type_factory
         mirror = factory.get_mirror(klass.getName)
       elsif jvm_type
         mirror = jvm_type
@@ -114,9 +129,9 @@ module Duby::JVM::Types
           types = BiteScript::ASM::Type.get_argument_types(macro['signature'])
           args = types.map do |type|
             if type.class_name == 'duby.lang.compiler.Block'
-              Duby::AST::TypeReference::BlockType
+              Mirah::AST::TypeReference::BlockType
             else
-              Duby::AST.type(nil, type)
+              Mirah::AST.type(nil, type)
             end
           end
           klass = JRuby.runtime.jruby_class_loader.loadClass(class_name)
@@ -160,7 +175,7 @@ module Duby::JVM::Types
 
       add_macro('kind_of?', ClassType) do |transformer, call|
         klass, object = call.parameters[0], call.target
-        Duby::AST::Call.new(call.parent, call.position, 'isInstance') do |call2|
+        Mirah::AST::Call.new(call.parent, call.position, 'isInstance') do |call2|
           klass.parent = object.parent = call2
           [
             klass,
@@ -209,8 +224,8 @@ module Duby::JVM::Types
         compiler.method.arraylength
       end
 
-      add_macro('each', Duby::AST.block_type) do |transformer, call|
-        Duby::AST::Loop.new(call.parent,
+      add_macro('each', Mirah::AST.block_type) do |transformer, call|
+        Mirah::AST::Loop.new(call.parent,
                             call.position, true, false) do |forloop|
           index = transformer.tmp
           array = transformer.tmp
@@ -229,7 +244,7 @@ module Duby::JVM::Types
           forloop.post << transformer.eval("#{index} += 1")
           call.block.body.parent = forloop if call.block.body
           [
-            Duby::AST::Condition.new(forloop, call.position) do |c|
+            Mirah::AST::Condition.new(forloop, call.position) do |c|
               [transformer.eval("#{index} < #{array}.length",
                                 '', forloop, index, array)]
             end,
@@ -341,8 +356,8 @@ module Duby::JVM::Types
     def add_intrinsics
       super
       add_enumerable_macros
-      add_macro('each', Duby::AST.block_type) do |transformer, call|
-        Duby::AST::Loop.new(call.parent,
+      add_macro('each', Mirah::AST.block_type) do |transformer, call|
+        Mirah::AST::Loop.new(call.parent,
                             call.position, true, false) do |forloop|
           it = transformer.tmp
 
@@ -358,7 +373,7 @@ module Duby::JVM::Types
           end
           call.block.body.parent = forloop if call.block.body
           [
-            Duby::AST::Condition.new(forloop, call.position) do |c|
+            Mirah::AST::Condition.new(forloop, call.position) do |c|
               [transformer.eval("#{it}.hasNext", '', forloop, it)]
             end,
             call.block.body

data/lib/mirah/jvm/types/literals.rb

@@ -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::JVM::Types
+module Mirah::JVM::Types
 
   # Represents a literal number that can be represented
   # in multiple types

data/lib/mirah/jvm/types/methods.rb

@@ -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 'mirah/jvm/types'
 
 class Java::JavaMethod
@@ -10,8 +25,8 @@ class Java::JavaMethod
   end
 end
 
-module Duby::JVM::Types
-  AST ||= Duby::AST
+module Mirah::JVM::Types
+  AST ||= Mirah::AST
 
   module ArgumentConversion
     def convert_args(compiler, values, types=nil)
@@ -106,10 +121,10 @@ module Duby::JVM::Types
 
     def exceptions
       @member.exception_types.map do |exception|
-        if exception.kind_of?(Duby::JVM::Types::Type)
+        if exception.kind_of?(Mirah::JVM::Types::Type)
           exception
         else
-          Duby::AST.type(nil, exception.class_name)
+          Mirah::AST.type(nil, exception.class_name)
         end
       end
     end
@@ -348,7 +363,7 @@ module Duby::JVM::Types
     end
   end
 
-  class DubyMember
+  class MirahMember
     attr_reader :name, :argument_types, :declaring_class, :return_type
     attr_reader :exception_types
 
@@ -477,11 +492,11 @@ module Duby::JVM::Types
 
     def inner_class_getter(name)
       full_name = "#{self.name}$#{name}"
-      inner_class = Duby::AST.type(nil, full_name) rescue nil
+      inner_class = Mirah::AST.type(nil, full_name) rescue nil
       return unless inner_class
       inner_class.inner_class = true
       add_macro(name) do |transformer, call|
-        Duby::AST::Constant.new(call.parent, call.position, full_name)
+        Mirah::AST::Constant.new(call.parent, call.position, full_name)
       end
       intrinsics[name][[]]
     end
@@ -554,7 +569,7 @@ module Duby::JVM::Types
 
     def declare_method(name, arguments, type, exceptions)
       raise "Bad args" unless arguments.all?
-      member = DubyMember.new(self, name, arguments, type, false, exceptions)
+      member = MirahMember.new(self, name, arguments, type, false, exceptions)
       if name == 'initialize'
         if @default_constructor_added
           unless arguments.empty?
@@ -569,7 +584,7 @@ module Duby::JVM::Types
     end
 
     def declare_static_method(name, arguments, type, exceptions)
-      member = DubyMember.new(self, name, arguments, type, true, exceptions)
+      member = MirahMember.new(self, name, arguments, type, true, exceptions)
       static_methods[name] << JavaStaticMethod.new(member)
     end
 

data/lib/mirah/jvm/types/number.rb

@@ -1,4 +1,19 @@
-module Duby::JVM::Types
+# 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::JVM::Types
   class ComparisonIntrinsic < Intrinsic
     attr_reader :name, :op
     def initialize(type, name, op, args)

data/lib/mirah/jvm/types.rb

@@ -1,20 +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 'bitescript'
 require 'mirah/ast'
 require 'mirah/jvm/method_lookup'
 require 'mirah/jvm/compiler'
 require 'set'
 
-module Duby
+module Mirah
   module JVM
     module Types
       class Type < AST::TypeReference
         include Java::DubyLangCompiler::Class
-        include Duby::JVM::MethodLookup
+        include Mirah::JVM::MethodLookup
 
         attr_writer :inner_class
 
         def log(message)
-          puts "* [JVM::Types] #{message}" if Duby::Compiler::JVM.verbose
+          puts "* [JVM::Types] #{message}" if Mirah::Compiler::JVM.verbose
         end
 
         def initialize(mirror_or_name)
@@ -111,7 +126,7 @@ module Duby
         end
 
         def array_type
-          @array_type ||= Duby::JVM::Types::ArrayType.new(self)
+          @array_type ||= Mirah::JVM::Types::ArrayType.new(self)
         end
 
         def prefix
@@ -247,6 +262,10 @@ module Duby
         def compatible?(other)
           !other.primitive?
         end
+        
+        def assignable_from?(other)
+          !other.primitive?
+        end
       end
 
       class VoidType < PrimitiveType

data/lib/mirah/nbcompiler.rb

@@ -1,5 +1,20 @@
+# 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 'mirah'
-module Duby
+module Mirah
   class NbCompiler
     include org.mirah.DubyCompiler
 
@@ -19,9 +34,9 @@ module Duby
     end
 
     def parse(text)
-      Duby::AST.type_factory = Duby::JVM::Types::TypeFactory.new
-      ast = Duby::AST.parse_ruby(text)
-      transformer = Duby::Transform::Transformer.new(Duby::CompilationState.new)
+      Mirah::AST.type_factory = Mirah::JVM::Types::TypeFactory.new
+      ast = Mirah::AST.parse_ruby(text)
+      transformer = Mirah::Transform::Transformer.new(Mirah::CompilationState.new)
       return ParseResult.new(
           transformer.transform(ast, nil), transformer.errors)
     end

data/lib/mirah/plugin/edb.rb

@@ -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 'erb'
 
-Duby::AST.defmacro('def_edb') do |transformer, fcall, parent|
+Mirah::AST.defmacro('def_edb') do |transformer, fcall, parent|
   name = fcall.parameters[0].name
   path = fcall.parameters[1].literal
   compiler = ERB::Compiler.new(nil)
@@ -9,14 +24,14 @@ Duby::AST.defmacro('def_edb') do |transformer, fcall, parent|
   compiler.pre_cmd = ["def #{name}", "_edbout = StringBuilder.new"]
   compiler.post_cmd = ["_edbout.toString", "end"]
   src = compiler.compile(IO.read(path))
-  ast = Duby::AST.parse_ruby(src, path)
+  ast = Mirah::AST.parse_ruby(src, path)
   transformer.filename = path
   script = transformer.transform(ast, parent)
   script.body.parent = parent
   script.body
 end
 
-Duby::AST.defmacro('__edb_insert__') do |transformer, fcall, parent|
+Mirah::AST.defmacro('__edb_insert__') do |transformer, fcall, parent|
   # ERB sticks in a .to_s that we don't want.
   # the ast is __edb_insert__(_edbout.append(content.to_s))
   append = fcall.parameters[0]