ast 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5188ebb01ae2cb91d0e2dae2e40804376d106e66
-  data.tar.gz: bb200f5e71042ac5557007ad49c51e4645a00961
+  metadata.gz: fa80b25cb36d090155a83e7e24dfb047701f681a
+  data.tar.gz: d93cac6b17f6b9b3f61df96a21fd5383cd53a6c7
 SHA512:
-  metadata.gz: 397957b342a439a794431ad75d842d8d10d086dc8599dad0077451bd0fcbec5f1b9eb2f0a192958b38d1ce0a2620b53ae23977531ea2e3596c6c43868cdf290a
-  data.tar.gz: e019bbec67f6c1d0b34410e8f2ddd1587d2a9054e0f7dc60e240387aff5b92a7b0a3bfdea7cfeb771a8ca3544be54327f05d45bf34816f311cbc1634159e619e
+  metadata.gz: edd48c34d4d4bb2deb23ce4eda259a7e1454c84a39d2d8b2d90bd489c0cc31f993deea37068aea225ea83470ae9ebb2e0ef603a0efc284b69edc2690456d94d2
+  data.tar.gz: 684ac2d08942b7161f0cc30ffac40605138034907c77047752842dd659cfb817826f21fd8ffd8724a27442f3a5bb1a44fbbd825fb4baef914f7905b853f545e1

data/.travis.yml

@@ -1,14 +1,14 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
+  - 2.4.1
   - jruby-18mode
   - jruby-19mode
-  - rbx-2
 
 before_install:
   - gem install bundler

data/ast.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ast'
-  s.version     = '2.3.0'
+  s.version     = '2.4.0'
   s.license     = 'MIT'
   s.authors     = ["whitequark"]
   s.email       = ["whitequark@whitequark.org"]

data/lib/ast/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AST
   # Node is an immutable class, instances of which represent abstract
   # syntax tree nodes. It combines semantic information (i.e. anything
@@ -42,8 +44,17 @@ module AST
 
     # Returns the children of this node.
     # The returned value is frozen.
+    # The to_a alias is useful for decomposing nodes concisely.
+    # For example:
+    #
+    #     node = s(:gasgn, :$foo, s(:integer, 1))
+    #     var_name, value = *node
+    #     p var_name # => :$foo
+    #     p value    # => (integer 1)
+    #
     # @return [Array]
     attr_reader :children
+    alias to_a children
 
     # Returns the precomputed hash value for this node
     # @return [Fixnum]
@@ -167,20 +178,6 @@ module AST
 
     alias << append
 
-    # Returns {#children}. This is very useful in order to decompose nodes
-    # concisely. For example:
-    #
-    #     node = s(:gasgn, :$foo, s(:integer, 1))
-    #     s
-    #     var_name, value = *node
-    #     p var_name # => :$foo
-    #     p value    # => (integer 1)
-    #
-    # @return [Array]
-    def to_a
-      children
-    end
-
     # Converts `self` to a pretty-printed s-expression.
     #
     # @param  [Integer] indent Base indentation level.
@@ -189,12 +186,8 @@ module AST
       indented = "  " * indent
       sexp = "#{indented}(#{fancy_type}"
 
-      first_node_child = children.index do |child|
-        child.is_a?(Node) || child.is_a?(Array)
-      end || children.count
-
-      children.each_with_index do |child, idx|
-        if child.is_a?(Node) && idx >= first_node_child
+      children.each do |child|
+        if child.is_a?(Node)
           sexp += "\n#{child.to_sexp(indent + 1)}"
         else
           sexp += " #{child.inspect}"
@@ -217,12 +210,8 @@ module AST
       indented = "  " * indent
       sexp = "#{indented}s(:#{@type}"
 
-      first_node_child = children.index do |child|
-        child.is_a?(Node) || child.is_a?(Array)
-      end || children.count
-
-      children.each_with_index do |child, idx|
-        if child.is_a?(Node) && idx >= first_node_child
+      children.each do |child|
+        if child.is_a?(Node)
           sexp += ",\n#{child.inspect(indent + 1)}"
         else
           sexp += ", #{child.inspect}"
@@ -238,6 +227,22 @@ module AST
     def to_ast
       self
     end
+    
+    # Converts `self` to an Array where the first element is the type as a Symbol,
+    # and subsequent elements are the same representation of its children. 
+    #
+    # @return [Array<Symbol, [...Array]>]
+    def to_sexp_array
+      children_sexp_arrs = children.map do |child|
+        if child.is_a?(Node)
+          child.to_sexp_array
+        else
+          child
+        end
+      end
+
+      [type, *children_sexp_arrs]
+    end
 
     protected
 

data/test/helper.rb

@@ -5,10 +5,10 @@ require 'simplecov'
 require 'coveralls'
 
 SimpleCov.start do
-  self.formatter = SimpleCov::Formatter::MultiFormatter[
+  self.formatter = SimpleCov::Formatter::MultiFormatter.new([
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
-  ]
+  ])
 
   # Exclude the testsuite itself.
   add_filter "/test/"

data/test/test_ast.rb

@@ -88,6 +88,13 @@ describe AST::Node do
   it 'should return self in to_ast' do
     @node.to_ast.should.be.identical_to @node
   end
+  
+  it 'should produce to_sexp_array correctly' do
+    AST::Node.new(:a, [ :sym, [ 1, 2 ] ]).to_sexp_array.should.equal [:a, :sym, [1, 2]]
+    AST::Node.new(:a, [ :sym,
+      AST::Node.new(:b, [ @node, @node ])
+    ]).to_sexp_array.should.equal [:a, :sym, [:b, [:node, 0, 1], [:node, 0, 1]]]
+  end
 
   it 'should only use type and children to compute #hash' do
     @node.hash.should.equal([@node.type, @node.children, @node.class].hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ast
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -194,9 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: A library for working with Abstract Syntax Trees.
 test_files: []
-has_rdoc: