regexp_parser 2.11.0 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb66cfbf1c78a46f36cb24a7cbc9e04b0bc96aa1285fe81de79cec4bfd1c2c1
-  data.tar.gz: f650a1b30acac1298186dce0818eede9944e3b5117e794801abd0576d7b37b9e
+  metadata.gz: 4a040acf8a74a8fba3bb10e289258195ecfbd78a0708da8757230fc6d6e9fe23
+  data.tar.gz: 2c444d8dcb5f24d752e00eca09adb0c2c9b1f4612accf3356b923b19c47cae57
 SHA512:
-  metadata.gz: 1b87b74cafd00c2a8a3fe5a44942a005a4756974363c916c650c18e74df719920537bfaecdf21080aed339d24f1988444940d96fd66dc6af847498c04efbc033
-  data.tar.gz: 40e7f8357bd2ff7485c7d7105d852b6c615eaf8902b787b611953df637e246a53990acdc6e1b7f7ff2dd350edf749bd012352981b908de2bbcbee0bc59714513
+  metadata.gz: 57021cd49ca2c5db4b62de77b6e929e717f44520eeff6d39a195f15b8a5b2e9bdb98eb74e849465dd2648a24a2c8c0102c38b9f938b41bc4ca40059925d038c4
+  data.tar.gz: 0e03ce414e29548f4923c98396262297f61260a1960b9849ffb24ed6da32788fd728cc42e0949b176fa9e1404790d4b3f788219f345607c187f81c0b9352ea3c

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 require 'rubygems'
 require 'rubygems/package_task'
@@ -14,10 +16,10 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => [:'test:full']
 
 namespace :test do
-  task full: [:'ragel:rb', :spec]
+  task full: [:ragel, :spec]
 end
 
 # Add ragel task as a prerequisite for building the gem to ensure that the
 # latest scanner code is generated and included in the build.
-desc "Runs ragel:rb before building the gem"
-task :build => ['ragel:rb']
+desc "Runs ragel before building the gem"
+task build: :ragel

data/lib/regexp_parser/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Parser
   # base class for all gem-specific errors
   class Error < StandardError; end

data/lib/regexp_parser/expression/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Base
     include Regexp::Expression::Shared

data/lib/regexp_parser/expression/classes/alternation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   # A sequence of expressions, used by Alternation as one of its alternatives.
   class Alternative < Regexp::Expression::Sequence; end

data/lib/regexp_parser/expression/classes/anchor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Anchor
     class Base < Regexp::Expression::Base; end

data/lib/regexp_parser/expression/classes/backreference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Backreference
     class Base < Regexp::Expression::Base; end

data/lib/regexp_parser/expression/classes/character_set/intersection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class CharacterSet < Regexp::Expression::Subexpression
     class IntersectedSequence < Regexp::Expression::Sequence; end

data/lib/regexp_parser/expression/classes/character_set/range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class CharacterSet < Regexp::Expression::Subexpression
     class Range < Regexp::Expression::Subexpression

data/lib/regexp_parser/expression/classes/character_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class CharacterSet < Regexp::Expression::Subexpression
     attr_accessor :closed, :negative

data/lib/regexp_parser/expression/classes/character_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module CharacterType
     class Base < Regexp::Expression::Base; end

data/lib/regexp_parser/expression/classes/conditional.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Conditional
     class TooManyBranches < Regexp::Parser::Error

data/lib/regexp_parser/expression/classes/escape_sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module EscapeSequence
     Base        = Class.new(Regexp::Expression::Base)

data/lib/regexp_parser/expression/classes/free_space.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class FreeSpace < Regexp::Expression::Base
     def quantify(*_args)

data/lib/regexp_parser/expression/classes/group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Group
     class Base < Regexp::Expression::Subexpression

data/lib/regexp_parser/expression/classes/keep.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Keep
     # TODO: in regexp_parser v3.0.0 this should possibly be a Subexpression

data/lib/regexp_parser/expression/classes/literal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Literal < Regexp::Expression::Base; end
 end

data/lib/regexp_parser/expression/classes/posix_class.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class PosixClass < Regexp::Expression::Base
     def name

data/lib/regexp_parser/expression/classes/root.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Root < Regexp::Expression::Subexpression
     def self.build(options = {})

data/lib/regexp_parser/expression/classes/unicode_property.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module UnicodeProperty
     class Base < Regexp::Expression::Base

data/lib/regexp_parser/expression/methods/construct.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
     module ClassMethods

data/lib/regexp_parser/expression/methods/escape_sequence_char.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Regexp::Expression::EscapeSequence::Base.class_eval do
   def char
     codepoint.chr('utf-8')

data/lib/regexp_parser/expression/methods/escape_sequence_codepoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression::EscapeSequence
   AsciiEscape.class_eval { def codepoint; 0x1B end }
   Backspace.class_eval   { def codepoint; 0x8  end }

data/lib/regexp_parser/expression/methods/human_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
     # default implementation, e.g. "atomic group", "hex escape", "word type", ..

data/lib/regexp_parser/expression/methods/match.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Base
     def match?(string)

data/lib/regexp_parser/expression/methods/match_length.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::MatchLength
   include Enumerable
 

data/lib/regexp_parser/expression/methods/negative.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
     def negative?

data/lib/regexp_parser/expression/methods/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Base
     def multiline?

data/lib/regexp_parser/expression/methods/parts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
     # default implementation

data/lib/regexp_parser/expression/methods/printing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
     def inspect

data/lib/regexp_parser/expression/methods/referenced_expressions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module ReferencedExpressions
     attr_accessor :referenced_expressions

data/lib/regexp_parser/expression/methods/strfregexp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Base
 

data/lib/regexp_parser/expression/methods/tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
 

data/lib/regexp_parser/expression/methods/traverse.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Subexpression < Regexp::Expression::Base
 

data/lib/regexp_parser/expression/quantifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   # TODO: in v3.0.0, maybe put Shared back into Base, and inherit from Base and
   # call super in #initialize, but raise in #quantifier= and #quantify,
@@ -6,7 +8,7 @@ module Regexp::Expression
   class Quantifier
     include Regexp::Expression::Shared
 
-    MODES = %i[greedy possessive reluctant]
+    MODES = %i[greedy possessive reluctant].freeze
 
     def initialize(*args)
       deprecated_old_init(*args) and return if args.count == 4 || args.count == 5

data/lib/regexp_parser/expression/sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   # A sequence of expressions. Differs from a Subexpressions by how it handles
   # quantifiers, as it applies them to its last element instead of itself as

data/lib/regexp_parser/expression/sequence_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   # abstract class
   class SequenceOperation < Regexp::Expression::Subexpression

data/lib/regexp_parser/expression/shared.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   module Shared
     module ClassMethods; end # filled in ./methods/*.rb
@@ -70,11 +72,12 @@ module Regexp::Expression
     # lit.to_s(:original) # => 'a +' # with quantifier AND intermittent decorations
     #
     def to_s(format = :full)
-      base = parts.each_with_object(''.dup) do |part, buff|
+      base = ''.dup
+      parts.each do |part|
         if part.instance_of?(String)
-          buff << part
+          base << part
         elsif !part.custom_to_s_handling
-          buff << part.to_s(:original)
+          base << part.to_s(:original)
         end
       end
       "#{base}#{pre_quantifier_decoration(format)}#{quantifier_affix(format)}"

data/lib/regexp_parser/expression/subexpression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Regexp::Expression
   class Subexpression < Regexp::Expression::Base
     include Enumerable

data/lib/regexp_parser/expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'error'
 
 require_relative 'expression/shared'

data/lib/regexp_parser/lexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A very thin wrapper around the scanner that breaks quantified literal runs,
 # collects emitted tokens into an array, calculates their nesting depth, and
 # normalizes tokens for the parser, and checks if they are implemented by the

data/lib/regexp_parser/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'error'
 require_relative 'expression'
 

data/lib/regexp_parser/scanner/errors/premature_end_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Scanner
   # Unexpected end of pattern
   class PrematureEndError < ScannerError

data/lib/regexp_parser/scanner/errors/scanner_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../regexp_parser/error'
 
 class Regexp::Scanner

data/lib/regexp_parser/scanner/errors/validation_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Scanner
   # Base for all scanner validation errors
   class ValidationError < ScannerError

data/lib/regexp_parser/scanner/properties/long.csv

@@ -9,6 +9,7 @@ age=13.0,age=13.0
 age=14.0,age=14.0
 age=15.0,age=15.0
 age=15.1,age=15.1
+age=16.0,age=16.0
 age=2.0,age=2.0
 age=2.1,age=2.1
 age=3.0,age=3.0
@@ -103,6 +104,7 @@ extendedpictographic,extended_pictographic
 extender,extender
 finalpunctuation,final_punctuation
 format,format
+garay,garay
 georgian,georgian
 glagolitic,glagolitic
 gothic,gothic
@@ -128,6 +130,7 @@ greek,greek
 gujarati,gujarati
 gunjalagondi,gunjala_gondi
 gurmukhi,gurmukhi
+gurungkhema,gurung_khema
 han,han
 hangul,hangul
 hanifirohingya,hanifi_rohingya
@@ -241,6 +244,7 @@ induployan,in_duployan
 inearlydynasticcuneiform,in_early_dynastic_cuneiform
 inegyptianhieroglyphformatcontrols,in_egyptian_hieroglyph_format_controls
 inegyptianhieroglyphs,in_egyptian_hieroglyphs
+inegyptianhieroglyphsextendeda,in_egyptian_hieroglyphs_extended_a
 inelbasan,in_elbasan
 inelymaic,in_elymaic
 inemoticons,in_emoticons
@@ -253,6 +257,7 @@ inethiopicextended,in_ethiopic_extended
 inethiopicextendeda,in_ethiopic_extended_a
 inethiopicextendedb,in_ethiopic_extended_b
 inethiopicsupplement,in_ethiopic_supplement
+ingaray,in_garay
 ingeneralpunctuation,in_general_punctuation
 ingeometricshapes,in_geometric_shapes
 ingeometricshapesextended,in_geometric_shapes_extended
@@ -268,6 +273,7 @@ ingreekextended,in_greek_extended
 ingujarati,in_gujarati
 ingunjalagondi,in_gunjala_gondi
 ingurmukhi,in_gurmukhi
+ingurungkhema,in_gurung_khema
 inhalfwidthandfullwidthforms,in_halfwidth_and_fullwidth_forms
 inhangulcompatibilityjamo,in_hangul_compatibility_jamo
 inhanguljamo,in_hangul_jamo
@@ -309,6 +315,7 @@ inkhmer,in_khmer
 inkhmersymbols,in_khmer_symbols
 inkhojki,in_khojki
 inkhudawadi,in_khudawadi
+inkiratrai,in_kirat_rai
 inlao,in_lao
 inlatin1supplement,in_latin_1_supplement
 inlatinextendeda,in_latin_extended_a
@@ -364,6 +371,7 @@ inmusicalsymbols,in_musical_symbols
 inmyanmar,in_myanmar
 inmyanmarextendeda,in_myanmar_extended_a
 inmyanmarextendedb,in_myanmar_extended_b
+inmyanmarextendedc,in_myanmar_extended_c
 innabataean,in_nabataean
 innagmundari,in_nag_mundari
 innandinagari,in_nandinagari
@@ -385,6 +393,7 @@ inoldsogdian,in_old_sogdian
 inoldsoutharabian,in_old_south_arabian
 inoldturkic,in_old_turkic
 inolduyghur,in_old_uyghur
+inolonal,in_ol_onal
 inopticalcharacterrecognition,in_optical_character_recognition
 inoriya,in_oriya
 inornamentaldingbats,in_ornamental_dingbats
@@ -424,6 +433,7 @@ inspacingmodifierletters,in_spacing_modifier_letters
 inspecials,in_specials
 insundanese,in_sundanese
 insundanesesupplement,in_sundanese_supplement
+insunuwar,in_sunuwar
 insuperscriptsandsubscripts,in_superscripts_and_subscripts
 insupplementalarrowsa,in_supplemental_arrows_a
 insupplementalarrowsb,in_supplemental_arrows_b
@@ -437,6 +447,7 @@ insuttonsignwriting,in_sutton_signwriting
 insylotinagri,in_syloti_nagri
 insymbolsandpictographsextendeda,in_symbols_and_pictographs_extended_a
 insymbolsforlegacycomputing,in_symbols_for_legacy_computing
+insymbolsforlegacycomputingsupplement,in_symbols_for_legacy_computing_supplement
 insyriac,in_syriac
 insyriacsupplement,in_syriac_supplement
 intagalog,in_tagalog
@@ -459,8 +470,10 @@ inthai,in_thai
 intibetan,in_tibetan
 intifinagh,in_tifinagh
 intirhuta,in_tirhuta
+intodhri,in_todhri
 intoto,in_toto
 intransportandmapsymbols,in_transport_and_map_symbols
+intulutigalari,in_tulu_tigalari
 inugaritic,in_ugaritic
 inunifiedcanadianaboriginalsyllabics,in_unified_canadian_aboriginal_syllabics
 inunifiedcanadianaboriginalsyllabicsextended,in_unified_canadian_aboriginal_syllabics_extended
@@ -491,6 +504,7 @@ khitansmallscript,khitan_small_script
 khmer,khmer
 khojki,khojki
 khudawadi,khudawadi
+kiratrai,kirat_rai
 lao,lao
 latin,latin
 lepcha,lepcha
@@ -524,6 +538,7 @@ meroiticcursive,meroitic_cursive
 meroitichieroglyphs,meroitic_hieroglyphs
 miao,miao
 modi,modi
+modifiercombiningmark,modifier_combining_mark
 modifierletter,modifier_letter
 modifiersymbol,modifier_symbol
 mongolian,mongolian
@@ -553,6 +568,7 @@ oldsogdian,old_sogdian
 oldsoutharabian,old_south_arabian
 oldturkic,old_turkic
 olduyghur,old_uyghur
+olonal,ol_onal
 openpunctuation,open_punctuation
 oriya,oriya
 osage,osage
@@ -606,6 +622,7 @@ space,space
 spaceseparator,space_separator
 spacingmark,spacing_mark
 sundanese,sundanese
+sunuwar,sunuwar
 surrogate,surrogate
 sylotinagri,syloti_nagri
 symbol,symbol
@@ -627,7 +644,9 @@ tibetan,tibetan
 tifinagh,tifinagh
 tirhuta,tirhuta
 titlecaseletter,titlecase_letter
+todhri,todhri
 toto,toto
+tulutigalari,tulu_tigalari
 ugaritic,ugaritic
 unassigned,unassigned
 unifiedideograph,unified_ideograph

data/lib/regexp_parser/scanner/properties/short.csv

@@ -58,6 +58,7 @@ epres,emoji_presentation
 ethi,ethiopic
 ext,extender
 extpict,extended_pictographic
+gara,garay
 geor,georgian
 glag,glagolitic
 gong,gunjala_gondi
@@ -69,6 +70,7 @@ grek,greek
 grext,grapheme_extend
 grlink,grapheme_link
 gujr,gujarati
+gukh,gurung_khema
 guru,gurmukhi
 hang,hangul
 hani,han
@@ -97,6 +99,7 @@ khmr,khmer
 khoj,khojki
 kits,khitan_small_script
 knda,kannada
+krai,kirat_rai
 kthi,kaithi
 l,letter
 lana,tai_tham
@@ -122,6 +125,7 @@ mand,mandaic
 mani,manichaean
 marc,marchen
 mc,spacing_mark
+mcm,modifier_combining_mark
 me,enclosing_mark
 medf,medefaidrin
 mend,mende_kikakui
@@ -154,6 +158,7 @@ oids,other_id_start
 olck,ol_chiki
 olower,other_lowercase
 omath,other_math
+onao,ol_onal
 orkh,old_turkic
 orya,oriya
 osge,osage
@@ -208,6 +213,7 @@ sora,sora_sompeng
 soyo,soyombo
 sterm,sentence_terminal
 sund,sundanese
+sunu,sunuwar
 sylo,syloti_nagri
 syrc,syriac
 tagb,tagbanwa
@@ -225,6 +231,8 @@ thaa,thaana
 tibt,tibetan
 tirh,tirhuta
 tnsa,tangsa
+todr,todhri
+tutg,tulu_tigalari
 ugar,ugaritic
 uideo,unified_ideograph
 vaii,vai

data/lib/regexp_parser/scanner/scanner.rl

@@ -263,7 +263,7 @@
       # If not enough groups have been opened, there is a fallback to either an
       # octal or literal interpretation for 2+ digit numerical escapes.
       digits = text[1..-1]
-      if digits.size == 1 || digits.to_i <= self.capturing_group_count
+      if digits.size == 1 || digits.to_i <= capturing_group_count
         emit(:backref, :number, text)
       elsif digits =~ /\A[0-7]{2,}\z/
         emit(:escape, :octal, text)
@@ -537,7 +537,7 @@
     };
 
     group_open @group_opened {
-      self.capturing_group_count += 1
+      self.capturing_group_count = capturing_group_count + 1
       text = copy(data, ts, te)
       emit(:group, :capture, text)
     };
@@ -686,7 +686,7 @@ class Regexp::Scanner
 
     input = input_object.is_a?(Regexp) ? input_object.source : input_object
     self.free_spacing = free_spacing?(input_object, options)
-    self.regexp_encoding = input_object.encoding if input_object.is_a?(::Regexp)
+    self.regexp_encoding = extract_encoding(input_object, options)
     self.spacing_stack = [{:free_spacing => free_spacing, :depth => 0}]
 
     data  = input.unpack("c*")
@@ -737,9 +737,11 @@ class Regexp::Scanner
     File.read("#{__dir__}/scanner/properties/#{name}.csv").scan(/(.+),(.+)/).to_h
   end
 
+  # Use each_with_object for required_ruby_version >= 2.2, or #to_h for >= 2.6
   POSIX_CLASSES =
     %w[alnum alpha ascii blank cntrl digit graph
-       lower print punct space upper word xdigit].to_h { |c| [c, true] }.freeze
+       lower print punct space upper word xdigit]
+      .inject({}) { |o, e| o.merge(e => true) }.freeze
 
   # Emits an array with the details of the scanned pattern
   def emit(type, token, text)
@@ -767,7 +769,7 @@ class Regexp::Scanner
     end
   end
 
-  attr_accessor :literal_run # only public for #||= to work on ruby <= 2.5
+  attr_accessor :capturing_group_count, :literal_run # only public for #||= to work on ruby <= 2.5
 
   private
 
@@ -776,9 +778,16 @@ class Regexp::Scanner
                 :free_spacing, :spacing_stack,
                 :regexp_encoding,
                 :group_depth, :set_depth, :conditional_stack,
-                :capturing_group_count,
                 :char_pos
 
+  def extract_encoding(input_object, options)
+    if input_object.is_a?(::Regexp)
+      input_object.encoding
+    elsif options && (options & Regexp::NOENCODING)
+      Encoding::BINARY
+    end
+  end
+
   def free_spacing?(input_object, options)
     if options && !input_object.is_a?(String)
       raise ArgumentError, 'options cannot be supplied unless scanning a String'