rubinius-ast 3.6 → 3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b20e9b3a87699e1b270e481571d3cb3ce36ade
-  data.tar.gz: a1e2ab029d36856c39134ebac9b7281db7100941
+  metadata.gz: 06e0b46a159bfd5b70e0be0f33d991baac700441
+  data.tar.gz: e263ff589d929bf5a470c66332a0ae429c08bd40
 SHA512:
-  metadata.gz: 06a5d737c90eb84cc1576a9b1400a62e490e721e696c6cf54f8dc05b3a063ec2a33a9518267dd71e9a7fe9c08116fb21e14bbc9986d1e9fd3d1d42acad3e96e5
-  data.tar.gz: 1a5b784a46f81f132810f4128b9c8c0890d4ebd255e6ef1f1d7004332426772d9c68cc72015ef963c76fbf4dfdfebc99cd0ad01abeca3dacee5d84ec534df611
+  metadata.gz: ab67238f9e53b7bd5b12e4e4d35a221119b2ae1cbc5a649ced69ea1c6212c133421e3efe34fb316991be446f0cc8b5b3959f2a5e0935f54aa8e42881e745ecdd
+  data.tar.gz: e828f1158c94f947e665c46553ec251c8321602f94d4de37ee38152ec9eafc49f7215f65eeb3e2b91af3e132dea6efb157afa108198b4128fe4bcbe3335dbf8b

data/lib/rubinius/code/ast/operators.rb

@@ -290,11 +290,11 @@ module CodeTools
         @assign = name.to_s[-1] == ?= ? name : :"#{name}="
       end
 
-      def bytecode(g)
+      def bytecode(g, anddot=false)
         pos(g)
 
         # X: h.a += 3, given h.a == 2
-        @receiver.bytecode(g)
+        @receiver.bytecode(g) unless anddot
         # X: TOS = h
         g.dup
         g.send @name, 0
@@ -389,6 +389,10 @@ module CodeTools
         end
       end
 
+      def sexp_name
+        :op_asgn2
+      end
+
       def to_sexp
         case @op
         when :or
@@ -398,7 +402,26 @@ module CodeTools
         else
           op = @op
         end
-        [:op_asgn2, @receiver.to_sexp, :"#{@name}=", op, @value.to_sexp]
+        [sexp_name, @receiver.to_sexp, :"#{@name}=", op, @value.to_sexp]
+      end
+    end
+
+    class AndOpAssignAttribute < OpAssignAttribute
+      def bytecode(g)
+        done = g.new_label
+
+        @receiver.bytecode(g)
+
+        g.dup
+        g.goto_if_nil done
+
+        super(g, true)
+
+        done.set!
+      end
+
+      def sexp_name
+        :and_op_asgn2
       end
     end
 

data/lib/rubinius/code/ast/sends.rb

@@ -20,14 +20,14 @@ module CodeTools
         end
       end
 
-      def bytecode(g)
+      def bytecode(g, anddot=false)
         pos(g)
 
         if @vcall_style
           if reference = check_local_reference(g)
             return reference.get_bytecode(g)
           end
-        else
+        elsif !anddot
           @receiver.bytecode(g)
         end
 
@@ -127,6 +127,25 @@ module CodeTools
       end
     end
 
+    class AndSend < Send
+      def bytecode(g)
+        done = g.new_label
+
+        @receiver.bytecode(g)
+
+        g.dup
+        g.goto_if_nil done
+
+        super(g, true)
+
+        done.set!
+      end
+
+      def sexp_name
+        :and_call
+      end
+    end
+
     class SendWithArguments < Send
       attr_accessor :arguments
 
@@ -136,8 +155,8 @@ module CodeTools
         @arguments = Arguments.new line, arguments
       end
 
-      def bytecode(g)
-        @receiver.bytecode(g)
+      def bytecode(g, anddot=false)
+        @receiver.bytecode(g) unless anddot
         @arguments.bytecode(g)
 
         pos(g)
@@ -168,6 +187,25 @@ module CodeTools
       end
     end
 
+    class AndSendWithArguments < SendWithArguments
+      def bytecode(g)
+        done = g.new_label
+
+        @receiver.bytecode(g)
+
+        g.dup
+        g.goto_if_nil done
+
+        super(g, true)
+
+        done.set!
+      end
+
+      def sexp_name
+        :and_call
+      end
+    end
+
     class AttributeAssignment < SendWithArguments
       def initialize(line, receiver, name, arguments)
         @line = line
@@ -180,8 +218,8 @@ module CodeTools
         @arguments = Arguments.new line, arguments
       end
 
-      def bytecode(g)
-        @receiver.bytecode(g)
+      def bytecode(g, anddot=false)
+        @receiver.bytecode(g) unless anddot
         if g.state.masgn?
           g.swap
           g.send @name, 1, @privately
@@ -208,6 +246,25 @@ module CodeTools
       end
     end
 
+    class AndAttributeAssignment < AttributeAssignment
+      def bytecode(g)
+        done = g.new_label
+
+        @receiver.bytecode(g)
+
+        g.dup
+        g.goto_if_nil done
+
+        super(g, true)
+
+        done.set!
+      end
+
+      def sexp_name
+        :and_attrasgn
+      end
+    end
+
     class ElementAssignment < SendWithArguments
       def initialize(line, receiver, arguments)
         @line = line

data/lib/rubinius/code/ast/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   module AST
-    VERSION = "3.6"
+    VERSION = "3.7"
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-ast
 version: !ruby/object:Gem::Version
-  version: '3.6'
+  version: '3.7'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: An Abstract Syntax Tree for the Rubinius language platform.
@@ -73,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An Abstract Syntax Tree for the Rubinius language platform.