mirah 0.0.5-java → 0.0.6-java

data/History.txt

@@ -1,3 +1,36 @@
+=== 0.0.6 / 2011-03-20
+
+ce9b740 Update dynalink stuff, add JSR292 mock to enable compiling/including invokedynamic logic.
+2898b87 Remove unused JRubyParser jar.
+b1cb2e0 Clean up --help output for normal and MirahCommand-based command lines.
+94000eb Add .redcar dir to .gitignore
+c450943 Get Maven artifacts building again and add an "else" case to MirahCommand for running from jar.
+92f723c Move more files out that are specific to the NB plugin.
+48777a6 Move NetBeans plugin to mirah-netbeans-plugin project.
+b3979b7 Fix poms to reference parent.
+d23ec2c Add support for using Colon2Const as a fully-qualified type name
+f1fe06b Save method arguments into the binding if necessary
+929fbdf Merge branch 'master' of git@github.com:mirah/mirah
+b230d94 Fix parsing of long constants
+935031b Body of void methods is not an expression
+372e1a4 Don't require compatible types for an if statement unless the statement is an expression.
+cc861f4 Fix java.lang.VerifyError: Attempt to split long or double on the stack
+789ec6e Get rid of .class files left behind by test_javac_compiler.rb
+e1a5828 Body of void methods is not an expression
+7fa9c62 Don't require compatible types for an if statement unless the statement is an expression.
+2346c9e Fix java.lang.VerifyError: Attempt to split long or double on the stack
+a0b1de4 fix typo in errors.rb
+638f326 Replace the ruby portion of the datastore plugin with mirah code
+35f3936 Hygenic macros
+b455e90  - Try to differentiate between errors from compiler bugs and errors in user code.  - Fix a bunch of ma
+6032830 Try to clean up error handling, and avoid having compiler bugs show up as InferenceErrors
+2dc85ad Fix scoping unquotes
+f35eb86 Fix duplicate extracted values with -V
+8911a66 Fix parent on Unquotes used as a name
+4d75d84 Add --no-save-extensions flag, and use it in tests.
+97a705a Merge branch 'master' of git@github.com:mirah/mirah
+3298ff0 Merge branch 'my' of https://github.com/markokocic/mirah into markokocic-my
+
 === 0.0.5 / 2010-12-22
 
 8e00222 Update mirah-parser.jar to one built from mirah-parser project.

data/README.txt

@@ -27,8 +27,8 @@ mirahc -java -e "inline script" # produces DashE.java
 
 == REQUIREMENTS:
 
-* JRuby 1.5.0 or higher.
-* BiteScript 0.0.5 or higher
+* JRuby 1.6.0 or higher.
+* BiteScript 0.0.8 or higher
 
 == INSTALL:
 
@@ -49,7 +49,6 @@ $ rake gem
 $ gem install pkg/mirah-*
 $ cd -
 
-
 == For Java tools:
 
 To build the Mirah jars from source you should have a checkout of both jruby and

data/Rakefile

@@ -77,6 +77,11 @@ task :compile => :init do
       'mirah'
       )
   end
+  
+  # compile invokedynamic stuff
+  ant.javac :destdir => 'build', :srcdir => 'src',
+    :includes => 'org/mirah/DynalangBootstrap.java',
+    :classpath => 'javalib/dynalink-0.1.jar:javalib/jsr292-mock.jar'
 end
 
 desc "build basic jar for distribution"

data/bin/mirah.cmd

@@ -1,16 +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.
+@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.cmd

@@ -1,16 +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.
+@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.cmd

@@ -1,16 +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.
+@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/plugins/appengine/Rakefile

@@ -41,7 +41,9 @@ end
 task :compile => :init do
   # build the Mirah sources
   puts "Compiling Mirah sources"
-  mirahc 'com/google/appengine', :dir => 'src', :dest => 'build'
+  mirahc 'com/google/appengine/ext/duby/db/MetaModel.mirah', :dir => 'src', :dest => 'build'
+  mirahc 'com/google/appengine/ext/duby/db/Model.duby', :dir => 'src', :dest => 'build',
+         :options => ['--classpath', Dir.pwd + '/build/']
 end
 
 task :compile_test => :jar do

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

@@ -0,0 +1,385 @@
+import duby.lang.compiler.*
+import java.lang.ref.WeakReference
+import java.util.Collections
+import java.util.WeakHashMap
+
+class DubyDatastorePlugin
+  def initialize(mirah:Compiler)
+    @mirah = WeakReference.new(mirah)
+    @models = {}
+
+    @type_map = {
+      'Category' => 'String',
+      'Email' => 'String',
+      'Link' => 'String',
+      'PhoneNumber' => 'String',
+      'PostalAddress' => 'String',
+      'Text' => 'String',
+      'Blob' => 'byte[]',
+      'ShortBlob' => 'byte[]',
+      'Rating' => 'int',
+      'Long' => 'long',
+      'Double' => 'double',
+      'Boolean' => 'boolean'
+    }
+
+    @primitives = ['Long', 'Double', 'Boolean', 'Rating']
+
+    @boxes = {
+      'int' => 'Integer',
+      'boolean' => 'Boolean',
+      'long' => 'Long',
+      'double' => 'Double',
+    }
+
+    @defaults = {
+      'Rating' => mirah.fixnum(0),
+      'Long' => mirah.quote { long(0) },
+      'Double' => mirah.quote { 0.0 },
+      'Boolean' => mirah.quote { false },
+      'Blob' => mirah.quote { byte[].cast(nil) },
+      'ShortBlob' => mirah.quote { byte[].cast(nil) },
+    }
+  end
+
+  def mirah:Compiler
+    Compiler(@mirah.get)
+  end
+
+  def add_property(name_node:Node, type_node:Node, call:Call)
+    parent = call.parent
+    name = name_node.string_value
+    ds_type = type_node.string_value
+    ds_type = 'Long' if ds_type == 'Integer'
+
+    # create an empty body
+    result = Body(mirah.quote { nil; nil })
+
+    klass = find_class(call.parent)
+    model = find_model(klass, result)
+
+    type_name = String(@type_map[ds_type]) || ds_type
+    if type_name.endsWith('[]')
+      array = true
+      type_name = type_name.replace('[]', '')
+    else
+      array = false
+      nil
+    end
+    coercion = "coerce_#{type_name.toLowerCase}#{array ? 's' : ''}"
+    loader = "load_#{ds_type.toLowerCase}"
+    duby_type = mirah.constant(type_name, array)
+
+    name_string = mirah.string(name)
+    update_query(model, name, ds_type, duby_type)
+    model.read << mirah.quote do
+      `name` = `'e'`.getProperty(`name_string`)
+      @`name` = self.`loader`(`name`)
+    end
+
+    model.save << mirah.quote do
+      e.setProperty(`name_string`, `to_datastore(ds_type, "@#{name}")`)
+    end
+
+    setter = "#{name}_set"
+    model.update << mirah.quote do
+      self.`setter`(properties.get(`name_string`)) if properties.containsKey(`name_string`)
+    end
+
+    value = maybe_box(type_name, mirah.quote {self.`name`})
+    model.get_properties << mirah.quote do
+      result.put(`name_string`, `value`)
+    end
+
+    result << mirah.quote do
+      def `name`
+        @`name`
+      end
+
+      def `setter`(value:`duby_type`)
+        @`name` = value
+      end
+
+      def `setter`(value:Object)  #`
+        @`name` = self.`coercion`(value)
+      end
+    end
+
+    result
+  end
+
+  def find_class(node:Node):ClassDefinition
+    while node && !node.kind_of?(ClassDefinition)
+      node = node.parent
+    end
+    ClassDefinition(node)
+  end
+
+  def find_model(klass:ClassDefinition, ast:Body):ModelState
+    unless @models[klass]
+      @models[klass] = ModelState.new(mirah, klass, ast)
+    end
+    ModelState(@models[klass])
+  end
+
+  def to_datastore(type:String, value:Object):Object
+    if @primitives.contains(type)
+      Object(mirah.quote { `type`.new(`value`) })
+    elsif @type_map.containsKey(type)
+      Object(mirah.quote { (`value` ? `type`.new(`value`) : nil) })
+    else
+      value
+    end
+  end
+
+  def maybe_box(duby_type:String, value:Object):Object
+    if @boxes.containsKey(duby_type)
+      Object(mirah.quote do
+        `@boxes[duby_type]`.valueOf(`value`)
+      end)
+    else
+      value
+    end
+  end
+
+  # Generate the query filtering method for a property.
+  def update_query(model:ModelState, property_name:String, type:String, duby_type:Node)
+    name_node = mirah.string(property_name)
+    if 'List'.equals type
+      # We don't know what's in the list, so just use Object
+      model.query << mirah.quote do
+        def `property_name`(value:Object):void  #`
+          _query.addFilter(`name_node`, FilterOperator.EQUAL, value)
+        end
+      end
+    else
+      model.query << mirah.quote do
+        def `property_name`(value:`duby_type`):void  #`
+          _query.addFilter(`name_node`,
+                            FilterOperator.EQUAL,
+                           `to_datastore(type, 'value')`)
+        end
+      end
+    end
+  end
+
+  def self.initialize:void
+    @@instances = Collections.synchronizedMap(WeakHashMap.new)
+  end
+
+  def self.get(mirah:Compiler)
+    instance = @@instances[mirah]
+    if (instance.nil?)
+      instance = DubyDatastorePlugin.new(mirah)
+      @@instances[mirah] = instance
+    end
+    DubyDatastorePlugin(instance)
+  end
+end
+
+class ModelState
+  macro def attr_reader(name)
+    quote do
+      def `name`  #`
+        @`name`
+      end
+    end
+  end
+  attr_reader :kind
+  attr_reader :query
+  attr_reader :read
+  attr_reader :save
+  attr_reader :update
+  attr_reader :get_properties
+
+  def initialize(mirah:Compiler, klass:ClassDefinition, ast:Body)
+    @mirah = WeakReference.new(mirah)
+    path = klass.name.split('\\.')
+    @kind = path[path.length - 1]
+    init_query(klass.name)
+    init_static(ast)
+
+    # The nodes we add to ast will get dup'ed before being inserted, but
+    # we need to be able to update some methods when add_property gets
+    # called again.  So we insert these directly into the class definition.
+    class_body = Body(klass.body)
+    init_read(class_body)
+    init_save(class_body)
+  end
+
+  def mirah:Compiler
+    Compiler(@mirah.get)
+  end
+
+  def init_query(classname:String)
+    name = "#{classname}$Query"
+    superclass = 'com.google.appengine.ext.duby.db.DQuery'
+    @query = Body(mirah.defineClass(name, superclass).body)
+    array_size = mirah.quote { entities.size }
+    @query << mirah.quote do
+      import com.google.appengine.api.datastore.Entity
+      import com.google.appengine.api.datastore.Query.FilterOperator
+
+      def initialize; end
+
+      def kind
+        `mirah.string kind`
+      end
+
+      def first
+        it = _prepare.asIterator
+        if it.hasNext
+          e = Entity(it.next)
+          m = `kind`.new
+          m._read_from(e)
+          m
+        else
+          `mirah.cast(kind, mirah.quote {nil})`
+        end
+      end
+
+      def run
+        entities = _prepare.asList(_options)
+        models = `mirah.empty_array(mirah.constant(kind), array_size)`
+        it = entities.iterator
+        i = 0
+        while (it.hasNext)
+          e = Entity(it.next)
+          m = `kind`.new
+          m._read_from(e)
+          models[i] = m
+          i += 1
+        end
+        models
+      end
+    end
+  end
+
+  def init_static(ast:Body)
+    # # TODO These imports don't work any more.  Figure out how to fix that.
+    # scope = ast.static_scope
+    # package = "#{scope.package}." unless scope.package.empty?
+    # scope.import('java.util.Map', 'Map')
+    # scope.import("#{package}#{kind}$Query", "#{kind}__Query__")
+    # %w( Entity Blob Category Email GeoPt IMHandle Key
+    #     Link PhoneNumber PostalAddress Rating ShortBlob
+    #     Text KeyFactory EntityNotFoundException ).each do |name|
+    #   scope.import("com.google.appengine.api.datastore.#{name}", name)
+    # end
+    kind_string = mirah.string(kind)
+    ast << mirah.quote do
+      import com.google.appengine.api.datastore.Entity
+      import com.google.appengine.api.datastore.EntityNotFoundException
+      import com.google.appengine.api.datastore.Key
+      import com.google.appengine.api.datastore.KeyFactory
+      import com.google.appengine.ext.duby.db.Model
+      import java.util.Map
+
+      def initialize
+        super
+      end
+
+      def initialize(key_name:String)
+        super
+      end
+
+      def initialize(parent:Model)
+        super
+      end
+
+      def initialize(parent:Key)
+        super
+      end
+
+      def initialize(parent:Model, key_name:String)
+        super
+      end
+
+      def initialize(parent:Key, key_name:String)
+        super
+      end
+
+      def self.get(key:Key)
+        begin
+          m = `kind`.new
+          m._read_from(Model._datastore.get(key))
+          m
+        rescue EntityNotFoundException
+          nil
+        end
+      end
+
+      def self.get(key_name:String)
+        get(KeyFactory.createKey(`kind_string`, key_name))
+      end
+
+      def self.get(id:long)
+        get(KeyFactory.createKey(`kind_string`, id))
+      end
+
+      def self.get(parent:Key, key_name:String)
+        get(KeyFactory.createKey(parent, `kind_string`, key_name))
+      end
+
+      def self.get(parent:Key, id:long)
+        get(KeyFactory.createKey(parent, `kind_string`, id))
+      end
+
+      def self.get(parent:Model, key_name:String)
+        get(KeyFactory.createKey(parent.key, `kind_string`, key_name))
+      end
+
+      def self.get(parent:Model, id:long)
+        get(KeyFactory.createKey(parent.key, `kind_string`, id))
+      end
+
+      def self.all
+        `kind`.Query.new
+      end
+    end
+  end
+
+  def init_read(ast:Body)
+    # We're in the main class scope instead of the one we created earlier,
+    # so we can't use our imports.
+    entity = mirah.constant('com.google.appengine.api.datastore.Entity')
+    map = mirah.constant('java.util.Map')
+    mdef = mirah.quote do
+      def _read_from(e:`entity`):void
+        self.entity = e
+        nil  # We need to statements to make sure we get a Body node.
+      end
+    end
+    ast << mdef
+    @read = Body(mdef.child_nodes.get(2))
+
+    mdef = mirah.quote do
+      def properties
+        result = super()
+        `mirah.body`
+        result
+      end
+    end
+    ast << mdef
+    @get_properties = Body(Node(mdef.child_nodes.get(2)).child_nodes.get(1))
+
+    mdef = mirah.quote do
+      def update(properties:`map`):void
+        nil;nil
+      end
+    end
+    ast << mdef
+    @update = Body(mdef.child_nodes.get(2))
+  end
+
+  def init_save(ast:Body)
+    entity = mirah.constant('com.google.appengine.api.datastore.Entity')
+    mdef = mirah.quote do
+      def _save_to(e:`entity`):void
+        nil; nil
+      end
+    end
+    ast << mdef
+    @save = Body(mdef.child_nodes.get(2))
+  end
+end