sexp_processor 4.8.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11e44f6312c253038fcf1ab9039d20f03e7703e0
-  data.tar.gz: 8fdd674b9c830e9436d27941d6c041fe3e3cb7eb
+  metadata.gz: c8a4cb1d34e3c86a00ee122db28cf4d3b7d2ef34
+  data.tar.gz: bec449692c425f44e6e40da22b7dae0192956640
 SHA512:
-  metadata.gz: 6e012cc2080b582e0c34217331594f3d0442f259828e370164147bbcfd78347490e402b66db482ab3c1205a219b8b74043c34d9c4633de768afc9f1a5fbed402
-  data.tar.gz: 293726bd82c8cb6bdbd05efbcb4046889afa9284e805c481e8532f573d1aaadc8e9eec4dfecf7cea73a3e86193cf5e0237090caa1631607d1fa63c9ee121cd1a
+  metadata.gz: 7ca8f74ecc9e62dc1dd2d2eb272b0cd2502255fa956c75bf8bdad60990070ec05a03d8806c6acf6f61f6d30915b5d3caea73410c551f1a21c7eb528d085f7553
+  data.tar.gz: ef4dde66d8a7a6903ddad8520c1bba5ac2885c3fea7a13d54f4d6affd7e42780e78faaebf7c70aa7b26a4aca650673c26d9f39a166bebb1d1cd201e31be25bc0

data/History.txt

@@ -1,3 +1,17 @@
+=== 4.9.0 / 2017-04-13
+
+* 9 minor enhancements:
+
+  * Added Sexp.depth
+  * Added Sexp.sexp_type=
+  * Cache Sexp.line_max. Massively speeds up large flay runs.
+  * Cleaned up SexpProcessor.process handling of result node type.
+  * Extend pt_testcase for ruby 2.4 tests.
+  * Extended Sexp.method_missing to only print on every invocation if $VERBOSE=1
+  * Extended Sexp.method_missing to warn if the expected sub-sexp is not found.
+  * Rewrote Sexp.mass to be MUCH faster. Helps tremendously with flay on large files.
+  * Warn that Sexp#method_missing was tripped if $DEBUG.
+
 === 4.8.0 / 2017-02-01
 
 * 2 minor enhancements:

data/lib/pt_testcase.rb

@@ -76,7 +76,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19_20_21_22_23", hash # HACK?
+    add_tests "#{name}__19_20_21_22_23_24", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -101,7 +101,7 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
-  VER_RE = "(1[89]|2[0123])"
+  VER_RE = "(1[89]|2[01234])"
 
   def self.generate_test klass, node, data, input_name, output_name
     klass.send :define_method, "test_#{node}" do

data/lib/sexp.rb

@@ -95,6 +95,10 @@ class Sexp < Array # ZenTest FULL
     end
   end
 
+  def depth
+    1 + (each_sexp.map(&:depth).max || 0)
+  end
+
   ##
   # Enumeratates the sexp yielding to +b+ when the node_type == +t+.
 
@@ -203,21 +207,36 @@ class Sexp < Array # ZenTest FULL
   # Returns the maximum line number of the children of self.
 
   def line_max
-    self.deep_each.map(&:line).max
+    @line_max ||= self.deep_each.map(&:line).max
   end
 
   ##
   # Returns the size of the sexp, flattened.
 
   def mass
-    @mass ||= self.structure.flatten.size
+    @mass ||=
+      inject(1) { |t, s|
+      if Sexp === s then
+        t + s.mass
+      else
+        t
+      end
+    }
   end
 
   ##
   # Returns the node named +node+, deleting it if +delete+ is true.
 
   def method_missing meth, delete = false
-    find_node meth, delete
+    r = find_node meth, delete
+    if ENV["DEBUG"] then
+      if r.nil? then
+        warn "%p.method_missing(%p) => nil from %s" % [self, meth, caller.first]
+      elsif ENV["VERBOSE"]
+        warn "%p.method_missing(%p) from %s" % [self, meth, caller.first]
+      end
+    end
+    r
   end
 
   def respond_to? msg, private = false # :nodoc:
@@ -241,6 +260,13 @@ class Sexp < Array # ZenTest FULL
     first
   end
 
+  ##
+  # Sets the node type of the Sexp.
+
+  def sexp_type= v
+    self[0] = v
+  end
+
   ##
   # Returns the Sexp body, ie the values without the node type.
 

data/lib/sexp_processor.rb

@@ -33,7 +33,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = "4.8.0"
+  VERSION = "4.9.0"
 
   ##
   # Automatically shifts off the Sexp type before handing the
@@ -278,12 +278,7 @@ class SexpProcessor
 
           # NOTE: this is costly, but we are in the generic processor
           # so we shouldn't hit it too much with RubyToC stuff at least.
-          #if Sexp === exp and not exp.sexp_type.nil? then
-          begin
-            result.sexp_type = exp.sexp_type
-          rescue Exception
-            # nothing to do, on purpose
-          end
+          result.sexp_type = exp.sexp_type if Sexp === exp and exp.sexp_type
         else
           msg = "Bug! Unknown node-type #{type.inspect} to #{self.class}"
           msg += " in #{exp_orig.inspect} from #{caller.inspect}" if $DEBUG

data/test/test_sexp.rb

@@ -1,10 +1,24 @@
 $TESTING = true
 
 require 'minitest/autorun'
+require "minitest/benchmark" if ENV["BENCH"]
 require 'sexp_processor'
 require 'stringio'
 require 'pp'
 
+def pyramid_sexp max
+  # s(:array,
+  #   s(:array, s(:s, 1)),
+  #   s(:array, s(:s, 1), s(:s, 2)),
+  #   ...
+  #   s(:array, s(:s, 1), s(:s, 2), ... s(:s, max-1)))
+
+  s(:array,
+    *(1...max).map { |n|
+      s(:array, *(1..n).map { |m|
+          s(:s, m) })})
+end
+
 class SexpTestCase < Minitest::Test
   # KEY for regex tests
   # :a == no change
@@ -235,6 +249,15 @@ class TestSexp < SexpTestCase # ZenTest FULL
     assert_equal 7, s.mass
   end
 
+  def test_mass_huge
+    max = 100
+    sexp = pyramid_sexp max
+
+    exp = (max*max + max)/2 # pyramid number 1+2+3+...+m
+
+    assert_equal exp, sexp.mass
+  end
+
   def test_method_missing
     assert_nil @sexp.not_there
     assert_equal s(:lit, 42), @basic_sexp.lit
@@ -342,6 +365,13 @@ class TestSexp < SexpTestCase # ZenTest FULL
     assert_equal [42], @basic_sexp.each_sexp.map { |_, n| n }
   end
 
+  def test_depth
+    assert_equal 1, s(:a).depth
+    assert_equal 2, s(:a, s(:b)).depth
+    assert_equal 3, s(:a, s(:b1, s(:c)), s(:b2)).depth
+    assert_equal 5, s(:a, s(:b, s(:c, s(:d, s(:e))))).depth
+  end
+
   def test_deep_each
     result = []
     @complex_sexp.deep_each { |s| result << s if s.first == :if }
@@ -373,3 +403,30 @@ class TestSexpAny < SexpTestCase
   end
 
 end
+
+class BenchSexp < Minitest::Benchmark
+  def run
+    GC.disable
+    super
+  ensure
+    GC.enable
+  end
+
+  def self.bench_range
+    bench_linear 100, 500, 50
+  end
+
+  @@data = Hash[bench_range.map { |n| [n, pyramid_sexp(n)] }]
+
+  def bench_pyramid
+    assert_performance_power do |max|
+      pyramid_sexp max
+    end
+  end
+
+  def bench_mass
+    assert_performance_power do |max|
+      @@data[max].mass
+    end
+  end
+end if ENV["BENCH"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
   fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc