rubinius-ast 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce309d261674f72639f17fab1746c6e70b207e43
-  data.tar.gz: 53ef60ff69d147a5232e6b5988eeb1ea60e189d9
+  metadata.gz: 079e046e984c4362cd37c68024244f84009692fb
+  data.tar.gz: 7fe5ddb81c8cb3d6ecf596a16e78070b085a9160
 SHA512:
-  metadata.gz: 1fbd9b7c7b706657e60760162da1cce65bd2d3e9bd154a1cb20c73f42557edf6a0052edf324d8c7b35cd02efc2b4d36f7873ee023e10d23f9846886511b6d200
-  data.tar.gz: a9e5446be9d2bf2d40f6c55bb606750ed3b3fea0ea36d64e943f11805886a82f6eb4074292052f01f488f4e6f79596f8949952116efb9bf6d549da805be105aa
+  metadata.gz: a63fd1d372f96337214c45741a5a6b285bd7c7ad0ea537b6611f3c045429fe62bda9b107b7b4ffb86ba35661ccbee16be9912d02db0141baebac9a26ba965d10
+  data.tar.gz: ae131cde981af56b61d16528e81965fe3984730f0ed65ba7dac04c721bc5eb535910c6ef60ee26301e64d19a8b4fd5dfd93c8ef1290e588ea91c91664f1206c7

data/lib/rubinius/{ast → code/ast}/definitions.rb

@@ -344,6 +344,13 @@ module CodeTools
 
         process_fixed_arguments post, @post = [], names
 
+        if kwargs || kwrest
+          placeholder_var = local_placeholder
+          @locals << placeholder_var
+        end
+
+        kwrest = placeholder_var if kwrest == true
+
         if kwargs
           @keywords = KeywordParameters.new line, kwargs, kwrest
           names.concat @keywords.names
@@ -351,11 +358,7 @@ module CodeTools
           @keywords = KeywordParameters.new line, nil, kwrest
         end
 
-        if @keywords
-          var = local_placeholder
-          @keywords.value = LocalVariableAccess.new line, var
-          @locals << var
-        end
+        @keywords.value = LocalVariableAccess.new line, placeholder_var if @keywords
 
         @names = names
 
@@ -602,13 +605,14 @@ module CodeTools
           @names = []
         end
 
-        case kwrest
-        when Symbol
-          kwrest_name = :"**#{kwrest}"
+        if kwrest
+          if kwrest.to_s.start_with?("_:")
+            kwrest_name = :**
+          else
+            kwrest_name = :"**#{kwrest}"
+          end
+
           @kwrest = LocalVariableAssignment.new line, kwrest
-        when true
-          kwrest_name = :**
-          @kwrest = true
         end
 
         @names << kwrest_name if kwrest_name
@@ -628,9 +632,7 @@ module CodeTools
       def map_arguments(scope)
         @arguments.each { |var| scope.assign_local_reference var }
 
-        if @kwrest.kind_of? LocalVariableAssignment
-          scope.assign_local_reference @kwrest
-        end
+        scope.assign_local_reference @kwrest if @kwrest
       end
 
       def bytecode(g)
@@ -685,7 +687,7 @@ module CodeTools
           g.push @arguments.size
           g.gine extra_keys
 
-          if @kwrest.kind_of? LocalVariableAssignment
+          if @kwrest
             g.push_cpath_top
             g.find_const :Hash
             g.send :allocate, 0, true
@@ -733,9 +735,7 @@ module CodeTools
         end
 
         g.send :keywords_extra, 2, true
-        if @kwrest.kind_of? LocalVariableAssignment
-          @kwrest.variable.set_bytecode(g)
-        end
+        @kwrest.variable.set_bytecode(g) if @kwrest
         g.pop
 
         done.set!
@@ -751,6 +751,10 @@ module CodeTools
 
     module LocalVariable
       attr_accessor :variable
+
+      def placeholder?
+        name.to_s.start_with?("_:")
+      end
     end
 
     class BlockArgument < Node

data/lib/rubinius/{ast → code/ast}/sends.rb

@@ -569,7 +569,7 @@ module CodeTools
       def assign_local_reference(var)
         if variable = variables[var.name]
           var.variable = variable.reference
-        elsif block_local?(var.name)
+        elsif block_local?(var.name) || var.placeholder?
           variable = new_local var.name
           var.variable = variable.reference
         elsif reference = @parent.search_local(var.name)

data/lib/rubinius/{ast → code/ast}/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   module AST
-    VERSION = "2.3.2"
+    VERSION = "2.4.0"
   end
 end

data/lib/rubinius/code/ast.rb

@@ -0,0 +1,18 @@
+# -*- encoding: us-ascii -*-
+
+require "rubinius/code/ast/node"
+require "rubinius/code/ast/self"
+require "rubinius/code/ast/constants"
+require "rubinius/code/ast/control_flow"
+require "rubinius/code/ast/data"
+require "rubinius/code/ast/definitions"
+require "rubinius/code/ast/encoding"
+require "rubinius/code/ast/exceptions"
+require "rubinius/code/ast/file"
+require "rubinius/code/ast/grapher"
+require "rubinius/code/ast/literals"
+require "rubinius/code/ast/operators"
+require "rubinius/code/ast/sends"
+require "rubinius/code/ast/values"
+require "rubinius/code/ast/variables"
+require "rubinius/code/ast/transforms"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-ast
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,8 +17,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,33 +45,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- lib/rubinius/ast.rb
-- lib/rubinius/ast/constants.rb
-- lib/rubinius/ast/control_flow.rb
-- lib/rubinius/ast/data.rb
-- lib/rubinius/ast/definitions.rb
-- lib/rubinius/ast/encoding.rb
-- lib/rubinius/ast/exceptions.rb
-- lib/rubinius/ast/file.rb
-- lib/rubinius/ast/grapher.rb
-- lib/rubinius/ast/literals.rb
-- lib/rubinius/ast/node.rb
-- lib/rubinius/ast/operators.rb
-- lib/rubinius/ast/self.rb
-- lib/rubinius/ast/sends.rb
-- lib/rubinius/ast/transforms.rb
-- lib/rubinius/ast/values.rb
-- lib/rubinius/ast/variables.rb
-- lib/rubinius/ast/version.rb
-- rubinius-ast.gemspec
-homepage: https://github.com/rubinius/rubinius-ast
+- lib/rubinius/code/ast.rb
+- lib/rubinius/code/ast/constants.rb
+- lib/rubinius/code/ast/control_flow.rb
+- lib/rubinius/code/ast/data.rb
+- lib/rubinius/code/ast/definitions.rb
+- lib/rubinius/code/ast/encoding.rb
+- lib/rubinius/code/ast/exceptions.rb
+- lib/rubinius/code/ast/file.rb
+- lib/rubinius/code/ast/grapher.rb
+- lib/rubinius/code/ast/literals.rb
+- lib/rubinius/code/ast/node.rb
+- lib/rubinius/code/ast/operators.rb
+- lib/rubinius/code/ast/self.rb
+- lib/rubinius/code/ast/sends.rb
+- lib/rubinius/code/ast/transforms.rb
+- lib/rubinius/code/ast/values.rb
+- lib/rubinius/code/ast/variables.rb
+- lib/rubinius/code/ast/version.rb
+homepage: https://github.com/rubinius/rubinius-code
 licenses:
-- BSD
+- MPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -89,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An Abstract Syntax Tree for Ruby.
 test_files: []
-has_rdoc: 

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rubinius-ast.gemspec
-gemspec

data/LICENSE

@@ -1,25 +0,0 @@
-Copyright (c) 2013, Brian Shirai
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. Neither the name of the library nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,29 +0,0 @@
-# Rubinius::Ast
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'rubinius-ast'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rubinius-ast
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/lib/rubinius/ast.rb

@@ -1,18 +0,0 @@
-# -*- encoding: us-ascii -*-
-
-require "rubinius/ast/node"
-require "rubinius/ast/self"
-require "rubinius/ast/constants"
-require "rubinius/ast/control_flow"
-require "rubinius/ast/data"
-require "rubinius/ast/definitions"
-require "rubinius/ast/encoding"
-require "rubinius/ast/exceptions"
-require "rubinius/ast/file"
-require "rubinius/ast/grapher"
-require "rubinius/ast/literals"
-require "rubinius/ast/operators"
-require "rubinius/ast/sends"
-require "rubinius/ast/values"
-require "rubinius/ast/variables"
-require "rubinius/ast/transforms"

data/rubinius-ast.gemspec

@@ -1,23 +0,0 @@
-# coding: utf-8
-require './lib/rubinius/ast/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "rubinius-ast"
-  spec.version       = CodeTools::AST::VERSION
-  spec.authors       = ["Brian Shirai"]
-  spec.email         = ["brixen@gmail.com"]
-  spec.description   = %q{An Abstract Syntax Tree for Ruby.}
-  spec.summary       = %q{An Abstract Syntax Tree for Ruby.}
-  spec.homepage      = "https://github.com/rubinius/rubinius-ast"
-  spec.license       = "BSD"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 1.9.2"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.0"
-end