sexp_processor 4.12.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33c4da3c4f6c19506d4aee6f94e76dca65aa94a3af108f751bd916cfbd0cb8f
-  data.tar.gz: de4b25babc82dc51481153180ae65a5d9ab54079c3d2b77519666ff8b537f3fa
+  metadata.gz: 2fe32dcd3e36da0a96d86a6a1a7fd60dd8cef96ebd1e0d1b0d87338e3d7fee85
+  data.tar.gz: d55a40a0ed66d6d84cf653efba498f01d64fba61e7fd4a9eb87caa04f8dcb396
 SHA512:
-  metadata.gz: 34e1e1f066956df4c8b71e96a2183c62183c02628ef7e7193f0c7bd48897960e4c7a47a9e08e8e9dcd02b7d202f6f2a6072511cf8d231932bb3e12de9799feef
-  data.tar.gz: 28d1ef553de797ccdb2f00fdd3b81b1c05d26dd7ce7b8e4fbb397e175fcb7d45d2647a684c1b3b6778f01df38ef6544e151ec3484f3349257ab7de3eb5f4a586
+  metadata.gz: 8574bf015b701313f58aa5650b963ab35f9119567826606190658640ee32c870ce957ad73e0b2e17b6350c9217fb691383f8794d91d152a4ff2c18873cb18d5b
+  data.tar.gz: 4a0a6754c29ac19d5654a3a8909a1fd233bfa1831fce155e9c4bee3e25143923693d84a2019079965f507fef34e0502ac412621a671076ba45ce42a312ccbac3

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 4.12.1 / 2019-06-03
+
+* 1 minor enhancement:
+
+  * Sexp#line now raises if setting w/ non-integer (eg nil).
+
+* 3 bug fixes:
+
+  * Fixed pt_testcase.rb for block args w/ trailing commas.
+  * Fixed pt_testcase.rb for stabby proc sexps.
+  * Simple fixes for STRICT_SEXP=1.
+
 === 4.12.0 / 2019-03-12
 
 * 3 bug fixes:

data/lib/pt_testcase.rb

@@ -363,26 +363,26 @@ class ParseTreeTestCase < Minitest::Test
   ###
   # 1.9 specific tests
 
-  add_19edgecases("lambda { || (x + 1) }",
+  add_19edgecases("-> () { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(: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) }",
+  add_19edgecases("-> { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     0,
                     s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
                   "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
 
-  add_19edgecases("lambda { |x, y| (x + y) }",
+  add_19edgecases("-> (x, y) { (x + y) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args, :x, :y),
                     s(:call, s(:lvar, :x), :+, s(:lvar, :y))),
                   "stabby_args_2"                 => "->(x, y) { (x + y) }",
@@ -390,9 +390,9 @@ class ParseTreeTestCase < Minitest::Test
                   "stabby_args_2_no_parens"       => "-> x, y { (x + y) }",
                   "stabby_args_2_no_parens_doend" => "-> x, y do (x + y) end")
 
-  add_19edgecases("lambda { |x| (x + 1) }",
+  add_19edgecases("-> (x) { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args, :x),
                     s(:call, s(:lvar, :x), :+, s(:lit, 1))),
                   "stabby_args_1"                 => "->(x) { (x + 1) }",
@@ -2080,17 +2080,15 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "lambda { |a,| a }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :lambda),
-                                s(:args, :a),
-                                s(:lvar, :a)),
-            "Ruby2Ruby"    => "lambda { |a| a }")
+                                s(:args, :a, nil),
+                                s(:lvar, :a)))
 
   add_tests("lambda_args_norm_comma2",
-            "Ruby"         => "lambda { |a,b,| a }",
+            "Ruby"         => "lambda { |a, b,| a }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :lambda),
-                                s(:args, :a, :b),
-                                s(:lvar, :a)),
-            "Ruby2Ruby"    => "lambda { |a, b| a }")
+                                s(:args, :a, :b, nil),
+                                s(:lvar, :a)))
 
   add_tests("lambda_args_norm_star",
             "Ruby"         => "lambda { |a, *star| star }",

data/lib/sexp.rb

@@ -202,13 +202,16 @@ class Sexp < Array # ZenTest FULL
     each_sexp.find_all { |sexp| sexp.sexp_type == name }
   end
 
+  UNASSIGNED = Object.new
+
   ##
   # If passed a line number, sets the line and returns self. Otherwise
   # returns the line number. This allows you to do message cascades
   # and still get the sexp back.
 
-  def line n = nil
-    if n then
+  def line n = UNASSIGNED
+    if n != UNASSIGNED then
+      raise ArgumentError, "setting %p.line %p" % [self, n] unless Integer === n
       @line = n
       self
     else

data/lib/sexp_processor.rb

@@ -34,7 +34,7 @@ require "sexp"
 class SexpProcessor
 
   # duh
-  VERSION = "4.12.0"
+  VERSION = "4.12.1"
 
   ##
   # Automatically shifts off the Sexp type before handing the
@@ -317,7 +317,7 @@ class SexpProcessor
 
   def assert_type list, typ
     raise SexpTypeError, "Expected type #{typ.inspect} in #{list.inspect}" if
-      not Array === list or list.first != typ
+      not Array === list or list.sexp_type != typ
   end
 
   def error_handler type, exp = nil # :nodoc:

data/test/test_sexp_processor.rb

@@ -247,12 +247,12 @@ class TestSexpProcessor < Minitest::Test
   end
 
   def test_assert_type_hit
-    assert_nil @processor.assert_type([:blah, 1, 2, 3], :blah)
+    assert_nil @processor.assert_type(s(:blah, 1, 2, 3), :blah)
   end
 
   def test_assert_type_miss
     assert_raises SexpTypeError do
-      @processor.assert_type([:thingy, 1, 2, 3], :blah)
+      @processor.assert_type(s(:thingy, 1, 2, 3), :blah)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc