rubinius-ast 3.5 → 3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c75c337e4e65b87670e62183252530329118d091
-  data.tar.gz: 640f7537ad2d01958c38a42c50e24683b7b389bc
+  metadata.gz: 03b20e9b3a87699e1b270e481571d3cb3ce36ade
+  data.tar.gz: a1e2ab029d36856c39134ebac9b7281db7100941
 SHA512:
-  metadata.gz: 9d3537443f9bbbad14036c85a2e041bb58686368605738c662d2d4ee7ec40f1c53aa76612ff2b17b417c931e03e0b3de84e30ff9e0e31f62e981b7c8ad0f01e1
-  data.tar.gz: 9d6f8ab36a677d7e1bddb00ccafd9d61785b028dbbb4dee51c399a3e66592c3dcc2cddf1bda02d71a04603af519756400e97236c4bb4ddfb44ddd60687731010
+  metadata.gz: 06a5d737c90eb84cc1576a9b1400a62e490e721e696c6cf54f8dc05b3a063ec2a33a9518267dd71e9a7fe9c08116fb21e14bbc9986d1e9fd3d1d42acad3e96e5
+  data.tar.gz: 1a5b784a46f81f132810f4128b9c8c0890d4ebd255e6ef1f1d7004332426772d9c68cc72015ef963c76fbf4dfdfebc99cd0ad01abeca3dacee5d84ec534df611

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

@@ -302,7 +302,7 @@ module CodeTools
     class Parameters < Node
       attr_accessor :names, :required, :optional, :defaults, :splat,
                     :post, :keywords, :kwrest
-      attr_reader :block_arg, :block_index
+      attr_reader :block_arg, :block_index, :kwrest_index
 
       def initialize(line, required=nil, optional=nil, splat=nil,
                      post=nil, kwargs=nil, kwrest=nil, block=nil)
@@ -312,6 +312,7 @@ module CodeTools
         @block_arg = nil
         @splat_index = nil
         @block_index = nil
+        @kwrest_index = nil
         @locals = []
         @local_index = 0
 
@@ -360,6 +361,11 @@ module CodeTools
 
         @keywords.value = LocalVariableAccess.new line, placeholder_var if @keywords
 
+        if kwrest
+          @kwrest_index = total_args + @keywords.arguments.length + 1
+          @kwrest_index += 1 if block
+        end
+
         @names = names
 
         self.block_arg = block
@@ -403,10 +409,7 @@ module CodeTools
           @block_arg = BlockArgument.new @line, block
         end
 
-        if @locals.last.kind_of? BlockArgument
-          @block_index -= 1
-          @locals.pop
-        end
+        @locals.pop if @locals.last.kind_of? BlockArgument
         @names.pop if @names.last.kind_of? BlockArgument
 
         @block_index = @locals.size
@@ -443,12 +446,7 @@ module CodeTools
 
         if @splat or not @optional.empty? or
             (@keywords and not @keywords.required?)
-          arity += 1
-        end
-
-        if @splat or not @optional.empty? or
-            (@keywords and not @keywords.required?)
-          arity = -arity
+          arity = -arity - 1
         end
 
         arity

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

@@ -66,6 +66,7 @@ module CodeTools
         blk.block_index = arguments.block_index
         blk.arity = arguments.arity
         blk.keywords = arguments.keywords.entries if arguments.keywords
+        blk.kwrest_index = arguments.kwrest_index
 
         blk
       end
@@ -83,6 +84,7 @@ module CodeTools
           meth.block_index = arguments.block_index
           meth.arity = arguments.arity
           meth.keywords = arguments.keywords.entries if arguments.keywords
+          meth.kwrest_index = arguments.kwrest_index
         end
 
         meth

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

@@ -622,6 +622,7 @@ module CodeTools
         blk.pop_state
 
         blk.splat_index = @arguments.splat_index
+        blk.kwrest_index = @arguments.kwrest_index
         blk.local_count = local_count
         blk.local_names = local_names
 
@@ -643,7 +644,7 @@ module CodeTools
 
     class IterArguments < Node
       attr_accessor :prelude, :arity, :optional, :arguments, :splat_index, :block_index
-      attr_accessor :required_args, :keywords
+      attr_accessor :required_args, :keywords, :kwrest_index
 
       def initialize(line, arguments)
         @line = line
@@ -652,6 +653,7 @@ module CodeTools
 
         @splat_index = -1
         @block_index = nil
+        @kwrest_index = nil
         @required_args = 0
         @splat = nil
         @block = nil
@@ -843,7 +845,7 @@ module CodeTools
 
     class ForParameters < Node
       attr_accessor :assignments, :required_args, :splat_index,
-                    :post_args, :keywords, :block_index
+                    :post_args, :keywords, :block_index, :kwrest_index
 
       def initialize(line, assignments)
         @line = line
@@ -853,6 +855,7 @@ module CodeTools
         @post_args = 0
         @keywords = nil
         @block_index = nil
+        @kwrest_index = nil
       end
 
       alias_method :total_args, :required_args

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-ast
 version: !ruby/object:Gem::Version
-  version: '3.5'
+  version: '3.6'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler