rubinius-ast 2.1.3 → 2.2.0

data/lib/rubinius/ast/encoding.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module AST
     class Encoding < Node
       attr_accessor :name
@@ -13,7 +13,8 @@ module Rubinius::ToolSets.current::ToolSet
       def bytecode(g)
         pos(g)
 
-        g.push_literal Compiler::Runtime
+        g.push_rubinius
+        g.find_const :Runtime
         g.push_literal @name
         g.send :get_encoding, 1
       end

data/lib/rubinius/ast/exceptions.rb

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

data/lib/rubinius/ast/file.rb

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

data/lib/rubinius/ast/grapher.rb

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

data/lib/rubinius/ast/literals.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module AST
     class ArrayLiteral < Node
       attr_accessor :body
@@ -132,14 +132,58 @@ module Rubinius::ToolSets.current::ToolSet
         g.send :new_from_literal, 1
 
         while i < count
-          k = @array[i]
-          v = @array[i + 1]
+          key = @array[i]
+          value = @array[i + 1]
+
+          if key
+            g.dup
+            key.bytecode(g)
+            value.bytecode(g)
+            g.send :[]=, 2
+            g.pop
+          else
+            case value
+            when HashLiteral
+              value.merge_entries_bytecode(g)
+            else
+              g.push_rubinius
+              g.find_const :Runtime
+              g.swap
+              value.bytecode(g)
+              g.send :splat_hash_value, 2
+            end
+          end
+
+          i += 2
+        end
+      end
 
-          g.dup
-          k.bytecode(g)
-          v.bytecode(g)
-          g.send :[]=, 2
-          g.pop
+      def merge_entries_bytecode(g)
+        count = @array.size
+        i = 0
+
+        while i < count
+          key = @array[i]
+          value = @array[i + 1]
+          if key
+            g.push_rubinius
+            g.find_const :Runtime
+            g.swap
+            key.bytecode(g)
+            value.bytecode(g)
+            g.send :splat_hash_entry, 3
+          else
+            case value
+            when HashLiteral
+              value.merge_entries_bytecode(g)
+            else
+              g.push_rubinius
+              g.find_const :Runtime
+              g.swap
+              value.bytecode(g)
+              g.send :splat_hash_value, 2
+            end
+          end
 
           i += 2
         end
@@ -150,7 +194,7 @@ module Rubinius::ToolSets.current::ToolSet
       end
 
       def to_sexp
-        @array.inject([:hash]) { |s, x| s << x.to_sexp }
+        @array.inject([:hash]) { |s, x| s << (x ? x.to_sexp : [:hash_splat]) }
       end
     end
 
@@ -233,6 +277,22 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
+    class RationalLiteral < NumberLiteral
+      def bytecode(g)
+        pos(g)
+
+        g.push_literal @value
+      end
+    end
+
+    class ImaginaryLiteral < NumberLiteral
+      def bytecode(g)
+        pos(g)
+
+        g.push_literal @value
+      end
+    end
+
     class Range < Node
       attr_accessor :start, :finish
 

data/lib/rubinius/ast/node.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module AST
     class Node
       attr_accessor :line
@@ -64,6 +64,8 @@ module Rubinius::ToolSets.current::ToolSet
         blk.total_args = arguments.total_args
         blk.splat_index = arguments.splat_index
         blk.block_index = arguments.block_index
+        blk.arity = arguments.arity
+        blk.keywords = arguments.keywords.entries if arguments.keywords
 
         blk
       end
@@ -79,6 +81,8 @@ module Rubinius::ToolSets.current::ToolSet
           meth.total_args = arguments.total_args
           meth.splat_index = arguments.splat_index
           meth.block_index = arguments.block_index
+          meth.arity = arguments.arity
+          meth.keywords = arguments.keywords.entries if arguments.keywords
         end
 
         meth

data/lib/rubinius/ast/operators.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module AST
     class And < Node
       attr_accessor :left, :right
@@ -102,7 +102,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)
@@ -110,7 +110,7 @@ module Rubinius::ToolSets.current::ToolSet
         @receiver = receiver
         @op = op
         arguments = nil if arguments.is_a?(EmptyArray)
-        @arguments = ActualArguments.new line, arguments
+        @arguments = Arguments.new line, arguments
         @value = value
       end
 
@@ -146,6 +146,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
@@ -162,8 +163,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
@@ -188,11 +206,30 @@ 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
+
           # @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
@@ -233,7 +270,7 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
-    class OpAssign2 < Node
+    class OpAssignAttribute < Node
       attr_accessor :receiver, :name, :assign, :op, :value
 
       def initialize(line, receiver, name, op, value)
@@ -248,7 +285,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
@@ -258,6 +295,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
@@ -268,8 +306,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
@@ -288,7 +344,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
@@ -356,7 +432,9 @@ module Rubinius::ToolSets.current::ToolSet
       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
@@ -365,17 +443,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/self.rb

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

data/lib/rubinius/ast/sends.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module AST
     class Send < Node
       attr_accessor :receiver, :name, :privately, :block, :variable, :vcall_style
@@ -131,7 +131,7 @@ module Rubinius::ToolSets.current::ToolSet
       def initialize(line, receiver, name, arguments, privately=false)
         super line, receiver, name, privately
         @block = nil
-        @arguments = ActualArguments.new line, arguments
+        @arguments = Arguments.new line, arguments
       end
 
       def bytecode(g)
@@ -167,7 +167,7 @@ module Rubinius::ToolSets.current::ToolSet
 
         @name = :"#{name}="
 
-        @arguments = ActualArguments.new line, arguments
+        @arguments = Arguments.new line, arguments
       end
 
       def bytecode(g)
@@ -209,9 +209,9 @@ module Rubinius::ToolSets.current::ToolSet
 
         case arguments
         when PushArgs
-          @arguments = PushActualArguments.new arguments
+          @arguments = PushArguments.new line, arguments
         else
-          @arguments = ActualArguments.new line, arguments
+          @arguments = Arguments.new line, arguments
         end
       end
 
@@ -228,13 +228,24 @@ module Rubinius::ToolSets.current::ToolSet
 
         @receiver.bytecode(g)
         @arguments.bytecode(g)
+
         g.dup
 
         if @arguments.splat?
-          g.move_down @arguments.size + 2
-          g.swap
+          case @arguments
+          when PushArguments
+            g.move_down @arguments.size + 2
+            g.swap
+            flag = true
+          when Arguments
+            # TODO: Optimize bytecode for x[a, *b, c, d] = e
+            g.send :last, 0, true
+            g.move_down @arguments.size + 2
+            flag = false
+          end
+
           g.push :nil
-          g.send_with_splat @name, @arguments.size, @privately, true
+          g.send_with_splat @name, @arguments.size, @privately, flag
         else
           g.move_down @arguments.size + 1
           g.send @name, @arguments.size, @privately
@@ -261,7 +272,8 @@ module Rubinius::ToolSets.current::ToolSet
         g.push_state ClosedScope.new(@line)
         g.state.push_name :BEGIN
 
-        g.push_literal Compiler::Runtime
+        g.push_rubinius
+        g.find_const :Runtime
         @block.bytecode(g)
         g.send_with_block :pre_exe, 0, false
 
@@ -285,10 +297,13 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
-    class PushActualArguments
-      def initialize(pa)
-        @arguments = pa.arguments
-        @value = pa.value
+    class PushArguments < Node
+      attr_accessor :arguments
+
+      def initialize(line, node)
+        @line = line
+        @arguments = node.arguments
+        @value = node.value
       end
 
       def size
@@ -305,7 +320,7 @@ module Rubinius::ToolSets.current::ToolSet
       end
 
       def to_sexp
-        [@arguments.to_sexp, @value.to_sexp]
+        [:argspush, @arguments.to_sexp, @value.to_sexp]
       end
     end
 
@@ -357,6 +372,8 @@ module Rubinius::ToolSets.current::ToolSet
     end
 
     class CollectSplat < Node
+      attr_accessor :splat, :array, :last
+
       def initialize(line, *parts)
         @line = line
         @splat = parts.shift
@@ -366,7 +383,6 @@ module Rubinius::ToolSets.current::ToolSet
 
       def bytecode(g)
         @splat.bytecode(g)
-        g.cast_array
 
         @array.each do |x|
           x.bytecode(g)
@@ -380,13 +396,12 @@ module Rubinius::ToolSets.current::ToolSet
         done = g.new_label
 
         @last.bytecode(g)
-        g.dup
 
-        g.push_const :Hash
-
-        g.push_type
-        g.move_down 2
-        g.send :object_kind_of?, 2
+        g.dup
+        g.push_cpath_top
+        g.find_const :Hash
+        g.swap
+        g.kind_of
         g.gif not_hash
 
         g.make_array 1
@@ -404,7 +419,7 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
-    class ActualArguments < Node
+    class Arguments < Node
       attr_accessor :array, :splat
 
       def initialize(line, arguments=nil)
@@ -491,13 +506,18 @@ module Rubinius::ToolSets.current::ToolSet
 
       def initialize(line, arguments, body)
         @line = line
-        @arguments = IterArguments.new line, arguments
+        @arguments = arguments || Parameters.new(line)
         @body = body || NilLiteral.new(line)
+
+        if @body.kind_of?(Block) and @body.locals
+          @locals = @body.locals.body.map { |x| x.value }
+        else
+          @locals = nil
+        end
       end
 
-      # 1.8 doesn't support declared Iter locals
       def block_local?(name)
-        false
+        @locals.include?(name) if @locals
       end
 
       def module?
@@ -600,31 +620,17 @@ module Rubinius::ToolSets.current::ToolSet
       end
 
       def to_sexp
-        [sexp_name, @arguments.to_sexp, @body.to_sexp]
-      end
-    end
-
-    class Iter19 < Iter
-      def initialize(line, arguments, body)
-        @line = line
-        @arguments = arguments || IterArguments.new(line, nil)
-        @body = body || NilLiteral.new(line)
-
-        if @body.kind_of?(Block) and @body.locals
-          @locals = @body.locals.body.map { |x| x.value }
-        else
-          @locals = nil
+        body_sexp = @body.to_sexp
+        if @locals
+          body_sexp[1] = @locals.map { |x| [:lvar, x] }
         end
-      end
-
-      def block_local?(name)
-        @locals.include?(name) if @locals
+        [sexp_name, @arguments.to_sexp, body_sexp]
       end
     end
 
     class IterArguments < Node
       attr_accessor :prelude, :arity, :optional, :arguments, :splat_index, :block_index
-      attr_accessor :required_args
+      attr_accessor :required_args, :keywords
 
       def initialize(line, arguments)
         @line = line
@@ -780,6 +786,14 @@ module Rubinius::ToolSets.current::ToolSet
     end
 
     class For < Iter
+      def initialize(line, arguments, body)
+        @line = line
+        @arguments = ForParameters.new line, arguments
+        @body = body || NilLiteral.new(line)
+
+        new_local :"$for_args"
+      end
+
       def nest_scope(scope)
         scope.parent = self
       end
@@ -814,25 +828,36 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
-    class For19Arguments < Node
-      attr_reader :block_index
+    class ForParameters < Node
+      attr_accessor :assignments, :required_args, :splat_index,
+                    :post_args, :keywords, :block_index
 
-      def initialize(line, arguments)
+      def initialize(line, assignments)
         @line = line
-        @arguments = arguments
+        @assignments = assignments
+        @splat_index = assignments.kind_of?(MultipleAssignment) ? 0 : nil
+        @required_args = @splat_index ? 0 : 1
+        @post_args = 0
+        @keywords = nil
+        @block_index = nil
+      end
 
-        if @arguments.kind_of? MultipleAssignment
-          @args = 0
-          @splat = 0
-        else
-          @args = 1
-          @splat = nil
+      alias_method :total_args, :required_args
+      alias_method :arity, :required_args
+
+      def map_arguments(scope)
+        case @assignments
+        when LocalVariable
+          scope.assign_local_reference @assignments
         end
       end
 
       def bytecode(g)
-        if @splat
-          g.push_literal Compiler::Runtime
+        map_arguments(g.state.scope)
+
+        if @splat_index
+          g.push_rubinius
+          g.find_const :Runtime
           g.push_local 0
           g.send :unwrap_block_arg, 1
         else
@@ -840,39 +865,8 @@ module Rubinius::ToolSets.current::ToolSet
         end
 
         g.state.push_masgn
-        @arguments.bytecode(g)
+        @assignments.bytecode(g)
         g.state.pop_masgn
-        g.pop
-      end
-
-      def required_args
-        @args
-      end
-
-      def total_args
-        @args
-      end
-
-      def post_args
-        0
-      end
-
-      def splat_index
-        @splat
-      end
-
-      def to_sexp
-        @arguments.to_sexp
-      end
-    end
-
-    class For19 < For
-      def initialize(line, arguments, body)
-        @line = line
-        @arguments = For19Arguments.new line, arguments
-        @body = body || NilLiteral.new(line)
-
-        new_local :"$for_args"
       end
     end
 
@@ -907,7 +901,7 @@ module Rubinius::ToolSets.current::ToolSet
         @line = line
         @block = nil
         @name = nil
-        @arguments = ActualArguments.new line, arguments
+        @arguments = Arguments.new line, arguments
       end
 
       def block_bytecode(g)
@@ -967,7 +961,7 @@ module Rubinius::ToolSets.current::ToolSet
           arguments = ArrayLiteral.new line, [arguments]
         end
 
-        @arguments = ActualArguments.new line, arguments
+        @arguments = Arguments.new line, arguments
         @argument_count = @arguments.size
         @yield_splat = false