rubinius-ast 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc92034ccb2ad50de44ce82fec2d33cd3aff30c
-  data.tar.gz: 5101ad9a2d5c03520105d9a77baaa1b40db51d44
+  metadata.gz: 2cda7718a6f58243f0f865ec0120f5e9971b3cb5
+  data.tar.gz: a630561d268b422713f711d7885c921cd003c3a3
 SHA512:
-  metadata.gz: 40a073041c986b2131d519ed10cd03d6fac33d57ca2da6e69822842b10f002621e33d712518664f430609bba78709f92a547b410d26169036e246ad9687c12c7
-  data.tar.gz: 4d63a8b26ed32cd1937a60d38142638b40111d597eadb77a70be1580dd1430eb6df5efd85a8b661cf6621ff9f9cde60066a402301f0b05ac32516186d7c76ca1
+  metadata.gz: 0d188bcf3227a86c2ddffd829a4d4078a774a326ed85e6d4df19296d25983e9a4c7bd8feeabcd42725f9c171b09d573e6f3b7a32252e56e0e23f89e9eb13a769
+  data.tar.gz: 8a7afeb5cbec85d572c3613a5d3a1b1d5a8e0a6d5ea657c96da90952a6fe452ab120bfc1a4d8bd70fa55636c2b87f53c55ae20b1c36aa09dc2ff33707ae64baa

data/lib/rubinius/ast/operators.rb

@@ -129,7 +129,7 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
-    class OpAssign1 < Node
+    class OpAssignElement < Node
       attr_accessor :receiver, :op, :arguments, :value
 
       def initialize(line, receiver, arguments, op, value)
@@ -173,6 +173,7 @@ module Rubinius::ToolSets.current::ToolSet
         if @op == :or or @op == :and
           fnd = g.new_label
           fin = g.new_label
+          assign = g.new_label
 
           # We dup the value from [] to leave it as the value of the
           # expression
@@ -189,8 +190,25 @@ module Rubinius::ToolSets.current::ToolSet
 
           # The receiver and arguments are still on the stack
 
+          old_break = g.break
+          new_break = g.new_label
+          g.break = new_break
+
           @value.bytecode(g)
 
+          g.goto assign
+
+          new_break.set!
+          if old_break
+            g.pop_many recv_stack + 1
+            g.push :nil
+            g.goto old_break
+          end
+
+          g.break = old_break
+
+          assign.set!
+
           # retain the rhs as the expression value
           g.dup
           g.move_down recv_stack + 1
@@ -215,11 +233,31 @@ module Rubinius::ToolSets.current::ToolSet
 
           fin.set!
         else
+          fin = g.new_label
+          assign = g.new_label
+
+          old_break = g.break
+          new_break = g.new_label
+          g.break = new_break
+
           # @op is something like + or -
           # We pull in @value to the stack
           @value.bytecode(g)
           # X: 3 TOS
 
+          g.goto assign
+
+          new_break.set!
+          if old_break
+            g.pop_many recv_stack + 2
+            g.push :nil
+            g.goto old_break
+          end
+
+          g.break = old_break
+
+          assign.set!
+
           # ... then call it as an argument to @or, called on the return
           # from [].
           # X: 2 + 3
@@ -242,18 +280,27 @@ module Rubinius::ToolSets.current::ToolSet
           else
             g.send :[]=, @arguments.size + 1
           end
+
+          fin.set!
           g.pop
         end
       end
 
       def to_sexp
         arguments = [:arglist] + @arguments.to_sexp
-        op = @op == :or ? :"||" : :"&&"
+        case @op
+        when :or
+          op = :"||"
+        when :and
+          op = :"&&"
+        else
+          op = @op
+        end
         [:op_asgn1, @receiver.to_sexp, arguments, op, @value.to_sexp]
       end
     end
 
-    class OpAssign2 < Node
+    class OpAssignAttribute < Node
       attr_accessor :receiver, :name, :assign, :op, :value
 
       def initialize(line, receiver, name, op, value)
@@ -268,7 +315,7 @@ module Rubinius::ToolSets.current::ToolSet
       def bytecode(g)
         pos(g)
 
-        # X: h[:a] += 3, given h.a == 2
+        # X: h.a += 3, given h.a == 2
         @receiver.bytecode(g)
         # X: TOS = h
         g.dup
@@ -278,6 +325,7 @@ module Rubinius::ToolSets.current::ToolSet
         if @op == :or or @op == :and
           fnd = g.new_label
           fin = g.new_label
+          assign = g.new_label
 
           g.dup
           if @op == :or
@@ -288,8 +336,26 @@ module Rubinius::ToolSets.current::ToolSet
 
           # Remove the copy of 2 and push @value on the stack
           g.pop
+
+          old_break = g.break
+          new_break = g.new_label
+          g.break = new_break
+
           @value.bytecode(g)
 
+          g.goto assign
+
+          new_break.set!
+          if old_break
+            g.pop_many 2
+            g.push :nil
+            g.goto old_break
+          end
+
+          g.break = old_break
+
+          assign.set!
+
           # Retain the this value to use as the expression value
           g.dup
           g.move_down 2
@@ -308,7 +374,27 @@ module Rubinius::ToolSets.current::ToolSet
 
           fin.set!
         else
+          assign = g.new_label
+
+          old_break = g.break
+          new_break = g.new_label
+          g.break = new_break
+
           @value.bytecode(g)
+
+          g.goto assign
+
+          new_break.set!
+          if old_break
+            g.pop_many 3
+            g.push :nil
+            g.goto old_break
+          end
+
+          g.break = old_break
+
+          assign.set!
+
           # X: TOS = 3
           # X: 2 + 3
           g.send @op, 1
@@ -326,7 +412,14 @@ module Rubinius::ToolSets.current::ToolSet
       end
 
       def to_sexp
-        op = @op == :or ? :"||" : :"&&"
+        case @op
+        when :or
+          op = :"||"
+        when :and
+          op = :"&&"
+        else
+          op = @op
+        end
         [:op_asgn2, @receiver.to_sexp, :"#{@name}=", op, @value.to_sexp]
       end
     end
@@ -378,17 +471,5 @@ module Rubinius::ToolSets.current::ToolSet
         :op_asgn_or
       end
     end
-
-    class OpAssignOr19 < OpAssignOr
-      def bytecode(g)
-        pos(g)
-
-        g.state.push_op_asgn
-        @left.or_bytecode(g) do
-          g.state.pop_op_asgn
-          @right.bytecode(g)
-        end
-      end
-    end
   end
 end

data/lib/rubinius/ast/version.rb

@@ -1,5 +1,5 @@
 module Rubinius::ToolSets.current::ToolSet
   module AST
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

metadata

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