brakeman 7.1.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388dbae9faa71cc1f26c5e63f748019d7b1570f24a9faa83ce90deabb2298675
-  data.tar.gz: b210a9e0c13a75ccce1c7897f39906331cfeda3ad46e14c682e299d0e35ac2bf
+  metadata.gz: 49ebce7c5b36fd14e30b08390083b297cafca5d188f7b57a50b872c466958479
+  data.tar.gz: 6c71f882538ebef7c9802018793032fe10213be7537b9f88465e1390babc12bb
 SHA512:
-  metadata.gz: 4f9f5579aa7005921ca0da113900acd19a2506cdd5e774fb91bb5f89ab7f4bc51d666b246460ef51c68e0e0810e686453e492fc37dd4b0fceedb5eb3ba845327
-  data.tar.gz: 4d31c48d9cfd10a80ea070297baf4bfc37d4b807931e54d7fa80769d7bd8ce263a211bd27d1d2c35d492efaadad4aeec5a7bc8f17f2c34589e9699450075bd53
+  metadata.gz: c24948824de7bbbb8242acf97bf21c12306e25540cde8510cb292a041573b05309b7db5973caa78e0acda30868d82361e75f6bf1f0c4d8129065b773d4a98917
+  data.tar.gz: e312665bc3680ce63f8b9c416bbf77966b8aba5d9666533252e9b4e8540353a01b49261d21281455a601e7becd3f5bbf068cf8b81edad862d910d7479a6f24c6

data/CHANGES.md

@@ -1,3 +1,11 @@
+# 7.1.2 - 2025-12-25
+
+* Update `ruby_parser` to remove version restriction (Chedli Bourguiba)
+* Raise minimum required Ruby to 3.2.0
+* Use Minitest 6.0
+* Reduce SQL injection false positives from `count` calls
+* Ignore more Haml attribute builder methods
+
 # 7.1.1 - 2025-11-03
 
 * Fix false positive when calling `with_content` on ViewComponents (Peer Allan)

data/README.md

@@ -65,7 +65,7 @@ Outside of Rails root (note that the output file is relative to path/to/rails/ap
 
 Brakeman should work with any version of Rails from 2.3.x to 8.x.
 
-Brakeman can analyze code written with Ruby 2.0 syntax and newer, but requires at least Ruby 3.0.0 to run.
+Brakeman can analyze code written with Ruby 2.0 syntax and newer, but requires at least Ruby 3.2.0 to run.
 
 # Basic Options
 
@@ -75,7 +75,7 @@ To specify an output file for the results:
 
     brakeman -o output_file
 
-The output format is determined by the file extension or by using the `-f` option. Current options are: `text`, `html`, `tabs`, `json`, `junit`, `markdown`, `csv`, `codeclimate`, and `sonar`.
+The output format is determined by the file extension or by using the `-f` option. Current options are: `text`, `html`, `tabs`, `json`, `junit`, `markdown`, `csv`, `codeclimate`, `github` and `sonar`.
 
 Multiple output files can be specified:
 

data/bundle/load.rb

@@ -1,17 +1,17 @@
 path = File.expand_path('../..', __FILE__)
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/csv-3.3.5/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/erubis-2.7.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/haml-6.4.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/highline-3.1.2/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/parallel-1.27.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/reline-0.6.2/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/rexml-3.4.4/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/ruby2ruby-2.5.2/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/ruby_parser-3.20.3/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/sexp_processor-4.17.4/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/slim-5.2.1/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/temple-0.10.4/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/terminal-table-4.0.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/tilt-2.6.1/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/unicode-display_width-3.2.0/lib"
-$:.unshift "#{path}/bundle/ruby/3.1.0/gems/unicode-emoji-4.1.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/csv-3.3.5/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/erubis-2.7.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/haml-6.4.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/highline-3.1.2/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/parallel-1.27.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/reline-0.6.3/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/rexml-3.4.4/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/ruby2ruby-2.5.2/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/ruby_parser-3.22.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/sexp_processor-4.17.5/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/slim-5.2.1/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/temple-0.10.4/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/terminal-table-4.0.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/tilt-2.6.1/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/unicode-display_width-3.2.0/lib"
+$:.unshift "#{path}/bundle/ruby/3.2.0/gems/unicode-emoji-4.2.0/lib"

data/bundle/ruby/{3.1.0/gems/reline-0.6.2 → 3.2.0/gems/reline-0.6.3}/lib/reline/io/ansi.rb

@@ -167,17 +167,6 @@ class Reline::ANSI < Reline::IO
     @buf.unshift(c)
   end
 
-  def retrieve_keybuffer
-    begin
-      return unless @input.wait_readable(0.001)
-      str = @input.read_nonblock(1024)
-      str.bytes.each do |c|
-        @buf.push(c)
-      end
-    rescue EOFError
-    end
-  end
-
   def get_screen_size
     s = @input.winsize
     return s if s[0] > 0 && s[1] > 0
@@ -309,7 +298,6 @@ class Reline::ANSI < Reline::IO
   def prep
     # Enable bracketed paste
     write "\e[?2004h" if Reline.core.config.enable_bracketed_paste && both_tty?
-    retrieve_keybuffer
     nil
   end
 

data/bundle/ruby/{3.1.0/gems/reline-0.6.2 → 3.2.0/gems/reline-0.6.3}/lib/reline/line_editor.rb

@@ -948,7 +948,7 @@ class Reline::LineEditor
 
   def wrap_method_call(method_symbol, key, with_operator)
     if @waiting_proc
-      @waiting_proc.call(key)
+      @waiting_proc.call(key, method_symbol)
       return
     end
 
@@ -1434,21 +1434,24 @@ class Reline::LineEditor
   end
   alias_method :end_of_line, :ed_move_to_end
 
-  private def generate_searcher(search_key)
+  private def generate_searcher(direction)
     search_word = String.new(encoding: encoding)
     hit_pointer = nil
-    lambda do |key|
+    lambda do |key, key_symbol|
       search_again = false
-      case key
-      when "\C-h", "\C-?"
+      case key_symbol
+      when :em_delete_prev_char, :backward_delete_char
         grapheme_clusters = search_word.grapheme_clusters
         if grapheme_clusters.size > 0
           grapheme_clusters.pop
           search_word = grapheme_clusters.join
         end
-      when "\C-r", "\C-s"
-        search_again = true if search_key == key
-        search_key = key
+      when :reverse_search_history, :vi_search_prev
+        search_again = direction == :reverse
+        direction = :reverse
+      when :forward_search_history, :vi_search_next
+        search_again = direction == :forward
+        direction = :forward
       else
         search_word << key
       end
@@ -1462,11 +1465,11 @@ class Reline::LineEditor
             search_word = Reline.last_incremental_search
           end
           if @history_pointer
-            case search_key
-            when "\C-r"
+            case direction
+            when :reverse
               history_pointer_base = 0
               history = Reline::HISTORY[0..(@history_pointer - 1)]
-            when "\C-s"
+            when :forward
               history_pointer_base = @history_pointer + 1
               history = Reline::HISTORY[(@history_pointer + 1)..-1]
             end
@@ -1475,11 +1478,11 @@ class Reline::LineEditor
             history = Reline::HISTORY
           end
         elsif @history_pointer
-          case search_key
-          when "\C-r"
+          case direction
+          when :reverse
             history_pointer_base = 0
             history = Reline::HISTORY[0..@history_pointer]
-          when "\C-s"
+          when :forward
             history_pointer_base = @history_pointer
             history = Reline::HISTORY[@history_pointer..-1]
           end
@@ -1487,12 +1490,12 @@ class Reline::LineEditor
           history_pointer_base = 0
           history = Reline::HISTORY
         end
-        case search_key
-        when "\C-r"
+        case direction
+        when :reverse
           hit_index = history.rindex { |item|
             item.include?(search_word)
           }
-        when "\C-s"
+        when :forward
           hit_index = history.index { |item|
             item.include?(search_word)
           }
@@ -1502,31 +1505,28 @@ class Reline::LineEditor
           hit = Reline::HISTORY[hit_pointer]
         end
       end
-      case search_key
-      when "\C-r"
-        prompt_name = 'reverse-i-search'
-      when "\C-s"
-        prompt_name = 'i-search'
-      end
+      prompt_name = direction == :forward ? 'i-search' : 'reverse-i-search'
       prompt_name = "failed #{prompt_name}" unless hit
       [search_word, prompt_name, hit_pointer]
     end
   end
 
-  private def incremental_search_history(key)
+  private def incremental_search_history(direction)
     backup = @buffer_of_lines.dup, @line_index, @byte_pointer, @history_pointer, @line_backup_in_history
-    searcher = generate_searcher(key)
-    @searching_prompt = "(reverse-i-search)`': "
+    searcher = generate_searcher(direction)
+    prompt_name = direction == :forward ? 'i-search' : 'reverse-i-search'
+    @searching_prompt = "(#{prompt_name})`': "
     termination_keys = ["\C-j"]
     termination_keys.concat(@config.isearch_terminators.chars) if @config.isearch_terminators
-    @waiting_proc = ->(k) {
+    accept_key_syms = [:em_delete_prev_char, :backward_delete_char, :vi_search_prev, :vi_search_next, :reverse_search_history, :forward_search_history]
+    @waiting_proc = ->(k, key_symbol) {
       if k == "\C-g"
         # cancel search and restore buffer
         @buffer_of_lines, @line_index, @byte_pointer, @history_pointer, @line_backup_in_history = backup
         @searching_prompt = nil
         @waiting_proc = nil
-      elsif !termination_keys.include?(k) && (k.match?(/[[:print:]]/) || k == "\C-h" || k == "\C-?" || k == "\C-r" || k == "\C-s")
-        search_word, prompt_name, hit_pointer = searcher.call(k)
+      elsif !termination_keys.include?(k) && (k.match?(/[[:print:]]/) || accept_key_syms.include?(key_symbol))
+        search_word, prompt_name, hit_pointer = searcher.call(k, key_symbol)
         Reline.last_incremental_search = search_word
         @searching_prompt = "(%s)`%s'" % [prompt_name, search_word]
         @searching_prompt += ': ' unless @is_multiline
@@ -1541,12 +1541,12 @@ class Reline::LineEditor
   end
 
   private def vi_search_prev(key)
-    incremental_search_history(key)
+    incremental_search_history(:reverse)
   end
   alias_method :reverse_search_history, :vi_search_prev
 
   private def vi_search_next(key)
-    incremental_search_history(key)
+    incremental_search_history(:forward)
   end
   alias_method :forward_search_history, :vi_search_next
 
@@ -2182,7 +2182,7 @@ class Reline::LineEditor
   end
 
   private def vi_replace_char(key, arg: 1)
-    @waiting_proc = ->(k) {
+    @waiting_proc = ->(k, _sym) {
       if arg == 1
         byte_size = Reline::Unicode.get_next_mbchar_size(current_line, @byte_pointer)
         before = current_line.byteslice(0, @byte_pointer)
@@ -2206,11 +2206,11 @@ class Reline::LineEditor
   end
 
   private def vi_next_char(key, arg: 1, inclusive: false)
-    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, inclusive: inclusive) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_next_char(key_for_proc, arg, inclusive: inclusive) }
   end
 
   private def vi_to_next_char(key, arg: 1, inclusive: false)
-    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, need_prev_char: true, inclusive: inclusive) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_next_char(key_for_proc, arg, need_prev_char: true, inclusive: inclusive) }
   end
 
   private def search_next_char(key, arg, need_prev_char: false, inclusive: false)
@@ -2253,11 +2253,11 @@ class Reline::LineEditor
   end
 
   private def vi_prev_char(key, arg: 1)
-    @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_prev_char(key_for_proc, arg) }
   end
 
   private def vi_to_prev_char(key, arg: 1)
-    @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg, true) }
+    @waiting_proc = ->(key_for_proc, _sym) { search_prev_char(key_for_proc, arg, true) }
   end
 
   private def search_prev_char(key, arg, need_next_char = false)

data/bundle/ruby/{3.1.0/gems/reline-0.6.2 → 3.2.0/gems/reline-0.6.3}/lib/reline/unicode.rb

@@ -37,7 +37,7 @@ class Reline::Unicode
 
   NON_PRINTING_START = "\1"
   NON_PRINTING_END = "\2"
-  CSI_REGEXP = /\e\[[\d;]*[ABCDEFGHJKSTfminsuhl]/
+  CSI_REGEXP = /\e\[[\x30-\x3f]*[\x20-\x2f]*[a-zA-Z]/
   OSC_REGEXP = /\e\]\d+(?:;[^;\a\e]+)*(?:\a|\e\\)/
   WIDTH_SCANNER = /\G(?:(#{NON_PRINTING_START})|(#{NON_PRINTING_END})|(#{CSI_REGEXP})|(#{OSC_REGEXP})|(\X))/o
 

data/bundle/ruby/3.2.0/gems/reline-0.6.3/lib/reline/version.rb

@@ -0,0 +1,3 @@
+module Reline
+  VERSION = '0.6.3'
+end

data/bundle/ruby/{3.1.0/gems/ruby_parser-3.20.3 → 3.2.0/gems/ruby_parser-3.22.0}/History.rdoc

@@ -1,3 +1,70 @@
+=== 3.22.0 / 2025-12-20
+
+* 1 major enhancement:
+
+  * Announced the EOL of ruby_parser! YAY!
+
+* 6 minor enhancements:
+
+  * 3.3: working down the grammar structural differences.
+  * Added tentative 3.4 support.
+  * Renamed assignable to old_assignable and added newer cleaner assignable
+  * Restructured comparison rake tasks and normalization to deal with lrama changes.
+  * Updated compare versions and added 3.4.
+  * Updated grammars to fit most closely to ruby 3.2. Working it down the line.
+
+* 11 bug fixes:
+
+  * Always raise RubyParser::SyntaxError (wrap and raise).
+  * Bumped ruby version to 3.2+.
+  * Cleaned up user_variable productions to always return sexps.
+  * Corrections and enhancements for gauntlet.md instructions.
+  * Fixed rake compare's clean subtask to nuke the unpacked ruby dirs entirely.
+  * Fixed superclass of V34.
+  * Fixed up a couple errors created by using STRICT_SEXP=2. 3 will be neigh impossible.
+  * I am nothing if not stubborn: fixed errors caused by STRICT_SEXP=3.
+  * Minor fixes for 3.2+ grammars on "defined?" expressions.
+  * Removed a lot of ancient compatibility checks and patches. (eg encodings)
+  * This in turn cleaned up var_ref and a bunch of other productions.
+
+=== 3.21.1 / 2024-07-09
+
+* 1 bug fix:
+
+  * Fix errors created when string literals are frozen.
+
+=== 3.21.0 / 2024-01-15
+
+* 18 minor enhancements:
+
+  * (internal) Added simple RubyLexer#comment.
+  * (internal) Removed RubyLexer#comments and #ignore_body_comments.
+  * (internal) Removed RubyParser#comments.
+  * (internal) Renamed files from lib/ruby##_parser.* to lib/ruby_parser##.*
+  * (internal) Renamed lib/ruby3_parser.yy to lib/ruby_parser3.yy
+  * (internal) Renamed lib/ruby_parser.yy to lib/ruby_parser2.yy
+  * Added tentative 3.2 support. (torrocus)
+  * Made `rake compare` a multitask (28s -> 10s!!).
+  * Made `rake compare` depend on `generate` (from clean: 28s -> 18s).
+  * No longer package versioned .y files.
+  * Overhaul of parser/lexer comment processing.
+  * Parser productions for k_class/k_module/k_def carry their comment with them.
+  * Restructured build tasks to utilize Hoe's .yy support! 8.5s -> 1.2s!!!
+  * RubyParser new_(class|module|defn|defs) handle comment processing via sexp.
+  * RubyParser new_(class|module|defn|defs) handle normalizing production sexps.
+  * RubyParser#next_token clears out lexer's comment when applicable.
+  * Simplified parser productions for defn_head, defs_head. No more normalizing.
+  * Updated `rake compare` steps for lrama in ruby 3.3+.
+
+* 6 bug fixes:
+
+  * Cleaned out cruft from `rake compare` code.
+  * Fixed compare/normalize.rb for lrama differences.
+  * Made `parser` task depend on `isolate` task to pick up racc generator.
+  * Made racc a runtime dependency (was dev only) now that ruby 3.3 doesn't ship with the racc runtime. (wildmaples)
+  * Updated README.rdoc updating instructions to match current filenames.
+  * Updated compare versions and added 3.3.
+
 === 3.20.3 / 2023-07-11
 
 * 2 minor enhancements:

data/bundle/ruby/3.2.0/gems/ruby_parser-3.22.0/Manifest.txt

@@ -0,0 +1,39 @@
+.autotest
+History.rdoc
+Manifest.txt
+README.rdoc
+Rakefile
+bin/ruby_parse
+bin/ruby_parse_extract_error
+compare/normalize.rb
+debugging.md
+gauntlet.md
+lib/.document
+lib/rp_extensions.rb
+lib/rp_stringscanner.rb
+lib/ruby_lexer.rb
+lib/ruby_lexer.rex
+lib/ruby_lexer.rex.rb
+lib/ruby_lexer_strings.rb
+lib/ruby_parser.rb
+lib/ruby_parser2.yy
+lib/ruby_parser20.rb
+lib/ruby_parser21.rb
+lib/ruby_parser22.rb
+lib/ruby_parser23.rb
+lib/ruby_parser24.rb
+lib/ruby_parser25.rb
+lib/ruby_parser26.rb
+lib/ruby_parser27.rb
+lib/ruby_parser3.yy
+lib/ruby_parser30.rb
+lib/ruby_parser31.rb
+lib/ruby_parser32.rb
+lib/ruby_parser33.rb
+lib/ruby_parser34.rb
+lib/ruby_parser_extras.rb
+test/test_ruby_lexer.rb
+test/test_ruby_parser.rb
+test/test_ruby_parser_extras.rb
+tools/munge.rb
+tools/ripper.rb

data/bundle/ruby/{3.1.0/gems/ruby_parser-3.20.3 → 3.2.0/gems/ruby_parser-3.22.0}/README.rdoc

@@ -4,6 +4,18 @@ home :: https://github.com/seattlerb/ruby_parser
 bugs :: https://github.com/seattlerb/ruby_parser/issues
 rdoc :: http://docs.seattlerb.org/ruby_parser
 
+== NOTICE:
+
+With the advent of prism, and it's ruby_parser compatibility mode,
+this project is EOL. I've switched all my projects that use
+ruby_parser over to prism with only a minimum of fixes sent upstream.
+Use prism ~> 1.7 for best results.
+
+I'm doing one more release to get my standing changes out into the
+world and might follow up with another if anything adverse is
+reported... but other than that, I'm very happy to put this out to
+pasture.
+
 == DESCRIPTION:
 
 ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
@@ -65,15 +77,15 @@ You can also use Ruby19Parser, Ruby18Parser, or RubyParser.for_current_ruby:
 
 To add a new version:
 
-* New parser should be generated from lib/ruby[3]_parser.yy.
-* Extend lib/ruby[3]_parser.yy with new class name.
+* New parser should be generated from lib/ruby_parser[23].yy.
+* Extend lib/ruby_parser[23].yy with new class name.
 * Add new version number to V2/V3 in Rakefile for rule creation.
 * Add new `ruby_parse "x.y.z"` line to Rakefile for rake compare (line ~300).
 * Require generated parser in lib/ruby_parser.rb.
 * Add new V## = ::Ruby##Parser; end to ruby_parser.rb (bottom of file).
 * Add empty TestRubyParserShared##Plus module and TestRubyParserV## to test/test_ruby_parser.rb.
 * Extend Manifest.txt with generated file names.
-* Add new version number to sexp_processor's pt_testcase.rb in all_versions
+* Add new version number to sexp_processor's pt_testcase.rb in all_versions.
 
 Until all of these are done, you won't have a clean test run.
 

data/bundle/ruby/{3.1.0/gems/ruby_parser-3.20.3 → 3.2.0/gems/ruby_parser-3.22.0}/compare/normalize.rb

@@ -91,6 +91,7 @@ def munge s
 
              "keyword_BEGIN",   "klBEGIN",
              "keyword_END",     "klEND",
+             "k_END",           "klEND",
              /keyword_(\w+)/,   proc { "k#{$1.upcase}" },
              /\bk_([a-z_]+)/,   proc { "k#{$1.upcase}" },
              /modifier_(\w+)/,  proc { "k#{$1.upcase}_MOD" },
@@ -153,13 +154,22 @@ def munge s
 
              '"do (for condition)"', "kDO_COND",
              '"do (for lambda)"',    "kDO_LAMBDA",
-             '"do (for block)"',     "kDO_BLOCK",
+             %("'do' for block"),    "kDO_BLOCK",    # 3.4
+             %("'do' for lambda"),   "kDO_LAMBDA",   # 3.4
+             %("'do' for condition"),"kDO_COND",     # 3.4
+             %q("#{"),               "tSTRING_DBEG", # 3.4
+             '"do (for block)"',     "kDO_BLOCK",    # 3.4
 
+             /\"'(\w+)' \(?modifier\)?\"/, proc { |x| "k#{$1.upcase}_MOD" }, # 3.4
              /\"(\w+) \(?modifier\)?\"/, proc { |x| "k#{$1.upcase}_MOD" },
-             /\"(\w+)\"/,                proc { |x| "k#{$1.upcase}" },
+             /\"((?!k)\w+)\"/,             proc { |x| "k#{$1.upcase}" },
 
              /\$?@(\d+)(\s+|$)/,    "", # newer bison
 
+             # 3.4(ish?) changes:
+             "option_tNL",              "opt_nl",
+             "option_terms",            "opt_terms",
+
              # TODO: remove for 3.0 work:
              "lex_ctxt ", "" # 3.0 production that's mostly noise right now
             ]
@@ -178,12 +188,16 @@ end
 ARGF.each_line do |line|
   next unless good or line =~ /^-* ?Grammar|\$accept : /
 
-  case line.strip
+  case line.strip # TODO: .delete %q["'()]
   when /^$/ then
   when /^(\d+) (\$?[@\w]+): (.*)/ then    # yacc
     rule = $2
     order << rule unless rules.has_key? rule
     rules[rule] << munge($3)
+  when /^(\d+) (\$?[@\w]+'(?: |\\n)'): (.*)/ then # munges both sides
+    rule = $2
+    order << rule unless rules.has_key? rule
+    rules[munge(rule)] << munge($3)
   when /^(\d+) \s+\| (.*)/ then        # yacc
     rules[rule] << munge($2)
   when /^(\d+) (@\d+): (.*)/ then      # yacc
@@ -202,6 +216,8 @@ ARGF.each_line do |line|
     break
   when /^Terminals/ then               # yacc
     break
+  when /^State \d/ then                # lrama
+    break
   when /^\cL/ then                     # byacc
     break
   else

data/bundle/ruby/{3.1.0/gems/ruby_parser-3.20.3 → 3.2.0/gems/ruby_parser-3.22.0}/gauntlet.md

@@ -38,11 +38,11 @@ using `unpack_gems.rb`.
 
 ```
 % cd RP/gauntlet
-% time caffeinate /Volumes/StuffA/gauntlet/bin/unpack_gems.rb -v [-a] ; say done
+% time caffeinate ./bin/unpack_gems.rb -v [-a] ; say done
 ... waaaait ...
 % DIR=gauntlet.$(today).(all|new).noindex
 % mv hashed.noindex $DIR
-% tar vc -T <(fd -tf . $DIR | sort) | zstd -5 -T0 --long > archives/$DIR.tar.zst ; say done
+% tar vc -T <(fd -tf . $DIR | sort) | zstdmt -12 --long > archives/$DIR.tar.zst ; say done
 % ./bin/sync.sh
 ```
 
@@ -71,7 +71,7 @@ compress).
 ### Stats
 
 ```
-9696 % find gauntlet.$(today).noindex -type f | lc
+9696 % fd -tf . gauntlet.$(today).noindex | wc -l
   561270
 3.5G gauntlet.2021-08-06.noindex
 239M gauntlet.2021-08-06.noindex.tar.zst
@@ -85,9 +85,12 @@ parse. It's about 3.5g but compresses very nicely down to 240m
 Assuming you're starting from scratch, unpack the archive once:
 
 ```
-% zstdcat gauntlet.$(today).noindex.tar.zst | tar x
+% tar xf gauntlet.$(today).noindex.tar.zst
 ```
 
+(BSD tar (and apparently newer gnu tars) can detect and uncompress
+most compression formats)
+
 Then, either run a single process (easier to read):
 
 ```
@@ -103,5 +106,32 @@ Or max out your machine using xargs (note the `-P 16` and choose accordingly):
 In another terminal I usually monitor the progress like so:
 
 ```
-% while true ; do clear; fd . -t d -t e gauntlet/*.noindex -X rmdir -p 2> /dev/null ; for D in gauntlet/*.noindex/? ; do echo -n "$D: "; fd .rb $D | wc -l ; done ; echo ; sleep 30 ; done
+% while true ; do clear; fd . -td -te gauntlet/*.noindex -X rmdir -p 2> /dev/null ; for D in gauntlet/*.noindex/? ; do echo -n "$D: "; fd .rb $D | wc -l ; done ; echo ; sleep 30 ; done
+```
+
+After this is run and done, there will be files left over that
+couldn't be parsed. There will also be a directory with a name like
+`gauntlet.slow.1` of files that timed out. What I generally do is wait
+for the first run to end and then start increasing the timeout and run
+again on the timeout dir:
+
+```
+$ ls -d gauntlet.slow.1/*.noindex/?/? | RP_TIMEOUT=30 time xargs -n 1 -P 16 ./gauntlet/bin/gauntlet.rb
+# or:
+$ RP_TIMEOUT=30 time ./gauntlet/bin/gauntlet.rb gauntlet.slow.*
+$ RP_TIMEOUT=60 time ./gauntlet/bin/gauntlet.rb gauntlet.slow.*
+$ fd -tf . gauntlet.slow.60/
+gauntlet.slow.60/gauntlet.2025-10-22.new.noindex/2/f/f/2ff00bbd2ee63b2145d247570c130823dce2b9fe.rb
+gauntlet.slow.60/gauntlet.2025-10-22.new.noindex/a/a/4/aa44d5a214217036425bf8fce5a7ab5b0e04fd92.rb
 ```
+
+for the most part, you wind up with absurdly large generated ruby files:
+
+```
+10022 $ wc -l gauntlet.slow.60/*/?/?/?/*.rb
+  412444 gauntlet.slow.60/gauntlet.2025-10-22.new.noindex/2/f/f/2ff00bbd2ee63b2145d247570c130823dce2b9fe.rb
+  295249 gauntlet.slow.60/gauntlet.2025-10-22.new.noindex/a/a/4/aa44d5a214217036425bf8fce5a7ab5b0e04fd92.rb
+  707693 total
+```
+
+and I don't care so much about these.

data/bundle/ruby/{3.1.0/gems/ruby_parser-3.20.3 → 3.2.0/gems/ruby_parser-3.22.0}/lib/ruby_lexer.rb

@@ -23,8 +23,6 @@ class RubyLexer
     "c\?"  => 127.chr,
   }
 
-  HAS_ENC = "".respond_to? :encoding
-
   BTOKENS = {
     ".."  => :tBDOT2,
     "..." => :tBDOT3,
@@ -113,7 +111,8 @@ class RubyLexer
   # Last token read via next_token.
   attr_accessor :token
 
-  attr_writer :comments
+  # Last comment lexed, or nil
+  attr_accessor :comment
 
   def initialize _ = nil
     @lex_state = nil # remove one warning under $DEBUG
@@ -134,16 +133,6 @@ class RubyLexer
     is_after_operator? ? EXPR_ARG : EXPR_BEG
   end
 
-  def ignore_body_comments
-    @comments.clear
-  end
-
-  def comments # TODO: remove this... maybe comment_string + attr_accessor
-    c = @comments.join
-    @comments.clear
-    c
-  end
-
   def debug n
     raise "debug #{n}"
   end
@@ -258,14 +247,15 @@ class RubyLexer
   end
 
   def process_begin text
-    @comments << matched
+    self.comment ||= +""
+    self.comment << matched
 
     unless scan(/.*?\n=end( |\t|\f)*[^\n]*(\n|\z)/m) then
-      @comments.clear
+      self.comment = nil
       rb_compile_error("embedded document meets end of file")
     end
 
-    @comments << matched
+    self.comment << matched
     self.lineno += matched.count("\n") # HACK?
 
     nil # TODO
@@ -447,7 +437,8 @@ class RubyLexer
 
       while scan(/\s*\#.*(\n+|\z)/) do
         self.lineno += matched.count "\n"
-        @comments << matched.gsub(/^ +#/, "#").gsub(/^ +$/, "")
+        self.comment ||= +""
+        self.comment << matched.gsub(/^ +#/, "#").gsub(/^ +$/, "")
       end
 
       return nil if end_of_stream?
@@ -768,7 +759,7 @@ class RubyLexer
     self.lineno        = 1
     self.brace_nest    = 0
     self.command_start = true
-    self.comments      = []
+    self.comment       = nil
     self.lex_state     = EXPR_NONE
     self.lex_strterm   = nil
     self.lpar_beg      = nil