rubinius-ast 1.3.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a80878e26807379f1033812a3b4696f07acdff5
-  data.tar.gz: 4ed3c3310f69aa17f6115d113a7c8dfb2b540b72
+  metadata.gz: c50ef0b73b000204cb9e7a73a1c6efdeacd9477e
+  data.tar.gz: c2c2532d06bf487f2ca3ace10dea8eec45a263bc
 SHA512:
-  metadata.gz: 208fd3f1cdfd68adf2f82695c8012b9c0806e56b68ef1730049d2489298299be8f78ba0a14775b067ad6535fa0f1d7d40f9305bbaa6a7c92d14ec7142411c05c
-  data.tar.gz: 7e4f788c9b910342ab1a170ab47b3df0a14f2e17a21eb8a56b7a2d7590f0bf7841e46fb6af625cce69d1051bcdd4d3f6940d500e227c689330b307d1fe5effb5
+  metadata.gz: 23aba6963dd1e3e42d6721772ae6387e4ea3a176c54f847d6762185e3f50fb064021ffb213e12bb9301baf407610a3d7c06fd998bf345a4f12930098cedf44a3
+  data.tar.gz: e0b18cf80a291e1be52329e750396e57a872efe6d2027baba9dd55e4f163d047dbdb2f39a600dbb4f616d584f2fcb74cd7a67ecd40507ab2dc765993f973a7b2

data/lib/rubinius/ast/constants.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
 
     class TypeConstant < Node
@@ -204,8 +204,7 @@ module CodeTools
         pos(g)
 
         if g.state.op_asgn?
-          g.push_rubinius
-          g.find_const :Runtime
+          g.push_literal Compiler::Runtime
           g.push_literal @name
           g.push_scope
           g.send :find_constant_for_op_asign_or, 2

data/lib/rubinius/ast/control_flow.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Case < Node
       attr_accessor :whens, :else
@@ -28,10 +28,6 @@ module CodeTools
         done.set!
       end
 
-      def defined(g)
-        g.push :nil
-      end
-
       def receiver_sexp
         nil
       end
@@ -209,8 +205,7 @@ module CodeTools
         g.dup
         @condition.bytecode(g)
         g.cast_array
-        g.push_rubinius
-        g.find_const :Runtime
+        g.push_literal Compiler::Runtime
         g.rotate(3)
         g.send :matches_when, 2
         g.git body
@@ -272,16 +267,14 @@ module CodeTools
       end
 
       def get_flip_flop(g, index)
-        g.push_rubinius
-        g.find_const :Runtime
+        g.push_literal Compiler::Runtime
         g.push_scope
         g.push_literal index
         g.send(:get_flip_flop, 2)
       end
 
       def set_flip_flop(g, index, value)
-        g.push_rubinius
-        g.find_const :Runtime
+        g.push_literal Compiler::Runtime
         g.push_scope
         g.push_literal index
         g.push_literal value
@@ -335,10 +328,6 @@ module CodeTools
         done.set!
       end
 
-      def defined(g)
-        g.push :nil
-      end
-
       def to_sexp
         else_sexp = @else.kind_of?(NilLiteral) ? nil : @else.to_sexp
         [:if, @condition.to_sexp, @body.to_sexp, else_sexp]
@@ -416,10 +405,6 @@ module CodeTools
         g.pop_modifiers
       end
 
-      def defined(g)
-        g.push :nil
-      end
-
       def sexp_name
         :while
       end
@@ -566,10 +551,6 @@ module CodeTools
         end
       end
 
-      def defined(g)
-        g.push :nil
-      end
-
       def sexp_name
         :break
       end
@@ -706,10 +687,6 @@ module CodeTools
         end
       end
 
-      def defined(g)
-        g.push :nil
-      end
-
       def to_sexp
         sexp = [:return]
         sexp << @value.to_sexp if @value

data/lib/rubinius/ast/data.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class EndData < Node
       attr_accessor :data

data/lib/rubinius/ast/definitions.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Alias < Node
       attr_accessor :to, :from
@@ -330,15 +330,7 @@ module CodeTools
         @required.size
       end
 
-      def arity
-        arity = required_args
-
-        if @splat or not @optional.empty?
-          arity = -(arity + 1)
-        end
-
-        arity
-      end
+      alias_method :arity, :required_args
 
       def post_args
         0
@@ -447,11 +439,17 @@ module CodeTools
           splat = nil
         end
 
+        @post = []
         if post
-          names.concat post
-          @post = post
-        else
-          @post = []
+          post.each do |arg|
+            case arg
+            when MultipleAssignment
+              @post << PatternArguments.from_masgn(arg)
+            when Symbol
+              @post << arg
+              names << arg
+            end
+          end
         end
 
         if block
@@ -501,8 +499,18 @@ module CodeTools
 
         @defaults.map_arguments scope if @defaults
         scope.new_local @splat if @splat.kind_of? Symbol
-        @post.each { |arg| scope.new_local arg }
+
+        @post.each do |arg|
+          case arg
+          when PatternArguments
+            arg.map_arguments scope
+          when Symbol
+            scope.new_local arg
+          end
+        end
+
         scope.assign_local_reference @block_arg if @block_arg
+
       end
 
       def bytecode(g)
@@ -516,9 +524,15 @@ module CodeTools
             g.pop
           end
         end
-
         @defaults.bytecode(g) if @defaults
         @block_arg.bytecode(g) if @block_arg
+        @post.each do |arg|
+          if arg.kind_of? PatternArguments
+            arg.argument.position_bytecode(g)
+            arg.bytecode(g)
+            g.pop
+          end
+        end
         g.state.check_for_locals = true
       end
     end
@@ -560,6 +574,7 @@ module CodeTools
           n = node.splat
           case n
           when EmptySplat
+            array << SplatPatternVariable.new(n.line, :*)
           when SplatAssignment, SplatWrapped, SplatArray
             array << SplatPatternVariable.new(n.value.line, n.value.name)
           end

data/lib/rubinius/ast/encoding.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Encoding < Node
       attr_accessor :name
@@ -13,16 +13,11 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push_rubinius
-        g.find_const :Runtime
+        g.push_literal Compiler::Runtime
         g.push_literal @name
         g.send :get_encoding, 1
       end
 
-      def defined(g)
-        g.push_literal "expression"
-      end
-
       def to_sexp
         [:encoding, @name]
       end

data/lib/rubinius/ast/exceptions.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Begin < Node
       attr_accessor :rescue

data/lib/rubinius/ast/file.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class File < Node
       def bytecode(g)
@@ -10,10 +10,6 @@ module CodeTools
         g.send :active_path, 0
       end
 
-      def defined(g)
-        g.push_literal "expression"
-      end
-
       def to_sexp
         [:file]
       end

data/lib/rubinius/ast/grapher.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class AsciiGrapher
       def initialize(ast, node_kind=Node)

data/lib/rubinius/ast/literals.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class ArrayLiteral < Node
       attr_accessor :body
@@ -446,21 +446,8 @@ module CodeTools
       end
 
       def defined(g)
-        f = g.new_label
-        done = g.new_label
-
-        @array.each do |x|
-          x.value_defined(g, f)
-          g.pop
-        end
-
         g.push_literal "expression"
-        g.goto done
-
-        f.set!
-        g.push :nil
-
-        done.set!
+        g.string_dup
       end
 
       def sexp_name

data/lib/rubinius/ast/node.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Node
       attr_accessor :line
@@ -64,7 +64,6 @@ module CodeTools
         blk.total_args = arguments.total_args
         blk.splat_index = arguments.splat_index
         blk.block_index = arguments.block_index
-        blk.arity = arguments.arity
 
         blk
       end
@@ -80,7 +79,6 @@ module CodeTools
           meth.total_args = arguments.total_args
           meth.splat_index = arguments.splat_index
           meth.block_index = arguments.block_index
-          meth.arity = arguments.arity
         end
 
         meth

data/lib/rubinius/ast/operators.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class And < Node
       attr_accessor :left, :right
@@ -28,35 +28,8 @@ module CodeTools
       end
 
       def defined(g)
-        t = g.new_label
-        f = g.new_label
-        done = g.new_label
-
-        case @left
-        when GlobalVariableAccess, InstanceVariableAccess
-          g.goto t
-        else
-          @left.value_defined(g, f)
-          g.pop
-        end
-
-        case @right
-        when GlobalVariableAccess, InstanceVariableAccess
-          g.goto t
-        else
-          @right.value_defined(g, f)
-          g.pop
-        end
-
-        t.set!
         g.push_literal "expression"
         g.string_dup
-        g.goto done
-
-        f.set!
-        g.push :nil
-
-        done.set!
       end
 
       def sexp_name
@@ -129,7 +102,7 @@ module CodeTools
       end
     end
 
-    class OpAssignElement < Node
+    class OpAssign1 < Node
       attr_accessor :receiver, :op, :arguments, :value
 
       def initialize(line, receiver, arguments, op, value)
@@ -173,7 +146,6 @@ module CodeTools
         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
@@ -190,25 +162,8 @@ module CodeTools
 
           # 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
@@ -233,30 +188,11 @@ module CodeTools
 
           fin.set!
         else
-          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
@@ -279,26 +215,18 @@ module CodeTools
           else
             g.send :[]=, @arguments.size + 1
           end
-
           g.pop
         end
       end
 
       def to_sexp
         arguments = [:arglist] + @arguments.to_sexp
-        case @op
-        when :or
-          op = :"||"
-        when :and
-          op = :"&&"
-        else
-          op = @op
-        end
+        op = @op == :or ? :"||" : :"&&"
         [:op_asgn1, @receiver.to_sexp, arguments, op, @value.to_sexp]
       end
     end
 
-    class OpAssignAttribute < Node
+    class OpAssign2 < Node
       attr_accessor :receiver, :name, :assign, :op, :value
 
       def initialize(line, receiver, name, op, value)
@@ -313,7 +241,7 @@ module CodeTools
       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
@@ -323,7 +251,6 @@ module CodeTools
         if @op == :or or @op == :and
           fnd = g.new_label
           fin = g.new_label
-          assign = g.new_label
 
           g.dup
           if @op == :or
@@ -334,26 +261,8 @@ module CodeTools
 
           # 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
@@ -372,27 +281,7 @@ module CodeTools
 
           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
@@ -410,14 +299,7 @@ module CodeTools
       end
 
       def to_sexp
-        case @op
-        when :or
-          op = :"||"
-        when :and
-          op = :"&&"
-        else
-          op = @op
-        end
+        op = @op == :or ? :"||" : :"&&"
         [:op_asgn2, @receiver.to_sexp, :"#{@name}=", op, @value.to_sexp]
       end
     end
@@ -469,5 +351,17 @@ module CodeTools
         :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