regexp_parser 1.6.0 → 1.8.2

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Ammar Ali
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -109,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
@@ -123,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
@@ -134,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
@@ -141,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
@@ -164,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"
@@ -174,82 +178,86 @@ 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.2.0.rc.1
+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/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
 - 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
 - spec/lexer/nesting_spec.rb
 - spec/lexer/refcalls_spec.rb
-- spec/lexer/literals_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/keep_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/anchors_spec.rb
+- spec/parser/conditionals_spec.rb
 - spec/parser/errors_spec.rb
-- spec/parser/refcalls_spec.rb
+- spec/parser/escapes_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/posix_classes_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/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/conditionals_spec.rb
+- spec/scanner/delimiters_spec.rb
 - spec/scanner/errors_spec.rb
-- spec/scanner/refcalls_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