regexp_parser 1.7.0 → 1.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -1
- data/README.md +2 -5
- data/lib/regexp_parser/scanner.rb +754 -723
- data/lib/regexp_parser/scanner/scanner.rl +19 -4
- data/lib/regexp_parser/version.rb +1 -1
- data/spec/lexer/delimiters_spec.rb +68 -0
- data/spec/parser/quantifiers_spec.rb +1 -0
- data/spec/scanner/delimiters_spec.rb +52 -0
- data/spec/scanner/errors_spec.rb +0 -1
- metadata +9 -5
@@ -62,13 +62,17 @@
|
|
62
62
|
quantifier_possessive = '?+' | '*+' | '++';
|
63
63
|
quantifier_mode = '?' | '+';
|
64
64
|
|
65
|
-
|
66
|
-
|
65
|
+
quantity_exact = (digit+);
|
66
|
+
quantity_minimum = (digit+) . ',';
|
67
|
+
quantity_maximum = ',' . (digit+);
|
68
|
+
quantity_range = (digit+) . ',' . (digit+);
|
69
|
+
quantifier_interval = range_open . ( quantity_exact | quantity_minimum |
|
70
|
+
quantity_maximum | quantity_range ) . range_close .
|
71
|
+
quantifier_mode?;
|
67
72
|
|
68
73
|
quantifiers = quantifier_greedy | quantifier_reluctant |
|
69
74
|
quantifier_possessive | quantifier_interval;
|
70
75
|
|
71
|
-
|
72
76
|
conditional = '(?(';
|
73
77
|
|
74
78
|
group_comment = '?#' . [^)]* . group_close;
|
@@ -114,6 +118,8 @@
|
|
114
118
|
curlies | parantheses | brackets |
|
115
119
|
line_anchor | quantifier_greedy;
|
116
120
|
|
121
|
+
literal_delimiters = ']' | '}';
|
122
|
+
|
117
123
|
ascii_print = ((0x20..0x7e) - meta_char);
|
118
124
|
ascii_nonprint = (0x01..0x1f | 0x7f);
|
119
125
|
|
@@ -417,6 +423,10 @@
|
|
417
423
|
end
|
418
424
|
};
|
419
425
|
|
426
|
+
literal_delimiters {
|
427
|
+
append_literal(data, ts, te)
|
428
|
+
};
|
429
|
+
|
420
430
|
# Character sets
|
421
431
|
# ------------------------------------------------------------------------
|
422
432
|
set_open >set_opened {
|
@@ -620,10 +630,15 @@
|
|
620
630
|
end
|
621
631
|
};
|
622
632
|
|
623
|
-
quantifier_interval
|
633
|
+
quantifier_interval {
|
624
634
|
emit(:quantifier, :interval, *text(data, ts, te))
|
625
635
|
};
|
626
636
|
|
637
|
+
# Catch unmatched curly braces as literals
|
638
|
+
range_open {
|
639
|
+
append_literal(data, ts, te)
|
640
|
+
};
|
641
|
+
|
627
642
|
# Escaped sequences
|
628
643
|
# ------------------------------------------------------------------------
|
629
644
|
backslash > (backslashed, 1) {
|
@@ -0,0 +1,68 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe('Literal delimiter lexing') do
|
4
|
+
include_examples 'lex', '}',
|
5
|
+
0 => [:literal, :literal, '}', 0, 1, 0, 0, 0]
|
6
|
+
|
7
|
+
include_examples 'lex', '}}',
|
8
|
+
0 => [:literal, :literal, '}}', 0, 2, 0, 0, 0]
|
9
|
+
|
10
|
+
include_examples 'lex', '{',
|
11
|
+
0 => [:literal, :literal, '{', 0, 1, 0, 0, 0]
|
12
|
+
|
13
|
+
include_examples 'lex', '{{',
|
14
|
+
0 => [:literal, :literal, '{{', 0, 2, 0, 0, 0]
|
15
|
+
|
16
|
+
include_examples 'lex', '{}',
|
17
|
+
0 => [:literal, :literal, '{}', 0, 2, 0, 0, 0]
|
18
|
+
|
19
|
+
include_examples 'lex', '}{',
|
20
|
+
0 => [:literal, :literal, '}{', 0, 2, 0, 0, 0]
|
21
|
+
|
22
|
+
include_examples 'lex', '}{+',
|
23
|
+
0 => [:literal, :literal, '}', 0, 1, 0, 0, 0],
|
24
|
+
1 => [:literal, :literal, '{', 1, 2, 0, 0, 0],
|
25
|
+
2 => [:quantifier, :one_or_more, '+', 2, 3, 0, 0, 0]
|
26
|
+
|
27
|
+
include_examples 'lex', '{{var}}',
|
28
|
+
0 => [:literal, :literal, '{{var}}', 0, 7, 0, 0, 0]
|
29
|
+
|
30
|
+
include_examples 'lex', 'a{b}c',
|
31
|
+
0 => [:literal, :literal, 'a{b}c', 0, 5, 0, 0, 0]
|
32
|
+
|
33
|
+
include_examples 'lex', 'a{1,2',
|
34
|
+
0 => [:literal, :literal, 'a{1,2', 0, 5, 0, 0, 0]
|
35
|
+
|
36
|
+
include_examples 'lex', '({.+})',
|
37
|
+
0 => [:group, :capture, '(', 0, 1, 0, 0, 0],
|
38
|
+
1 => [:literal, :literal, '{', 1, 2, 1, 0, 0],
|
39
|
+
2 => [:meta, :dot, '.', 2, 3, 1, 0, 0],
|
40
|
+
3 => [:quantifier, :one_or_more, '+', 3, 4, 1, 0, 0],
|
41
|
+
4 => [:literal, :literal, '}', 4, 5, 1, 0, 0],
|
42
|
+
5 => [:group, :close, ')', 5, 6, 0, 0, 0]
|
43
|
+
|
44
|
+
include_examples 'lex', ']',
|
45
|
+
0 => [:literal, :literal, ']', 0, 1, 0, 0, 0]
|
46
|
+
|
47
|
+
include_examples 'lex', ']]',
|
48
|
+
0 => [:literal, :literal, ']]', 0, 2, 0, 0, 0]
|
49
|
+
|
50
|
+
include_examples 'lex', ']\[',
|
51
|
+
0 => [:literal, :literal, ']', 0, 1, 0, 0, 0],
|
52
|
+
1 => [:escape, :set_open, '\[', 1, 3, 0, 0, 0]
|
53
|
+
|
54
|
+
include_examples 'lex', '()',
|
55
|
+
0 => [:group, :capture, '(', 0, 1, 0, 0, 0],
|
56
|
+
1 => [:group, :close, ')', 1, 2, 0, 0, 0]
|
57
|
+
|
58
|
+
include_examples 'lex', '{abc:.+}}}[^}]]}',
|
59
|
+
0 => [:literal, :literal, '{abc:', 0, 5, 0, 0, 0],
|
60
|
+
1 => [:meta, :dot, '.', 5, 6, 0, 0, 0],
|
61
|
+
2 => [:quantifier, :one_or_more, '+', 6, 7, 0, 0, 0],
|
62
|
+
3 => [:literal, :literal, '}}}', 7, 10, 0, 0, 0],
|
63
|
+
4 => [:set, :open, '[', 10, 11, 0, 0, 0],
|
64
|
+
5 => [:set, :negate, '^', 11, 12, 0, 1, 0],
|
65
|
+
6 => [:literal, :literal, '}', 12, 13, 0, 1, 0],
|
66
|
+
7 => [:set, :close, ']', 13, 14, 0, 0, 0],
|
67
|
+
8 => [:literal, :literal, ']}', 14, 16, 0, 0, 0]
|
68
|
+
end
|
@@ -35,6 +35,7 @@ RSpec.describe('Quantifier parsing') do
|
|
35
35
|
include_examples 'quantifier', /a{4}b/, '{4}', :greedy, :interval, 4, 4
|
36
36
|
include_examples 'quantifier', /a{4}?b/, '{4}?', :reluctant, :interval, 4, 4
|
37
37
|
include_examples 'quantifier', /a{4}+b/, '{4}+', :possessive, :interval, 4, 4
|
38
|
+
include_examples 'quantifier', /a{004}+b/, '{004}+', :possessive, :interval, 4, 4
|
38
39
|
|
39
40
|
specify('mode-checking methods') do
|
40
41
|
exp = RP.parse(/a??/).first
|
@@ -0,0 +1,52 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe('Literal delimiter scanning') do
|
4
|
+
include_examples 'scan', '}',
|
5
|
+
0 => [:literal, :literal, '}', 0, 1]
|
6
|
+
|
7
|
+
include_examples 'scan', '}}',
|
8
|
+
0 => [:literal, :literal, '}}', 0, 2]
|
9
|
+
|
10
|
+
include_examples 'scan', '{',
|
11
|
+
0 => [:literal, :literal, '{', 0, 1]
|
12
|
+
|
13
|
+
include_examples 'scan', '{{',
|
14
|
+
0 => [:literal, :literal, '{{', 0, 2]
|
15
|
+
|
16
|
+
include_examples 'scan', '{}',
|
17
|
+
0 => [:literal, :literal, '{}', 0, 2]
|
18
|
+
|
19
|
+
include_examples 'scan', '}{',
|
20
|
+
0 => [:literal, :literal, '}{', 0, 2]
|
21
|
+
|
22
|
+
include_examples 'scan', '}{+',
|
23
|
+
0 => [:literal, :literal, '}{', 0, 2]
|
24
|
+
|
25
|
+
include_examples 'scan', '{{var}}',
|
26
|
+
0 => [:literal, :literal, '{{var}}', 0, 7]
|
27
|
+
|
28
|
+
include_examples 'scan', 'a{1,2',
|
29
|
+
0 => [:literal, :literal, 'a{1,2', 0, 5]
|
30
|
+
|
31
|
+
include_examples 'scan', '({.+})',
|
32
|
+
0 => [:group, :capture, '(', 0, 1],
|
33
|
+
1 => [:literal, :literal, '{', 1, 2],
|
34
|
+
2 => [:meta, :dot, '.', 2, 3],
|
35
|
+
3 => [:quantifier, :one_or_more, '+', 3, 4],
|
36
|
+
4 => [:literal, :literal, '}', 4, 5],
|
37
|
+
5 => [:group, :close, ')', 5, 6]
|
38
|
+
|
39
|
+
include_examples 'scan', ']',
|
40
|
+
0 => [:literal, :literal, ']', 0, 1]
|
41
|
+
|
42
|
+
include_examples 'scan', ']]',
|
43
|
+
0 => [:literal, :literal, ']]', 0, 2]
|
44
|
+
|
45
|
+
include_examples 'scan', ']\[',
|
46
|
+
0 => [:literal, :literal, ']', 0, 1],
|
47
|
+
1 => [:escape, :set_open, '\[', 1, 3]
|
48
|
+
|
49
|
+
include_examples 'scan', '()',
|
50
|
+
0 => [:group, :capture, '(', 0, 1],
|
51
|
+
1 => [:group, :close, ')', 1, 2]
|
52
|
+
end
|
data/spec/scanner/errors_spec.rb
CHANGED
@@ -10,7 +10,6 @@ RSpec.describe(Regexp::Scanner) do
|
|
10
10
|
include_examples 'scan error', RS::PrematureEndError, 'unbalanced set', '[a'
|
11
11
|
include_examples 'scan error', RS::PrematureEndError, 'unbalanced set', '[[:alpha:]'
|
12
12
|
include_examples 'scan error', RS::PrematureEndError, 'unbalanced group', '(abc'
|
13
|
-
include_examples 'scan error', RS::PrematureEndError, 'unbalanced interval', 'a{1,2'
|
14
13
|
include_examples 'scan error', RS::PrematureEndError, 'eof in property', '\p{asci'
|
15
14
|
include_examples 'scan error', RS::PrematureEndError, 'incomplete property', '\p{ascii abc'
|
16
15
|
include_examples 'scan error', RS::PrematureEndError, 'eof options', '(?mix'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: regexp_parser
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ammar Ali
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-06-07 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
|
14
14
|
email:
|
@@ -109,6 +109,7 @@ files:
|
|
109
109
|
- spec/expression/to_s_spec.rb
|
110
110
|
- spec/lexer/all_spec.rb
|
111
111
|
- spec/lexer/conditionals_spec.rb
|
112
|
+
- spec/lexer/delimiters_spec.rb
|
112
113
|
- spec/lexer/escapes_spec.rb
|
113
114
|
- spec/lexer/keep_spec.rb
|
114
115
|
- spec/lexer/literals_spec.rb
|
@@ -134,6 +135,7 @@ files:
|
|
134
135
|
- spec/scanner/all_spec.rb
|
135
136
|
- spec/scanner/anchors_spec.rb
|
136
137
|
- spec/scanner/conditionals_spec.rb
|
138
|
+
- spec/scanner/delimiters_spec.rb
|
137
139
|
- spec/scanner/errors_spec.rb
|
138
140
|
- spec/scanner/escapes_spec.rb
|
139
141
|
- spec/scanner/free_space_spec.rb
|
@@ -164,7 +166,7 @@ licenses:
|
|
164
166
|
- MIT
|
165
167
|
metadata:
|
166
168
|
issue_tracker: https://github.com/ammar/regexp_parser/issues
|
167
|
-
post_install_message:
|
169
|
+
post_install_message:
|
168
170
|
rdoc_options:
|
169
171
|
- "--inline-source"
|
170
172
|
- "--charset=UTF-8"
|
@@ -182,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
182
184
|
version: '0'
|
183
185
|
requirements: []
|
184
186
|
rubygems_version: 3.1.2
|
185
|
-
signing_key:
|
187
|
+
signing_key:
|
186
188
|
specification_version: 4
|
187
189
|
summary: Scanner, lexer, parser for ruby's regular expressions
|
188
190
|
test_files:
|
@@ -193,6 +195,7 @@ test_files:
|
|
193
195
|
- spec/lexer/all_spec.rb
|
194
196
|
- spec/lexer/conditionals_spec.rb
|
195
197
|
- spec/lexer/nesting_spec.rb
|
198
|
+
- spec/lexer/delimiters_spec.rb
|
196
199
|
- spec/lexer/refcalls_spec.rb
|
197
200
|
- spec/lexer/literals_spec.rb
|
198
201
|
- spec/parser/escapes_spec.rb
|
@@ -249,6 +252,7 @@ test_files:
|
|
249
252
|
- spec/scanner/anchors_spec.rb
|
250
253
|
- spec/scanner/meta_spec.rb
|
251
254
|
- spec/scanner/errors_spec.rb
|
255
|
+
- spec/scanner/delimiters_spec.rb
|
252
256
|
- spec/scanner/refcalls_spec.rb
|
253
257
|
- spec/scanner/groups_spec.rb
|
254
258
|
- spec/scanner/literals_spec.rb
|