sexp_processor 4.16.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ef3f53aa7901804e1d92cba1d04eb0ad8631c26a021653e4855b15da3566fc
-  data.tar.gz: e35d6224928d2f29504fa1734dcb62c6f5c984511dffac7a0538c5b163b7f6a5
+  metadata.gz: 8b30f507c9e1ef31db3410827bd5cfdd8046ff95c42587d0eed73aa6ee26fef8
+  data.tar.gz: 18fae0eec8a40801981cfc1054c8d894cc123458a5d21f47acb8f99cb4fa2882
 SHA512:
-  metadata.gz: 876af156dcbe63d56c35796dc12ae32a2447640f1fc45b47286b6197dafb733512913028c127d45517fd6e0915d7182c767ed162823406ced6402336f852280b
-  data.tar.gz: a22bec5d094bfbd59ef3b92cb2091d0279be18a2302bb88bade6c8c382d40071b404c897b137cbf7b592222b7f75407058e08282e423ce60bbcfa834e1ef58fc
+  metadata.gz: 2885be395e9829b320cd862d7a84db81356aa4fb19e65b13b47d885995af455c87419b937e6e9e3cf1777c0af7d9be927f62d6c642e853cc0f09bb68ab310089
+  data.tar.gz: 3a37439f48fb2c99f8c3ccf31702013e9be5bb133441094069e186aabd5b97565222187058d8dbfbbf4b40edef95d0328d7b8a56a31129e68916a8a17eef767d

data/History.rdoc

@@ -1,3 +1,22 @@
+=== 4.17.0 / 2023-05-03
+
+* 2 minor enhancements:
+
+  * Added Sexp#line_max=.
+  * Will load strict_sexp if $SP_DEBUG is set.
+
+* 3 bug fixes:
+
+  * Sexp#line_max lazy accessor now compacts.
+  * Sexp#new copies line_max if defined.
+  * strict_sexp.rb: #first can take an int arg. Fixed mutator wrappers to pass args.
+
+=== 4.16.1 / 2022-04-09
+
+* 1 minor enhancement:
+
+  * Reworked ParseTreeTestCase's notion of versions to make it easier to extend.
+
 === 4.16.0 / 2021-10-27
 
 * 4 minor enhancements:

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.add_include_dirs("../../ruby_parser/dev/lib")
 Hoe.spec 'sexp_processor' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  require_ruby_version [">= 2.1", "< 4"]
+  require_ruby_version [">= 2.6", "< 4"]
 
   license "MIT"
 end

data/lib/pt_testcase.rb

@@ -34,6 +34,12 @@ class Examples
 end
 
 class ParseTreeTestCase < Minitest::Test
+  all_versions  = %w[18 19 20 21 22 23 24 25 26 27 30 31 32]
+  most_versions = all_versions.drop(1)
+
+  TEST_SUFFIX = "_#{most_versions.join "_"}"
+  VER_RE      = /(#{Regexp.union(*all_versions)})/
+
   attr_accessor :processor # to be defined by subclass
 
   def setup
@@ -77,7 +83,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19_20_21_22_23_24_25_26_27_30", hash # HACK?
+    add_tests "#{name}_#{TEST_SUFFIX}", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -102,8 +108,6 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
-  VER_RE = "(1[89]|2[01234567]|3[0])"
-
   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?
@@ -1068,7 +1072,7 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby2Ruby"    => "-(2 ** 31)")
 
   add_tests("case",
-            "Ruby"         => "var = 2\nresult = \"\"\ncase var\nwhen 1 then\n  puts(\"something\")\n  result = \"red\"\nwhen 2, 3 then\n  result = \"yellow\"\nwhen 4 then\n  # do nothing\nelse\n  result = \"green\"\nend\ncase result\nwhen \"red\" then\n  var = 1\nwhen \"yellow\" then\n  var = 2\nwhen \"green\" then\n  var = 3\nelse\n  # do nothing\nend\n",
+            "Ruby"         => "var = 2\nresult = \"\"\ncase var\nwhen 1 then\n  puts(\"something\")\n  result = \"red\"\nwhen 2, 3 then\n  result = \"yellow\"\nwhen 4 then\n  # do nothing\nelse\n  result = \"green\"\nend\ncase result\nwhen \"red\" then\n  var = 1\nwhen \"yellow\" then\n  var = 2\nwhen \"green\" then\n  var = 3\nend\n",
             "ParseTree"    => s(:block,
                                 s(:lasgn, :var, s(:lit, 2)),
                                 s(:lasgn, :result, s(:str, "")),
@@ -1120,7 +1124,7 @@ class ParseTreeTestCase < Minitest::Test
                                   s(:lasgn, :result, s(:lit, 7)))))
 
   add_tests("case_nested_inner_no_expr",
-            "Ruby"         => "case a\nwhen b then\n  case\n  when (d and e) then\n    f\n  else\n    # do nothing\n  end\nelse\n  # do nothing\nend",
+            "Ruby"         => "case a\nwhen b then\n  case\n  when (d and e) then\n    f\n  end\nend",
             "ParseTree"    => s(:case, s(:call, nil, :a),
                                 s(:when,
                                   s(:array, s(:call, nil, :b)),

data/lib/sexp.rb

@@ -12,6 +12,11 @@ class Sexp < Array # ZenTest FULL
 
   attr_writer :line
 
+  ##
+  # Set the maximum line number for this sexp. Often set by ruby_parser.
+
+  attr_writer :line_max
+
   ##
   # Accessors for the file. Usually set by ruby_parser.
 
@@ -59,6 +64,7 @@ class Sexp < Array # ZenTest FULL
     r = self.class.new._concat(body) # ensures a sexp from map
     r.file     = self.file     if self.file
     r.line     = self.line     if self.line
+    r.line_max = self.line_max if defined?(@line_max)
     r.comments = self.comments if self.comments
     r
   end
@@ -233,7 +239,7 @@ class Sexp < Array # ZenTest FULL
   # Returns the maximum line number of the children of self.
 
   def line_max
-    @line_max ||= self.deep_each.map(&:line).max
+    @line_max ||= self.deep_each.map(&:line).compact.max
   end
 
   ##
@@ -388,4 +394,4 @@ def s *args, &blk
 end
 
 require "sexp_matcher" unless defined? Sexp::Matcher
-require "strict_sexp" if ENV["STRICT_SEXP"].to_i > 0
+require "strict_sexp" if ENV["SP_DEBUG"] || ENV["STRICT_SEXP"].to_i > 0

data/lib/sexp_processor.rb

@@ -34,7 +34,7 @@ require "sexp"
 class SexpProcessor
 
   # duh
-  VERSION = "4.16.0"
+  VERSION = "4.17.0"
 
   ##
   # Automatically shifts off the Sexp type before handing the

data/lib/strict_sexp.rb

@@ -83,8 +83,9 @@ class Sexp
     self.safe_asgn i, v
   end
 
-  def first
-    raise "use sexp_type"
+  def first(n = nil)
+    raise "use sexp_type" unless n
+    super
   end
 
   nuke_method :collect!, 4
@@ -136,10 +137,10 @@ if ENV["SP_DEBUG"] && !ENV["STRICT_SEXP"] then
                  ]
 
     mutators.each do |method|
-      define_method method do |*|
+      define_method method do |*args|
         warn "Sexp modified by %p at %s" % [__method__, caller.first] if
-          $VERBOSE or (defined?(@hash) and @hash)
-        super
+          ENV["VERBOSE"] or (defined?(@hash) and @hash)
+        super(*args)
       end
     end
   end

data.tar.gz.sig

@@ -1 +1 @@
-=��R�����t��m8[]U��zL��N��D�*m\+�
+��<a|�pG�/������0�YZ裱�v��-�$`�+3�x7�p

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.17.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIwMTIyMjIwMzgzMFoXDTIxMTIyMjIwMzgzMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAE3XRm1YZcCVjAJy5yMZvTOFrS7B2SYErc+0QwmKYbHztTTDY2m5Bii+jhpuxh
-  H+ETcU1z8TUKLpsBUP4kUpIRowkVN1p/jKapV8T3Rbwq+VuYFe+GMKsf8wGZSecG
-  oMQ8DzzauZfbvhe2kDg7G9BBPU0wLQlY25rDcCy9bLnD7R0UK3ONqpwvsI5I7x5X
-  ZIMXR0a9/DG+55mawwdGzCQobDKiSNLK89KK7OcNTALKU0DfgdTkktdgKchzKHqZ
-  d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
-  KToW560QIey7SPfHWduzFJnV
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.0'
 description: |-
   sexp_processor branches from ParseTree bringing all the generic sexp
   processing tools with it. Sexp, SexpProcessor, Environment, etc... all
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: sexp_processor branches from ParseTree bringing all the generic sexp processing