mirah 0.0.5-java → 0.0.6-java

data/examples/plugins/appengine/src/com/google/appengine/ext/duby/db/Model.duby

@@ -15,19 +15,29 @@
 
 import java.util.ConcurrentModificationException
 
+import com.google.appengine.api.datastore.Blob
+import com.google.appengine.api.datastore.Category
 import com.google.appengine.api.datastore.DatastoreServiceFactory
+import com.google.appengine.api.datastore.Email
 import com.google.appengine.api.datastore.Entity
 import com.google.appengine.api.datastore.EntityNotFoundException
+import com.google.appengine.api.datastore.FetchOptions.Builder
+import com.google.appengine.api.datastore.GeoPt
+import com.google.appengine.api.datastore.IMHandle
 import com.google.appengine.api.datastore.Key
 import com.google.appengine.api.datastore.KeyFactory
+import com.google.appengine.api.datastore.Link
+import com.google.appengine.api.datastore.PhoneNumber
+import com.google.appengine.api.datastore.PostalAddress
 import com.google.appengine.api.datastore.Query
-import 'Builder', 'com.google.appengine.api.datastore.FetchOptions$Builder'
-import 'FilterOperator', 'com.google.appengine.api.datastore.Query$FilterOperator'
-import 'SortDirection', 'com.google.appengine.api.datastore.Query$SortDirection'
-import com.google.appengine.api.datastore.GeoPt
-import com.google.appengine.api.datastore.IMHandle
+import com.google.appengine.api.datastore.Query.FilterOperator
+import com.google.appengine.api.datastore.Query.SortDirection
+import com.google.appengine.api.datastore.Rating
+import com.google.appengine.api.datastore.ShortBlob
+import com.google.appengine.api.datastore.Text
 import com.google.appengine.api.users.User
 
+import duby.lang.compiler.StringNode
 import java.util.Arrays
 import java.util.Date
 import java.util.HashMap
@@ -98,16 +108,8 @@ class DQuery
 end
 
 class Model
-  defmacro property(name, type) do
-    # This is a hack to make packaging possible.
-    # Everything's still written in ruby, but we load it out of
-    # the datastore plugin's JAR. So as long as Model is in your CLASSPATH
-    # you don't need any extra arguments to dubyc.
-    code = <<RUBY
-      require 'com/google/appengine/ext/duby/db/datastore.rb'
-      AppEngine::DubyDatastorePlugin.add_property(*arg.to_a)
-RUBY
-    @mirah.__ruby_eval(code, [name, type, @mirah, @call])
+  macro def property(name, type)
+    DubyDatastorePlugin.get(@mirah).add_property(name, type, @call)
   end
 
   def initialize; end
@@ -319,6 +321,47 @@ RUBY
 
   # TODO coerce arrays to lists?
 
+  macro def simple_loader(type_node)
+    type = type_node.string_value
+    name = "load_#{type.toLowerCase}"
+    quote do
+      def `name`(value:Object) #`
+        `@mirah.cast(type, 'value')`
+      end
+    end
+  end
+
+  macro def converting_loader(from_node, converter)
+    from = from_node.string_value
+    name = "load_#{from.toLowerCase}"
+    quote do
+      def `name`(value:Object)  #`
+        result = `@mirah.cast(from, 'value')`.`converter` if value
+        result
+      end
+    end
+  end
+
+  simple_loader('Date')
+  simple_loader('GeoPt')
+  simple_loader('IMHandle')
+  simple_loader('Key')
+  simple_loader('List')
+  simple_loader('String')
+  simple_loader('User')
+  converting_loader('Category', 'getCategory')
+  converting_loader('Email', 'getEmail')
+  converting_loader('Link', 'getValue')
+  converting_loader('PhoneNumber', 'getNumber')
+  converting_loader('PostalAddress', 'getAddress')
+  converting_loader('Text', 'getValue')
+  converting_loader('Blob', 'getBytes')
+  converting_loader('ShortBlob', 'getBytes')
+  converting_loader('Long', 'longValue')
+  converting_loader('Double', 'doubleValue')
+  converting_loader('Boolean', 'booleanValue')
+  converting_loader('Rating', 'getRating')
+
   def before_save; end
 
   def self.transaction(block:Runnable):void

data/lib/mirah.rb

@@ -21,6 +21,7 @@ require 'mirah/ast'
 require 'mirah/typer'
 require 'mirah/compiler'
 require 'mirah/env'
+require 'mirah/errors'
 begin
   require 'bitescript'
 rescue LoadError
@@ -54,6 +55,10 @@ module Mirah
   end
 
   def self.print_error(message, position)
+    if position.nil?
+      puts message
+      return
+    end
     puts "#{position.file}:#{position.start_line}: #{message}"
     file_offset = 0
     startline = position.start_line - 1
@@ -84,11 +89,14 @@ module Mirah
   class CompilationState
     def initialize
       BiteScript.bytecode_version = BiteScript::JAVA1_5
+      @save_extensions = true
     end
-    
+
     attr_accessor :verbose, :destination
     attr_accessor :version_printed
-    
+    attr_accessor :help_printed
+    attr_accessor :save_extensions
+
     def set_jvm_version(ver_str)
       case ver_str
       when '1.4'
@@ -114,7 +122,7 @@ class MirahClassLoader < java::security::SecureClassLoader
     super(parent)
     @class_map = class_map
   end
-  
+
   def findClass(name)
     if @class_map[name]
       bytes = @class_map[name].to_java_bytes
@@ -173,8 +181,14 @@ class MirahImpl
         raise e
       end
     else
-      puts "No main found" unless @state.version_printed
+      puts "No main found" unless @state.version_printed || @state.help_printed
     end
+  rescue Mirah::InternalCompilerError => ice
+    Mirah.print_error(ice.message, ice.position) if ice.node
+    raise ice
+  rescue Mirah::MirahError => ex
+    Mirah.print_error(ex.message, ex.position)
+    puts ex.backtrace if @state.verbose
   end
 
   def compile(*args)
@@ -184,6 +198,13 @@ class MirahImpl
       bytes = builder.generate
       File.open(filename, 'wb') {|f| f.write(bytes)}
     end
+  rescue Mirah::InternalCompilerError => ice
+    Mirah.print_error(ice.message, ice.position) if ice.position
+    puts "error on #{ice.node}(#{ice.node.object_id})"
+    raise ice
+  rescue Mirah::MirahError => ex
+    Mirah.print_error(ex.message, ex.position)
+    puts ex.backtrace if @state.verbose
   end
 
   def generate(args, &block)
@@ -245,11 +266,17 @@ class MirahImpl
     @error = @transformer.errors.size > 0
 
     ast
+  rescue Mirah::InternalCompilerError => ice
+    Mirah.print_error(ice.message, ice.position) if ice.node
+    raise ice
+  rescue Mirah::MirahError => ex
+    Mirah.print_error(ex.message, ex.position)
+    puts ex.backtrace if @state.verbose
   end
 
   def infer_asts(asts)
     typer = Mirah::Typer::JVM.new(@transformer)
-    asts.each {|ast| typer.infer(ast) }
+    asts.each {|ast| typer.infer(ast, true) }
     begin
       typer.resolve(false)
     ensure
@@ -260,7 +287,7 @@ class MirahImpl
         puts "Inference Error:"
         typer.errors.each do |ex|
           if ex.node
-            Mirah.print_error(ex.message, ex.node.position)
+            Mirah.print_error(ex.message, ex.position)
           else
             puts ex.message
           end
@@ -272,20 +299,9 @@ class MirahImpl
   end
 
   def compile_ast(ast, &block)
-    begin
-      compiler = @compiler_class.new
-      ast.compile(compiler, false)
-      compiler.generate(&block)
-    rescue Exception => ex
-      if ex.respond_to? :node
-        Mirah.print_error(ex.message, ex.node.position)
-        puts ex.backtrace if @state.verbose
-        exit 1
-      else
-        raise ex
-      end
-    end
-
+    compiler = @compiler_class.new
+    ast.compile(compiler, false)
+    compiler.generate(&block)
   end
 
   def process_flags!(args)
@@ -308,7 +324,7 @@ class MirahImpl
         Mirah::AST::Script.explicit_packages = true
       when '--help', '-h'
         print_help
-        exit(0)
+        args.clear
       when '--java', '-j'
         require 'mirah/jvm/source_compiler'
         @compiler_class = Mirah::Compiler::JavaSource
@@ -332,10 +348,13 @@ class MirahImpl
       when '--version', '-v'
         args.shift
         print_version
+      when '--no-save-extensions'
+        args.shift
+        @state.save_extensions = false
       else
         puts "unrecognized flag: " + args[0]
         print_help
-        exit(1)
+        args.clear
       end
     end
     @state.destination ||= File.join(File.expand_path('.'), '')
@@ -343,7 +362,7 @@ class MirahImpl
   end
 
   def print_help
-    puts "#{$0} [flags] <files or \"-e SCRIPT\">
+    puts "#{$0} [flags] <files or -e SCRIPT>
   -c, --classpath PATH\tAdd PATH to the Java classpath for compilation
   --cd DIR\t\tSwitch to the specified DIR befor compilation
   -d, --dir DIR\t\tUse DIR as the base dir for compilation, packages
@@ -352,14 +371,15 @@ class MirahImpl
   --explicit-packages\tRequire explicit 'package' lines in source
   -h, --help\t\tPrint this help message
   -I DIR\t\tAdd DIR to the Ruby load path before running
-  -j, --java\t\tOutput .java source (jrubyc only)
+  -j, --java\t\tOutput .java source (compile mode only)
   --jvm VERSION\t\tEmit JVM bytecode targeting specified JVM
   \t\t\t  version (1.4, 1.5, 1.6, 1.7)
   -p, --plugin PLUGIN\trequire 'mirah/plugin/PLUGIN' before running
   -v, --version\t\tPrint the version of Mirah to the console
   -V, --verbose\t\tVerbose logging"
+    @state.help_printed = true
   end
-  
+
   def print_version
     puts "Mirah v#{Mirah::VERSION}"
     @state.version_printed = true

data/lib/mirah/ast.rb

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'delegate'
 require 'mirah/transform'
 require 'mirah/ast/scope'
 
@@ -79,20 +80,23 @@ module Mirah
       end
 
       def _dump(depth)
-        to_skip = %w(@parent @newline @inferred_type @resolved @proxy @scope @class_scope @typer)
+        to_skip = %w(@parent @newline @inferred_type @resolved @proxy @scope @class_scope @static_scope @typer)
         vars = {}
         instance_variables.each do |name|
           next if to_skip.include?(name)
           vars[name] = instance_variable_get(name)
           begin
-            Marshal.dump(vars[name]) if AST.verbose
+            Mirah::AST::Unquote.extract_values do
+              Marshal.dump(vars[name]) if AST.verbose
+            end
           rescue
             puts "#{self}: Failed to marshal #{name}"
+            puts inspect
             puts $!, $@
             raise $!
           end
         end
-        Marshal.dump(vars)
+          Marshal.dump(vars)
       end
 
       def self._load(vars)
@@ -156,13 +160,17 @@ module Mirah
                  end
                 str << "\n#{ary_child.inspect(indent + extra_indent + 1)}"
               }
-            elsif ::Hash === child
+            elsif ::Hash === child || ::String === child
               str << "\n#{indent_str} #{child.inspect}"
             else
               if Mirah::AST.verbose && Node === child && child.parent != self
                 str << "\n#{indent_str} (wrong parent)"
               end
-              str << "\n#{child.inspect(indent + extra_indent + 1)}"
+              begin
+                str << "\n#{child.inspect(indent + extra_indent + 1)}"
+              rescue ArgumentError => ex
+                str << "\n#{indent_str} #{child.inspect}"
+              end
             end
           end
         end
@@ -180,6 +188,10 @@ module Mirah
 
       def to_s; simple_name; end
 
+      def string_value
+        raise Mirah::SyntaxError.new("Can't use #{self.class} as string literal")
+      end
+
       def [](index) children[index] end
 
       def []=(index, node)
@@ -233,6 +245,11 @@ module Mirah
       end
 
       def initialize_copy(other)
+        # bug: node is deferred, but it's parent isn't
+        #      parent gets duped
+        #      duped parent is inferred so it's children aren't
+        #      original node gets inferred, but not the duplicate child
+        @inferred_type = @resolved = nil
         @parent = nil
         @children = []
         other.children.each do |child|
@@ -249,7 +266,7 @@ module Mirah
 
       def inferred_type!
         unless @inferred_type
-          raise Mirah::Typer::InferenceError.new(
+          raise Mirah::InternalCompilerError.new(
               "Internal Error: #{self.class} never inferred", self)
         end
         inferred_type
@@ -265,17 +282,28 @@ module Mirah
         @resolved = true
       end
 
-      def infer(typer)
+      def infer(typer, expression)
       end
     end
 
     module Named
-      attr_accessor :name
+      attr_reader :name
+
+      def name=(name)
+        if Node === name
+          name.parent = self
+        end
+        @name = name
+      end
 
       def to_s
         "#{super}(#{name})"
       end
 
+      def string_value
+        name
+      end
+
       def validate_name
         if UnquotedValue === @name
           @name = @name.name
@@ -299,6 +327,10 @@ module Mirah
       def to_s
         "#{super}(#{literal.inspect})"
       end
+
+      def string_value
+        literal.to_s
+      end
     end
 
     module Annotated
@@ -324,43 +356,31 @@ module Mirah
       end
     end
 
-    class Colon2 < Node; end
-
     class Constant < Node
       include Named
       include Scoped
       attr_accessor :array
 
       def initialize(parent, position, name)
-        @name = name
+        self.name = name
         super(parent, position, [])
       end
 
-      def infer(typer)
+      def infer(typer, expression)
         @inferred_type ||= begin
           # TODO lookup constant, inline if we're supposed to.
-          begin
-            typer.type_reference(scope, name, @array, true)
-          rescue NameError => ex
-            typer.known_types[@name] = Mirah::AST.error_type
-            raise ex
-          end
+          typer.type_reference(scope, name, @array, true)
         end
       end
 
       def type_reference(typer)
-        begin
-          typer.type_reference(scope, @name, @array)
-        rescue NameError => ex
-          typer.known_types[@name] = Mirah::AST.error_type
-          raise ex
-        end
+        typer.type_reference(scope, @name, @array)
       end
     end
 
     class Self < Node
       include Scoped
-      def infer(typer)
+      def infer(typer, expression)
         @inferred_type ||= scope.static_scope.self_type
       end
     end
@@ -400,7 +420,7 @@ module Mirah
         @values[name]
       end
 
-      def infer(typer)
+      def infer(typer, expression)
         @inferred ||= begin
           @name = name_node.type_reference(typer).name if name_node
           @values.each do |name, value|
@@ -427,6 +447,40 @@ module Mirah
       end
     end
 
+    class NodeProxy < DelegateClass(Node)
+      include Java::DubyLangCompiler::Node
+      def __inline__(node)
+        node.parent = parent
+        __setobj__(node)
+      end
+
+      def dup
+        value = __getobj__.dup
+        if value.respond_to?(:proxy=)
+          new = super
+          new.__setobj__(value)
+          new.proxy = new
+          new
+        else
+          value
+        end
+      end
+
+      def _dump(depth)
+        Marshal.dump(__getobj__)
+      end
+
+      def self._load(str)
+        value = Marshal.load(str)
+        if value.respond_to?(:proxy=)
+          proxy = NodeProxy.new(value)
+          proxy.proxy = proxy
+        else
+          value
+        end
+      end
+    end
+
     class TypeReference < Node
       include Named
       attr_accessor :array
@@ -436,7 +490,7 @@ module Mirah
 
       def initialize(name, array = false, meta = false, position=nil)
         super(nil, position)
-        @name = name
+        self.name = name
         @array = array
         @meta = meta
       end