ast 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3398752b5d18c8a0d8d92566ddb560f35391bc
-  data.tar.gz: 1d08b307064106e701044d3f640c5cac033148c6
+  metadata.gz: 6fd328f8be0444eea7ebadfba831f783f87defe1
+  data.tar.gz: ee6204555aec2a37f32aa1db514a7a43dd959d77
 SHA512:
-  metadata.gz: 2dfe3fe6af1cbfc6c4ce5dde12c8c285c10a4249779e8442ecbe1a9a73301dcb7e5b6028ccf4e7a4c7686b353762475103f85c1216f7ee4a69a55d8d8b6a3169
-  data.tar.gz: 752a64d60bf8b65c20782343a653958458f224fb4b124d258e1edef86e2c7acbd95fc9c5eebabbd7ebe4ced860e6fd0280412d180a896aabe8320ec3dfdc7a30
+  metadata.gz: 32abdd8a6d4ba69e9433c307d9048358d39423c621a8af819649f9cc712ada40cdfd21289549a5478d1db68c695eab51b4edb7bae5966381284735ebc9cd65bc
+  data.tar.gz: a680513585f7b67ef99b25e621cf5bbea81183d2412e3c237d756cc82faa21a32775ea050251bf893aeeba813699a27104705f6032fb94c7e1fbb38f212c983d

data/README.md

@@ -1,8 +1,8 @@
 # AST
 
-[![Build Status](https://travis-ci.org/whitequark/ast.png?branch=master)](https://travis-ci.org/whitequark/ast)
-[![Code Climate](https://codeclimate.com/github/whitequark/ast.png)](https://codeclimate.com/github/whitequark/ast)
-[![Coverage Status](https://coveralls.io/repos/whitequark/ast/badge.png?branch=master)](https://coveralls.io/r/whitequark/ast)
+[![Build Status](https://travis-ci.org/whitequark/ast.svg?branch=master)](https://travis-ci.org/whitequark/ast)
+[![Code Climate](https://codeclimate.com/github/whitequark/ast.svg)](https://codeclimate.com/github/whitequark/ast)
+[![Coverage Status](https://coveralls.io/repos/whitequark/ast/badge.svg?branch=master)](https://coveralls.io/r/whitequark/ast)
 
 AST is a small library for working with immutable abstract syntax trees.
 

data/ast.gemspec

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

data/lib/ast/node.rb

@@ -80,7 +80,7 @@ module AST
     # By default, each entry in the `properties` hash is assigned to
     # an instance variable in this instance of Node. A subclass should define
     # attribute readers for such variables. The values passed in the hash
-    # are not frozen or whitelisted; such behavior can also be implemented\
+    # are not frozen or whitelisted; such behavior can also be implemented
     # by subclassing Node and overriding this method.
     #
     # @return [nil]
@@ -104,6 +104,7 @@ module AST
     def dup
       self
     end
+    alias :clone :dup
 
     # Returns a new instance of Node where non-nil arguments replace the
     # corresponding fields of `self`.
@@ -166,13 +167,6 @@ module AST
 
     alias << append
 
-    # Converts `self` to a concise s-expression, omitting any children.
-    #
-    # @return [String]
-    def to_s
-      "(#{fancy_type} ...)"
-    end
-
     # Returns {#children}. This is very useful in order to decompose nodes
     # concisely. For example:
     #
@@ -211,7 +205,34 @@ module AST
 
       sexp
     end
-    alias :inspect :to_sexp
+
+    alias to_s to_sexp
+
+    # Converts `self` to a s-expression ruby string.
+    # The code return will recreate the node, using the sexp module s()
+    #
+    # @param  [Integer] indent Base indentation level.
+    # @return [String]
+    def inspect(indent=0)
+      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
+          sexp << ",\n#{child.inspect(indent + 1)}"
+        else
+          sexp << ", #{child.inspect}"
+        end
+      end
+
+      sexp << ")"
+
+      sexp
+    end
 
     # @return [AST::Node] self
     def to_ast

data/test/test_ast.rb

@@ -30,6 +30,10 @@ describe AST::Node do
     @node.dup.should.equal? @node
   end
 
+  it 'should return self when cloning' do
+    @node.clone.should.equal? @node
+  end
+
   it 'should return an updated node, but only if needed' do
     @node.updated().should.be.identical_to @node
     @node.updated(:node).should.be.identical_to @node
@@ -51,11 +55,6 @@ describe AST::Node do
     updated.meta.should.equal 'other_value'
   end
 
-  it 'should use fancy type in to_s' do
-    node = AST::Node.new(:ast_node)
-    node.to_s.should.equal '(ast-node ...)'
-  end
-
   it 'should format to_sexp correctly' do
     AST::Node.new(:a, [ :sym, [ 1, 2 ] ]).to_sexp.should.equal '(a :sym [1, 2])'
     AST::Node.new(:a, [ :sym, @node ]).to_sexp.should.equal "(a :sym\n  (node 0 1))"
@@ -64,6 +63,28 @@ describe AST::Node do
     ]).to_sexp.should.equal "(a :sym\n  (b\n    (node 0 1)\n    (node 0 1)))"
   end
 
+  it 'should format to_s correctly' do
+    AST::Node.new(:a, [ :sym, [ 1, 2 ] ]).to_s.should.equal '(a :sym [1, 2])'
+    AST::Node.new(:a, [ :sym, @node ]).to_s.should.equal "(a :sym\n  (node 0 1))"
+    AST::Node.new(:a, [ :sym,
+      AST::Node.new(:b, [ @node, @node ])
+    ]).to_s.should.equal "(a :sym\n  (b\n    (node 0 1)\n    (node 0 1)))"
+  end
+
+  it 'should format inspect correctly' do
+    AST::Node.new(:a, [ :sym, [ 1, 2 ] ]).inspect.should.equal "s(:a, :sym, [1, 2])"
+    AST::Node.new(:a, [ :sym,
+      AST::Node.new(:b, [ @node, @node ])
+    ]).inspect.should.equal "s(:a, :sym,\n  s(:b,\n    s(:node, 0, 1),\n    s(:node, 0, 1)))"
+  end
+
+  it 'should recreate inspect output' do
+    simple_node = AST::Node.new(:a, [ :sym, [ 1, 2 ] ])
+    eval(simple_node.inspect).should.equal simple_node
+    complex_node =  s(:a ,  :sym,  s(:b, s(:node,  0,  1),  s(:node,  0,  1)))
+    eval(complex_node.inspect).should.equal complex_node
+  end
+
   it 'should return self in to_ast' do
     @node.to_ast.should.be.identical_to @node
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ast
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake