rubinius-ast 1.3.0 → 2.0.1

data/lib/rubinius/ast/self.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Self < Node
       def bytecode(g)

data/lib/rubinius/ast/sends.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class Send < Node
       attr_accessor :receiver, :name, :privately, :block, :variable, :vcall_style
@@ -65,11 +65,6 @@ module CodeTools
       end
 
       def defined(g)
-        if @block.kind_of? For
-          @block.defined(g)
-          return
-        end
-
         if @vcall_style and check_local_reference(g)
           g.push_literal "local-variable"
           return
@@ -264,8 +259,7 @@ module CodeTools
         g.push_state ClosedScope.new(@line)
         g.state.push_name :BEGIN
 
-        g.push_rubinius
-        g.find_const :Runtime
+        g.push_literal Compiler::Runtime
         @block.bytecode(g)
         g.send_with_block :pre_exe, 0, false
 
@@ -342,8 +336,7 @@ module CodeTools
       end
 
       def assignment_bytecode(g)
-        g.push_block_arg
-        convert(g)
+        g.push_proc
         @body.bytecode(g)
       end
 
@@ -810,10 +803,6 @@ module CodeTools
         var.variable = reference
       end
 
-      def defined(g)
-        g.push_literal "expression"
-      end
-
       def sexp_name
         :for
       end
@@ -837,8 +826,7 @@ module CodeTools
 
       def bytecode(g)
         if @splat
-          g.push_rubinius
-          g.find_const :Runtime
+          g.push_literal Compiler::Runtime
           g.push_local 0
           g.send :unwrap_block_arg, 1
         else
@@ -1011,14 +999,7 @@ module CodeTools
       end
 
       def to_sexp
-        args = @arguments.to_sexp
-        args << @block.to_sexp if @block
-        if @argument_count == 1 and !@yield_splat and @arguments.splat.nil? and
-           @arguments.array.first.kind_of? SplatValue
-          [:yield, [:array] + args]
-        else
-          [:yield] + args
-        end
+        arguments_sexp :yield
       end
     end
 

data/lib/rubinius/ast/transforms.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     module Transforms
       def self.register(category, name, klass)
@@ -249,6 +249,9 @@ module CodeTools
     class SendFastNew < SendWithArguments
       transform :default, :fast_new, "Fast SomeClass.new path"
 
+      # FIXME duplicated from kernel/common/compiled_code.rb
+      KernelMethodSerial = 47
+
       def self.match?(line, receiver, name, arguments, privately)
         # ignore vcall style
         return false if !arguments and privately
@@ -267,9 +270,9 @@ module CodeTools
         g.dup
 
         if @privately
-          g.check_serial_private :new, Rubinius::CompiledCode::KernelMethodSerial
+          g.check_serial_private :new, KernelMethodSerial
         else
-          g.check_serial :new, Rubinius::CompiledCode::KernelMethodSerial
+          g.check_serial :new, KernelMethodSerial
         end
         g.gif slow
 

data/lib/rubinius/ast/values.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class SplatValue < Node
       attr_accessor :value
@@ -12,83 +12,7 @@ module CodeTools
 
       def bytecode(g)
         @value.bytecode(g)
-        return if @value.kind_of? ArrayLiteral
-
-        convert_to_ary(g)
-      end
-
-      def convert_to_ary(g)
-        done = g.new_label
-        coerce = g.new_label
-        coerce_method = :to_ary
-
-        kind_of_array(g, done)
-
-        check_respond_to = g.new_label
-
-        g.dup
-        g.push :nil
-        g.swap
-        g.send :equal?, 1, true
-        g.gif check_respond_to
-
-        g.make_array 1
-        g.goto done
-
-        check_respond_to.set!
-        g.dup
-        g.push_literal :to_ary
-        g.send :respond_to?, 1, true
-        g.git coerce
-
-        discard = g.new_label
-        check_array = g.new_label
-
-        make_array = g.new_label
-        make_array.set!
-        g.dup
-        g.send :to_a, 0, true
-        coerce_method = :to_a
-        g.goto check_array
-
-        coerce.set!
-        g.dup
-        g.send :to_ary, 0, true
-
-        g.dup
-        g.push :nil
-        g.send :equal?, 1, true
-        coerce_method = :to_ary
-        g.gif check_array
-
-        g.pop
-        g.goto make_array
-
-        check_array.set!
-        kind_of_array(g, discard)
-
-        g.push_type
-        g.move_down 2
-        g.push_literal coerce_method
-        g.push_cpath_top
-        g.find_const :Array
-        g.send :coerce_to_type_error, 4, true
-        g.goto done
-
-        discard.set!
-        g.swap
-        g.pop
-
-        done.set!
-      end
-
-      def kind_of_array(g, label)
-        g.dup
-        g.push_cpath_top
-        g.find_const :Array
-        g.swap
-        g.kind_of
-        g.git label
+        g.cast_array unless @value.kind_of? ArrayLiteral
       end
 
       def to_sexp
@@ -113,7 +37,7 @@ module CodeTools
         if @array
           @array.bytecode(g)
           @rest.bytecode(g)
-          convert_to_ary(g)
+          g.cast_array
           g.send :+, 1
         else
           @rest.bytecode(g)
@@ -121,69 +45,6 @@ module CodeTools
         end
       end
 
-      # TODO: de-dup
-      def convert_to_ary(g)
-        done = g.new_label
-        coerce = g.new_label
-        make_array = g.new_label
-        coerce_method = :to_ary
-
-        kind_of_array(g, done)
-
-        g.dup
-        g.push_literal :to_ary
-        g.send :respond_to?, 1, true
-        g.git coerce
-
-        discard = g.new_label
-        check_array = g.new_label
-
-        make_array.set!
-        g.dup
-        g.send :to_a, 0, true
-        coerce_method = :to_a
-        g.goto check_array
-
-        coerce.set!
-        g.dup
-        g.send :to_ary, 0, true
-
-        g.dup
-        g.push :nil
-        g.send :equal?, 1, true
-        coerce_method = :to_ary
-        g.gif check_array
-
-        g.pop
-        g.goto make_array
-
-        check_array.set!
-        kind_of_array(g, discard)
-
-        g.push_type
-        g.move_down 2
-        g.push_literal :to_ary
-        g.push_cpath_top
-        g.find_const :Array
-        g.send :coerce_to_type_error, 4, true
-        g.goto done
-
-        discard.set!
-        g.swap
-        g.pop
-
-        done.set!
-      end
-
-      def kind_of_array(g, label)
-        g.dup
-        g.push_cpath_top
-        g.find_const :Array
-        g.swap
-        g.kind_of
-        g.git label
-      end
-
       # Dive down and try to find an array of regular values
       # that could construct the left side of a concatination.
       # This is used to minimize the splat doing a send.
@@ -281,49 +142,8 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        done = g.new_label
-        coerce = g.new_label
-
         @value.bytecode(g)
-        kind_of_array(g, done)
-
-        g.dup
-        g.push_literal :to_ary
-        g.send :respond_to?, 1, true
-        g.git coerce
-
-        g.make_array 1
-        g.goto done
-
-        coerce.set!
-        g.dup
-        g.send :to_ary, 0, true
-
-        discard = g.new_label
-        kind_of_array(g, discard)
-
-        g.push_type
-        g.move_down 2
-        g.push_literal :to_a
-        g.push_cpath_top
-        g.find_const :Array
-        g.send :coerce_to_type_error, 4, true
-        g.goto done
-
-        discard.set!
-        g.swap
-        g.pop
-
-        done.set!
-      end
-
-      def kind_of_array(g, label)
-        g.dup
-        g.push_cpath_top
-        g.find_const :Array
-        g.swap
-        g.kind_of
-        g.git label
+        g.cast_multi_value
       end
 
       def to_sexp

data/lib/rubinius/ast/variables.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module CodeTools
+module Rubinius::ToolSet.current::TS
   module AST
     class BackRef < Node
       attr_accessor :kind
@@ -45,7 +45,7 @@ module CodeTools
         g.is_nil
         g.git f
 
-        g.push_literal "$#{@kind}"
+        g.push_literal "global-variable"
         g.string_dup
 
         g.goto done
@@ -87,7 +87,7 @@ module CodeTools
         g.is_nil
         g.git f
 
-        g.push_literal "$#{@which}"
+        g.push_literal "global-variable"
         g.string_dup
 
         g.goto done
@@ -541,7 +541,7 @@ module CodeTools
     end
 
     class MultipleAssignment < Node
-      attr_accessor :left, :right, :splat, :block
+      attr_accessor :left, :right, :splat, :block, :post
 
       def initialize(line, left, right, splat)
         @line = line
@@ -549,8 +549,17 @@ module CodeTools
         @right = right
         @splat = nil
         @block = nil # support for |&b|
-
-        @fixed = right.kind_of?(ArrayLiteral) ? true : false
+        @post = nil # in `a,*b,c`, c is in post.
+
+        if splat.kind_of?(PostArg)
+          @fixed = false
+          @post = splat.rest
+          splat = splat.into
+        elsif right.kind_of?(ArrayLiteral)
+          @fixed = right.body.size > 1
+        else
+          @fixed = false
+        end
 
         if splat.kind_of? Node
           if @left
@@ -573,6 +582,44 @@ module CodeTools
         end
       end
 
+      def pad_short(g)
+        short = @left.body.size - @right.body.size
+        if short > 0
+          short.times { g.push :nil }
+          g.make_array 0 if @splat
+        end
+      end
+
+      def pop_excess(g)
+        excess = @right.body.size - @left.body.size
+        excess.times { g.pop } if excess > 0
+      end
+
+      def make_array(g)
+        size = @right.body.size - @left.body.size
+        g.make_array size if size >= 0
+      end
+
+      def make_retval(g)
+        size = @right.body.size
+        if @left and !@splat
+          lhs = @left.body.size
+          size = lhs if lhs > size
+        end
+        g.dup_many @right.body.size
+        g.make_array @right.body.size
+        g.move_down size
+      end
+
+      def rotate(g)
+        if @splat
+          size = @left.body.size + 1
+        else
+          size = @right.body.size
+        end
+        g.rotate size
+      end
+
       def iter_arguments
         @iter_arguments = true
       end
@@ -601,233 +648,83 @@ module CodeTools
       end
 
       def bytecode(g, array_on_stack=false)
-        declare_local_scope(g.state.scope)
-
-        case @right
-        when ArrayLiteral, ConcatArgs
-          @right.bytecode(g)
-        when SplatValue
-          @right.bytecode(g)
-          convert_to_ary(g)
-        when ToArray
-          @right.bytecode(g)
-        when nil
-          convert_to_ary(g)
-        else
-          @right.bytecode(g)
-          convert_to_a(g)
+        unless array_on_stack
+          g.cast_array unless @right or (@splat and not @left)
         end
 
-        size = g.new_stack_local
-        g.dup
-        g.send :size, 0, true
-        g.set_stack_local size
-        g.pop
-
-        index = g.new_stack_local
-        g.push 0
-        g.set_stack_local index
-        g.pop
-
-        g.state.push_masgn
-
-        if @left
-          @left.body.each do |x|
-            convert_to_ary(g) if x.kind_of? MultipleAssignment
-
-            get_element(g, index)
-
-            x.bytecode(g)
-            g.pop
-          end
-        end
-
-        if @splat
-          g.dup
-
-          convert_to_ary(g) if @splat.kind_of? SplatValue
-
-          g.push_stack_local index
-
-          check_count = g.new_label
-
-          g.push_stack_local size
-          g.push_stack_local index
-          g.send :-, 1, true
+        declare_local_scope(g.state.scope)
 
-          g.goto check_count
+        if @fixed
+          pad_short(g) if @left and !@splat
+          @right.body.each { |x| x.bytecode(g) }
 
-          underflow = g.new_label
-          assign_splat = g.new_label
+          if @left
+            make_retval(g)
 
-          underflow.set!
-          g.pop_many 3
-          g.make_array 0
+            if @splat
+              pad_short(g)
+              make_array(g)
+            end
 
-          g.goto assign_splat
+            rotate(g)
 
-          check_count.set!
-          g.dup
-          g.push 0
-          g.send :<, 1, true
-          g.git underflow
+            g.state.push_masgn
+            @left.body.each do |x|
+              x.bytecode(g)
+              g.pop
+            end
+            g.state.pop_masgn
 
-          g.dup
-          g.push_stack_local index
-          g.send :+, 1, true
-          g.set_stack_local index
-          g.pop
+            pop_excess(g) unless @splat
+          end
+        else
+          if @right
+            if @right.kind_of? ArrayLiteral and @right.body.size == 1
+              @right.body.first.bytecode(g)
+              g.cast_multi_value
+            else
+              @right.bytecode(g)
+            end
 
-          g.send :[], 2, true
+            g.cast_array unless @right.kind_of? ToArray
+            g.dup # Use the array as the return value
+          end
 
-          assign_splat.set!
+          if @left
+            g.state.push_masgn
+            @left.body.each do |x|
+              g.shift_array
+              g.cast_array if x.kind_of? MultipleAssignment and x.left
+              x.bytecode(g)
+              g.pop
+            end
+            g.state.pop_masgn
+          end
 
-          # TODO: Fix nodes to work correctly.
-          case @splat
-          when EmptySplat
-            # nothing
-          when SplatArray, SplatWrapped
-            @splat.value.bytecode(g)
-          else
-            @splat.bytecode(g)
+          if @post
+            g.state.push_masgn
+            @post.body.each do |x|
+              g.dup
+              g.send :pop, 0
+              g.cast_array if x.kind_of? MultipleAssignment and x.left
+              x.bytecode(g)
+              g.pop
+            end
+            g.state.pop_masgn
           end
-          g.pop
         end
 
-        g.state.pop_masgn
-      end
-
-      def convert_to_a(g)
-        done = g.new_label
-        check_array = g.new_label
-
-        kind_of_array(g, done)
-
-        wrap_tuple = g.new_label
-        kind_of_tuple(g, wrap_tuple)
-
-        g.dup
-        g.send :to_a, 0, true
-        g.goto check_array
-
-        wrap_tuple.set!
-        g.dup
-        g.make_array 0
-        g.dup
-        g.move_down 2
-        g.swap
-        g.push_literal :@tuple
-        g.swap
-        g.invoke_primitive :object_set_ivar, 3
-        g.send :size, 0, true
-        g.push_literal :@total
-        g.swap
-        g.invoke_primitive :object_set_ivar, 3
-        g.pop
-        g.goto done
-
-        discard = g.new_label
-
-        check_array.set!
-        kind_of_array(g, discard)
-
-        g.push_type
-        g.move_down 2
-        g.push_literal :to_a
-        g.push_cpath_top
-        g.find_const :Array
-        g.send :coerce_to_type_error, 4, true
-        g.goto done
-
-        discard.set!
-        g.swap
-        g.pop
-
-        done.set!
-      end
-
-      def convert_to_ary(g)
-        done = g.new_label
-        coerce = g.new_label
-        make_array = g.new_label
-        coerce_method = :to_ary
-
-        kind_of_array(g, done)
-
-        g.dup
-        g.push_literal :to_ary
-        g.send :respond_to?, 1, true
-        g.git coerce
-
-        discard = g.new_label
-        check_array = g.new_label
-
-        make_array.set!
-        g.dup
-        g.send :to_a, 0, true
-        coerce_method = :to_a
-        g.goto check_array
-
-        coerce.set!
-        g.dup
-        g.send :to_ary, 0, true
-
-        g.dup
-        g.push :nil
-        g.send :equal?, 1, true
-        coerce_method = :to_ary
-        g.gif check_array
-
-        g.pop
-        g.goto make_array
-
-        check_array.set!
-        kind_of_array(g, discard)
-
-        g.push_type
-        g.move_down 2
-        g.push_literal coerce_method
-        g.push_cpath_top
-        g.find_const :Array
-        g.send :coerce_to_type_error, 4, true
-        g.goto done
-
-        discard.set!
-        g.swap
-        g.pop
-
-        done.set!
-      end
-
-      def kind_of_array(g, label)
-        g.dup
-        g.push_cpath_top
-        g.find_const :Array
-        g.swap
-        g.kind_of
-        g.git label
-      end
-
-      def kind_of_tuple(g, label)
-        g.dup
-        g.push_rubinius
-        g.find_const :Tuple
-        g.swap
-        g.kind_of
-        g.git label
-      end
+        if @splat
+          g.state.push_masgn
+          @splat.bytecode(g)
 
-      def get_element(g, index)
-        g.dup
-        g.push_stack_local index
+          # Use the array as the return value
+          g.dup if @fixed and !@left
 
-        g.dup
-        g.push 1
-        g.send :+, 1, true
-        g.set_stack_local index
-        g.pop
+          g.state.pop_masgn
+        end
 
-        g.send :[], 1, true
+        g.pop if @right and (!@fixed or @splat)
       end
 
       def defined(g)