regexp_parser 2.7.0 → 2.12.0

data/lib/regexp_parser/syntax/token/unicode_property.rb

@@ -1,37 +1,42 @@
+# frozen_string_literal: true
+
 module Regexp::Syntax
   module Token
     module UnicodeProperty
-      all = proc { |name| constants.grep(/#{name}/).flat_map(&method(:const_get)) }
+      def self.all(name)
+        constants.grep(/#{name}/).flat_map(&method(:const_get)).freeze
+      end
+      private_class_method :all
 
       CharType_V1_9_0 = %i[alnum alpha ascii blank cntrl digit graph
-                           lower print punct space upper word xdigit]
+                           lower print punct space upper word xdigit].freeze
 
-      CharType_V2_5_0 = %i[xposixpunct]
+      CharType_V2_5_0 = %i[xposixpunct].freeze
 
-      POSIX = %i[any assigned newline]
+      POSIX = %i[any assigned newline].freeze
 
       module Category
         Letter        = %i[letter uppercase_letter lowercase_letter
-                           titlecase_letter modifier_letter other_letter]
+                           titlecase_letter modifier_letter other_letter].freeze
 
         Mark          = %i[mark nonspacing_mark spacing_mark
-                           enclosing_mark]
+                           enclosing_mark].freeze
 
         Number        = %i[number decimal_number letter_number
-                           other_number]
+                           other_number].freeze
 
         Punctuation   = %i[punctuation connector_punctuation dash_punctuation
                            open_punctuation close_punctuation initial_punctuation
-                           final_punctuation other_punctuation]
+                           final_punctuation other_punctuation].freeze
 
         Symbol        = %i[symbol math_symbol currency_symbol
-                           modifier_symbol other_symbol]
+                           modifier_symbol other_symbol].freeze
 
         Separator     = %i[separator space_separator line_separator
-                           paragraph_separator]
+                           paragraph_separator].freeze
 
         Codepoint     = %i[other control format
-                           surrogate private_use unassigned]
+                           surrogate private_use unassigned].freeze
 
         All = Letter + Mark + Number + Punctuation +
               Symbol + Separator + Codepoint
@@ -39,29 +44,33 @@ module Regexp::Syntax
 
       Age_V1_9_3 = %i[age=1.1 age=2.0 age=2.1 age=3.0 age=3.1
                       age=3.2 age=4.0 age=4.1 age=5.0 age=5.1
-                      age=5.2 age=6.0]
+                      age=5.2 age=6.0].freeze
+
+      Age_V2_0_0 = %i[age=6.1].freeze
 
-      Age_V2_0_0 = %i[age=6.1]
+      Age_V2_2_0 = %i[age=6.2 age=6.3 age=7.0].freeze
 
-      Age_V2_2_0 = %i[age=6.2 age=6.3 age=7.0]
+      Age_V2_3_0 = %i[age=8.0].freeze
 
-      Age_V2_3_0 = %i[age=8.0]
+      Age_V2_4_0 = %i[age=9.0].freeze
 
-      Age_V2_4_0 = %i[age=9.0]
+      Age_V2_5_0 = %i[age=10.0].freeze
 
-      Age_V2_5_0 = %i[age=10.0]
+      Age_V2_6_0 = %i[age=11.0].freeze
 
-      Age_V2_6_0 = %i[age=11.0]
+      Age_V2_6_2 = %i[age=12.0].freeze
 
-      Age_V2_6_2 = %i[age=12.0]
+      Age_V2_6_3 = %i[age=12.1].freeze
 
-      Age_V2_6_3 = %i[age=12.1]
+      Age_V3_1_0 = %i[age=13.0].freeze
 
-      Age_V3_1_0 = %i[age=13.0]
+      Age_V3_2_0 = %i[age=14.0 age=15.0].freeze
 
-      Age_V3_2_0 = %i[age=14.0]
+      Age_V3_5_0 = %i[age=15.1].freeze
 
-      Age = all[:Age_V]
+      Age_V4_0_0 = %i[age=16.0 age=17.0].freeze
+
+      Age = all(:Age_V)
 
       Derived_V1_9_0 = %i[
         ascii_hex_digit
@@ -115,22 +124,32 @@ module Regexp::Syntax
         white_space
         xid_start
         xid_continue
-      ]
+      ].freeze
 
       Derived_V2_0_0 = %i[
         cased_letter
         combining_mark
-      ]
+      ].freeze
 
       Derived_V2_4_0 = %i[
         prepended_concatenation_mark
-      ]
+      ].freeze
 
       Derived_V2_5_0 = %i[
         regional_indicator
+      ].freeze
+
+      Derived_V3_5_0 = %i[
+        id_compat_math_continue
+        id_compat_math_start
+        ids_unary_operator
+      ].freeze
+
+      Derived_V4_0_0 = %i[
+        modifier_combining_mark
       ]
 
-      Derived = all[:Derived_V]
+      Derived = all(:Derived_V)
 
       Script_V1_9_0 = %i[
         arabic
@@ -226,13 +245,13 @@ module Regexp::Syntax
         inherited
         common
         unknown
-      ]
+      ].freeze
 
       Script_V1_9_3 = %i[
         brahmi
         batak
         mandaic
-      ]
+      ].freeze
 
       Script_V2_0_0 = %i[
         chakma
@@ -242,7 +261,7 @@ module Regexp::Syntax
         sharada
         sora_sompeng
         takri
-      ]
+      ].freeze
 
       Script_V2_2_0 = %i[
         caucasian_albanian
@@ -268,7 +287,7 @@ module Regexp::Syntax
         khudawadi
         tirhuta
         warang_citi
-      ]
+      ].freeze
 
       Script_V2_3_0 = %i[
         ahom
@@ -277,7 +296,7 @@ module Regexp::Syntax
         multani
         old_hungarian
         signwriting
-      ]
+      ].freeze
 
       Script_V2_4_0 = %i[
         adlam
@@ -286,14 +305,14 @@ module Regexp::Syntax
         newa
         osage
         tangut
-      ]
+      ].freeze
 
       Script_V2_5_0 = %i[
         masaram_gondi
         nushu
         soyombo
         zanabazar_square
-      ]
+      ].freeze
 
       Script_V2_6_0 = %i[
         dogra
@@ -303,31 +322,47 @@ module Regexp::Syntax
         medefaidrin
         old_sogdian
         sogdian
-      ]
+      ].freeze
 
       Script_V2_6_2 = %i[
         elymaic
         nandinagari
         nyiakeng_puachue_hmong
         wancho
-      ]
+      ].freeze
 
       Script_V3_1_0 = %i[
         chorasmian
         dives_akuru
         khitan_small_script
         yezidi
-      ]
+      ].freeze
 
       Script_V3_2_0 = %i[
         cypro_minoan
+        kawi
+        nag_mundari
         old_uyghur
         tangsa
         toto
         vithkuqi
-      ]
-
-      Script = all[:Script_V]
+      ].freeze
+
+      Script_V4_0_0 = %i[
+        beria_erfe
+        garay
+        gurung_khema
+        kirat_rai
+        ol_onal
+        sidetic
+        sunuwar
+        tai_yo
+        todhri
+        tolong_siki
+        tulu_tigalari
+      ].freeze
+
+      Script = all(:Script_V)
 
       UnicodeBlock_V1_9_0 = %i[
         in_alphabetic_presentation_forms
@@ -426,7 +461,7 @@ module Regexp::Syntax
         in_yi_radicals
         in_yi_syllables
         in_yijing_hexagram_symbols
-      ]
+      ].freeze
 
       UnicodeBlock_V2_0_0 = %i[
         in_aegean_numbers
@@ -554,7 +589,7 @@ module Regexp::Syntax
         in_variation_selectors_supplement
         in_vedic_extensions
         in_vertical_forms
-      ]
+      ].freeze
 
       UnicodeBlock_V2_2_0 = %i[
         in_bassa_vah
@@ -589,7 +624,7 @@ module Regexp::Syntax
         in_supplemental_arrows_c
         in_tirhuta
         in_warang_citi
-      ]
+      ].freeze
 
       UnicodeBlock_V2_3_0 = %i[
         in_ahom
@@ -602,7 +637,7 @@ module Regexp::Syntax
         in_old_hungarian
         in_supplemental_symbols_and_pictographs
         in_sutton_signwriting
-      ]
+      ].freeze
 
       UnicodeBlock_V2_4_0 = %i[
         in_adlam
@@ -616,7 +651,7 @@ module Regexp::Syntax
         in_osage
         in_tangut
         in_tangut_components
-      ]
+      ].freeze
 
       UnicodeBlock_V2_5_0 = %i[
         in_cjk_unified_ideographs_extension_f
@@ -626,7 +661,7 @@ module Regexp::Syntax
         in_soyombo
         in_syriac_supplement
         in_zanabazar_square
-      ]
+      ].freeze
 
       UnicodeBlock_V2_6_0 = %i[
         in_chess_symbols
@@ -640,7 +675,7 @@ module Regexp::Syntax
         in_medefaidrin
         in_old_sogdian
         in_sogdian
-      ]
+      ].freeze
 
       UnicodeBlock_V2_6_2 = %i[
         in_egyptian_hieroglyph_format_controls
@@ -652,7 +687,7 @@ module Regexp::Syntax
         in_symbols_and_pictographs_extended_a
         in_tamil_supplement
         in_wancho
-      ]
+      ].freeze
 
       UnicodeBlock_V3_1_0 = %i[
         in_chorasmian
@@ -663,24 +698,56 @@ module Regexp::Syntax
         in_symbols_for_legacy_computing
         in_tangut_supplement
         in_yezidi
-      ]
+      ].freeze
 
       UnicodeBlock_V3_2_0 = %i[
         in_arabic_extended_b
+        in_arabic_extended_c
+        in_cjk_unified_ideographs_extension_h
         in_cypro_minoan
+        in_cyrillic_extended_d
+        in_devanagari_extended_a
         in_ethiopic_extended_b
+        in_kaktovik_numerals
         in_kana_extended_b
+        in_kawi
         in_latin_extended_f
         in_latin_extended_g
+        in_nag_mundari
         in_old_uyghur
         in_tangsa
         in_toto
         in_unified_canadian_aboriginal_syllabics_extended_a
         in_vithkuqi
         in_znamenny_musical_notation
-      ]
-
-      UnicodeBlock = all[:UnicodeBlock_V]
+      ].freeze
+
+      UnicodeBlock_V3_5_0 = %i[
+        in_cjk_unified_ideographs_extension_i
+      ].freeze
+
+      UnicodeBlock_V4_0_0 = %i[
+        in_beria_erfe
+        in_cjk_unified_ideographs_extension_j
+        in_egyptian_hieroglyphs_extended_a
+        in_garay
+        in_gurung_khema
+        in_kirat_rai
+        in_miscellaneous_symbols_supplement
+        in_myanmar_extended_c
+        in_ol_onal
+        in_sharada_supplement
+        in_sidetic
+        in_sunuwar
+        in_symbols_for_legacy_computing_supplement
+        in_tai_yo
+        in_tangut_components_supplement
+        in_todhri
+        in_tolong_siki
+        in_tulu_tigalari
+      ].freeze
+
+      UnicodeBlock = all(:UnicodeBlock_V)
 
       Emoji_V2_5_0 = %i[
         emoji
@@ -688,24 +755,48 @@ module Regexp::Syntax
         emoji_modifier
         emoji_modifier_base
         emoji_presentation
-      ]
-
-      Emoji = all[:Emoji_V]
-
-      V1_9_0 = Category::All + POSIX + all[:V1_9_0]
-      V1_9_3 = all[:V1_9_3]
-      V2_0_0 = all[:V2_0_0]
-      V2_2_0 = all[:V2_2_0]
-      V2_3_0 = all[:V2_3_0]
-      V2_4_0 = all[:V2_4_0]
-      V2_5_0 = all[:V2_5_0]
-      V2_6_0 = all[:V2_6_0]
-      V2_6_2 = all[:V2_6_2]
-      V2_6_3 = all[:V2_6_3]
-      V3_1_0 = all[:V3_1_0]
-      V3_2_0 = all[:V3_2_0]
-
-      All = all[/^V\d+_\d+_\d+$/]
+      ].freeze
+
+      Emoji_V2_6_0 = %i[
+        extended_pictographic
+      ].freeze
+
+      Enumerated_V2_4_0 = %i[
+        grapheme_cluster_break=control
+        grapheme_cluster_break=cr
+        grapheme_cluster_break=extend
+        grapheme_cluster_break=l
+        grapheme_cluster_break=lf
+        grapheme_cluster_break=lv
+        grapheme_cluster_break=lvt
+        grapheme_cluster_break=prepend
+        grapheme_cluster_break=regional_indicator
+        grapheme_cluster_break=spacingmark
+        grapheme_cluster_break=t
+        grapheme_cluster_break=v
+        grapheme_cluster_break=zwj
+      ].freeze
+
+      Enumerated = all(:Enumerated_V)
+
+      Emoji = all(:Emoji_V)
+
+      V1_9_0 = Category::All + POSIX + all(:V1_9_0)
+      V1_9_3 = all(:V1_9_3)
+      V2_0_0 = all(:V2_0_0)
+      V2_2_0 = all(:V2_2_0)
+      V2_3_0 = all(:V2_3_0)
+      V2_4_0 = all(:V2_4_0)
+      V2_5_0 = all(:V2_5_0)
+      V2_6_0 = all(:V2_6_0)
+      V2_6_2 = all(:V2_6_2)
+      V2_6_3 = all(:V2_6_3)
+      V3_1_0 = all(:V3_1_0)
+      V3_2_0 = all(:V3_2_0)
+      V3_5_0 = all(:V3_5_0)
+      V4_0_0 = all(:V4_0_0)
+
+      All = all(/^V\d+_\d+_\d+$/)
 
       Type = :property
       NonType = :nonproperty
@@ -713,5 +804,8 @@ module Regexp::Syntax
 
     Map[UnicodeProperty::Type] = UnicodeProperty::All
     Map[UnicodeProperty::NonType] = UnicodeProperty::All
+
+    # alias for symmetry between token symbol and Token module name
+    Property = UnicodeProperty
   end
 end

data/lib/regexp_parser/syntax/token/virtual.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Regexp::Syntax
+  module Token
+    module Virtual
+      Root     = %i[root].freeze
+      Sequence = %i[sequence].freeze
+
+      All  = %i[root sequence].freeze
+      Type = :expression
+    end
+  end
+end

data/lib/regexp_parser/syntax/token.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 # Define the base module and the simplest of tokens.
 module Regexp::Syntax
   module Token
-    Map = {}
+    Map = Hash.new
 
     module Literal
-      All = %i[literal]
+      All = %i[literal].freeze
       Type = :literal
     end
 
     module FreeSpace
-      All  = %i[comment whitespace]
+      All  = %i[comment whitespace].freeze
       Type = :free_space
     end
 
@@ -20,19 +22,19 @@ end
 
 
 # Load all the token files, they will populate the Map constant.
-require 'regexp_parser/syntax/token/anchor'
-require 'regexp_parser/syntax/token/assertion'
-require 'regexp_parser/syntax/token/backreference'
-require 'regexp_parser/syntax/token/posix_class'
-require 'regexp_parser/syntax/token/character_set'
-require 'regexp_parser/syntax/token/character_type'
-require 'regexp_parser/syntax/token/conditional'
-require 'regexp_parser/syntax/token/escape'
-require 'regexp_parser/syntax/token/group'
-require 'regexp_parser/syntax/token/keep'
-require 'regexp_parser/syntax/token/meta'
-require 'regexp_parser/syntax/token/quantifier'
-require 'regexp_parser/syntax/token/unicode_property'
+require_relative 'token/anchor'
+require_relative 'token/assertion'
+require_relative 'token/backreference'
+require_relative 'token/posix_class'
+require_relative 'token/character_set'
+require_relative 'token/character_type'
+require_relative 'token/conditional'
+require_relative 'token/escape'
+require_relative 'token/group'
+require_relative 'token/keep'
+require_relative 'token/meta'
+require_relative 'token/quantifier'
+require_relative 'token/unicode_property'
 
 
 # After loading all the tokens the map is full. Extract all tokens and types

data/lib/regexp_parser/syntax/version_lookup.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Regexp::Syntax
   VERSION_FORMAT = '\Aruby/\d+\.\d+(\.\d+)?\z'
-  VERSION_REGEXP = /#{VERSION_FORMAT}/
-  VERSION_CONST_REGEXP = /\AV\d+_\d+(?:_\d+)?\z/
+  VERSION_REGEXP = /#{VERSION_FORMAT}/.freeze
+  VERSION_CONST_REGEXP = /\AV\d+_\d+(?:_\d+)?\z/.freeze
 
   class InvalidVersionNameError < Regexp::Syntax::SyntaxError
     def initialize(name)

data/lib/regexp_parser/syntax/versions/1.8.6.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V1_8_6 < Regexp::Syntax::Base
   implements :anchor,     Anchor::All
   implements :assertion,  Assertion::Lookahead

data/lib/regexp_parser/syntax/versions/1.9.1.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V1_9_1 < Regexp::Syntax::V1_8_6
   implements :assertion,     Assertion::Lookbehind
   implements :backref,       Backreference::V1_9_1 + SubexpressionCall::All

data/lib/regexp_parser/syntax/versions/1.9.3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V1_9_3 < Regexp::Syntax::V1_9_1
   implements :property,    UnicodeProperty::V1_9_3
   implements :nonproperty, UnicodeProperty::V1_9_3

data/lib/regexp_parser/syntax/versions/2.0.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_0_0 < Regexp::Syntax::V1_9_3
   implements :keep,        Keep::All
   implements :conditional, Conditional::All

data/lib/regexp_parser/syntax/versions/2.2.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_2_0 < Regexp::Syntax::V2_0_0
   implements :property,    UnicodeProperty::V2_2_0
   implements :nonproperty, UnicodeProperty::V2_2_0

data/lib/regexp_parser/syntax/versions/2.3.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_3_0 < Regexp::Syntax::V2_2_0
   implements :property,    UnicodeProperty::V2_3_0
   implements :nonproperty, UnicodeProperty::V2_3_0

data/lib/regexp_parser/syntax/versions/2.4.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_4_0 < Regexp::Syntax::V2_3_0
   implements :property,    UnicodeProperty::V2_4_0
   implements :nonproperty, UnicodeProperty::V2_4_0

data/lib/regexp_parser/syntax/versions/2.4.1.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_4_1 < Regexp::Syntax::V2_4_0
   implements :group, Group::V2_4_1
 end

data/lib/regexp_parser/syntax/versions/2.5.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_5_0 < Regexp::Syntax::V2_4_1
   implements :property,    UnicodeProperty::V2_5_0
   implements :nonproperty, UnicodeProperty::V2_5_0

data/lib/regexp_parser/syntax/versions/2.6.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_6_0 < Regexp::Syntax::V2_5_0
   implements :property,    UnicodeProperty::V2_6_0
   implements :nonproperty, UnicodeProperty::V2_6_0

data/lib/regexp_parser/syntax/versions/2.6.2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_6_2 < Regexp::Syntax::V2_6_0
   implements :property,    UnicodeProperty::V2_6_2
   implements :nonproperty, UnicodeProperty::V2_6_2

data/lib/regexp_parser/syntax/versions/2.6.3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V2_6_3 < Regexp::Syntax::V2_6_2
   implements :property,    UnicodeProperty::V2_6_3
   implements :nonproperty, UnicodeProperty::V2_6_3

data/lib/regexp_parser/syntax/versions/3.1.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V3_1_0 < Regexp::Syntax::V2_6_3
   implements :property,    UnicodeProperty::V3_1_0
   implements :nonproperty, UnicodeProperty::V3_1_0

data/lib/regexp_parser/syntax/versions/3.2.0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp::Syntax::V3_2_0 < Regexp::Syntax::V3_1_0
   implements :property,    UnicodeProperty::V3_2_0
   implements :nonproperty, UnicodeProperty::V3_2_0

data/lib/regexp_parser/syntax/versions/3.5.0.rb

@@ -0,0 +1,4 @@
+class Regexp::Syntax::V3_5_0 < Regexp::Syntax::V3_2_0
+  implements :property,    UnicodeProperty::V3_5_0
+  implements :nonproperty, UnicodeProperty::V3_5_0
+end

data/lib/regexp_parser/syntax/versions/4.0.0.rb

@@ -0,0 +1,4 @@
+class Regexp::Syntax::V4_0_0 < Regexp::Syntax::V3_5_0
+  implements :property,    UnicodeProperty::V4_0_0
+  implements :nonproperty, UnicodeProperty::V4_0_0
+end

data/lib/regexp_parser/syntax/versions.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # Ruby 1.x is no longer a supported runtime,
 # but its regex features are still recognized.
 #
 # Aliases for the latest patch version are provided as 'ruby/n.n',
 # e.g. 'ruby/1.9' refers to Ruby v1.9.3.
-Dir[File.expand_path('../versions/*.rb', __FILE__)].sort.each { |f| require f }
+Dir[File.expand_path('../versions/*.rb', __FILE__)].sort.each { |f| require_relative f }
 
 Regexp::Syntax::CURRENT = Regexp::Syntax.for("ruby/#{RUBY_VERSION}")

data/lib/regexp_parser/syntax.rb

@@ -1,4 +1,6 @@
-require 'regexp_parser/error'
+# frozen_string_literal: true
+
+require_relative 'error'
 
 module Regexp::Syntax
   class SyntaxError < Regexp::Parser::Error; end

data/lib/regexp_parser/token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Regexp
   TOKEN_KEYS = %i[
     type