sexp_processor 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62c0aa828d8f1248831b41b55c5e98d555f78d72
-  data.tar.gz: 8400a9eea896d3abe596824d0d4bbd032b1aeb84
+  metadata.gz: f975ee007ac41fd5b43349710e01c3b76054708b
+  data.tar.gz: c77b1d3a11a080df070b3f987703b476603f992b
 SHA512:
-  metadata.gz: 43948ed14ddf302790cc948f6c6587cfe8dd51a80eede842c1d3fae7305a3263fde9ee88c9bbebf3f701eed20c6c83c5ff06d7f5105156f943afa522bfe9dbee
-  data.tar.gz: bc347b20545780e71531eb702d215a83eff13b7aeb8149e6dc62e2716db4ea8b7f16886ca6c73dcef1b773201b1e159d7f9ca0f957b9504408f7dad6ffae9e86
+  metadata.gz: 02edf0e83cc7752fbe124ce8e69a5b8a7199ac5fb878020d7532dd49b2d333858d044d78e92aec6d15b2429fecc3d69a6d5bb14ea18e30ad74d789eb16a44b8d
+  data.tar.gz: 69652aa589311f238917f6e62eb769aa19f9a8ca76df815d9cfdc53ad8d1ea79a4357fae224594f04d63bbec14697c45a8e2989e0eabaa8bcd613ac7fd96759a

data/History.txt

@@ -1,3 +1,14 @@
+=== 4.6.0 / 2015-05-28
+
+* 2 minor enhancements:
+
+  * Extended generate_test to deal with 19 and up.
+  * Extended pt_testcase.rb so add_19tests means 19 and up.
+
+* 1 bug fix:
+
+  * Added and normalized tests to deal with canonicalized block args from ruby_parser.
+
 === 4.5.1 / 2015-04-27
 
 * 1 minor enhancement:

data/lib/pt_testcase.rb

@@ -76,7 +76,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19", hash
+    add_tests "#{name}__19_20_21_22", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -101,15 +101,19 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
+  VER_RE = "(1[89]|2[012])"
+
   def self.generate_test klass, node, data, input_name, output_name
     klass.send :define_method, "test_#{node}" do
       flunk "Processor is nil" if processor.nil?
 
-      if node =~ /(1[89]|2[01])$/ then
-        version = $1
+      tversions = node[/(?:_#{VER_RE})+$/]
+      if tversions then
+        cversion = self.class.name[/#{VER_RE}/]
+
         # can't push this up because it may be generating into an
         # abstract test class and the actual subclass is versioned.
-        return "version specific test" unless self.class.name =~ /#{version}/
+        return "version specific test" unless tversions.include? cversion if cversion
       end
 
       assert data.has_key?(input_name), "Unknown input data"
@@ -357,12 +361,18 @@ class ParseTreeTestCase < Minitest::Test
   # 1.9 specific tests
 
   add_19edgecases("lambda { || (x + 1) }",
+                  s(:iter,
+                    s(:call, nil, :lambda),
+                    s(:args),
+                    s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
+                  "stabby_args"                   => "->() { (x + 1) }",
+                  "stabby_args_doend"             => "->() do (x + 1) end")
+
+  add_19edgecases("lambda { (x + 1) }",
                   s(:iter,
                     s(:call, nil, :lambda),
                     0,
                     s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
-                  "stabby_args_0"                 => "->() { (x + 1) }",
-                  "stabby_args_0_doend"           => "->() do (x + 1) end",
                   "stabby_args_0_no_parens"       => "-> { (x + 1) }",
                   "stabby_args_0_no_parens_doend" => "-> do (x + 1) end",
                   "stabby_args_0_spacebar_broken" => "->{x+1}") # I hate you
@@ -813,7 +823,7 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "a(b) do\n  if b then\n    true\n  else\n    c = false\n    d { |x| c = true }\n    c\n  end\nend",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :a, s(:call, nil, :b)),
-                                s(:args),
+                                0,
                                 s(:if,
                                   s(:call, nil, :b),
                                   s(:true),
@@ -970,14 +980,14 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "loop { break if true }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :loop),
-                                s(:args),
+                                0,
                                 s(:if, s(:true), s(:break), nil)))
 
   add_tests("break_arg",
             "Ruby"         => "loop { break 42 if true }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :loop),
-                                s(:args),
+                                0,
                                 s(:if, s(:true), s(:break, s(:lit, 42)), nil)))
 
   add_tests("call",
@@ -1282,13 +1292,13 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "a do\n  v = nil\n  assert_block(full_message) do\n    begin\n      yield\n    rescue Exception => v\n      break\n    end\n  end\nend",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :a),
-                                s(:args),
+                                0,
                                 s(:block,
                                   s(:lasgn, :v, s(:nil)),
                                   s(:iter,
                                     s(:call, nil, :assert_block,
                                       s(:call, nil, :full_message)),
-                                    s(:args),
+                                    0,
                                     s(:rescue,
                                       s(:yield),
                                       s(:resbody,
@@ -1720,7 +1730,7 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "a(:b) { :c }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :a, s(:lit, :b)),
-                                s(:args),
+                                0,
                                 s(:lit, :c)))
 
   add_tests("fcall_index_space",
@@ -1943,7 +1953,7 @@ class ParseTreeTestCase < Minitest::Test
 
   add_tests("iter_loop_empty",
             "Ruby"         => "loop { }",
-            "ParseTree"    => s(:iter, s(:call, nil, :loop), s(:args)))
+            "ParseTree"    => s(:iter, s(:call, nil, :loop), 0))
 
   add_tests("iter_masgn_2",
             "Ruby"         => "a { |b, c| p(c) }",
@@ -2181,7 +2191,7 @@ class ParseTreeTestCase < Minitest::Test
                                 s(:defn, :a, s(:args),
                                   s(:iter,
                                     s(:call, nil, :c),
-                                    s(:args),
+                                    0,
                                     s(:rescue,
                                       s(:call, nil, :do_stuff),
                                       s(:resbody,
@@ -2394,14 +2404,14 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "loop { next if false }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :loop),
-                                s(:args),
+                                0,
                                 s(:if, s(:false), s(:next), nil)))
 
   add_tests("next_arg",
             "Ruby"         => "loop { next 42 if false }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :loop),
-                                s(:args),
+                                0,
                                 s(:if, s(:false), s(:next, s(:lit, 42)), nil)))
 
   add_tests("nth_ref",
@@ -2551,13 +2561,13 @@ class ParseTreeTestCase < Minitest::Test
 
   add_tests("postexe",
             "Ruby"         => "END { 1 }",
-            "ParseTree"    => s(:iter, s(:postexe), s(:args), s(:lit, 1)))
+            "ParseTree"    => s(:iter, s(:postexe), 0, s(:lit, 1)))
 
   add_tests("proc_args_0",
             "Ruby"         => "proc { || (x + 1) }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :proc),
-                                0,
+                                s(:args),
                                 s(:call, s(:call, nil, :x), :+, s(:lit, 1))))
 
   add_tests("proc_args_1",
@@ -2578,14 +2588,14 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "proc { (x + 1) }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :proc),
-                                s(:args),
+                                0,
                                 s(:call, s(:call, nil, :x), :+, s(:lit, 1))))
 
   add_tests("redo",
             "Ruby"         => "loop { redo if false }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :loop),
-                                s(:args),
+                                0,
                                 s(:if, s(:false), s(:redo), nil)))
 
   add_tests("rescue",  # TODO: need a resbody w/ multiple classes and a splat

data/lib/sexp_processor.rb

@@ -33,7 +33,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = "4.5.1"
+  VERSION = "4.6.0"
 
   ##
   # Automatically shifts off the Sexp type before handing the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
   VpzF30vNaJK6ZT7xlIsIlwmH
   -----END CERTIFICATE-----
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement