rubinius-ast 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99683e876af3e1613bd1972099cc510a9eed27ba
-  data.tar.gz: 48be16076f392660fd32ca711e3488415d986968
+  metadata.gz: 9a7851656bf49dfc51a484b281e4e26fc26ba8ac
+  data.tar.gz: 90237b04c583847cc647810514a8129726e05885
 SHA512:
-  metadata.gz: e94fd71400a89085a78c2e5da18debfb4b6bdf32192c0b843e55b17e3b861194b17a648500aeae95cef6be0bcde954deb5915d2e610bac5203da1286f9bcd506
-  data.tar.gz: f92279ffeef1e1a75b6938d600049ec468ce01082146a6138b82458dc03157bc7384f40a8b70a3d3b4ffabdfdb9b3b26d1c3672c1617caf42d0764dc06003ca9
+  metadata.gz: 5c6753402e9bf52244614b435e52c85d341c3f9d60bf5a85f0ce5e1691d07af71b556b1c36996ccd9a30f06d20f1a4e615d55495a4e1cf3b6eebebbf60d68992
+  data.tar.gz: faed2b96a7ebead3df82c4a92527dce3445d0dc95195ddf11e0403055c6e99e15e9ff6eb82e672a74b7c31522292732128a295fcd3afc2d8d806a3d259d01907

data/lib/rubinius/ast/definitions.rb

@@ -565,8 +565,6 @@ module CodeTools
           arg.variable.get_bytecode(g)
           g.send :equal?, 1, 0
           g.gif done
-          # g.passed_arg arg.variable.slot
-          # g.git done
           arg.bytecode(g)
           g.pop
 
@@ -645,9 +643,7 @@ module CodeTools
         @value.bytecode(g)
 
         g.dup
-        g.push :nil
-        g.swap
-        g.send :equal?, 1, true
+        g.is_nil
         g.gif check_hash
 
         g.pop

data/lib/rubinius/ast/values.rb

@@ -14,9 +14,13 @@ module CodeTools
         done = g.new_label
         coerce = g.new_label
         make_array = g.new_label
+        array_dup = g.new_label
+        dup_as_array = g.new_label
 
         @value.bytecode(g)
-        kind_of_array(g, done)
+
+        instance_of_array(g, array_dup)
+        kind_of_array(g, dup_as_array)
 
         g.dup
         g.push_literal :to_a
@@ -28,16 +32,24 @@ module CodeTools
         g.make_array 1
         g.goto done
 
+        discard = g.new_label
+
+        dup_as_array.set!
+        g.dup
+        g.push_rubinius
+        g.find_const :Runtime
+        g.swap
+        g.send :dup_as_array, 1, true
+        g.goto discard
+
         coerce.set!
         g.dup
         g.send :to_a, 0, true
 
-        discard = g.new_label
         check_array = g.new_label
 
         g.dup
-        g.push :nil
-        g.send :equal?, 1, true
+        g.is_nil
         g.gif check_array
 
         g.pop
@@ -54,6 +66,10 @@ module CodeTools
         g.send :coerce_to_type_error, 4, true
         g.goto done
 
+        array_dup.set!
+        g.send :dup, 0, true
+        g.goto done
+
         discard.set!
         g.swap
         g.pop
@@ -61,6 +77,15 @@ module CodeTools
         done.set!
       end
 
+      def instance_of_array(g, label)
+        g.dup
+        g.push_cpath_top
+        g.find_const :Array
+        g.swap
+        g.instance_of
+        g.git label
+      end
+
       def kind_of_array(g, label)
         g.dup
         g.push_cpath_top
@@ -123,8 +148,7 @@ module CodeTools
         check_array = g.new_label
 
         g.dup
-        g.push :nil
-        g.send :equal?, 1, true
+        g.is_nil
         g.gif check_array
 
         g.pop

data/lib/rubinius/ast/variables.rb

@@ -713,8 +713,10 @@ module CodeTools
         done = g.new_label
         coerce = g.new_label
         make_array = g.new_label
+        dup_as_array = g.new_label
 
-        kind_of_array(g, done)
+        instance_of_array(g, done)
+        kind_of_array(g, dup_as_array)
 
         g.dup
         g.push_literal :to_ary
@@ -726,16 +728,24 @@ module CodeTools
         g.make_array 1
         g.goto done
 
+        discard = g.new_label
+
+        dup_as_array.set!
+        g.dup
+        g.push_rubinius
+        g.find_const :Runtime
+        g.swap
+        g.send :dup_as_array, 1, true
+        g.goto discard
+
         coerce.set!
         g.dup
         g.send :to_ary, 0, true
 
-        discard = g.new_label
         check_array = g.new_label
 
         g.dup
-        g.push :nil
-        g.send :equal?, 1, true
+        g.is_nil
         g.gif check_array
 
         g.pop
@@ -759,6 +769,15 @@ module CodeTools
         done.set!
       end
 
+      def instance_of_array(g, label)
+        g.dup
+        g.push_cpath_top
+        g.find_const :Array
+        g.swap
+        g.instance_of
+        g.git label
+      end
+
       def kind_of_array(g, label)
         g.dup
         g.push_cpath_top

data/lib/rubinius/ast/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   module AST
-    VERSION = "2.2.3"
+    VERSION = "2.2.4"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-ast
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
 description: An Abstract Syntax Tree for Ruby.
 email:
 - brixen@gmail.com