regexp_parser 2.8.1 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1426faee272654c45e3da8e262e94cfdbcf134dbad7804aed8cd945334c07be
-  data.tar.gz: 37eec721839fe2ebfc25c9d614756289b59ee766f5e7e60ecf4839b554bbb93e
+  metadata.gz: 53bc2105c4601ec650c24172f48b4dfa4ffa356f84f4de2a58cca4429cff45a4
+  data.tar.gz: 3cb580ee3db70e9490b350722fcd63b77640cc1cbaed4c7555b192f9ddcc341b
 SHA512:
-  metadata.gz: abed9d7f387634b5e16eb19cbfd5d9aab03288dd4d284b1c52688f958714479783275c5418ee623607ced96b301124ab82dff546e7e4146c7c5ec7feae3e089d
-  data.tar.gz: 62c0757df1c73df52fcf71ef8de666ab9a51a4a8145e71321424ab0ff8408cb2b707cf154dae64ebbcc5a9c8a12ee377a3eadab7549432a9d0e6ee0e65afddd1
+  metadata.gz: fcdf19c19bc62b11a3c8a22a75c54ef996635dfc3cbabf7512eee49090c0215b21c751a275923561a0be33bb0070e04ce57f49a5bc95bedb386afd763ba6d7ba
+  data.tar.gz: 5744e2e8baa4ecf52d87718a821c4ba69e8d2d1ced6deffca3224cf415a72714726f8465d50c0f504421fed5992c94519c3c8e0a0e7f79e24037a9fad5386347

data/lib/regexp_parser/scanner/scanner.rl

@@ -267,6 +267,13 @@
       fret;
     };
 
+    [8-9] . [0-9] { # special case, emits two tokens
+      text = copy(data, ts-1, te)
+      emit(:escape, :literal, text[0, 2])
+      emit(:literal, :literal, text[2])
+      fret;
+    };
+
     meta_char {
       case text = copy(data, ts-1, te)
       when '\.';  emit(:escape, :dot,               text)
@@ -357,6 +364,7 @@
   conditional_expression := |*
     group_lookup . ')' {
       text = copy(data, ts, te-1)
+      text =~ /[^0]/ or raise ValidationError.for(:backref, 'condition', 'invalid ref ID')
       emit(:conditional, :condition, text)
       emit(:conditional, :condition_close, ')')
     };
@@ -534,13 +542,13 @@
       case text = copy(data, ts, te)
       when /^\\k(.)[^0-9\-][^+\-]*['>]$/
         emit(:backref, $1 == '<' ? :name_ref_ab : :name_ref_sq, text)
-      when /^\\k(.)[1-9]\d*['>]$/
+      when /^\\k(.)0*[1-9]\d*['>]$/
         emit(:backref, $1 == '<' ? :number_ref_ab : :number_ref_sq, text)
-      when /^\\k(.)-[1-9]\d*['>]$/
+      when /^\\k(.)-0*[1-9]\d*['>]$/
         emit(:backref, $1 == '<' ? :number_rel_ref_ab : :number_rel_ref_sq, text)
       when /^\\k(.)[^0-9\-].*[+\-]\d+['>]$/
         emit(:backref, $1 == '<' ? :name_recursion_ref_ab : :name_recursion_ref_sq, text)
-      when /^\\k(.)-?[1-9]\d*[+\-]\d+['>]$/
+      when /^\\k(.)-?0*[1-9]\d*[+\-]\d+['>]$/
         emit(:backref, $1 == '<' ? :number_recursion_ref_ab : :number_recursion_ref_sq, text)
       else
         raise ValidationError.for(:backref, 'backreference', 'invalid ref ID')
@@ -553,9 +561,9 @@
       case text = copy(data, ts, te)
       when /^\\g(.)[^0-9+\-].*['>]$/
         emit(:backref, $1 == '<' ? :name_call_ab : :name_call_sq, text)
-      when /^\\g(.)\d+['>]$/
+      when /^\\g(.)(?:0|0*[1-9]\d*)['>]$/
         emit(:backref, $1 == '<' ? :number_call_ab : :number_call_sq, text)
-      when /^\\g(.)[+-]\d+/
+      when /^\\g(.)[+-]0*[1-9]\d*/
         emit(:backref, $1 == '<' ? :number_rel_call_ab : :number_rel_call_sq, text)
       else
         raise ValidationError.for(:backref, 'subexpression call', 'invalid ref ID')

data/lib/regexp_parser/scanner.rb

@@ -85,12 +85,12 @@ self._re_scanner_trans_keys = [
 48,120,48,55,48,55,
 -62,125,-128,-65,-128,
 -65,-128,-65,48,55,
-48,55,77,77,45,45,
-0,0,67,99,45,
-45,0,0,92,92,
-48,102,39,60,39,57,
-48,57,41,57,33,
-62,0
+48,55,48,57,77,77,
+45,45,0,0,67,
+99,45,45,0,0,
+92,92,48,102,39,60,
+39,57,48,57,41,
+57,33,62,0
 ]
 
 class << self
@@ -111,8 +111,8 @@ self._re_scanner_key_spans = [
 94,1,21,21,21,58,14,52,
 33,188,64,64,64,1,56,1,
 73,8,8,188,64,64,64,8,
-8,1,1,0,33,1,0,1,
-55,22,19,10,17,30
+8,10,1,1,0,33,1,0,
+1,55,22,19,10,17,30
 ]
 
 class << self
@@ -133,8 +133,8 @@ self._re_scanner_index_offsets = [
 3415,3510,3512,3534,3556,3578,3637,3652,
 3705,3739,3928,3993,4058,4123,4125,4182,
 4184,4258,4267,4276,4465,4530,4595,4660,
-4669,4678,4680,4682,4683,4717,4719,4720,
-4722,4778,4801,4821,4832,4850
+4669,4678,4689,4691,4693,4694,4728,4730,
+4731,4733,4789,4812,4832,4843,4861
 ]
 
 class << self
@@ -726,33 +726,34 @@ self._re_scanner_indicies = [
 176,176,176,176,176,176,176,176,
 176,176,176,175,178,178,178,178,
 178,178,178,178,177,180,180,180,
-180,180,180,180,180,179,182,62,
-184,183,62,186,67,67,67,67,
+180,180,180,180,180,179,182,182,
+182,182,182,182,182,182,182,182,
+181,184,62,186,185,62,188,67,
 67,67,67,67,67,67,67,67,
 67,67,67,67,67,67,67,67,
 67,67,67,67,67,67,67,67,
-67,67,67,187,67,189,188,67,
-70,67,191,191,191,191,191,191,
-191,191,191,191,190,190,190,190,
-190,190,190,191,191,191,191,191,
-191,190,190,190,190,190,190,190,
-190,190,190,190,190,190,190,190,
-190,190,190,190,190,190,190,190,
-190,190,190,191,191,191,191,191,
-191,190,193,192,192,192,192,192,
-194,192,192,195,195,195,195,195,
-195,195,195,195,195,192,192,196,
-192,86,85,85,85,85,85,197,
-85,85,197,197,197,197,197,197,
-197,197,197,197,85,88,88,88,
-88,88,88,88,88,88,88,197,
-87,197,197,197,197,197,197,88,
+67,67,67,67,67,67,189,67,
+191,190,67,70,67,193,193,193,
+193,193,193,193,193,193,193,192,
+192,192,192,192,192,192,193,193,
+193,193,193,193,192,192,192,192,
+192,192,192,192,192,192,192,192,
+192,192,192,192,192,192,192,192,
+192,192,192,192,192,192,193,193,
+193,193,193,193,192,195,194,194,
+194,194,194,196,194,194,197,197,
+197,197,197,197,197,197,197,197,
+194,194,198,194,86,85,85,85,
+85,85,199,85,85,199,199,199,
+199,199,199,199,199,199,199,85,
 88,88,88,88,88,88,88,88,
-88,197,197,89,89,89,89,89,
-89,89,89,89,89,89,197,89,
-89,197,197,197,197,197,197,197,
-197,197,197,89,89,89,89,86,
-89,0
+88,88,199,87,199,199,199,199,
+199,199,88,88,88,88,88,88,
+88,88,88,88,199,199,89,89,
+89,89,89,89,89,89,89,89,
+89,199,89,89,199,199,199,199,
+199,199,199,199,199,199,89,89,
+89,89,86,89,0
 ]
 
 class << self
@@ -767,10 +768,10 @@ self._re_scanner_trans_targs = [
 27,28,30,31,32,33,34,71,
 36,71,37,39,0,40,41,88,
 89,89,42,89,89,89,45,46,
-89,89,99,99,47,50,99,105,
-99,107,53,99,108,99,110,56,
+89,89,99,99,47,50,99,106,
+99,108,53,99,109,99,111,56,
 59,57,58,99,60,61,62,63,
-64,65,99,112,113,67,68,113,
+64,65,99,113,114,67,68,114,
 69,70,3,73,74,75,76,77,
 71,78,71,82,83,71,84,71,
 85,71,71,86,71,71,71,71,
@@ -780,11 +781,11 @@ self._re_scanner_trans_targs = [
 38,90,91,92,89,93,94,95,
 89,89,89,89,43,89,89,44,
 89,89,89,96,97,96,96,98,
-96,100,101,102,99,103,103,99,
+96,100,101,102,99,103,103,105,
 49,99,52,99,99,55,66,99,
-48,99,104,99,99,99,106,99,
-51,99,109,111,99,54,99,99,
-113,114,115,116,117,113
+48,99,104,99,99,99,99,99,
+107,99,51,99,110,112,99,54,
+99,99,114,115,116,117,118,114
 ]
 
 class << self
@@ -812,11 +813,11 @@ self._re_scanner_trans_actions = [
 0,0,40,40,66,0,40,67,
 68,69,70,71,0,72,73,0,
 74,75,76,77,0,78,79,0,
-80,0,40,40,81,82,83,84,
-0,85,0,86,87,0,0,88,
-0,89,0,90,91,92,40,93,
-0,94,40,0,95,0,96,97,
-98,40,40,40,40,99
+80,0,40,40,81,82,83,0,
+0,84,0,85,86,0,0,87,
+0,88,0,89,90,91,92,93,
+40,94,0,95,40,0,96,0,
+97,98,99,40,40,40,40,100
 ]
 
 class << self
@@ -838,7 +839,7 @@ self._re_scanner_to_state_actions = [
 64,64,0,0,0,0,0,0,
 64,0,0,64,0,0,0,0,
 0,0,0,0,0,0,0,0,
-0,64,0,0,0,0
+0,0,64,0,0,0,0
 ]
 
 class << self
@@ -860,7 +861,7 @@ self._re_scanner_from_state_actions = [
 34,34,0,0,0,0,0,0,
 34,0,0,34,0,0,0,0,
 0,0,0,0,0,0,0,0,
-0,34,0,0,0,0
+0,0,34,0,0,0,0
 ]
 
 class << self
@@ -882,7 +883,7 @@ self._re_scanner_eof_actions = [
 0,24,0,0,0,0,0,0,
 0,0,0,24,0,0,0,0,
 0,0,0,0,0,0,0,0,
-0,0,0,0,0,0
+0,0,0,0,0,0,0
 ]
 
 class << self
@@ -903,8 +904,8 @@ self._re_scanner_eof_trans = [
 116,122,123,125,127,129,134,0,
 0,0,148,148,148,148,151,154,
 0,159,159,0,176,176,176,178,
-180,182,182,182,186,186,186,186,
-191,0,198,198,198,198
+180,182,184,184,184,188,188,188,
+188,193,0,200,200,200,200
 ]
 
 class << self
@@ -943,7 +944,7 @@ self.re_scanner_en_escape_sequence = 99;
 class << self
 	attr_accessor :re_scanner_en_conditional_expression
 end
-self.re_scanner_en_conditional_expression = 113;
+self.re_scanner_en_conditional_expression = 114;
 class << self
 	attr_accessor :re_scanner_en_main
 end
@@ -1243,12 +1244,11 @@ p = p - 1; begin
 
      end
 		end
-	when 84 then
+	when 90 then
 		begin
 te = p+1
  begin
-      text = copy(data, ts-1,te)
-      emit(:backref, :number, text)
+      emit(:escape, :octal, copy(data, ts-1,te))
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1258,11 +1258,13 @@ te = p+1
 
      end
 		end
-	when 91 then
+	when 92 then
 		begin
 te = p+1
- begin
-      emit(:escape, :octal, copy(data, ts-1,te))
+ begin  # special case, emits two tokens
+      text = copy(data, ts-1,te)
+      emit(:escape, :literal, text[0,2])
+      emit(:literal, :literal, text[2])
       	begin
 		top -= 1
 		cs = stack[top]
@@ -1302,7 +1304,7 @@ te = p+1
 
      end
 		end
-	when 87 then
+	when 86 then
 		begin
 te = p+1
  begin
@@ -1346,7 +1348,7 @@ te = p+1
 
      end
 		end
-	when 97 then
+	when 98 then
 		begin
 te = p+1
  begin
@@ -1388,7 +1390,7 @@ te = p+1
 
      end
 		end
-	when 85 then
+	when 84 then
 		begin
 te = p+1
  begin
@@ -1404,7 +1406,7 @@ te = p+1
 
      end
 		end
-	when 86 then
+	when 85 then
 		begin
 te = p+1
  begin
@@ -1434,7 +1436,22 @@ te = p+1
 
      end
 		end
-	when 90 then
+	when 91 then
+		begin
+te = p
+p = p - 1; begin
+      text = copy(data, ts-1,te)
+      emit(:backref, :number, text)
+      	begin
+		top -= 1
+		cs = stack[top]
+		_goto_level = _again
+		next
+	end
+
+     end
+		end
+	when 89 then
 		begin
 te = p
 p = p - 1; begin
@@ -1448,7 +1465,7 @@ p = p - 1; begin
 
      end
 		end
-	when 96 then
+	when 97 then
 		begin
 te = p
 p = p - 1; begin
@@ -1462,7 +1479,7 @@ p = p - 1; begin
 
      end
 		end
-	when 93 then
+	when 94 then
 		begin
 te = p
 p = p - 1; begin
@@ -1476,7 +1493,7 @@ p = p - 1; begin
 
      end
 		end
-	when 95 then
+	when 96 then
 		begin
 te = p
 p = p - 1; begin
@@ -1490,7 +1507,7 @@ p = p - 1; begin
 
      end
 		end
-	when 88 then
+	when 87 then
 		begin
 te = p
 p = p - 1; begin
@@ -1518,7 +1535,7 @@ p = p - 1; begin
 
      end
 		end
-	when 89 then
+	when 88 then
 		begin
 	case act
 	when 17 then
@@ -1553,11 +1570,12 @@ end
 te = p+1
  begin
       text = copy(data, ts, te-1)
+      text =~ /[^0]/ or raise ValidationError.for(:backref, 'condition', 'invalid ref ID')
       emit(:conditional, :condition, text)
       emit(:conditional, :condition_close, ')')
      end
 		end
-	when 98 then
+	when 99 then
 		begin
 te = p+1
  begin
@@ -1572,7 +1590,7 @@ te = p+1
 
      end
 		end
-	when 99 then
+	when 100 then
 		begin
 te = p
 p = p - 1; begin
@@ -1675,7 +1693,7 @@ te = p+1
       	begin
 		stack[top] = cs
 		top+= 1
-		cs = 113
+		cs = 114
 		_goto_level = _again
 		next
 	end
@@ -1733,13 +1751,13 @@ te = p+1
       case text = copy(data, ts, te)
       when /^\\k(.)[^0-9\-][^+\-]*['>]$/
         emit(:backref, $1 == '<' ? :name_ref_ab : :name_ref_sq, text)
-      when /^\\k(.)[1-9]\d*['>]$/
+      when /^\\k(.)0*[1-9]\d*['>]$/
         emit(:backref, $1 == '<' ? :number_ref_ab : :number_ref_sq, text)
-      when /^\\k(.)-[1-9]\d*['>]$/
+      when /^\\k(.)-0*[1-9]\d*['>]$/
         emit(:backref, $1 == '<' ? :number_rel_ref_ab : :number_rel_ref_sq, text)
       when /^\\k(.)[^0-9\-].*[+\-]\d+['>]$/
         emit(:backref, $1 == '<' ? :name_recursion_ref_ab : :name_recursion_ref_sq, text)
-      when /^\\k(.)-?[1-9]\d*[+\-]\d+['>]$/
+      when /^\\k(.)-?0*[1-9]\d*[+\-]\d+['>]$/
         emit(:backref, $1 == '<' ? :number_recursion_ref_ab : :number_recursion_ref_sq, text)
       else
         raise ValidationError.for(:backref, 'backreference', 'invalid ref ID')
@@ -1753,9 +1771,9 @@ te = p+1
       case text = copy(data, ts, te)
       when /^\\g(.)[^0-9+\-].*['>]$/
         emit(:backref, $1 == '<' ? :name_call_ab : :name_call_sq, text)
-      when /^\\g(.)\d+['>]$/
+      when /^\\g(.)(?:0|0*[1-9]\d*)['>]$/
         emit(:backref, $1 == '<' ? :number_call_ab : :number_call_sq, text)
-      when /^\\g(.)[+-]\d+/
+      when /^\\g(.)[+-]0*[1-9]\d*/
         emit(:backref, $1 == '<' ? :number_rel_call_ab : :number_rel_call_sq, text)
       else
         raise ValidationError.for(:backref, 'subexpression call', 'invalid ref ID')
@@ -1975,7 +1993,7 @@ p = p - 1; begin
 		next
 	end
 end
-	when 41 then
+	when 42 then
 	begin begin p = ((te))-1; end
 
       text = copy(data, ts, te)
@@ -1984,7 +2002,7 @@ end
       end
       emit_options(text)
     end
-	when 42 then
+	when 43 then
 	begin begin p = ((te))-1; end
 
       case text = copy(data, ts, te)
@@ -1994,7 +2012,7 @@ end
       when '(?<!'; emit(:assertion, :nlookbehind,  text)
       end
     end
-	when 56 then
+	when 57 then
 	begin begin p = ((te))-1; end
 
       append_literal(data, ts, te)
@@ -2041,7 +2059,7 @@ p = p - 1; begin
 
      end
 		end
-	when 92 then
+	when 93 then
 		begin
 
     text = copy(data, ts ? ts-1 : 0,-1)
@@ -2060,7 +2078,7 @@ p = p - 1; begin
 
      end
 		end
-	when 94 then
+	when 95 then
 		begin
 
     text = copy(data, ts ? ts-1 : 0,-1)
@@ -2279,19 +2297,19 @@ act = 18;		end
 te = p+1
 		end
 		begin
-act = 41;		end
+act = 42;		end
 	when 7 then
 		begin
 te = p+1
 		end
 		begin
-act = 42;		end
+act = 43;		end
 	when 2 then
 		begin
 te = p+1
 		end
 		begin
-act = 56;		end
+act = 57;		end
 	end
 	end
 	end

data/lib/regexp_parser/version.rb

@@ -1,5 +1,5 @@
 class Regexp
   class Parser
-    VERSION = '2.8.1'
+    VERSION = '2.8.3'
   end
 end

data/regexp_parser.gemspec

@@ -16,17 +16,15 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['wiki_uri']        = "#{spec.homepage}/wiki"
 
-  spec.authors       = ['Ammar Ali']
-  spec.email         = ['ammarabuali@gmail.com']
+  spec.authors       = ['Ammar Ali', 'Janosch Müller']
+  spec.email         = ['ammarabuali@gmail.com', 'janosch84@gmail.com']
 
   spec.license       = 'MIT'
 
   spec.require_paths = ['lib']
 
   spec.files         = Dir.glob('lib/**/*.{csv,rb,rl}') +
-                       %w[Gemfile Rakefile LICENSE README.md CHANGELOG.md regexp_parser.gemspec]
-
-  spec.rdoc_options  = ["--inline-source", "--charset=UTF-8"]
+                       %w[Gemfile Rakefile LICENSE regexp_parser.gemspec]
 
   spec.platform      = Gem::Platform::RUBY
 

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.3
 platform: ruby
 authors:
 - Ammar Ali
+- Janosch Müller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
 - ammarabuali@gmail.com
+- janosch84@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - Gemfile
 - LICENSE
-- README.md
 - Rakefile
 - lib/regexp_parser.rb
 - lib/regexp_parser/error.rb
@@ -115,9 +115,7 @@ metadata:
   source_code_uri: https://github.com/ammar/regexp_parser
   wiki_uri: https://github.com/ammar/regexp_parser/wiki
 post_install_message:
-rdoc_options:
-- "--inline-source"
-- "--charset=UTF-8"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -131,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Scanner, lexer, parser for ruby's regular expressions