regexp_parser 1.5.1 → 1.8.1

data/spec/lexer/delimiters_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+RSpec.describe('Literal delimiter lexing') do
+  include_examples 'lex', '}',
+    0 => [:literal,     :literal,       '}',       0,  1,  0, 0, 0]
+
+  include_examples 'lex', '}}',
+    0 => [:literal,     :literal,       '}}',      0,  2,  0, 0, 0]
+
+  include_examples 'lex', '{',
+    0 => [:literal,     :literal,       '{',       0,  1,  0, 0, 0]
+
+  include_examples 'lex', '{{',
+    0 => [:literal,     :literal,       '{{',      0,  2,  0, 0, 0]
+
+  include_examples 'lex', '{}',
+    0 => [:literal,     :literal,       '{}',      0,  2,  0, 0, 0]
+
+  include_examples 'lex', '}{',
+    0 => [:literal,     :literal,       '}{',      0,  2,  0, 0, 0]
+
+  include_examples 'lex', '}{+',
+    0 => [:literal,     :literal,       '}',       0,  1,  0, 0, 0],
+    1 => [:literal,     :literal,       '{',       1,  2,  0, 0, 0],
+    2 => [:quantifier,  :one_or_more,   '+',       2,  3,  0, 0, 0]
+
+  include_examples 'lex', '{{var}}',
+    0 => [:literal,     :literal,       '{{var}}',  0,  7,  0, 0, 0]
+
+  include_examples 'lex', 'a{b}c',
+    0 => [:literal,     :literal,       'a{b}c',    0,  5,  0, 0, 0]
+
+  include_examples 'lex', 'a{1,2',
+    0 => [:literal,     :literal,       'a{1,2',    0,  5,  0, 0, 0]
+
+  include_examples 'lex', '({.+})',
+    0 => [:group,       :capture,       '(',    0,  1,  0, 0, 0],
+    1 => [:literal,     :literal,       '{',    1,  2,  1, 0, 0],
+    2 => [:meta,        :dot,           '.',    2,  3,  1, 0, 0],
+    3 => [:quantifier,  :one_or_more,   '+',    3,  4,  1, 0, 0],
+    4 => [:literal,     :literal,       '}',    4,  5,  1, 0, 0],
+    5 => [:group,       :close,         ')',    5,  6,  0, 0, 0]
+
+  include_examples 'lex', ']',
+    0 => [:literal,     :literal,       ']',        0,  1,  0, 0, 0]
+
+  include_examples 'lex', ']]',
+    0 => [:literal,     :literal,       ']]',       0,  2,  0, 0, 0]
+
+  include_examples 'lex', ']\[',
+    0 => [:literal,     :literal,       ']',        0,  1,  0, 0, 0],
+    1 => [:escape,      :set_open,      '\[',       1,  3,  0, 0, 0]
+
+  include_examples 'lex', '()',
+    0 => [:group,       :capture,       '(',        0,  1,  0, 0, 0],
+    1 => [:group,       :close,         ')',        1,  2,  0, 0, 0]
+
+  include_examples 'lex', '{abc:.+}}}[^}]]}',
+    0 => [:literal,     :literal,       '{abc:',    0,  5,  0, 0, 0],
+    1 => [:meta,        :dot,           '.',        5,  6,  0, 0, 0],
+    2 => [:quantifier,  :one_or_more,   '+',        6,  7,  0, 0, 0],
+    3 => [:literal,     :literal,       '}}}',      7,  10, 0, 0, 0],
+    4 => [:set,         :open,          '[',        10, 11, 0, 0, 0],
+    5 => [:set,         :negate,        '^',        11, 12, 0, 1, 0],
+    6 => [:literal,     :literal,       '}',        12, 13, 0, 1, 0],
+    7 => [:set,         :close,         ']',        13, 14, 0, 0, 0],
+    8 => [:literal,     :literal,       ']}',       14, 16, 0, 0, 0]
+end

data/spec/parser/options_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+RSpec.describe('passing options to parse') do
+  it 'raises if if parsing from a Regexp and options are passed' do
+    expect { RP.parse(/a+/, options: ::Regexp::EXTENDED) }.to raise_error(
+      ArgumentError,
+      'options cannot be supplied unless parsing a String'
+    )
+  end
+
+  it 'sets options if parsing from a String' do
+    root = RP.parse('a+', options: ::Regexp::MULTILINE | ::Regexp::EXTENDED)
+
+    expect(root.options).to eq(m: true, x: true)
+  end
+
+  it 'allows options to not be supplied when parsing from a Regexp' do
+    root = RP.parse(/a+/ix)
+
+    expect(root.options).to eq(i: true, x: true)
+  end
+
+  it 'has an empty option-hash when parsing from a String and passing no options' do
+    root = RP.parse('a+')
+
+    expect(root.options).to be_empty
+  end
+end

data/spec/parser/properties_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe('Property parsing') do
   end
 
   specify('parse property shortcut') do
-    expect(RP.parse('\p{mark}')[0].shortcut).to eq 'm'
+    expect(RP.parse('\p{lowercase_letter}')[0].shortcut).to eq 'll'
     expect(RP.parse('\p{sc}')[0].shortcut).to eq 'sc'
     expect(RP.parse('\p{in_bengali}')[0].shortcut).to be_nil
   end

data/spec/parser/quantifiers_spec.rb

@@ -35,6 +35,7 @@ RSpec.describe('Quantifier parsing') do
   include_examples 'quantifier', /a{4}b/,    '{4}',    :greedy,     :interval,     4, 4
   include_examples 'quantifier', /a{4}?b/,   '{4}?',   :reluctant,  :interval,     4, 4
   include_examples 'quantifier', /a{4}+b/,   '{4}+',   :possessive, :interval,     4, 4
+  include_examples 'quantifier', /a{004}+b/, '{004}+', :possessive, :interval,     4, 4
 
   specify('mode-checking methods') do
     exp = RP.parse(/a??/).first

data/spec/scanner/delimiters_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+RSpec.describe('Literal delimiter scanning') do
+  include_examples 'scan', '}',
+    0 => [:literal,     :literal,       '}',        0,  1]
+
+  include_examples 'scan', '}}',
+    0 => [:literal,     :literal,       '}}',       0,  2]
+
+  include_examples 'scan', '{',
+    0 => [:literal,     :literal,       '{',        0,  1]
+
+  include_examples 'scan', '{{',
+    0 => [:literal,     :literal,       '{{',       0,  2]
+
+  include_examples 'scan', '{}',
+    0 => [:literal,     :literal,       '{}',       0,  2]
+
+  include_examples 'scan', '}{',
+    0 => [:literal,     :literal,       '}{',       0,  2]
+
+  include_examples 'scan', '}{+',
+    0 => [:literal,     :literal,       '}{',       0,  2]
+
+  include_examples 'scan', '{{var}}',
+    0 => [:literal,     :literal,       '{{var}}',  0,  7]
+
+  include_examples 'scan', 'a{1,2',
+    0 => [:literal,     :literal,       'a{1,2',    0,  5]
+
+  include_examples 'scan', '({.+})',
+    0 => [:group,       :capture,       '(',        0,  1],
+    1 => [:literal,     :literal,       '{',        1,  2],
+    2 => [:meta,        :dot,           '.',        2,  3],
+    3 => [:quantifier,  :one_or_more,   '+',        3,  4],
+    4 => [:literal,     :literal,       '}',        4,  5],
+    5 => [:group,       :close,         ')',        5,  6]
+
+  include_examples 'scan', ']',
+    0 => [:literal,     :literal,       ']',        0,  1]
+
+  include_examples 'scan', ']]',
+    0 => [:literal,     :literal,       ']]',       0,  2]
+
+  include_examples 'scan', ']\[',
+    0 => [:literal,     :literal,       ']',        0,  1],
+    1 => [:escape,      :set_open,      '\[',       1,  3]
+
+  include_examples 'scan', '()',
+    0 => [:group,       :capture,       '(',        0,  1],
+    1 => [:group,       :close,         ')',        1,  2]
+end

data/spec/scanner/errors_spec.rb

@@ -10,7 +10,6 @@ RSpec.describe(Regexp::Scanner) do
   include_examples 'scan error', RS::PrematureEndError, 'unbalanced set', '[a'
   include_examples 'scan error', RS::PrematureEndError, 'unbalanced set', '[[:alpha:]'
   include_examples 'scan error', RS::PrematureEndError, 'unbalanced group', '(abc'
-  include_examples 'scan error', RS::PrematureEndError, 'unbalanced interval', 'a{1,2'
   include_examples 'scan error', RS::PrematureEndError, 'eof in property', '\p{asci'
   include_examples 'scan error', RS::PrematureEndError, 'incomplete property', '\p{ascii abc'
   include_examples 'scan error', RS::PrematureEndError, 'eof options', '(?mix'

data/spec/scanner/escapes_spec.rb

@@ -13,6 +13,10 @@ RSpec.describe('Escape scanning') do
 
   include_examples 'scan', 'c\qt',            1 => [:escape,  :literal,          '\q',             1,  3]
 
+  # these incomplete ref/call sequences are treated as literal escapes by Ruby
+  include_examples 'scan', 'c\gt',            1 => [:escape,  :literal,          '\g',             1,  3]
+  include_examples 'scan', 'c\kt',            1 => [:escape,  :literal,          '\k',             1,  3]
+
   include_examples 'scan', 'a\012c',          1 => [:escape,  :octal,            '\012',           1,  5]
   include_examples 'scan', 'a\0124',          1 => [:escape,  :octal,            '\012',           1,  5]
   include_examples 'scan', '\712+7',          0 => [:escape,  :octal,            '\712',           0,  4]

data/spec/scanner/free_space_spec.rb

@@ -39,6 +39,17 @@ RSpec.describe('FreeSpace scanning') do
       11 => [:free_space, :comment,  "# B ? comment\n",      37,  51],
       17 => [:free_space, :comment,  "# C {2,3} comment\n",  66,  84],
       29 => [:free_space, :comment,  "# D|E comment\n",     100, 114]
+
+    # single line / no trailing newline (c.f. issue #66)
+    include_examples 'scan', /a # b/x,
+      0 => [:literal,    :literal,    'a',   0,  1],
+      1 => [:free_space, :whitespace, ' ',   1,  2],
+      2 => [:free_space, :comment,    "# b", 2,  5]
+
+    # without spaces (c.f. issue #66)
+    include_examples 'scan', /a#b/x,
+      0 => [:literal,    :literal,  'a',   0,  1],
+      1 => [:free_space, :comment,  "#b", 1,  3]
   end
 
   describe('scan free space inlined') do
@@ -130,4 +141,25 @@ RSpec.describe('FreeSpace scanning') do
       26 => [:literal,    :literal,        'i j',   35, 38],
       27 => [:group,      :close,          ')',     38, 39]
   end
+
+  describe('scanning `#` in regular (non-x mode)') do # c.f. issue 70
+    include_examples 'scan', /a#bcd/,
+      0 => [:literal, :literal, 'a#bcd', 0, 5]
+    include_examples 'scan', /a # bcd/,
+      0 => [:literal, :literal, 'a # bcd', 0, 7]
+
+    include_examples 'scan', /a#\d/,
+      0 => [:literal, :literal, 'a#', 0, 2],
+      1 => [:type,    :digit,   '\d', 2, 4]
+    include_examples 'scan', /a # \d/,
+      0 => [:literal, :literal, 'a # ', 0, 4],
+      1 => [:type,    :digit,   '\d',   4, 6]
+
+    include_examples 'scan', /a#()/,
+      0 => [:literal, :literal, 'a#', 0, 2],
+      1 => [:group,   :capture, '(',  2, 3]
+    include_examples 'scan', /a # ()/,
+      0 => [:literal, :literal, 'a # ', 0, 4],
+      1 => [:group,   :capture, '(',    4, 5]
+  end
 end

data/spec/scanner/options_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.describe('passing options to scan') do
+  def expect_type_tokens(tokens, type_tokens)
+    expect(tokens.map { |type, token, *| [type, token] }).to eq(type_tokens)
+  end
+
+  it 'raises if if scanning from a Regexp and options are passed' do
+    expect { RS.scan(/a+/, options: ::Regexp::EXTENDED) }.to raise_error(
+      ArgumentError,
+      'options cannot be supplied unless scanning a String'
+    )
+  end
+
+  it 'sets free_spacing based on options if scanning from a String' do
+    expect_type_tokens(
+      RS.scan('a+#c', options: ::Regexp::MULTILINE | ::Regexp::EXTENDED),
+      [
+        %i[literal literal],
+        %i[quantifier one_or_more],
+        %i[free_space comment]
+      ]
+    )
+  end
+
+  it 'does not set free_spacing if scanning from a String and passing no options' do
+    expect_type_tokens(
+      RS.scan('a+#c'),
+      [
+        %i[literal literal],
+        %i[quantifier one_or_more],
+        %i[literal literal]
+      ]
+    )
+  end
+end

data/spec/syntax/versions/aliases_spec.rb

@@ -25,7 +25,9 @@ RSpec.describe(Regexp::Syntax) do
   include_examples 'syntax alias', 'ruby/2.5.0',  Regexp::Syntax::V2_4_1
   include_examples 'syntax alias', 'ruby/2.5',    Regexp::Syntax::V2_5_0
   include_examples 'syntax alias', 'ruby/2.6.0',  Regexp::Syntax::V2_5_0
-  include_examples 'syntax alias', 'ruby/2.6',    Regexp::Syntax::V2_5_0
+  include_examples 'syntax alias', 'ruby/2.6.2',  Regexp::Syntax::V2_6_2
+  include_examples 'syntax alias', 'ruby/2.6.3',  Regexp::Syntax::V2_6_3
+  include_examples 'syntax alias', 'ruby/2.6',    Regexp::Syntax::V2_6_3
 
   specify('future alias warning') do
     expect { Regexp::Syntax.new('ruby/5.0') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Ammar Ali
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -87,6 +87,8 @@ files:
 - lib/regexp_parser/syntax/versions/2.4.1.rb
 - lib/regexp_parser/syntax/versions/2.5.0.rb
 - lib/regexp_parser/syntax/versions/2.6.0.rb
+- lib/regexp_parser/syntax/versions/2.6.2.rb
+- lib/regexp_parser/syntax/versions/2.6.3.rb
 - lib/regexp_parser/token.rb
 - lib/regexp_parser/version.rb
 - regexp_parser.gemspec
@@ -107,6 +109,7 @@ files:
 - spec/expression/to_s_spec.rb
 - spec/lexer/all_spec.rb
 - spec/lexer/conditionals_spec.rb
+- spec/lexer/delimiters_spec.rb
 - spec/lexer/escapes_spec.rb
 - spec/lexer/keep_spec.rb
 - spec/lexer/literals_spec.rb
@@ -121,6 +124,7 @@ files:
 - spec/parser/free_space_spec.rb
 - spec/parser/groups_spec.rb
 - spec/parser/keep_spec.rb
+- spec/parser/options_spec.rb
 - spec/parser/posix_classes_spec.rb
 - spec/parser/properties_spec.rb
 - spec/parser/quantifiers_spec.rb
@@ -132,6 +136,7 @@ files:
 - spec/scanner/all_spec.rb
 - spec/scanner/anchors_spec.rb
 - spec/scanner/conditionals_spec.rb
+- spec/scanner/delimiters_spec.rb
 - spec/scanner/errors_spec.rb
 - spec/scanner/escapes_spec.rb
 - spec/scanner/free_space_spec.rb
@@ -139,6 +144,7 @@ files:
 - 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
@@ -162,7 +168,7 @@ licenses:
 - MIT
 metadata:
   issue_tracker: https://github.com/ammar/regexp_parser/issues
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--inline-source"
 - "--charset=UTF-8"
@@ -172,15 +178,15 @@ 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.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Scanner, lexer, parser for ruby's regular expressions
 test_files:
@@ -191,6 +197,7 @@ test_files:
 - 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/literals_spec.rb
 - spec/parser/escapes_spec.rb
@@ -198,6 +205,7 @@ test_files:
 - spec/parser/sets_spec.rb
 - spec/parser/free_space_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
@@ -241,12 +249,14 @@ test_files:
 - spec/scanner/sets_spec.rb
 - spec/scanner/free_space_spec.rb
 - spec/scanner/keep_spec.rb
+- spec/scanner/options_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/delimiters_spec.rb
 - spec/scanner/refcalls_spec.rb
 - spec/scanner/groups_spec.rb
 - spec/scanner/literals_spec.rb