regexp_parser 1.8.0 → 2.0.2

data/spec/scanner/groups_spec.rb

@@ -5,11 +5,20 @@ RSpec.describe('Group scanning') do
   include_examples 'scan', '(?>abc)',         0 => [:group,     :atomic,         '(?>',        0, 3]
   include_examples 'scan', '(abc)',           0 => [:group,     :capture,        '(',          0, 1]
 
+  # Named groups
+  # only names that start with a hyphen or digit (ascii or other) are invalid
   include_examples 'scan', '(?<name>abc)',    0 => [:group,     :named_ab,       '(?<name>',   0, 8]
   include_examples 'scan', "(?'name'abc)",    0 => [:group,     :named_sq,       "(?'name'",   0, 8]
-
   include_examples 'scan', '(?<name_1>abc)',  0 => [:group,     :named_ab,       '(?<name_1>', 0,10]
   include_examples 'scan', "(?'name_1'abc)",  0 => [:group,     :named_sq,       "(?'name_1'", 0,10]
+  include_examples 'scan', '(?<name-1>abc)',  0 => [:group,     :named_ab,       '(?<name-1>', 0,10]
+  include_examples 'scan', "(?'name-1'abc)",  0 => [:group,     :named_sq,       "(?'name-1'", 0,10]
+  include_examples 'scan', "(?<name'1>abc)",  0 => [:group,     :named_ab,       "(?<name'1>", 0,10]
+  include_examples 'scan', "(?'name>1'abc)",  0 => [:group,     :named_sq,       "(?'name>1'", 0,10]
+  include_examples 'scan', '(?<üüuuüü>abc)',  0 => [:group,     :named_ab,       '(?<üüuuüü>', 0,10]
+  include_examples 'scan', "(?'üüuuüü'abc)",  0 => [:group,     :named_sq,       "(?'üüuuüü'", 0,10]
+  include_examples 'scan', "(?<😋1234😋>abc)",  0 => [:group,     :named_ab,       "(?<😋1234😋>", 0,10]
+  include_examples 'scan', "(?'😋1234😋'abc)",  0 => [:group,     :named_sq,       "(?'😋1234😋'", 0,10]
 
   include_examples 'scan', '(?:abc)',         0 => [:group,     :passive,        '(?:',        0, 3]
   include_examples 'scan', '(?:)',            0 => [:group,     :passive,        '(?:',        0, 3]

data/spec/scanner/literals_spec.rb

@@ -2,48 +2,38 @@ require 'spec_helper'
 
 RSpec.describe('UTF8 scanning') do
   # ascii, single byte characters
-  include_examples 'scan', 'a', 0              => [:literal,     :literal,       'a',        0, 1]
+  include_examples 'scan', 'a',
+    0 => [:literal,     :literal,       'a',        0, 1]
 
-  include_examples 'scan', 'ab+', 0            => [:literal,     :literal,       'ab',       0, 2]
-  include_examples 'scan', 'ab+', 1            => [:quantifier,  :one_or_more,   '+',        2, 3]
+  include_examples 'scan', 'ab+',
+    0 => [:literal,     :literal,       'ab',       0, 2],
+    1 => [:quantifier,  :one_or_more,   '+',        2, 3]
 
-  # 2 byte wide characters, Arabic
-  include_examples 'scan', 'aاbبcت', 0         => [:literal,     :literal,       'aاbبcت',   0, 9]
-
-  include_examples 'scan', 'aاbبت?', 0         => [:literal,     :literal,       'aاbبت',    0, 8]
-  include_examples 'scan', 'aاbبت?', 1         => [:quantifier,  :zero_or_one,   '?',        8, 9]
-
-  include_examples 'scan', 'aا?bبcت+', 0       => [:literal,     :literal,       'aا',       0, 3]
-  include_examples 'scan', 'aا?bبcت+', 1       => [:quantifier,  :zero_or_one,   '?',        3, 4]
-  include_examples 'scan', 'aا?bبcت+', 2       => [:literal,     :literal,       'bبcت',     4, 10]
-  include_examples 'scan', 'aا?bبcت+', 3       => [:quantifier,  :one_or_more,   '+',        10, 11]
-
-  include_examples 'scan', 'a(اbب+)cت?', 0     => [:literal,     :literal,       'a',        0, 1]
-  include_examples 'scan', 'a(اbب+)cت?', 1     => [:group,       :capture,       '(',        1, 2]
-  include_examples 'scan', 'a(اbب+)cت?', 2     => [:literal,     :literal,       'اbب',      2, 7]
-  include_examples 'scan', 'a(اbب+)cت?', 3     => [:quantifier,  :one_or_more,   '+',        7, 8]
-  include_examples 'scan', 'a(اbب+)cت?', 4     => [:group,       :close,         ')',        8, 9]
-  include_examples 'scan', 'a(اbب+)cت?', 5     => [:literal,     :literal,       'cت',       9, 12]
-  include_examples 'scan', 'a(اbب+)cت?', 6     => [:quantifier,  :zero_or_one,   '?',        12, 13]
+  # 2 byte wide characters
+  include_examples 'scan', 'äöü',
+    0 => [:literal,     :literal,        'äöü',     0, 3]
 
   # 3 byte wide characters, Japanese
-  include_examples 'scan', 'ab?れます+cd', 0    => [:literal,     :literal,       'ab',       0, 2]
-  include_examples 'scan', 'ab?れます+cd', 1    => [:quantifier,  :zero_or_one,   '?',        2, 3]
-  include_examples 'scan', 'ab?れます+cd', 2    => [:literal,     :literal,       'れます',    3, 12]
-  include_examples 'scan', 'ab?れます+cd', 3    => [:quantifier,  :one_or_more,   '+',        12, 13]
-  include_examples 'scan', 'ab?れます+cd', 4    => [:literal,     :literal,       'cd',       13, 15]
+  include_examples 'scan', 'ab?れます+cd',
+    0 => [:literal,     :literal,       'ab',       0, 2],
+    1 => [:quantifier,  :zero_or_one,   '?',        2, 3],
+    2 => [:literal,     :literal,       'れます',    3, 6],
+    3 => [:quantifier,  :one_or_more,   '+',        6, 7],
+    4 => [:literal,     :literal,       'cd',       7, 9]
 
   # 4 byte wide characters, Osmanya
-  include_examples 'scan', '𐒀𐒁?𐒂ab+𐒃', 0      => [:literal,     :literal,       '𐒀𐒁',       0, 8]
-  include_examples 'scan', '𐒀𐒁?𐒂ab+𐒃', 1      => [:quantifier,  :zero_or_one,   '?',        8, 9]
-  include_examples 'scan', '𐒀𐒁?𐒂ab+𐒃', 2      => [:literal,     :literal,       '𐒂ab',      9, 15]
-  include_examples 'scan', '𐒀𐒁?𐒂ab+𐒃', 3      => [:quantifier,  :one_or_more,   '+',        15, 16]
-  include_examples 'scan', '𐒀𐒁?𐒂ab+𐒃', 4      => [:literal,     :literal,       '𐒃',        16, 20]
-
-  include_examples 'scan', 'mu𝄞?si*𝄫c+', 0      => [:literal,     :literal,       'mu𝄞',       0, 6]
-  include_examples 'scan', 'mu𝄞?si*𝄫c+', 1      => [:quantifier,  :zero_or_one,   '?',        6, 7]
-  include_examples 'scan', 'mu𝄞?si*𝄫c+', 2      => [:literal,     :literal,       'si',       7, 9]
-  include_examples 'scan', 'mu𝄞?si*𝄫c+', 3      => [:quantifier,  :zero_or_more,  '*',        9, 10]
-  include_examples 'scan', 'mu𝄞?si*𝄫c+', 4      => [:literal,     :literal,       '𝄫c',       10, 15]
-  include_examples 'scan', 'mu𝄞?si*𝄫c+', 5      => [:quantifier,  :one_or_more,   '+',        15, 16]
+  include_examples 'scan', '𐒀𐒁?𐒂ab+𐒃',
+    0 => [:literal,     :literal,       '𐒀𐒁',       0, 2],
+    1 => [:quantifier,  :zero_or_one,   '?',        2, 3],
+    2 => [:literal,     :literal,       '𐒂ab',      3, 6],
+    3 => [:quantifier,  :one_or_more,   '+',        6, 7],
+    4 => [:literal,     :literal,       '𐒃',        7, 8]
+
+  include_examples 'scan', 'mu𝄞?si*𝄫c+',
+    0 => [:literal,     :literal,       'mu𝄞',       0, 3],
+    1 => [:quantifier,  :zero_or_one,   '?',        3, 4],
+    2 => [:literal,     :literal,       'si',       4, 6],
+    3 => [:quantifier,  :zero_or_more,  '*',        6, 7],
+    4 => [:literal,     :literal,       '𝄫c',       7, 9],
+    5 => [:quantifier,  :one_or_more,   '+',        9, 10]
 end

data/spec/scanner/quantifiers_spec.rb

@@ -1,20 +1,25 @@
 require 'spec_helper'
 
 RSpec.describe('Quantifier scanning') do
-  include_examples 'scan', 'a?',     1 => [:quantifier,  :zero_or_one,             '?',     1, 2]
-  include_examples 'scan', 'a??',    1 => [:quantifier,  :zero_or_one_reluctant,   '??',    1, 3]
-  include_examples 'scan', 'a?+',    1 => [:quantifier,  :zero_or_one_possessive,  '?+',    1, 3]
+  include_examples 'scan', 'a?',       1 => [:quantifier,  :zero_or_one,             '?',     1, 2]
+  include_examples 'scan', 'a??',      1 => [:quantifier,  :zero_or_one_reluctant,   '??',    1, 3]
+  include_examples 'scan', 'a?+',      1 => [:quantifier,  :zero_or_one_possessive,  '?+',    1, 3]
 
-  include_examples 'scan', 'a*',     1 => [:quantifier,  :zero_or_more,            '*',     1, 2]
-  include_examples 'scan', 'a*?',    1 => [:quantifier,  :zero_or_more_reluctant,  '*?',    1, 3]
-  include_examples 'scan', 'a*+',    1 => [:quantifier,  :zero_or_more_possessive, '*+',    1, 3]
+  include_examples 'scan', 'a*',       1 => [:quantifier,  :zero_or_more,            '*',     1, 2]
+  include_examples 'scan', 'a*?',      1 => [:quantifier,  :zero_or_more_reluctant,  '*?',    1, 3]
+  include_examples 'scan', 'a*+',      1 => [:quantifier,  :zero_or_more_possessive, '*+',    1, 3]
 
-  include_examples 'scan', 'a+',     1 => [:quantifier,  :one_or_more,             '+',     1, 2]
-  include_examples 'scan', 'a+?',    1 => [:quantifier,  :one_or_more_reluctant,   '+?',    1, 3]
-  include_examples 'scan', 'a++',    1 => [:quantifier,  :one_or_more_possessive,  '++',    1, 3]
+  include_examples 'scan', 'a+',       1 => [:quantifier,  :one_or_more,             '+',     1, 2]
+  include_examples 'scan', 'a+?',      1 => [:quantifier,  :one_or_more_reluctant,   '+?',    1, 3]
+  include_examples 'scan', 'a++',      1 => [:quantifier,  :one_or_more_possessive,  '++',    1, 3]
 
-  include_examples 'scan', 'a{2}',   1 => [:quantifier,  :interval,                '{2}',   1, 4]
-  include_examples 'scan', 'a{2,}',  1 => [:quantifier,  :interval,                '{2,}',  1, 5]
-  include_examples 'scan', 'a{,2}',  1 => [:quantifier,  :interval,                '{,2}',  1, 5]
-  include_examples 'scan', 'a{2,4}', 1 => [:quantifier,  :interval,                '{2,4}', 1, 6]
+  include_examples 'scan', 'a{2}',     1 => [:quantifier,  :interval,                '{2}',   1, 4]
+  include_examples 'scan', 'a{2,}',    1 => [:quantifier,  :interval,                '{2,}',  1, 5]
+  include_examples 'scan', 'a{,2}',    1 => [:quantifier,  :interval,                '{,2}',  1, 5]
+  include_examples 'scan', 'a{2,4}',   1 => [:quantifier,  :interval,                '{2,4}', 1, 6]
+
+  # special case: chained quantifiers
+  include_examples 'scan', 'a+{2}{3}', 1 => [:quantifier,  :one_or_more,             '+',     1, 2]
+  include_examples 'scan', 'a+{2}{3}', 2 => [:quantifier,  :interval,                '{2}',   2, 5]
+  include_examples 'scan', 'a+{2}{3}', 3 => [:quantifier,  :interval,                '{3}',   5, 8]
 end

data/spec/scanner/sets_spec.rb

@@ -18,8 +18,6 @@ RSpec.describe('Set scanning') do
   include_examples 'scan', /[<]/,                   1 => [:literal, :literal,        '<',          1, 2]
   include_examples 'scan', /[>]/,                   1 => [:literal, :literal,        '>',          1, 2]
 
-  include_examples 'scan', /[äöü]/,                 2 => [:literal, :literal,        'ö',          3, 5]
-
   include_examples 'scan', /[\x20]/,                1 => [:escape, :hex,             '\x20',       1, 5]
 
   include_examples 'scan', '[\.]',                  1 => [:escape, :dot,             '\.',         1, 3]
@@ -90,6 +88,14 @@ RSpec.describe('Set scanning') do
     8 => [:set,    :range,           '-',          9, 10],
     10=> [:set,    :close,           ']',          11, 12]
 
+  # multi-byte characters should not affect indices
+  include_examples 'scan', /[れます]/,
+    0 => [:set,     :open,           '[',          0, 1],
+    1 => [:literal, :literal,        'れ',          1, 2],
+    2 => [:literal, :literal,        'ま',          2, 3],
+    3 => [:literal, :literal,        'す',          3, 4],
+    4 => [:set,     :close,          ']',          4, 5]
+
   specify('set literal encoding') do
     text = RS.scan('[a]')[1][2].to_s
     expect(text).to eq 'a'

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'ice_nine'
 require 'regexp_parser'
 require 'regexp_property_values'
 require_relative 'support/shared_examples'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Ammar Ali
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -102,8 +102,6 @@ files:
 - spec/expression/methods/tests_spec.rb
 - spec/expression/methods/traverse_spec.rb
 - spec/expression/options_spec.rb
-- spec/expression/root_spec.rb
-- spec/expression/sequence_spec.rb
 - spec/expression/subexpression_spec.rb
 - spec/expression/to_h_spec.rb
 - spec/expression/to_s_spec.rb
@@ -178,86 +176,84 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.0
 signing_key:
 specification_version: 4
 summary: Scanner, lexer, parser for ruby's regular expressions
 test_files:
-- spec/token/token_spec.rb
-- spec/spec_helper.rb
-- spec/lexer/escapes_spec.rb
-- spec/lexer/keep_spec.rb
+- spec/expression/base_spec.rb
+- spec/expression/clone_spec.rb
+- spec/expression/conditional_spec.rb
+- spec/expression/free_space_spec.rb
+- spec/expression/methods/match_length_spec.rb
+- spec/expression/methods/match_spec.rb
+- spec/expression/methods/strfregexp_spec.rb
+- spec/expression/methods/tests_spec.rb
+- spec/expression/methods/traverse_spec.rb
+- spec/expression/options_spec.rb
+- spec/expression/subexpression_spec.rb
+- spec/expression/to_h_spec.rb
+- spec/expression/to_s_spec.rb
 - spec/lexer/all_spec.rb
 - spec/lexer/conditionals_spec.rb
-- spec/lexer/nesting_spec.rb
 - spec/lexer/delimiters_spec.rb
-- spec/lexer/refcalls_spec.rb
+- spec/lexer/escapes_spec.rb
+- spec/lexer/keep_spec.rb
 - spec/lexer/literals_spec.rb
+- spec/lexer/nesting_spec.rb
+- spec/lexer/refcalls_spec.rb
+- spec/parser/all_spec.rb
+- spec/parser/alternation_spec.rb
+- spec/parser/anchors_spec.rb
+- spec/parser/conditionals_spec.rb
+- spec/parser/errors_spec.rb
 - spec/parser/escapes_spec.rb
-- spec/parser/properties_spec.rb
-- spec/parser/sets_spec.rb
 - spec/parser/free_space_spec.rb
+- spec/parser/groups_spec.rb
 - spec/parser/keep_spec.rb
 - spec/parser/options_spec.rb
-- spec/parser/all_spec.rb
-- spec/parser/conditionals_spec.rb
-- spec/parser/types_spec.rb
-- spec/parser/anchors_spec.rb
-- spec/parser/alternation_spec.rb
 - spec/parser/posix_classes_spec.rb
-- spec/parser/set/ranges_spec.rb
-- spec/parser/set/intersections_spec.rb
-- spec/parser/errors_spec.rb
-- spec/parser/refcalls_spec.rb
-- spec/parser/groups_spec.rb
+- spec/parser/properties_spec.rb
 - spec/parser/quantifiers_spec.rb
-- spec/support/warning_extractor.rb
-- spec/support/shared_examples.rb
-- spec/support/runner.rb
-- spec/expression/subexpression_spec.rb
-- spec/expression/methods/match_spec.rb
-- spec/expression/methods/match_length_spec.rb
-- spec/expression/methods/traverse_spec.rb
-- spec/expression/methods/strfregexp_spec.rb
-- spec/expression/methods/tests_spec.rb
-- spec/expression/free_space_spec.rb
-- spec/expression/options_spec.rb
-- spec/expression/to_s_spec.rb
-- spec/expression/root_spec.rb
-- spec/expression/sequence_spec.rb
-- spec/expression/clone_spec.rb
-- spec/expression/to_h_spec.rb
-- spec/expression/conditional_spec.rb
-- spec/expression/base_spec.rb
-- spec/syntax/syntax_spec.rb
-- spec/syntax/syntax_token_map_spec.rb
-- spec/syntax/versions/1.9.3_spec.rb
-- spec/syntax/versions/2.2.0_spec.rb
-- spec/syntax/versions/1.9.1_spec.rb
-- spec/syntax/versions/2.0.0_spec.rb
-- spec/syntax/versions/1.8.6_spec.rb
-- spec/syntax/versions/aliases_spec.rb
-- spec/scanner/escapes_spec.rb
-- spec/scanner/properties_spec.rb
-- spec/scanner/sets_spec.rb
-- spec/scanner/free_space_spec.rb
-- spec/scanner/keep_spec.rb
-- spec/scanner/options_spec.rb
+- spec/parser/refcalls_spec.rb
+- spec/parser/set/intersections_spec.rb
+- spec/parser/set/ranges_spec.rb
+- spec/parser/sets_spec.rb
+- spec/parser/types_spec.rb
 - spec/scanner/all_spec.rb
-- spec/scanner/conditionals_spec.rb
-- spec/scanner/types_spec.rb
 - spec/scanner/anchors_spec.rb
-- spec/scanner/meta_spec.rb
-- spec/scanner/errors_spec.rb
+- spec/scanner/conditionals_spec.rb
 - spec/scanner/delimiters_spec.rb
-- spec/scanner/refcalls_spec.rb
+- spec/scanner/errors_spec.rb
+- spec/scanner/escapes_spec.rb
+- spec/scanner/free_space_spec.rb
 - spec/scanner/groups_spec.rb
+- spec/scanner/keep_spec.rb
 - spec/scanner/literals_spec.rb
+- spec/scanner/meta_spec.rb
+- spec/scanner/options_spec.rb
+- spec/scanner/properties_spec.rb
 - spec/scanner/quantifiers_spec.rb
+- spec/scanner/refcalls_spec.rb
+- spec/scanner/sets_spec.rb
+- spec/scanner/types_spec.rb
+- spec/spec_helper.rb
+- spec/support/runner.rb
+- spec/support/shared_examples.rb
+- spec/support/warning_extractor.rb
+- spec/syntax/syntax_spec.rb
+- spec/syntax/syntax_token_map_spec.rb
+- spec/syntax/versions/1.8.6_spec.rb
+- spec/syntax/versions/1.9.1_spec.rb
+- spec/syntax/versions/1.9.3_spec.rb
+- spec/syntax/versions/2.0.0_spec.rb
+- spec/syntax/versions/2.2.0_spec.rb
+- spec/syntax/versions/aliases_spec.rb
+- spec/token/token_spec.rb

data/spec/expression/root_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe(Regexp::Expression::Root) do
-  describe('#initialize') do
-    it 'supports the old, nonstandard arity for backwards compatibility' do
-      expect { Root.new }.to output.to_stderr
-    end
-  end
-end

data/spec/expression/sequence_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe(Regexp::Expression::Sequence) do
-  describe('#initialize') do
-    it 'supports the old, nonstandard arity for backwards compatibility' do
-      expect { Sequence.new(0, 0, 0) }.to output.to_stderr
-    end
-  end
-end