Mercurial > vim
annotate src/regexp_nfa.c @ 32427:11bc7fa31c3b v9.0.1545
patch 9.0.1545: text not scrolled when cursor moved with "g0" and "h"
Commit: https://github.com/vim/vim/commit/8667a5678f983ba899825b810ab849952d49bcb8
Author: Luuk van Baal <luukvbaal@gmail.com>
Date: Fri May 12 15:47:25 2023 +0100
patch 9.0.1545: text not scrolled when cursor moved with "g0" and "h"
Problem: Text not scrolled when cursor moved with "g0" and "h".
Solution: Adjust w_skipcol when needed. (Luuk van Baal, closes https://github.com/vim/vim/issues/12387)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 12 May 2023 17:00:05 +0200 |
| parents | 2ed95122d59c |
| children | d6055989fa27 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9371
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 4444 | 2 * |
| 3 * NFA regular expression implementation. | |
| 4 * | |
| 5 * This file is included in "regexp.c". | |
| 6 */ | |
| 7 | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
8 /* |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
9 * Logging of NFA engine. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
10 * |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
11 * The NFA engine can write four log files: |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
12 * - Error log: Contains NFA engine's fatal errors. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
13 * - Dump log: Contains compiled NFA state machine's information. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
14 * - Run log: Contains information of matching procedure. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
15 * - Debug log: Contains detailed information of matching procedure. Can be |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
16 * disabled by undefining NFA_REGEXP_DEBUG_LOG. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
17 * The first one can also be used without debug mode. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
18 * The last three are enabled when compiled as debug mode and individually |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
19 * disabled by commenting them out. |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
20 * The log files can get quite big! |
|
26592
9f445e07f766
patch 8.2.3825: various comments could be improved
Bram Moolenaar <Bram@vim.org>
parents:
26436
diff
changeset
|
21 * To disable all of this when compiling Vim for debugging, undefine DEBUG in |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
22 * regexp.c |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
23 */ |
| 4444 | 24 #ifdef DEBUG |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
25 # define NFA_REGEXP_ERROR_LOG "nfa_regexp_error.log" |
| 4444 | 26 # define ENABLE_LOG |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
27 # define NFA_REGEXP_DUMP_LOG "nfa_regexp_dump.log" |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
28 # define NFA_REGEXP_RUN_LOG "nfa_regexp_run.log" |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
29 # define NFA_REGEXP_DEBUG_LOG "nfa_regexp_debug.log" |
| 4444 | 30 #endif |
| 31 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
32 // Added to NFA_ANY - NFA_NUPPER_IC to include a NL. |
| 5296 | 33 #define NFA_ADD_NL 31 |
| 34 | |
| 4444 | 35 enum |
| 36 { | |
| 37 NFA_SPLIT = -1024, | |
| 38 NFA_MATCH, | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
39 NFA_EMPTY, // matches 0-length |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
40 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
41 NFA_START_COLL, // [abc] start |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
42 NFA_END_COLL, // [abc] end |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
43 NFA_START_NEG_COLL, // [^abc] start |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
44 NFA_END_NEG_COLL, // [^abc] end (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
45 NFA_RANGE, // range of the two previous items |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
46 // (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
47 NFA_RANGE_MIN, // low end of a range |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
48 NFA_RANGE_MAX, // high end of a range |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
49 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
50 NFA_CONCAT, // concatenate two previous items (postfix |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
51 // only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
52 NFA_OR, // \| (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
53 NFA_STAR, // greedy * (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
54 NFA_STAR_NONGREEDY, // non-greedy * (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
55 NFA_QUEST, // greedy \? (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
56 NFA_QUEST_NONGREEDY, // non-greedy \? (postfix only) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
57 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
58 NFA_BOL, // ^ Begin line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
59 NFA_EOL, // $ End line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
60 NFA_BOW, // \< Begin word |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
61 NFA_EOW, // \> End word |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
62 NFA_BOF, // \%^ Begin file |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
63 NFA_EOF, // \%$ End file |
| 4444 | 64 NFA_NEWL, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
65 NFA_ZSTART, // Used for \zs |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
66 NFA_ZEND, // Used for \ze |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
67 NFA_NOPEN, // Start of subexpression marked with \%( |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
68 NFA_NCLOSE, // End of subexpr. marked with \%( ... \) |
| 4444 | 69 NFA_START_INVISIBLE, |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
70 NFA_START_INVISIBLE_FIRST, |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
71 NFA_START_INVISIBLE_NEG, |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
72 NFA_START_INVISIBLE_NEG_FIRST, |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
73 NFA_START_INVISIBLE_BEFORE, |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
74 NFA_START_INVISIBLE_BEFORE_FIRST, |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
75 NFA_START_INVISIBLE_BEFORE_NEG, |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
76 NFA_START_INVISIBLE_BEFORE_NEG_FIRST, |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
77 NFA_START_PATTERN, |
| 4444 | 78 NFA_END_INVISIBLE, |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
79 NFA_END_INVISIBLE_NEG, |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
80 NFA_END_PATTERN, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
81 NFA_COMPOSING, // Next nodes in NFA are part of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
82 // composing multibyte char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
83 NFA_END_COMPOSING, // End of a composing char in the NFA |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
84 NFA_ANY_COMPOSING, // \%C: Any composing characters. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
85 NFA_OPT_CHARS, // \%[abc] |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
86 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
87 // The following are used only in the postfix form, not in the NFA |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
88 NFA_PREV_ATOM_NO_WIDTH, // Used for \@= |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
89 NFA_PREV_ATOM_NO_WIDTH_NEG, // Used for \@! |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
90 NFA_PREV_ATOM_JUST_BEFORE, // Used for \@<= |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
91 NFA_PREV_ATOM_JUST_BEFORE_NEG, // Used for \@<! |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
92 NFA_PREV_ATOM_LIKE_PATTERN, // Used for \@> |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
93 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
94 NFA_BACKREF1, // \1 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
95 NFA_BACKREF2, // \2 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
96 NFA_BACKREF3, // \3 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
97 NFA_BACKREF4, // \4 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
98 NFA_BACKREF5, // \5 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
99 NFA_BACKREF6, // \6 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
100 NFA_BACKREF7, // \7 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
101 NFA_BACKREF8, // \8 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
102 NFA_BACKREF9, // \9 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
103 #ifdef FEAT_SYN_HL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
104 NFA_ZREF1, // \z1 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
105 NFA_ZREF2, // \z2 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
106 NFA_ZREF3, // \z3 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
107 NFA_ZREF4, // \z4 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
108 NFA_ZREF5, // \z5 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
109 NFA_ZREF6, // \z6 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
110 NFA_ZREF7, // \z7 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
111 NFA_ZREF8, // \z8 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
112 NFA_ZREF9, // \z9 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
113 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
114 NFA_SKIP, // Skip characters |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
115 |
| 4444 | 116 NFA_MOPEN, |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
117 NFA_MOPEN1, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
118 NFA_MOPEN2, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
119 NFA_MOPEN3, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
120 NFA_MOPEN4, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
121 NFA_MOPEN5, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
122 NFA_MOPEN6, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
123 NFA_MOPEN7, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
124 NFA_MOPEN8, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
125 NFA_MOPEN9, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
126 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
127 NFA_MCLOSE, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
128 NFA_MCLOSE1, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
129 NFA_MCLOSE2, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
130 NFA_MCLOSE3, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
131 NFA_MCLOSE4, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
132 NFA_MCLOSE5, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
133 NFA_MCLOSE6, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
134 NFA_MCLOSE7, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
135 NFA_MCLOSE8, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
136 NFA_MCLOSE9, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
137 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
138 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
139 NFA_ZOPEN, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
140 NFA_ZOPEN1, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
141 NFA_ZOPEN2, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
142 NFA_ZOPEN3, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
143 NFA_ZOPEN4, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
144 NFA_ZOPEN5, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
145 NFA_ZOPEN6, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
146 NFA_ZOPEN7, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
147 NFA_ZOPEN8, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
148 NFA_ZOPEN9, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
149 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
150 NFA_ZCLOSE, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
151 NFA_ZCLOSE1, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
152 NFA_ZCLOSE2, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
153 NFA_ZCLOSE3, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
154 NFA_ZCLOSE4, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
155 NFA_ZCLOSE5, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
156 NFA_ZCLOSE6, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
157 NFA_ZCLOSE7, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
158 NFA_ZCLOSE8, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
159 NFA_ZCLOSE9, |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
160 #endif |
| 4444 | 161 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
162 // NFA_FIRST_NL |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
163 NFA_ANY, // Match any one character. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
164 NFA_IDENT, // Match identifier char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
165 NFA_SIDENT, // Match identifier char but no digit |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
166 NFA_KWORD, // Match keyword char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
167 NFA_SKWORD, // Match word char but no digit |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
168 NFA_FNAME, // Match file name char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
169 NFA_SFNAME, // Match file name char but no digit |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
170 NFA_PRINT, // Match printable char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
171 NFA_SPRINT, // Match printable char but no digit |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
172 NFA_WHITE, // Match whitespace char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
173 NFA_NWHITE, // Match non-whitespace char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
174 NFA_DIGIT, // Match digit char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
175 NFA_NDIGIT, // Match non-digit char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
176 NFA_HEX, // Match hex char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
177 NFA_NHEX, // Match non-hex char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
178 NFA_OCTAL, // Match octal char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
179 NFA_NOCTAL, // Match non-octal char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
180 NFA_WORD, // Match word char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
181 NFA_NWORD, // Match non-word char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
182 NFA_HEAD, // Match head char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
183 NFA_NHEAD, // Match non-head char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
184 NFA_ALPHA, // Match alpha char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
185 NFA_NALPHA, // Match non-alpha char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
186 NFA_LOWER, // Match lowercase char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
187 NFA_NLOWER, // Match non-lowercase char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
188 NFA_UPPER, // Match uppercase char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
189 NFA_NUPPER, // Match non-uppercase char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
190 NFA_LOWER_IC, // Match [a-z] |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
191 NFA_NLOWER_IC, // Match [^a-z] |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
192 NFA_UPPER_IC, // Match [A-Z] |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
193 NFA_NUPPER_IC, // Match [^A-Z] |
| 5296 | 194 |
| 195 NFA_FIRST_NL = NFA_ANY + NFA_ADD_NL, | |
| 196 NFA_LAST_NL = NFA_NUPPER_IC + NFA_ADD_NL, | |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
197 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
198 NFA_CURSOR, // Match cursor pos |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
199 NFA_LNUM, // Match line number |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
200 NFA_LNUM_GT, // Match > line number |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
201 NFA_LNUM_LT, // Match < line number |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
202 NFA_COL, // Match cursor column |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
203 NFA_COL_GT, // Match > cursor column |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
204 NFA_COL_LT, // Match < cursor column |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
205 NFA_VCOL, // Match cursor virtual column |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
206 NFA_VCOL_GT, // Match > cursor virtual column |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
207 NFA_VCOL_LT, // Match < cursor virtual column |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
208 NFA_MARK, // Match mark |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
209 NFA_MARK_GT, // Match > mark |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
210 NFA_MARK_LT, // Match < mark |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
211 NFA_VISUAL, // Match Visual area |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
212 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
213 // Character classes [:alnum:] etc |
| 4444 | 214 NFA_CLASS_ALNUM, |
| 215 NFA_CLASS_ALPHA, | |
| 216 NFA_CLASS_BLANK, | |
| 217 NFA_CLASS_CNTRL, | |
| 218 NFA_CLASS_DIGIT, | |
| 219 NFA_CLASS_GRAPH, | |
| 220 NFA_CLASS_LOWER, | |
| 221 NFA_CLASS_PRINT, | |
| 222 NFA_CLASS_PUNCT, | |
| 223 NFA_CLASS_SPACE, | |
| 224 NFA_CLASS_UPPER, | |
| 225 NFA_CLASS_XDIGIT, | |
| 226 NFA_CLASS_TAB, | |
| 227 NFA_CLASS_RETURN, | |
| 228 NFA_CLASS_BACKSPACE, | |
|
15709
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
229 NFA_CLASS_ESCAPE, |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
230 NFA_CLASS_IDENT, |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
231 NFA_CLASS_KEYWORD, |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
232 NFA_CLASS_FNAME |
| 4444 | 233 }; |
| 234 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
235 // Keep in sync with classchars. |
| 4444 | 236 static int nfa_classcodes[] = { |
| 237 NFA_ANY, NFA_IDENT, NFA_SIDENT, NFA_KWORD,NFA_SKWORD, | |
| 238 NFA_FNAME, NFA_SFNAME, NFA_PRINT, NFA_SPRINT, | |
| 239 NFA_WHITE, NFA_NWHITE, NFA_DIGIT, NFA_NDIGIT, | |
| 240 NFA_HEX, NFA_NHEX, NFA_OCTAL, NFA_NOCTAL, | |
| 241 NFA_WORD, NFA_NWORD, NFA_HEAD, NFA_NHEAD, | |
| 242 NFA_ALPHA, NFA_NALPHA, NFA_LOWER, NFA_NLOWER, | |
| 243 NFA_UPPER, NFA_NUPPER | |
| 244 }; | |
| 245 | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
246 // Variables only used in nfa_regcomp() and descendants. |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
247 static int nfa_re_flags; // re_flags passed to nfa_regcomp() |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
248 static int *post_start; // holds the postfix form of r.e. |
| 4444 | 249 static int *post_end; |
| 250 static int *post_ptr; | |
|
23471
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
251 |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
252 // Set when the pattern should use the NFA engine. |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
253 // E.g. [[:upper:]] only allows 8bit characters for BT engine, |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
254 // while NFA engine handles multibyte characters correctly. |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
255 static int wants_nfa; |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
256 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
257 static int nstate; // Number of states in the NFA. |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
258 static int istate; // Index in the state vector, used in alloc_state() |
| 4444 | 259 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
260 // If not NULL match must end at this position |
|
4694
efc4fb311d5d
updated for version 7.3.1094
Bram Moolenaar <bram@vim.org>
parents:
4692
diff
changeset
|
261 static save_se_T *nfa_endp = NULL; |
| 4444 | 262 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
263 // 0 for first call to nfa_regmatch(), 1 for recursive call. |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
264 static int nfa_ll_index = 0; |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
265 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
266 static int realloc_post_list(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
267 static int nfa_reg(int paren); |
| 4444 | 268 #ifdef DEBUG |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
269 static void nfa_print_state2(FILE *debugf, nfa_state_T *state, garray_T *indent); |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
270 #endif |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
271 static int match_follows(nfa_state_T *startstate, int depth); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
272 static int failure_chance(nfa_state_T *state, int depth); |
| 4444 | 273 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
274 // helper functions used when doing re2post() ... regatom() parsing |
| 4444 | 275 #define EMIT(c) do { \ |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
276 if (post_ptr >= post_end && realloc_post_list() == FAIL) \ |
| 4444 | 277 return FAIL; \ |
| 278 *post_ptr++ = c; \ | |
| 279 } while (0) | |
| 280 | |
| 281 /* | |
| 282 * Initialize internal variables before NFA compilation. | |
| 283 * Return OK on success, FAIL otherwise. | |
| 284 */ | |
| 285 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
286 nfa_regcomp_start( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
287 char_u *expr, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
288 int re_flags) // see vim_regcomp() |
| 4444 | 289 { |
| 4458 | 290 size_t postfix_size; |
|
4555
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
291 int nstate_max; |
| 4444 | 292 |
| 293 nstate = 0; | |
| 294 istate = 0; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
295 // A reasonable estimation for maximum size |
|
4673
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
296 nstate_max = (int)(STRLEN(expr) + 1) * 25; |
| 4444 | 297 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
298 // Some items blow up in size, such as [A-z]. Add more space for that. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
299 // When it is still not enough realloc_post_list() will be used. |
| 4458 | 300 nstate_max += 1000; |
| 4454 | 301 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
302 // Size for postfix representation of expr. |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
303 postfix_size = sizeof(int) * nstate_max; |
| 4454 | 304 |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
305 post_start = alloc(postfix_size); |
| 4444 | 306 if (post_start == NULL) |
| 307 return FAIL; | |
| 308 post_ptr = post_start; | |
| 4454 | 309 post_end = post_start + nstate_max; |
|
23471
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
310 wants_nfa = FALSE; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
311 rex.nfa_has_zend = FALSE; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
312 rex.nfa_has_backref = FALSE; |
| 4444 | 313 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
314 // shared with BT engine |
| 4444 | 315 regcomp_start(expr, re_flags); |
| 316 | |
| 317 return OK; | |
| 318 } | |
| 319 | |
| 320 /* | |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
321 * Figure out if the NFA state list starts with an anchor, must match at start |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
322 * of the line. |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
323 */ |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
324 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
325 nfa_get_reganch(nfa_state_T *start, int depth) |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
326 { |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
327 nfa_state_T *p = start; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
328 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
329 if (depth > 4) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
330 return 0; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
331 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
332 while (p != NULL) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
333 { |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
334 switch (p->c) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
335 { |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
336 case NFA_BOL: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
337 case NFA_BOF: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
338 return 1; // yes! |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
339 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
340 case NFA_ZSTART: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
341 case NFA_ZEND: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
342 case NFA_CURSOR: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
343 case NFA_VISUAL: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
344 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
345 case NFA_MOPEN: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
346 case NFA_MOPEN1: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
347 case NFA_MOPEN2: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
348 case NFA_MOPEN3: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
349 case NFA_MOPEN4: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
350 case NFA_MOPEN5: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
351 case NFA_MOPEN6: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
352 case NFA_MOPEN7: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
353 case NFA_MOPEN8: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
354 case NFA_MOPEN9: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
355 case NFA_NOPEN: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
356 #ifdef FEAT_SYN_HL |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
357 case NFA_ZOPEN: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
358 case NFA_ZOPEN1: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
359 case NFA_ZOPEN2: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
360 case NFA_ZOPEN3: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
361 case NFA_ZOPEN4: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
362 case NFA_ZOPEN5: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
363 case NFA_ZOPEN6: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
364 case NFA_ZOPEN7: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
365 case NFA_ZOPEN8: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
366 case NFA_ZOPEN9: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
367 #endif |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
368 p = p->out; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
369 break; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
370 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
371 case NFA_SPLIT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
372 return nfa_get_reganch(p->out, depth + 1) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
373 && nfa_get_reganch(p->out1, depth + 1); |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
374 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
375 default: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
376 return 0; // noooo |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
377 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
378 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
379 return 0; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
380 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
381 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
382 /* |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
383 * Figure out if the NFA state list starts with a character which must match |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
384 * at start of the match. |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
385 */ |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
386 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
387 nfa_get_regstart(nfa_state_T *start, int depth) |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
388 { |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
389 nfa_state_T *p = start; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
390 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
391 if (depth > 4) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
392 return 0; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
393 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
394 while (p != NULL) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
395 { |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
396 switch (p->c) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
397 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
398 // all kinds of zero-width matches |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
399 case NFA_BOL: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
400 case NFA_BOF: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
401 case NFA_BOW: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
402 case NFA_EOW: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
403 case NFA_ZSTART: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
404 case NFA_ZEND: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
405 case NFA_CURSOR: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
406 case NFA_VISUAL: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
407 case NFA_LNUM: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
408 case NFA_LNUM_GT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
409 case NFA_LNUM_LT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
410 case NFA_COL: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
411 case NFA_COL_GT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
412 case NFA_COL_LT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
413 case NFA_VCOL: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
414 case NFA_VCOL_GT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
415 case NFA_VCOL_LT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
416 case NFA_MARK: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
417 case NFA_MARK_GT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
418 case NFA_MARK_LT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
419 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
420 case NFA_MOPEN: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
421 case NFA_MOPEN1: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
422 case NFA_MOPEN2: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
423 case NFA_MOPEN3: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
424 case NFA_MOPEN4: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
425 case NFA_MOPEN5: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
426 case NFA_MOPEN6: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
427 case NFA_MOPEN7: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
428 case NFA_MOPEN8: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
429 case NFA_MOPEN9: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
430 case NFA_NOPEN: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
431 #ifdef FEAT_SYN_HL |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
432 case NFA_ZOPEN: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
433 case NFA_ZOPEN1: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
434 case NFA_ZOPEN2: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
435 case NFA_ZOPEN3: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
436 case NFA_ZOPEN4: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
437 case NFA_ZOPEN5: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
438 case NFA_ZOPEN6: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
439 case NFA_ZOPEN7: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
440 case NFA_ZOPEN8: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
441 case NFA_ZOPEN9: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
442 #endif |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
443 p = p->out; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
444 break; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
445 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
446 case NFA_SPLIT: |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
447 { |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
448 int c1 = nfa_get_regstart(p->out, depth + 1); |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
449 int c2 = nfa_get_regstart(p->out1, depth + 1); |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
450 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
451 if (c1 == c2) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
452 return c1; // yes! |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
453 return 0; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
454 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
455 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
456 default: |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
457 if (p->c > 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
458 return p->c; // yes! |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
459 return 0; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
460 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
461 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
462 return 0; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
463 } |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
464 |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
465 /* |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
466 * Figure out if the NFA state list contains just literal text and nothing |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
467 * else. If so return a string in allocated memory with what must match after |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
468 * regstart. Otherwise return NULL. |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
469 */ |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
470 static char_u * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
471 nfa_get_match_text(nfa_state_T *start) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
472 { |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
473 nfa_state_T *p = start; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
474 int len = 0; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
475 char_u *ret; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
476 char_u *s; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
477 |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
478 if (p->c != NFA_MOPEN) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
479 return NULL; // just in case |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
480 p = p->out; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
481 while (p->c > 0) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
482 { |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
483 len += MB_CHAR2LEN(p->c); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
484 p = p->out; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
485 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
486 if (p->c != NFA_MCLOSE || p->out->c != NFA_MATCH) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
487 return NULL; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
488 |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
489 ret = alloc(len); |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
490 if (ret == NULL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
491 return NULL; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
492 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
493 p = start->out->out; // skip first char, it goes into regstart |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
494 s = ret; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
495 while (p->c > 0) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
496 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
497 if (has_mbyte) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
498 s += (*mb_char2bytes)(p->c, s); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
499 else |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
500 *s++ = p->c; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
501 p = p->out; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
502 } |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
503 *s = NUL; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
504 return ret; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
505 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
506 |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
507 /* |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
508 * Allocate more space for post_start. Called when |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
509 * running above the estimated number of states. |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
510 */ |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
511 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
512 realloc_post_list(void) |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
513 { |
|
4667
9e7ef781d494
updated for version 7.3.1081
Bram Moolenaar <bram@vim.org>
parents:
4661
diff
changeset
|
514 int nstate_max = (int)(post_end - post_start); |
|
15904
fec4416adb80
patch 8.1.0958: compiling weird regexp pattern is very slow
Bram Moolenaar <Bram@vim.org>
parents:
15876
diff
changeset
|
515 int new_max; |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
516 int *new_start; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
517 int *old_start; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
518 |
|
15904
fec4416adb80
patch 8.1.0958: compiling weird regexp pattern is very slow
Bram Moolenaar <Bram@vim.org>
parents:
15876
diff
changeset
|
519 // For weird patterns the number of states can be very high. Increasing by |
|
fec4416adb80
patch 8.1.0958: compiling weird regexp pattern is very slow
Bram Moolenaar <Bram@vim.org>
parents:
15876
diff
changeset
|
520 // 50% seems a reasonable compromise between memory use and speed. |
|
fec4416adb80
patch 8.1.0958: compiling weird regexp pattern is very slow
Bram Moolenaar <Bram@vim.org>
parents:
15876
diff
changeset
|
521 new_max = nstate_max * 3 / 2; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
522 new_start = ALLOC_MULT(int, new_max); |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
523 if (new_start == NULL) |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
524 return FAIL; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
525 mch_memmove(new_start, post_start, nstate_max * sizeof(int)); |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
526 old_start = post_start; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
527 post_start = new_start; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
528 post_ptr = new_start + (post_ptr - old_start); |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
529 post_end = post_start + new_max; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
530 vim_free(old_start); |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
531 return OK; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
532 } |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
533 |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
534 /* |
| 4444 | 535 * Search between "start" and "end" and try to recognize a |
| 536 * character class in expanded form. For example [0-9]. | |
| 537 * On success, return the id the character class to be emitted. | |
| 538 * On failure, return 0 (=FAIL) | |
| 539 * Start points to the first char of the range, while end should point | |
| 540 * to the closing brace. | |
| 5296 | 541 * Keep in mind that 'ignorecase' applies at execution time, thus [a-z] may |
| 542 * need to be interpreted as [a-zA-Z]. | |
| 4444 | 543 */ |
| 544 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
545 nfa_recognize_char_class(char_u *start, char_u *end, int extra_newl) |
| 4444 | 546 { |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
547 # define CLASS_not 0x80 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
548 # define CLASS_af 0x40 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
549 # define CLASS_AF 0x20 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
550 # define CLASS_az 0x10 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
551 # define CLASS_AZ 0x08 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
552 # define CLASS_o7 0x04 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
553 # define CLASS_o9 0x02 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
554 # define CLASS_underscore 0x01 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
555 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
556 int newl = FALSE; |
| 4444 | 557 char_u *p; |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
558 int config = 0; |
| 4444 | 559 |
| 560 if (extra_newl == TRUE) | |
| 561 newl = TRUE; | |
| 562 | |
| 563 if (*end != ']') | |
| 564 return FAIL; | |
| 565 p = start; | |
| 566 if (*p == '^') | |
| 567 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
568 config |= CLASS_not; |
|
4720
bd6bef0bd0fb
updated for version 7.3.1107
Bram Moolenaar <bram@vim.org>
parents:
4718
diff
changeset
|
569 p++; |
| 4444 | 570 } |
| 571 | |
| 572 while (p < end) | |
| 573 { | |
| 574 if (p + 2 < end && *(p + 1) == '-') | |
| 575 { | |
| 576 switch (*p) | |
| 577 { | |
| 578 case '0': | |
| 579 if (*(p + 2) == '9') | |
| 580 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
581 config |= CLASS_o9; |
| 4444 | 582 break; |
| 583 } | |
| 584 if (*(p + 2) == '7') | |
| 585 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
586 config |= CLASS_o7; |
| 4444 | 587 break; |
| 588 } | |
|
11469
0ade9dd85156
patch 8.0.0618: NFA regex engine handles [0-z] incorrectly
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
589 return FAIL; |
|
0ade9dd85156
patch 8.0.0618: NFA regex engine handles [0-z] incorrectly
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
590 |
| 4444 | 591 case 'a': |
| 592 if (*(p + 2) == 'z') | |
| 593 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
594 config |= CLASS_az; |
| 4444 | 595 break; |
| 596 } | |
| 597 if (*(p + 2) == 'f') | |
| 598 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
599 config |= CLASS_af; |
| 4444 | 600 break; |
| 601 } | |
|
11469
0ade9dd85156
patch 8.0.0618: NFA regex engine handles [0-z] incorrectly
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
602 return FAIL; |
|
0ade9dd85156
patch 8.0.0618: NFA regex engine handles [0-z] incorrectly
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
603 |
| 4444 | 604 case 'A': |
| 605 if (*(p + 2) == 'Z') | |
| 606 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
607 config |= CLASS_AZ; |
| 4444 | 608 break; |
| 609 } | |
| 610 if (*(p + 2) == 'F') | |
| 611 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
612 config |= CLASS_AF; |
| 4444 | 613 break; |
| 614 } | |
|
11469
0ade9dd85156
patch 8.0.0618: NFA regex engine handles [0-z] incorrectly
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
615 return FAIL; |
|
0ade9dd85156
patch 8.0.0618: NFA regex engine handles [0-z] incorrectly
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
616 |
| 4444 | 617 default: |
| 618 return FAIL; | |
| 619 } | |
| 620 p += 3; | |
| 621 } | |
| 622 else if (p + 1 < end && *p == '\\' && *(p + 1) == 'n') | |
| 623 { | |
| 624 newl = TRUE; | |
| 625 p += 2; | |
| 626 } | |
| 627 else if (*p == '_') | |
| 628 { | |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
629 config |= CLASS_underscore; |
| 4444 | 630 p ++; |
| 631 } | |
| 632 else if (*p == '\n') | |
| 633 { | |
| 634 newl = TRUE; | |
| 635 p ++; | |
| 636 } | |
| 637 else | |
| 638 return FAIL; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
639 } // while (p < end) |
| 4444 | 640 |
| 641 if (p != end) | |
| 642 return FAIL; | |
| 643 | |
| 644 if (newl == TRUE) | |
| 5296 | 645 extra_newl = NFA_ADD_NL; |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
646 |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
647 switch (config) |
| 4444 | 648 { |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
649 case CLASS_o9: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
650 return extra_newl + NFA_DIGIT; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
651 case CLASS_not | CLASS_o9: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
652 return extra_newl + NFA_NDIGIT; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
653 case CLASS_af | CLASS_AF | CLASS_o9: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
654 return extra_newl + NFA_HEX; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
655 case CLASS_not | CLASS_af | CLASS_AF | CLASS_o9: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
656 return extra_newl + NFA_NHEX; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
657 case CLASS_o7: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
658 return extra_newl + NFA_OCTAL; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
659 case CLASS_not | CLASS_o7: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
660 return extra_newl + NFA_NOCTAL; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
661 case CLASS_az | CLASS_AZ | CLASS_o9 | CLASS_underscore: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
662 return extra_newl + NFA_WORD; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
663 case CLASS_not | CLASS_az | CLASS_AZ | CLASS_o9 | CLASS_underscore: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
664 return extra_newl + NFA_NWORD; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
665 case CLASS_az | CLASS_AZ | CLASS_underscore: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
666 return extra_newl + NFA_HEAD; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
667 case CLASS_not | CLASS_az | CLASS_AZ | CLASS_underscore: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
668 return extra_newl + NFA_NHEAD; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
669 case CLASS_az | CLASS_AZ: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
670 return extra_newl + NFA_ALPHA; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
671 case CLASS_not | CLASS_az | CLASS_AZ: |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
672 return extra_newl + NFA_NALPHA; |
|
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
673 case CLASS_az: |
| 5296 | 674 return extra_newl + NFA_LOWER_IC; |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
675 case CLASS_not | CLASS_az: |
| 5296 | 676 return extra_newl + NFA_NLOWER_IC; |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
677 case CLASS_AZ: |
| 5296 | 678 return extra_newl + NFA_UPPER_IC; |
|
4728
43de4ebbe7ad
updated for version 7.3.1111
Bram Moolenaar <bram@vim.org>
parents:
4726
diff
changeset
|
679 case CLASS_not | CLASS_AZ: |
| 5296 | 680 return extra_newl + NFA_NUPPER_IC; |
| 4444 | 681 } |
| 682 return FAIL; | |
| 683 } | |
| 684 | |
| 685 /* | |
| 686 * Produce the bytes for equivalence class "c". | |
| 687 * Currently only handles latin1, latin9 and utf-8. | |
| 688 * Emits bytes in postfix notation: 'a,b,NFA_OR,c,NFA_OR' is | |
| 689 * equivalent to 'a OR b OR c' | |
| 690 * | |
| 691 * NOTE! When changing this function, also update reg_equi_class() | |
| 692 */ | |
| 693 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
694 nfa_emit_equi_class(int c) |
| 4444 | 695 { |
| 5351 | 696 #define EMIT2(c) EMIT(c); EMIT(NFA_CONCAT); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
697 |
| 4444 | 698 if (enc_utf8 || STRCMP(p_enc, "latin1") == 0 |
| 699 || STRCMP(p_enc, "iso-8859-15") == 0) | |
| 700 { | |
|
27490
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
701 #define A_grave 0xc0 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
702 #define A_acute 0xc1 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
703 #define A_circumflex 0xc2 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
704 #define A_virguilla 0xc3 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
705 #define A_diaeresis 0xc4 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
706 #define A_ring 0xc5 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
707 #define C_cedilla 0xc7 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
708 #define E_grave 0xc8 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
709 #define E_acute 0xc9 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
710 #define E_circumflex 0xca |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
711 #define E_diaeresis 0xcb |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
712 #define I_grave 0xcc |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
713 #define I_acute 0xcd |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
714 #define I_circumflex 0xce |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
715 #define I_diaeresis 0xcf |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
716 #define N_virguilla 0xd1 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
717 #define O_grave 0xd2 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
718 #define O_acute 0xd3 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
719 #define O_circumflex 0xd4 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
720 #define O_virguilla 0xd5 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
721 #define O_diaeresis 0xd6 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
722 #define O_slash 0xd8 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
723 #define U_grave 0xd9 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
724 #define U_acute 0xda |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
725 #define U_circumflex 0xdb |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
726 #define U_diaeresis 0xdc |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
727 #define Y_acute 0xdd |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
728 #define a_grave 0xe0 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
729 #define a_acute 0xe1 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
730 #define a_circumflex 0xe2 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
731 #define a_virguilla 0xe3 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
732 #define a_diaeresis 0xe4 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
733 #define a_ring 0xe5 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
734 #define c_cedilla 0xe7 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
735 #define e_grave 0xe8 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
736 #define e_acute 0xe9 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
737 #define e_circumflex 0xea |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
738 #define e_diaeresis 0xeb |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
739 #define i_grave 0xec |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
740 #define i_acute 0xed |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
741 #define i_circumflex 0xee |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
742 #define i_diaeresis 0xef |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
743 #define n_virguilla 0xf1 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
744 #define o_grave 0xf2 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
745 #define o_acute 0xf3 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
746 #define o_circumflex 0xf4 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
747 #define o_virguilla 0xf5 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
748 #define o_diaeresis 0xf6 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
749 #define o_slash 0xf8 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
750 #define u_grave 0xf9 |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
751 #define u_acute 0xfa |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
752 #define u_circumflex 0xfb |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
753 #define u_diaeresis 0xfc |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
754 #define y_acute 0xfd |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
755 #define y_diaeresis 0xff |
| 4444 | 756 switch (c) |
| 757 { | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
758 case 'A': case A_grave: case A_acute: case A_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
759 case A_virguilla: case A_diaeresis: case A_ring: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
760 case 0x100: case 0x102: case 0x104: case 0x1cd: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
761 case 0x1de: case 0x1e0: case 0x1fa: case 0x200: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
762 case 0x202: case 0x226: case 0x23a: case 0x1e00: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
763 case 0x1ea0: case 0x1ea2: case 0x1ea4: case 0x1ea6: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
764 case 0x1ea8: case 0x1eaa: case 0x1eac: case 0x1eae: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
765 case 0x1eb0: case 0x1eb2: case 0x1eb4: case 0x1eb6: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
766 EMIT2('A') EMIT2(A_grave) EMIT2(A_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
767 EMIT2(A_circumflex) EMIT2(A_virguilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
768 EMIT2(A_diaeresis) EMIT2(A_ring) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
769 EMIT2(0x100) EMIT2(0x102) EMIT2(0x104) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
770 EMIT2(0x1cd) EMIT2(0x1de) EMIT2(0x1e0) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
771 EMIT2(0x1fa) EMIT2(0x200) EMIT2(0x202) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
772 EMIT2(0x226) EMIT2(0x23a) EMIT2(0x1e00) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
773 EMIT2(0x1ea0) EMIT2(0x1ea2) EMIT2(0x1ea4) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
774 EMIT2(0x1ea6) EMIT2(0x1ea8) EMIT2(0x1eaa) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
775 EMIT2(0x1eac) EMIT2(0x1eae) EMIT2(0x1eb0) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
776 EMIT2(0x1eb2) EMIT2(0x1eb6) EMIT2(0x1eb4) |
| 5351 | 777 return OK; |
| 778 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
779 case 'B': case 0x181: case 0x243: case 0x1e02: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
780 case 0x1e04: case 0x1e06: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
781 EMIT2('B') |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
782 EMIT2(0x181) EMIT2(0x243) EMIT2(0x1e02) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
783 EMIT2(0x1e04) EMIT2(0x1e06) |
| 4444 | 784 return OK; |
| 785 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
786 case 'C': case C_cedilla: case 0x106: case 0x108: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
787 case 0x10a: case 0x10c: case 0x187: case 0x23b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
788 case 0x1e08: case 0xa792: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
789 EMIT2('C') EMIT2(C_cedilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
790 EMIT2(0x106) EMIT2(0x108) EMIT2(0x10a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
791 EMIT2(0x10c) EMIT2(0x187) EMIT2(0x23b) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
792 EMIT2(0x1e08) EMIT2(0xa792) |
| 5351 | 793 return OK; |
| 794 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
795 case 'D': case 0x10e: case 0x110: case 0x18a: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
796 case 0x1e0a: case 0x1e0c: case 0x1e0e: case 0x1e10: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
797 case 0x1e12: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
798 EMIT2('D') EMIT2(0x10e) EMIT2(0x110) EMIT2(0x18a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
799 EMIT2(0x1e0a) EMIT2(0x1e0c) EMIT2(0x1e0e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
800 EMIT2(0x1e10) EMIT2(0x1e12) |
| 4444 | 801 return OK; |
| 802 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
803 case 'E': case E_grave: case E_acute: case E_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
804 case E_diaeresis: case 0x112: case 0x114: case 0x116: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
805 case 0x118: case 0x11a: case 0x204: case 0x206: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
806 case 0x228: case 0x246: case 0x1e14: case 0x1e16: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
807 case 0x1e18: case 0x1e1a: case 0x1e1c: case 0x1eb8: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
808 case 0x1eba: case 0x1ebc: case 0x1ebe: case 0x1ec0: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
809 case 0x1ec2: case 0x1ec4: case 0x1ec6: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
810 EMIT2('E') EMIT2(E_grave) EMIT2(E_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
811 EMIT2(E_circumflex) EMIT2(E_diaeresis) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
812 EMIT2(0x112) EMIT2(0x114) EMIT2(0x116) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
813 EMIT2(0x118) EMIT2(0x11a) EMIT2(0x204) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
814 EMIT2(0x206) EMIT2(0x228) EMIT2(0x246) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
815 EMIT2(0x1e14) EMIT2(0x1e16) EMIT2(0x1e18) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
816 EMIT2(0x1e1a) EMIT2(0x1e1c) EMIT2(0x1eb8) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
817 EMIT2(0x1eba) EMIT2(0x1ebc) EMIT2(0x1ebe) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
818 EMIT2(0x1ec0) EMIT2(0x1ec2) EMIT2(0x1ec4) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
819 EMIT2(0x1ec6) |
| 5351 | 820 return OK; |
| 821 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
822 case 'F': case 0x191: case 0x1e1e: case 0xa798: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
823 EMIT2('F') EMIT2(0x191) EMIT2(0x1e1e) EMIT2(0xa798) |
| 5351 | 824 return OK; |
| 825 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
826 case 'G': case 0x11c: case 0x11e: case 0x120: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
827 case 0x122: case 0x193: case 0x1e4: case 0x1e6: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
828 case 0x1f4: case 0x1e20: case 0xa7a0: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
829 EMIT2('G') EMIT2(0x11c) EMIT2(0x11e) EMIT2(0x120) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
830 EMIT2(0x122) EMIT2(0x193) EMIT2(0x1e4) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
831 EMIT2(0x1e6) EMIT2(0x1f4) EMIT2(0x1e20) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
832 EMIT2(0xa7a0) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
833 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
834 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
835 case 'H': case 0x124: case 0x126: case 0x21e: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
836 case 0x1e22: case 0x1e24: case 0x1e26: case 0x1e28: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
837 case 0x1e2a: case 0x2c67: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
838 EMIT2('H') EMIT2(0x124) EMIT2(0x126) EMIT2(0x21e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
839 EMIT2(0x1e22) EMIT2(0x1e24) EMIT2(0x1e26) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
840 EMIT2(0x1e28) EMIT2(0x1e2a) EMIT2(0x2c67) |
| 4444 | 841 return OK; |
| 842 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
843 case 'I': case I_grave: case I_acute: case I_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
844 case I_diaeresis: case 0x128: case 0x12a: case 0x12c: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
845 case 0x12e: case 0x130: case 0x197: case 0x1cf: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
846 case 0x208: case 0x20a: case 0x1e2c: case 0x1e2e: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
847 case 0x1ec8: case 0x1eca: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
848 EMIT2('I') EMIT2(I_grave) EMIT2(I_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
849 EMIT2(I_circumflex) EMIT2(I_diaeresis) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
850 EMIT2(0x128) EMIT2(0x12a) EMIT2(0x12c) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
851 EMIT2(0x12e) EMIT2(0x130) EMIT2(0x197) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
852 EMIT2(0x1cf) EMIT2(0x208) EMIT2(0x20a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
853 EMIT2(0x1e2c) EMIT2(0x1e2e) EMIT2(0x1ec8) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
854 EMIT2(0x1eca) |
| 5351 | 855 return OK; |
| 856 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
857 case 'J': case 0x134: case 0x248: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
858 EMIT2('J') EMIT2(0x134) EMIT2(0x248) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
859 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
860 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
861 case 'K': case 0x136: case 0x198: case 0x1e8: case 0x1e30: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
862 case 0x1e32: case 0x1e34: case 0x2c69: case 0xa740: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
863 EMIT2('K') EMIT2(0x136) EMIT2(0x198) EMIT2(0x1e8) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
864 EMIT2(0x1e30) EMIT2(0x1e32) EMIT2(0x1e34) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
865 EMIT2(0x2c69) EMIT2(0xa740) |
| 5351 | 866 return OK; |
| 867 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
868 case 'L': case 0x139: case 0x13b: case 0x13d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
869 case 0x13f: case 0x141: case 0x23d: case 0x1e36: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
870 case 0x1e38: case 0x1e3a: case 0x1e3c: case 0x2c60: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
871 EMIT2('L') EMIT2(0x139) EMIT2(0x13b) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
872 EMIT2(0x13d) EMIT2(0x13f) EMIT2(0x141) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
873 EMIT2(0x23d) EMIT2(0x1e36) EMIT2(0x1e38) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
874 EMIT2(0x1e3a) EMIT2(0x1e3c) EMIT2(0x2c60) |
| 5351 | 875 return OK; |
| 876 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
877 case 'M': case 0x1e3e: case 0x1e40: case 0x1e42: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
878 EMIT2('M') EMIT2(0x1e3e) EMIT2(0x1e40) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
879 EMIT2(0x1e42) |
| 4444 | 880 return OK; |
| 881 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
882 case 'N': case N_virguilla: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
883 case 0x143: case 0x145: case 0x147: case 0x1f8: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
884 case 0x1e44: case 0x1e46: case 0x1e48: case 0x1e4a: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
885 case 0xa7a4: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
886 EMIT2('N') EMIT2(N_virguilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
887 EMIT2(0x143) EMIT2(0x145) EMIT2(0x147) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
888 EMIT2(0x1f8) EMIT2(0x1e44) EMIT2(0x1e46) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
889 EMIT2(0x1e48) EMIT2(0x1e4a) EMIT2(0xa7a4) |
| 4444 | 890 return OK; |
| 891 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
892 case 'O': case O_grave: case O_acute: case O_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
893 case O_virguilla: case O_diaeresis: case O_slash: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
894 case 0x14c: case 0x14e: case 0x150: case 0x19f: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
895 case 0x1a0: case 0x1d1: case 0x1ea: case 0x1ec: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
896 case 0x1fe: case 0x20c: case 0x20e: case 0x22a: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
897 case 0x22c: case 0x22e: case 0x230: case 0x1e4c: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
898 case 0x1e4e: case 0x1e50: case 0x1e52: case 0x1ecc: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
899 case 0x1ece: case 0x1ed0: case 0x1ed2: case 0x1ed4: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
900 case 0x1ed6: case 0x1ed8: case 0x1eda: case 0x1edc: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
901 case 0x1ede: case 0x1ee0: case 0x1ee2: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
902 EMIT2('O') EMIT2(O_grave) EMIT2(O_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
903 EMIT2(O_circumflex) EMIT2(O_virguilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
904 EMIT2(O_diaeresis) EMIT2(O_slash) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
905 EMIT2(0x14c) EMIT2(0x14e) EMIT2(0x150) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
906 EMIT2(0x19f) EMIT2(0x1a0) EMIT2(0x1d1) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
907 EMIT2(0x1ea) EMIT2(0x1ec) EMIT2(0x1fe) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
908 EMIT2(0x20c) EMIT2(0x20e) EMIT2(0x22a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
909 EMIT2(0x22c) EMIT2(0x22e) EMIT2(0x230) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
910 EMIT2(0x1e4c) EMIT2(0x1e4e) EMIT2(0x1e50) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
911 EMIT2(0x1e52) EMIT2(0x1ecc) EMIT2(0x1ece) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
912 EMIT2(0x1ed0) EMIT2(0x1ed2) EMIT2(0x1ed4) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
913 EMIT2(0x1ed6) EMIT2(0x1ed8) EMIT2(0x1eda) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
914 EMIT2(0x1edc) EMIT2(0x1ede) EMIT2(0x1ee0) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
915 EMIT2(0x1ee2) |
| 5351 | 916 return OK; |
| 917 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
918 case 'P': case 0x1a4: case 0x1e54: case 0x1e56: case 0x2c63: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
919 EMIT2('P') EMIT2(0x1a4) EMIT2(0x1e54) EMIT2(0x1e56) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
920 EMIT2(0x2c63) |
| 5351 | 921 return OK; |
| 922 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
923 case 'Q': case 0x24a: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
924 EMIT2('Q') EMIT2(0x24a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
925 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
926 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
927 case 'R': case 0x154: case 0x156: case 0x158: case 0x210: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
928 case 0x212: case 0x24c: case 0x1e58: case 0x1e5a: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
929 case 0x1e5c: case 0x1e5e: case 0x2c64: case 0xa7a6: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
930 EMIT2('R') EMIT2(0x154) EMIT2(0x156) EMIT2(0x158) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
931 EMIT2(0x210) EMIT2(0x212) EMIT2(0x24c) EMIT2(0x1e58) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
932 EMIT2(0x1e5a) EMIT2(0x1e5c) EMIT2(0x1e5e) EMIT2(0x2c64) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
933 EMIT2(0xa7a6) |
| 5351 | 934 return OK; |
| 935 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
936 case 'S': case 0x15a: case 0x15c: case 0x15e: case 0x160: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
937 case 0x218: case 0x1e60: case 0x1e62: case 0x1e64: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
938 case 0x1e66: case 0x1e68: case 0x2c7e: case 0xa7a8: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
939 EMIT2('S') EMIT2(0x15a) EMIT2(0x15c) EMIT2(0x15e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
940 EMIT2(0x160) EMIT2(0x218) EMIT2(0x1e60) EMIT2(0x1e62) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
941 EMIT2(0x1e64) EMIT2(0x1e66) EMIT2(0x1e68) EMIT2(0x2c7e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
942 EMIT2(0xa7a8) |
| 5351 | 943 return OK; |
| 944 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
945 case 'T': case 0x162: case 0x164: case 0x166: case 0x1ac: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
946 case 0x1ae: case 0x21a: case 0x23e: case 0x1e6a: case 0x1e6c: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
947 case 0x1e6e: case 0x1e70: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
948 EMIT2('T') EMIT2(0x162) EMIT2(0x164) EMIT2(0x166) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
949 EMIT2(0x1ac) EMIT2(0x1ae) EMIT2(0x23e) EMIT2(0x21a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
950 EMIT2(0x1e6a) EMIT2(0x1e6c) EMIT2(0x1e6e) EMIT2(0x1e70) |
| 4444 | 951 return OK; |
| 952 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
953 case 'U': case U_grave: case U_acute: case U_diaeresis: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
954 case U_circumflex: case 0x168: case 0x16a: case 0x16c: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
955 case 0x16e: case 0x170: case 0x172: case 0x1af: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
956 case 0x1d3: case 0x1d5: case 0x1d7: case 0x1d9: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
957 case 0x1db: case 0x214: case 0x216: case 0x244: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
958 case 0x1e72: case 0x1e74: case 0x1e76: case 0x1e78: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
959 case 0x1e7a: case 0x1ee4: case 0x1ee6: case 0x1ee8: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
960 case 0x1eea: case 0x1eec: case 0x1eee: case 0x1ef0: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
961 EMIT2('U') EMIT2(U_grave) EMIT2(U_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
962 EMIT2(U_diaeresis) EMIT2(U_circumflex) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
963 EMIT2(0x168) EMIT2(0x16a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
964 EMIT2(0x16c) EMIT2(0x16e) EMIT2(0x170) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
965 EMIT2(0x172) EMIT2(0x1af) EMIT2(0x1d3) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
966 EMIT2(0x1d5) EMIT2(0x1d7) EMIT2(0x1d9) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
967 EMIT2(0x1db) EMIT2(0x214) EMIT2(0x216) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
968 EMIT2(0x244) EMIT2(0x1e72) EMIT2(0x1e74) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
969 EMIT2(0x1e76) EMIT2(0x1e78) EMIT2(0x1e7a) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
970 EMIT2(0x1ee4) EMIT2(0x1ee6) EMIT2(0x1ee8) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
971 EMIT2(0x1eea) EMIT2(0x1eec) EMIT2(0x1eee) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
972 EMIT2(0x1ef0) |
| 5351 | 973 return OK; |
| 974 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
975 case 'V': case 0x1b2: case 0x1e7c: case 0x1e7e: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
976 EMIT2('V') EMIT2(0x1b2) EMIT2(0x1e7c) EMIT2(0x1e7e) |
| 5351 | 977 return OK; |
| 978 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
979 case 'W': case 0x174: case 0x1e80: case 0x1e82: case 0x1e84: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
980 case 0x1e86: case 0x1e88: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
981 EMIT2('W') EMIT2(0x174) EMIT2(0x1e80) EMIT2(0x1e82) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
982 EMIT2(0x1e84) EMIT2(0x1e86) EMIT2(0x1e88) |
| 4444 | 983 return OK; |
| 984 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
985 case 'X': case 0x1e8a: case 0x1e8c: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
986 EMIT2('X') EMIT2(0x1e8a) EMIT2(0x1e8c) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
987 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
988 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
989 case 'Y': case Y_acute: case 0x176: case 0x178: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
990 case 0x1b3: case 0x232: case 0x24e: case 0x1e8e: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
991 case 0x1ef2: case 0x1ef4: case 0x1ef6: case 0x1ef8: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
992 EMIT2('Y') EMIT2(Y_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
993 EMIT2(0x176) EMIT2(0x178) EMIT2(0x1b3) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
994 EMIT2(0x232) EMIT2(0x24e) EMIT2(0x1e8e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
995 EMIT2(0x1ef2) EMIT2(0x1ef4) EMIT2(0x1ef6) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
996 EMIT2(0x1ef8) |
| 5351 | 997 return OK; |
| 998 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
999 case 'Z': case 0x179: case 0x17b: case 0x17d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1000 case 0x1b5: case 0x1e90: case 0x1e92: case 0x1e94: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1001 case 0x2c6b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1002 EMIT2('Z') EMIT2(0x179) EMIT2(0x17b) EMIT2(0x17d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1003 EMIT2(0x1b5) EMIT2(0x1e90) EMIT2(0x1e92) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1004 EMIT2(0x1e94) EMIT2(0x2c6b) |
| 4444 | 1005 return OK; |
| 1006 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1007 case 'a': case a_grave: case a_acute: case a_circumflex: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1008 case a_virguilla: case a_diaeresis: case a_ring: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1009 case 0x101: case 0x103: case 0x105: case 0x1ce: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1010 case 0x1df: case 0x1e1: case 0x1fb: case 0x201: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1011 case 0x203: case 0x227: case 0x1d8f: case 0x1e01: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1012 case 0x1e9a: case 0x1ea1: case 0x1ea3: case 0x1ea5: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1013 case 0x1ea7: case 0x1ea9: case 0x1eab: case 0x1ead: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1014 case 0x1eaf: case 0x1eb1: case 0x1eb3: case 0x1eb5: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1015 case 0x1eb7: case 0x2c65: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1016 EMIT2('a') EMIT2(a_grave) EMIT2(a_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1017 EMIT2(a_circumflex) EMIT2(a_virguilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1018 EMIT2(a_diaeresis) EMIT2(a_ring) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1019 EMIT2(0x101) EMIT2(0x103) EMIT2(0x105) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1020 EMIT2(0x1ce) EMIT2(0x1df) EMIT2(0x1e1) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1021 EMIT2(0x1fb) EMIT2(0x201) EMIT2(0x203) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1022 EMIT2(0x227) EMIT2(0x1d8f) EMIT2(0x1e01) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1023 EMIT2(0x1e9a) EMIT2(0x1ea1) EMIT2(0x1ea3) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1024 EMIT2(0x1ea5) EMIT2(0x1ea7) EMIT2(0x1ea9) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1025 EMIT2(0x1eab) EMIT2(0x1ead) EMIT2(0x1eaf) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1026 EMIT2(0x1eb1) EMIT2(0x1eb3) EMIT2(0x1eb5) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1027 EMIT2(0x1eb7) EMIT2(0x2c65) |
| 5351 | 1028 return OK; |
| 1029 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1030 case 'b': case 0x180: case 0x253: case 0x1d6c: case 0x1d80: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1031 case 0x1e03: case 0x1e05: case 0x1e07: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1032 EMIT2('b') EMIT2(0x180) EMIT2(0x253) EMIT2(0x1d6c) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1033 EMIT2(0x1d80) EMIT2(0x1e03) EMIT2(0x1e05) EMIT2(0x1e07) |
| 4444 | 1034 return OK; |
| 1035 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1036 case 'c': case c_cedilla: case 0x107: case 0x109: case 0x10b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1037 case 0x10d: case 0x188: case 0x23c: case 0x1e09: case 0xa793: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1038 case 0xa794: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1039 EMIT2('c') EMIT2(c_cedilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1040 EMIT2(0x107) EMIT2(0x109) EMIT2(0x10b) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1041 EMIT2(0x10d) EMIT2(0x188) EMIT2(0x23c) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1042 EMIT2(0x1e09) EMIT2(0xa793) EMIT2(0xa794) |
| 5351 | 1043 return OK; |
| 1044 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1045 case 'd': case 0x10f: case 0x111: case 0x257: case 0x1d6d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1046 case 0x1d81: case 0x1d91: case 0x1e0b: case 0x1e0d: case 0x1e0f: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1047 case 0x1e11: case 0x1e13: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1048 EMIT2('d') EMIT2(0x10f) EMIT2(0x111) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1049 EMIT2(0x257) EMIT2(0x1d6d) EMIT2(0x1d81) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1050 EMIT2(0x1d91) EMIT2(0x1e0b) EMIT2(0x1e0d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1051 EMIT2(0x1e0f) EMIT2(0x1e11) EMIT2(0x1e13) |
| 4444 | 1052 return OK; |
| 1053 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
1054 case 'e': case e_grave: case e_acute: case e_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1055 case e_diaeresis: case 0x113: case 0x115: case 0x117: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1056 case 0x119: case 0x11b: case 0x205: case 0x207: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1057 case 0x229: case 0x247: case 0x1d92: case 0x1e15: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1058 case 0x1e17: case 0x1e19: case 0x1e1b: case 0x1e1d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1059 case 0x1eb9: case 0x1ebb: case 0x1ebd: case 0x1ebf: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1060 case 0x1ec1: case 0x1ec3: case 0x1ec5: case 0x1ec7: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1061 EMIT2('e') EMIT2(e_grave) EMIT2(e_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1062 EMIT2(e_circumflex) EMIT2(e_diaeresis) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1063 EMIT2(0x113) EMIT2(0x115) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1064 EMIT2(0x117) EMIT2(0x119) EMIT2(0x11b) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1065 EMIT2(0x205) EMIT2(0x207) EMIT2(0x229) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1066 EMIT2(0x247) EMIT2(0x1d92) EMIT2(0x1e15) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1067 EMIT2(0x1e17) EMIT2(0x1e19) EMIT2(0x1e1b) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1068 EMIT2(0x1e1d) EMIT2(0x1eb9) EMIT2(0x1ebb) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1069 EMIT2(0x1ebd) EMIT2(0x1ebf) EMIT2(0x1ec1) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1070 EMIT2(0x1ec3) EMIT2(0x1ec5) EMIT2(0x1ec7) |
| 5351 | 1071 return OK; |
| 1072 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1073 case 'f': case 0x192: case 0x1d6e: case 0x1d82: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1074 case 0x1e1f: case 0xa799: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1075 EMIT2('f') EMIT2(0x192) EMIT2(0x1d6e) EMIT2(0x1d82) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1076 EMIT2(0x1e1f) EMIT2(0xa799) |
| 5351 | 1077 return OK; |
| 1078 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1079 case 'g': case 0x11d: case 0x11f: case 0x121: case 0x123: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1080 case 0x1e5: case 0x1e7: case 0x1f5: case 0x260: case 0x1d83: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1081 case 0x1e21: case 0xa7a1: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1082 EMIT2('g') EMIT2(0x11d) EMIT2(0x11f) EMIT2(0x121) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1083 EMIT2(0x123) EMIT2(0x1e5) EMIT2(0x1e7) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1084 EMIT2(0x1f5) EMIT2(0x260) EMIT2(0x1d83) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1085 EMIT2(0x1e21) EMIT2(0xa7a1) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1086 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1087 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1088 case 'h': case 0x125: case 0x127: case 0x21f: case 0x1e23: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1089 case 0x1e25: case 0x1e27: case 0x1e29: case 0x1e2b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1090 case 0x1e96: case 0x2c68: case 0xa795: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1091 EMIT2('h') EMIT2(0x125) EMIT2(0x127) EMIT2(0x21f) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1092 EMIT2(0x1e23) EMIT2(0x1e25) EMIT2(0x1e27) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1093 EMIT2(0x1e29) EMIT2(0x1e2b) EMIT2(0x1e96) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1094 EMIT2(0x2c68) EMIT2(0xa795) |
| 4444 | 1095 return OK; |
| 1096 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
1097 case 'i': case i_grave: case i_acute: case i_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1098 case i_diaeresis: case 0x129: case 0x12b: case 0x12d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1099 case 0x12f: case 0x1d0: case 0x209: case 0x20b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1100 case 0x268: case 0x1d96: case 0x1e2d: case 0x1e2f: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1101 case 0x1ec9: case 0x1ecb: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1102 EMIT2('i') EMIT2(i_grave) EMIT2(i_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1103 EMIT2(i_circumflex) EMIT2(i_diaeresis) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1104 EMIT2(0x129) EMIT2(0x12b) EMIT2(0x12d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1105 EMIT2(0x12f) EMIT2(0x1d0) EMIT2(0x209) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1106 EMIT2(0x20b) EMIT2(0x268) EMIT2(0x1d96) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1107 EMIT2(0x1e2d) EMIT2(0x1e2f) EMIT2(0x1ec9) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1108 EMIT2(0x1ecb) EMIT2(0x1ecb) |
| 5351 | 1109 return OK; |
| 1110 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1111 case 'j': case 0x135: case 0x1f0: case 0x249: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1112 EMIT2('j') EMIT2(0x135) EMIT2(0x1f0) EMIT2(0x249) |
| 5351 | 1113 return OK; |
| 1114 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1115 case 'k': case 0x137: case 0x199: case 0x1e9: case 0x1d84: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1116 case 0x1e31: case 0x1e33: case 0x1e35: case 0x2c6a: case 0xa741: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1117 EMIT2('k') EMIT2(0x137) EMIT2(0x199) EMIT2(0x1e9) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1118 EMIT2(0x1d84) EMIT2(0x1e31) EMIT2(0x1e33) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1119 EMIT2(0x1e35) EMIT2(0x2c6a) EMIT2(0xa741) |
| 5351 | 1120 return OK; |
| 1121 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1122 case 'l': case 0x13a: case 0x13c: case 0x13e: case 0x140: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1123 case 0x142: case 0x19a: case 0x1e37: case 0x1e39: case 0x1e3b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1124 case 0x1e3d: case 0x2c61: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1125 EMIT2('l') EMIT2(0x13a) EMIT2(0x13c) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1126 EMIT2(0x13e) EMIT2(0x140) EMIT2(0x142) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1127 EMIT2(0x19a) EMIT2(0x1e37) EMIT2(0x1e39) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1128 EMIT2(0x1e3b) EMIT2(0x1e3d) EMIT2(0x2c61) |
| 4444 | 1129 return OK; |
| 1130 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1131 case 'm': case 0x1d6f: case 0x1e3f: case 0x1e41: case 0x1e43: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1132 EMIT2('m') EMIT2(0x1d6f) EMIT2(0x1e3f) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1133 EMIT2(0x1e41) EMIT2(0x1e43) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1134 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1135 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1136 case 'n': case n_virguilla: case 0x144: case 0x146: case 0x148: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1137 case 0x149: case 0x1f9: case 0x1d70: case 0x1d87: case 0x1e45: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1138 case 0x1e47: case 0x1e49: case 0x1e4b: case 0xa7a5: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1139 EMIT2('n') EMIT2(n_virguilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1140 EMIT2(0x144) EMIT2(0x146) EMIT2(0x148) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1141 EMIT2(0x149) EMIT2(0x1f9) EMIT2(0x1d70) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1142 EMIT2(0x1d87) EMIT2(0x1e45) EMIT2(0x1e47) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1143 EMIT2(0x1e49) EMIT2(0x1e4b) EMIT2(0xa7a5) |
| 4444 | 1144 return OK; |
| 1145 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
1146 case 'o': case o_grave: case o_acute: case o_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1147 case o_virguilla: case o_diaeresis: case o_slash: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1148 case 0x14d: case 0x14f: case 0x151: case 0x1a1: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1149 case 0x1d2: case 0x1eb: case 0x1ed: case 0x1ff: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1150 case 0x20d: case 0x20f: case 0x22b: case 0x22d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1151 case 0x22f: case 0x231: case 0x275: case 0x1e4d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1152 case 0x1e4f: case 0x1e51: case 0x1e53: case 0x1ecd: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1153 case 0x1ecf: case 0x1ed1: case 0x1ed3: case 0x1ed5: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1154 case 0x1ed7: case 0x1ed9: case 0x1edb: case 0x1edd: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1155 case 0x1edf: case 0x1ee1: case 0x1ee3: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1156 EMIT2('o') EMIT2(o_grave) EMIT2(o_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1157 EMIT2(o_circumflex) EMIT2(o_virguilla) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1158 EMIT2(o_diaeresis) EMIT2(o_slash) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1159 EMIT2(0x14d) EMIT2(0x14f) EMIT2(0x151) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1160 EMIT2(0x1a1) EMIT2(0x1d2) EMIT2(0x1eb) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1161 EMIT2(0x1ed) EMIT2(0x1ff) EMIT2(0x20d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1162 EMIT2(0x20f) EMIT2(0x22b) EMIT2(0x22d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1163 EMIT2(0x22f) EMIT2(0x231) EMIT2(0x275) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1164 EMIT2(0x1e4d) EMIT2(0x1e4f) EMIT2(0x1e51) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1165 EMIT2(0x1e53) EMIT2(0x1ecd) EMIT2(0x1ecf) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1166 EMIT2(0x1ed1) EMIT2(0x1ed3) EMIT2(0x1ed5) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1167 EMIT2(0x1ed7) EMIT2(0x1ed9) EMIT2(0x1edb) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1168 EMIT2(0x1edd) EMIT2(0x1edf) EMIT2(0x1ee1) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1169 EMIT2(0x1ee3) |
| 5351 | 1170 return OK; |
| 1171 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1172 case 'p': case 0x1a5: case 0x1d71: case 0x1d7d: case 0x1d88: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1173 case 0x1e55: case 0x1e57: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1174 EMIT2('p') EMIT2(0x1a5) EMIT2(0x1d71) EMIT2(0x1d7d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1175 EMIT2(0x1d88) EMIT2(0x1e55) EMIT2(0x1e57) |
| 5351 | 1176 return OK; |
| 1177 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1178 case 'q': case 0x24b: case 0x2a0: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1179 EMIT2('q') EMIT2(0x24b) EMIT2(0x2a0) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1180 return OK; |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1181 |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1182 case 'r': case 0x155: case 0x157: case 0x159: case 0x211: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1183 case 0x213: case 0x24d: case 0x27d: case 0x1d72: case 0x1d73: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1184 case 0x1d89: case 0x1e59: case 0x1e5b: case 0x1e5d: case 0x1e5f: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1185 case 0xa7a7: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1186 EMIT2('r') EMIT2(0x155) EMIT2(0x157) EMIT2(0x159) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1187 EMIT2(0x211) EMIT2(0x213) EMIT2(0x24d) EMIT2(0x27d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1188 EMIT2(0x1d72) EMIT2(0x1d73) EMIT2(0x1d89) EMIT2(0x1e59) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1189 EMIT2(0x1e5b) EMIT2(0x1e5d) EMIT2(0x1e5f) EMIT2(0xa7a7) |
| 5351 | 1190 return OK; |
| 1191 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1192 case 's': case 0x15b: case 0x15d: case 0x15f: case 0x161: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1193 case 0x219: case 0x23f: case 0x1d74: case 0x1d8a: case 0x1e61: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1194 case 0x1e63: case 0x1e65: case 0x1e67: case 0x1e69: case 0xa7a9: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1195 EMIT2('s') EMIT2(0x15b) EMIT2(0x15d) EMIT2(0x15f) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1196 EMIT2(0x161) EMIT2(0x219) EMIT2(0x23f) EMIT2(0x1d74) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1197 EMIT2(0x1d8a) EMIT2(0x1e61) EMIT2(0x1e63) EMIT2(0x1e65) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1198 EMIT2(0x1e67) EMIT2(0x1e69) EMIT2(0xa7a9) |
| 5351 | 1199 return OK; |
| 1200 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1201 case 't': case 0x163: case 0x165: case 0x167: case 0x1ab: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1202 case 0x1ad: case 0x21b: case 0x288: case 0x1d75: case 0x1e6b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1203 case 0x1e6d: case 0x1e6f: case 0x1e71: case 0x1e97: case 0x2c66: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1204 EMIT2('t') EMIT2(0x163) EMIT2(0x165) EMIT2(0x167) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1205 EMIT2(0x1ab) EMIT2(0x1ad) EMIT2(0x21b) EMIT2(0x288) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1206 EMIT2(0x1d75) EMIT2(0x1e6b) EMIT2(0x1e6d) EMIT2(0x1e6f) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1207 EMIT2(0x1e71) EMIT2(0x1e97) EMIT2(0x2c66) |
| 4444 | 1208 return OK; |
| 1209 | |
|
8841
f196308a2813
commit https://github.com/vim/vim/commit/2a6fa564a3b5061c14ff63b8b0f12801df0b0ac2
Christian Brabandt <cb@256bit.org>
parents:
8021
diff
changeset
|
1210 case 'u': case u_grave: case u_acute: case u_circumflex: |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1211 case u_diaeresis: case 0x169: case 0x16b: case 0x16d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1212 case 0x16f: case 0x171: case 0x173: case 0x1b0: case 0x1d4: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1213 case 0x1d6: case 0x1d8: case 0x1da: case 0x1dc: case 0x215: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1214 case 0x217: case 0x289: case 0x1d7e: case 0x1d99: case 0x1e73: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1215 case 0x1e75: case 0x1e77: case 0x1e79: case 0x1e7b: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1216 case 0x1ee5: case 0x1ee7: case 0x1ee9: case 0x1eeb: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1217 case 0x1eed: case 0x1eef: case 0x1ef1: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1218 EMIT2('u') EMIT2(u_grave) EMIT2(u_acute) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1219 EMIT2(u_circumflex) EMIT2(u_diaeresis) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1220 EMIT2(0x169) EMIT2(0x16b) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1221 EMIT2(0x16d) EMIT2(0x16f) EMIT2(0x171) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1222 EMIT2(0x173) EMIT2(0x1d6) EMIT2(0x1d8) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1223 EMIT2(0x215) EMIT2(0x217) EMIT2(0x1b0) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1224 EMIT2(0x1d4) EMIT2(0x1da) EMIT2(0x1dc) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1225 EMIT2(0x289) EMIT2(0x1e73) EMIT2(0x1d7e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1226 EMIT2(0x1d99) EMIT2(0x1e75) EMIT2(0x1e77) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1227 EMIT2(0x1e79) EMIT2(0x1e7b) EMIT2(0x1ee5) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1228 EMIT2(0x1ee7) EMIT2(0x1ee9) EMIT2(0x1eeb) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1229 EMIT2(0x1eed) EMIT2(0x1eef) EMIT2(0x1ef1) |
| 5351 | 1230 return OK; |
| 1231 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1232 case 'v': case 0x28b: case 0x1d8c: case 0x1e7d: case 0x1e7f: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1233 EMIT2('v') EMIT2(0x28b) EMIT2(0x1d8c) EMIT2(0x1e7d) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1234 EMIT2(0x1e7f) |
| 5351 | 1235 return OK; |
| 1236 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1237 case 'w': case 0x175: case 0x1e81: case 0x1e83: case 0x1e85: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1238 case 0x1e87: case 0x1e89: case 0x1e98: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1239 EMIT2('w') EMIT2(0x175) EMIT2(0x1e81) EMIT2(0x1e83) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1240 EMIT2(0x1e85) EMIT2(0x1e87) EMIT2(0x1e89) EMIT2(0x1e98) |
| 5351 | 1241 return OK; |
| 1242 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1243 case 'x': case 0x1e8b: case 0x1e8d: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1244 EMIT2('x') EMIT2(0x1e8b) EMIT2(0x1e8d) |
| 4444 | 1245 return OK; |
| 1246 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1247 case 'y': case y_acute: case y_diaeresis: case 0x177: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1248 case 0x1b4: case 0x233: case 0x24f: case 0x1e8f: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1249 case 0x1e99: case 0x1ef3: case 0x1ef5: case 0x1ef7: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1250 case 0x1ef9: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1251 EMIT2('y') EMIT2(y_acute) EMIT2(y_diaeresis) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1252 EMIT2(0x177) EMIT2(0x1b4) EMIT2(0x233) EMIT2(0x24f) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1253 EMIT2(0x1e8f) EMIT2(0x1e99) EMIT2(0x1ef3) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1254 EMIT2(0x1ef5) EMIT2(0x1ef7) EMIT2(0x1ef9) |
| 4444 | 1255 return OK; |
| 1256 | |
|
24351
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1257 case 'z': case 0x17a: case 0x17c: case 0x17e: case 0x1b6: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1258 case 0x1d76: case 0x1d8e: case 0x1e91: case 0x1e93: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1259 case 0x1e95: case 0x2c6c: |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1260 EMIT2('z') EMIT2(0x17a) EMIT2(0x17c) EMIT2(0x17e) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1261 EMIT2(0x1b6) EMIT2(0x1d76) EMIT2(0x1d8e) EMIT2(0x1e91) |
|
585695c70392
patch 8.2.2716: the equivalent class regexp is missing some characters
Bram Moolenaar <Bram@vim.org>
parents:
23471
diff
changeset
|
1262 EMIT2(0x1e93) EMIT2(0x1e95) EMIT2(0x2c6c) |
| 5351 | 1263 return OK; |
| 1264 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1265 // default: character itself |
| 4444 | 1266 } |
| 1267 } | |
| 1268 | |
| 5351 | 1269 EMIT2(c); |
| 4444 | 1270 return OK; |
| 1271 #undef EMIT2 | |
| 1272 } | |
| 1273 | |
| 1274 /* | |
| 1275 * Code to parse regular expression. | |
| 1276 * | |
| 1277 * We try to reuse parsing functions in regexp.c to | |
| 1278 * minimize surprise and keep the syntax consistent. | |
| 1279 */ | |
| 1280 | |
| 1281 /* | |
| 1282 * Parse the lowest level. | |
| 1283 * | |
| 1284 * An atom can be one of a long list of items. Many atoms match one character | |
| 1285 * in the text. It is often an ordinary character or a character class. | |
| 1286 * Braces can be used to make a pattern into an atom. The "\z(\)" construct | |
| 1287 * is only for syntax highlighting. | |
| 1288 * | |
| 1289 * atom ::= ordinary-atom | |
| 1290 * or \( pattern \) | |
| 1291 * or \%( pattern \) | |
| 1292 * or \z( pattern \) | |
| 1293 */ | |
| 1294 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1295 nfa_regatom(void) |
| 4444 | 1296 { |
| 1297 int c; | |
| 1298 int charclass; | |
| 1299 int equiclass; | |
| 1300 int collclass; | |
| 1301 int got_coll_char; | |
| 1302 char_u *p; | |
| 1303 char_u *endp; | |
| 1304 char_u *old_regparse = regparse; | |
| 1305 int extra = 0; | |
| 1306 int emit_range; | |
| 1307 int negated; | |
| 1308 int result; | |
| 1309 int startc = -1; | |
|
8021
b6b4f354df23
commit https://github.com/vim/vim/commit/7c29f387819b5817b003d2ba73e2b5cf3cb3d0dd
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
1310 int save_prev_at_start = prev_at_start; |
| 4444 | 1311 |
| 1312 c = getchr(); | |
| 1313 switch (c) | |
| 1314 { | |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1315 case NUL: |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1316 EMSG_RET_FAIL(_(e_nfa_regexp_end_encountered_prematurely)); |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1317 |
| 4444 | 1318 case Magic('^'): |
| 1319 EMIT(NFA_BOL); | |
| 1320 break; | |
| 1321 | |
| 1322 case Magic('$'): | |
| 1323 EMIT(NFA_EOL); | |
| 1324 #if defined(FEAT_SYN_HL) || defined(PROTO) | |
| 1325 had_eol = TRUE; | |
| 1326 #endif | |
| 1327 break; | |
| 1328 | |
| 1329 case Magic('<'): | |
| 1330 EMIT(NFA_BOW); | |
| 1331 break; | |
| 1332 | |
| 1333 case Magic('>'): | |
| 1334 EMIT(NFA_EOW); | |
| 1335 break; | |
| 1336 | |
| 1337 case Magic('_'): | |
| 1338 c = no_Magic(getchr()); | |
| 5511 | 1339 if (c == NUL) |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1340 EMSG_RET_FAIL(_(e_nfa_regexp_end_encountered_prematurely)); |
| 5511 | 1341 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1342 if (c == '^') // "\_^" is start-of-line |
| 4444 | 1343 { |
| 1344 EMIT(NFA_BOL); | |
| 1345 break; | |
| 1346 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1347 if (c == '$') // "\_$" is end-of-line |
| 4444 | 1348 { |
| 1349 EMIT(NFA_EOL); | |
| 1350 #if defined(FEAT_SYN_HL) || defined(PROTO) | |
| 1351 had_eol = TRUE; | |
| 1352 #endif | |
| 1353 break; | |
| 1354 } | |
| 1355 | |
| 5296 | 1356 extra = NFA_ADD_NL; |
| 4444 | 1357 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1358 // "\_[" is collection plus newline |
| 4444 | 1359 if (c == '[') |
|
4517
9a2183bd8295
updated for version 7.3.1006
Bram Moolenaar <bram@vim.org>
parents:
4515
diff
changeset
|
1360 goto collection; |
| 4444 | 1361 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1362 // "\_x" is character class plus newline |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1363 // FALLTHROUGH |
| 4444 | 1364 |
| 1365 /* | |
| 1366 * Character classes. | |
| 1367 */ | |
| 1368 case Magic('.'): | |
| 1369 case Magic('i'): | |
| 1370 case Magic('I'): | |
| 1371 case Magic('k'): | |
| 1372 case Magic('K'): | |
| 1373 case Magic('f'): | |
| 1374 case Magic('F'): | |
| 1375 case Magic('p'): | |
| 1376 case Magic('P'): | |
| 1377 case Magic('s'): | |
| 1378 case Magic('S'): | |
| 1379 case Magic('d'): | |
| 1380 case Magic('D'): | |
| 1381 case Magic('x'): | |
| 1382 case Magic('X'): | |
| 1383 case Magic('o'): | |
| 1384 case Magic('O'): | |
| 1385 case Magic('w'): | |
| 1386 case Magic('W'): | |
| 1387 case Magic('h'): | |
| 1388 case Magic('H'): | |
| 1389 case Magic('a'): | |
| 1390 case Magic('A'): | |
| 1391 case Magic('l'): | |
| 1392 case Magic('L'): | |
| 1393 case Magic('u'): | |
| 1394 case Magic('U'): | |
| 1395 p = vim_strchr(classchars, no_Magic(c)); | |
| 1396 if (p == NULL) | |
| 1397 { | |
| 5511 | 1398 if (extra == NFA_ADD_NL) |
| 1399 { | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1400 semsg(_(e_nfa_regexp_invalid_character_class_nr), c); |
| 5511 | 1401 rc_did_emsg = TRUE; |
| 1402 return FAIL; | |
| 1403 } | |
|
15490
98c35d312987
patch 8.1.0753: printf format not checked for semsg()
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
1404 siemsg("INTERNAL: Unknown character class char: %d", c); |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
1405 return FAIL; |
| 4444 | 1406 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
1407 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1408 // When '.' is followed by a composing char ignore the dot, so that |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1409 // the composing char is matched here. |
| 4444 | 1410 if (enc_utf8 && c == Magic('.') && utf_iscomposing(peekchr())) |
| 1411 { | |
|
4535
45f97c349537
updated for version 7.3.1015
Bram Moolenaar <bram@vim.org>
parents:
4533
diff
changeset
|
1412 old_regparse = regparse; |
| 4444 | 1413 c = getchr(); |
| 1414 goto nfa_do_multibyte; | |
| 1415 } | |
| 1416 EMIT(nfa_classcodes[p - classchars]); | |
| 5296 | 1417 if (extra == NFA_ADD_NL) |
| 4444 | 1418 { |
| 1419 EMIT(NFA_NEWL); | |
| 1420 EMIT(NFA_OR); | |
| 1421 regflags |= RF_HASNL; | |
| 1422 } | |
| 1423 break; | |
| 1424 | |
| 1425 case Magic('n'): | |
| 1426 if (reg_string) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1427 // In a string "\n" matches a newline character. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1428 EMIT(NL); |
| 4444 | 1429 else |
| 1430 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1431 // In buffer text "\n" matches the end of a line. |
| 4444 | 1432 EMIT(NFA_NEWL); |
| 1433 regflags |= RF_HASNL; | |
| 1434 } | |
| 1435 break; | |
| 1436 | |
| 1437 case Magic('('): | |
| 1438 if (nfa_reg(REG_PAREN) == FAIL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1439 return FAIL; // cascaded error |
| 4444 | 1440 break; |
| 1441 | |
| 1442 case Magic('|'): | |
| 1443 case Magic('&'): | |
| 1444 case Magic(')'): | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1445 semsg(_(e_nfa_regexp_misplaced_chr), no_Magic(c)); |
| 4444 | 1446 return FAIL; |
| 1447 | |
| 1448 case Magic('='): | |
| 1449 case Magic('?'): | |
| 1450 case Magic('+'): | |
| 1451 case Magic('@'): | |
| 1452 case Magic('*'): | |
| 1453 case Magic('{'): | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1454 // these should follow an atom, not form an atom |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1455 semsg(_(e_nfa_regexp_misplaced_chr), no_Magic(c)); |
| 4444 | 1456 return FAIL; |
| 1457 | |
|
4714
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1458 case Magic('~'): |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1459 { |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1460 char_u *lp; |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1461 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1462 // Previous substitute pattern. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1463 // Generated as "\%(pattern\)". |
|
4714
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1464 if (reg_prev_sub == NULL) |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1465 { |
|
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25178
diff
changeset
|
1466 emsg(_(e_no_previous_substitute_regular_expression)); |
|
4714
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1467 return FAIL; |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1468 } |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1469 for (lp = reg_prev_sub; *lp != NUL; MB_CPTR_ADV(lp)) |
|
4714
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1470 { |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1471 EMIT(PTR2CHAR(lp)); |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1472 if (lp != reg_prev_sub) |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1473 EMIT(NFA_CONCAT); |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1474 } |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1475 EMIT(NFA_NOPEN); |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1476 break; |
|
fc4d7f02ea3a
updated for version 7.3.1104
Bram Moolenaar <bram@vim.org>
parents:
4712
diff
changeset
|
1477 } |
| 4444 | 1478 |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1479 case Magic('1'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1480 case Magic('2'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1481 case Magic('3'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1482 case Magic('4'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1483 case Magic('5'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1484 case Magic('6'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1485 case Magic('7'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1486 case Magic('8'): |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1487 case Magic('9'): |
|
11525
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1488 { |
|
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1489 int refnum = no_Magic(c) - '1'; |
|
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1490 |
|
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1491 if (!seen_endbrace(refnum + 1)) |
|
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1492 return FAIL; |
|
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1493 EMIT(NFA_BACKREF1 + refnum); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
1494 rex.nfa_has_backref = TRUE; |
|
11525
14b6b79d685b
patch 8.0.0645: no error for illegal back reference in NFA engine
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1495 } |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
1496 break; |
| 4444 | 1497 |
| 1498 case Magic('z'): | |
| 1499 c = no_Magic(getchr()); | |
| 1500 switch (c) | |
| 1501 { | |
| 1502 case 's': | |
| 1503 EMIT(NFA_ZSTART); | |
| 6170 | 1504 if (re_mult_next("\\zs") == FAIL) |
| 1505 return FAIL; | |
| 4444 | 1506 break; |
| 1507 case 'e': | |
| 1508 EMIT(NFA_ZEND); | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
1509 rex.nfa_has_zend = TRUE; |
| 6170 | 1510 if (re_mult_next("\\ze") == FAIL) |
| 1511 return FAIL; | |
|
4569
f262fb02889d
updated for version 7.3.1032
Bram Moolenaar <bram@vim.org>
parents:
4567
diff
changeset
|
1512 break; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1513 #ifdef FEAT_SYN_HL |
| 4444 | 1514 case '1': |
| 1515 case '2': | |
| 1516 case '3': | |
| 1517 case '4': | |
| 1518 case '5': | |
| 1519 case '6': | |
| 1520 case '7': | |
| 1521 case '8': | |
| 1522 case '9': | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1523 // \z1...\z9 |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14159
diff
changeset
|
1524 if ((reg_do_extmatch & REX_USE) == 0) |
|
26436
ef0c07cbf53f
patch 8.2.3749: error messages are everywhere
Bram Moolenaar <Bram@vim.org>
parents:
26161
diff
changeset
|
1525 EMSG_RET_FAIL(_(e_z1_z9_not_allowed_here)); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1526 EMIT(NFA_ZREF1 + (no_Magic(c) - '1')); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1527 // No need to set rex.nfa_has_backref, the sub-matches don't |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1528 // change when \z1 .. \z9 matches or not. |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1529 re_has_z = REX_USE; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1530 break; |
| 4444 | 1531 case '(': |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1532 // \z( |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14159
diff
changeset
|
1533 if ((reg_do_extmatch & REX_SET) == 0) |
|
26436
ef0c07cbf53f
patch 8.2.3749: error messages are everywhere
Bram Moolenaar <Bram@vim.org>
parents:
26161
diff
changeset
|
1534 EMSG_RET_FAIL(_(e_z_not_allowed_here)); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1535 if (nfa_reg(REG_ZPAREN) == FAIL) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1536 return FAIL; // cascaded error |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1537 re_has_z = REX_SET; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1538 break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
1539 #endif |
| 4444 | 1540 default: |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1541 semsg(_(e_nfa_regexp_unknown_operator_z_chr), no_Magic(c)); |
| 4444 | 1542 return FAIL; |
| 1543 } | |
| 1544 break; | |
| 1545 | |
| 1546 case Magic('%'): | |
| 1547 c = no_Magic(getchr()); | |
| 1548 switch (c) | |
| 1549 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1550 // () without a back reference |
| 4444 | 1551 case '(': |
| 1552 if (nfa_reg(REG_NPAREN) == FAIL) | |
| 1553 return FAIL; | |
| 1554 EMIT(NFA_NOPEN); | |
| 1555 break; | |
| 1556 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1557 case 'd': // %d123 decimal |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1558 case 'o': // %o123 octal |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1559 case 'x': // %xab hex 2 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1560 case 'u': // %uabcd hex 4 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1561 case 'U': // %U1234abcd hex 8 |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1562 { |
|
12752
09c856605191
patch 8.0.1254: undefined left shift in gethexchrs()
Christian Brabandt <cb@256bit.org>
parents:
12674
diff
changeset
|
1563 long nr; |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1564 |
|
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1565 switch (c) |
|
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1566 { |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
1567 case 'd': nr = getdecchrs(); break; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
1568 case 'o': nr = getoctchrs(); break; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
1569 case 'x': nr = gethexchrs(2); break; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
1570 case 'u': nr = gethexchrs(4); break; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
1571 case 'U': nr = gethexchrs(8); break; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
1572 default: nr = -1; break; |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1573 } |
|
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1574 |
|
15924
98d315176d48
patch 8.1.0968: crash when using search pattern %Ufffffc23
Bram Moolenaar <Bram@vim.org>
parents:
15904
diff
changeset
|
1575 if (nr < 0 || nr > INT_MAX) |
|
26952
b34ddbca305c
patch 8.2.4005: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26883
diff
changeset
|
1576 EMSG2_RET_FAIL(_(e_invalid_character_after_str_2), |
|
b34ddbca305c
patch 8.2.4005: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26883
diff
changeset
|
1577 reg_magic == MAGIC_ALL); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1578 // A NUL is stored in the text as NL |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1579 // TODO: what if a composing character follows? |
| 5360 | 1580 EMIT(nr == 0 ? 0x0a : nr); |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
1581 } |
| 4444 | 1582 break; |
| 1583 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1584 // Catch \%^ and \%$ regardless of where they appear in the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1585 // pattern -- regardless of whether or not it makes sense. |
| 4444 | 1586 case '^': |
| 1587 EMIT(NFA_BOF); | |
| 1588 break; | |
| 1589 | |
| 1590 case '$': | |
| 1591 EMIT(NFA_EOF); | |
| 1592 break; | |
| 1593 | |
| 1594 case '#': | |
|
28911
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1595 if (regparse[0] == '=' && regparse[1] >= 48 |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1596 && regparse[1] <= 50) |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1597 { |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1598 // misplaced \%#=1 |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1599 semsg(_(e_atom_engine_must_be_at_start_of_pattern), |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1600 regparse[1]); |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1601 return FAIL; |
|
e25196adb7c1
patch 8.2.4978: no error if engine selection atom is not at the start
Bram Moolenaar <Bram@vim.org>
parents:
28335
diff
changeset
|
1602 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1603 EMIT(NFA_CURSOR); |
| 4444 | 1604 break; |
| 1605 | |
| 1606 case 'V': | |
|
4730
749e2b2755d5
updated for version 7.3.1112
Bram Moolenaar <bram@vim.org>
parents:
4728
diff
changeset
|
1607 EMIT(NFA_VISUAL); |
| 4444 | 1608 break; |
| 1609 | |
| 5901 | 1610 case 'C': |
| 1611 EMIT(NFA_ANY_COMPOSING); | |
| 1612 break; | |
| 1613 | |
| 4444 | 1614 case '[': |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1615 { |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1616 int n; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1617 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1618 // \%[abc] |
|
4944
613651492c19
updated for version 7.3.1217
Bram Moolenaar <bram@vim.org>
parents:
4938
diff
changeset
|
1619 for (n = 0; (c = peekchr()) != ']'; ++n) |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1620 { |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1621 if (c == NUL) |
|
26436
ef0c07cbf53f
patch 8.2.3749: error messages are everywhere
Bram Moolenaar <Bram@vim.org>
parents:
26161
diff
changeset
|
1622 EMSG2_RET_FAIL(_(e_missing_sb_after_str), |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1623 reg_magic == MAGIC_ALL); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1624 // recursive call! |
|
4944
613651492c19
updated for version 7.3.1217
Bram Moolenaar <bram@vim.org>
parents:
4938
diff
changeset
|
1625 if (nfa_regatom() == FAIL) |
|
613651492c19
updated for version 7.3.1217
Bram Moolenaar <bram@vim.org>
parents:
4938
diff
changeset
|
1626 return FAIL; |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1627 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1628 getchr(); // get the ] |
|
4760
532a9855bd30
updated for version 7.3.1127
Bram Moolenaar <bram@vim.org>
parents:
4758
diff
changeset
|
1629 if (n == 0) |
|
26436
ef0c07cbf53f
patch 8.2.3749: error messages are everywhere
Bram Moolenaar <Bram@vim.org>
parents:
26161
diff
changeset
|
1630 EMSG2_RET_FAIL(_(e_empty_str_brackets), |
|
4760
532a9855bd30
updated for version 7.3.1127
Bram Moolenaar <bram@vim.org>
parents:
4758
diff
changeset
|
1631 reg_magic == MAGIC_ALL); |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1632 EMIT(NFA_OPT_CHARS); |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1633 EMIT(n); |
|
5255
3c6e2b89875f
updated for version 7.4b.004
Bram Moolenaar <bram@vim.org>
parents:
5253
diff
changeset
|
1634 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1635 // Emit as "\%(\%[abc]\)" to be able to handle |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1636 // "\%[abc]*" which would cause the empty string to be |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1637 // matched an unlimited number of times. NFA_NOPEN is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1638 // added only once at a position, while NFA_SPLIT is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1639 // added multiple times. This is more efficient than |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1640 // not allowing NFA_SPLIT multiple times, it is used |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1641 // a lot. |
|
5255
3c6e2b89875f
updated for version 7.4b.004
Bram Moolenaar <bram@vim.org>
parents:
5253
diff
changeset
|
1642 EMIT(NFA_NOPEN); |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1643 break; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1644 } |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
1645 |
| 4444 | 1646 default: |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1647 { |
|
20677
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1648 long_u n = 0; |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1649 int cmp = c; |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1650 int cur = FALSE; |
|
28335
786707ef91de
patch 8.2.4693: new regexp does not accept pattern "%>0v"
Bram Moolenaar <Bram@vim.org>
parents:
28325
diff
changeset
|
1651 int got_digit = FALSE; |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1652 |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1653 if (c == '<' || c == '>') |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1654 c = getchr(); |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1655 if (no_Magic(c) == '.') |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1656 { |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1657 cur = TRUE; |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1658 c = getchr(); |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1659 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1660 while (VIM_ISDIGIT(c)) |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1661 { |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1662 long_u tmp; |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1663 |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1664 if (cur) |
|
28135
3ccd55c472b8
patch 8.2.4592: search continues after giving E1204
Bram Moolenaar <Bram@vim.org>
parents:
28043
diff
changeset
|
1665 { |
|
28325
a3a760ee765f
patch 8.2.4688: new regexp engine does not give an error for "%v"
Bram Moolenaar <Bram@vim.org>
parents:
28247
diff
changeset
|
1666 semsg(_(e_regexp_number_after_dot_pos_search_chr), |
|
28135
3ccd55c472b8
patch 8.2.4592: search continues after giving E1204
Bram Moolenaar <Bram@vim.org>
parents:
28043
diff
changeset
|
1667 no_Magic(c)); |
|
3ccd55c472b8
patch 8.2.4592: search continues after giving E1204
Bram Moolenaar <Bram@vim.org>
parents:
28043
diff
changeset
|
1668 return FAIL; |
|
3ccd55c472b8
patch 8.2.4592: search continues after giving E1204
Bram Moolenaar <Bram@vim.org>
parents:
28043
diff
changeset
|
1669 } |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1670 tmp = n * 10 + (c - '0'); |
|
20677
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1671 |
|
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1672 if (tmp < n) |
|
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1673 { |
|
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1674 // overflow. |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1675 emsg(_(e_percent_value_too_large)); |
|
20677
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1676 return FAIL; |
|
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1677 } |
|
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1678 n = tmp; |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1679 c = getchr(); |
|
28335
786707ef91de
patch 8.2.4693: new regexp does not accept pattern "%>0v"
Bram Moolenaar <Bram@vim.org>
parents:
28325
diff
changeset
|
1680 got_digit = TRUE; |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1681 } |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1682 if (c == 'l' || c == 'c' || c == 'v') |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1683 { |
|
20677
ab0dc036f586
patch 8.2.0892: ubsan warns for undefined behavior
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
1684 long_u limit = INT_MAX; |
|
15802
f043c8931585
patch 8.1.0908: can't handle large value for %{nr}v in regexp
Bram Moolenaar <Bram@vim.org>
parents:
15800
diff
changeset
|
1685 |
|
28335
786707ef91de
patch 8.2.4693: new regexp does not accept pattern "%>0v"
Bram Moolenaar <Bram@vim.org>
parents:
28325
diff
changeset
|
1686 if (!cur && !got_digit) |
|
28325
a3a760ee765f
patch 8.2.4688: new regexp engine does not give an error for "%v"
Bram Moolenaar <Bram@vim.org>
parents:
28247
diff
changeset
|
1687 { |
|
a3a760ee765f
patch 8.2.4688: new regexp engine does not give an error for "%v"
Bram Moolenaar <Bram@vim.org>
parents:
28247
diff
changeset
|
1688 semsg(_(e_nfa_regexp_missing_value_in_chr), |
|
a3a760ee765f
patch 8.2.4688: new regexp engine does not give an error for "%v"
Bram Moolenaar <Bram@vim.org>
parents:
28247
diff
changeset
|
1689 no_Magic(c)); |
|
a3a760ee765f
patch 8.2.4688: new regexp engine does not give an error for "%v"
Bram Moolenaar <Bram@vim.org>
parents:
28247
diff
changeset
|
1690 return FAIL; |
|
a3a760ee765f
patch 8.2.4688: new regexp engine does not give an error for "%v"
Bram Moolenaar <Bram@vim.org>
parents:
28247
diff
changeset
|
1691 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1692 if (c == 'l') |
|
8021
b6b4f354df23
commit https://github.com/vim/vim/commit/7c29f387819b5817b003d2ba73e2b5cf3cb3d0dd
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
1693 { |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1694 if (cur) |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1695 n = curwin->w_cursor.lnum; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1696 // \%{n}l \%{n}<l \%{n}>l |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1697 EMIT(cmp == '<' ? NFA_LNUM_LT : |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1698 cmp == '>' ? NFA_LNUM_GT : NFA_LNUM); |
|
8021
b6b4f354df23
commit https://github.com/vim/vim/commit/7c29f387819b5817b003d2ba73e2b5cf3cb3d0dd
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
1699 if (save_prev_at_start) |
|
b6b4f354df23
commit https://github.com/vim/vim/commit/7c29f387819b5817b003d2ba73e2b5cf3cb3d0dd
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
1700 at_start = TRUE; |
|
b6b4f354df23
commit https://github.com/vim/vim/commit/7c29f387819b5817b003d2ba73e2b5cf3cb3d0dd
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
1701 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1702 else if (c == 'c') |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1703 { |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1704 if (cur) |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1705 { |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1706 n = curwin->w_cursor.col; |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1707 n++; |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1708 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1709 // \%{n}c \%{n}<c \%{n}>c |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1710 EMIT(cmp == '<' ? NFA_COL_LT : |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1711 cmp == '>' ? NFA_COL_GT : NFA_COL); |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1712 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1713 else |
|
15802
f043c8931585
patch 8.1.0908: can't handle large value for %{nr}v in regexp
Bram Moolenaar <Bram@vim.org>
parents:
15800
diff
changeset
|
1714 { |
|
25147
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1715 if (cur) |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1716 { |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1717 colnr_T vcol = 0; |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1718 |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1719 getvvcol(curwin, &curwin->w_cursor, |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1720 NULL, NULL, &vcol); |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1721 n = ++vcol; |
|
10b269321459
patch 8.2.3110: a pattern that matches the cursor position is complicated
Bram Moolenaar <Bram@vim.org>
parents:
24693
diff
changeset
|
1722 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1723 // \%{n}v \%{n}<v \%{n}>v |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1724 EMIT(cmp == '<' ? NFA_VCOL_LT : |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1725 cmp == '>' ? NFA_VCOL_GT : NFA_VCOL); |
|
15802
f043c8931585
patch 8.1.0908: can't handle large value for %{nr}v in regexp
Bram Moolenaar <Bram@vim.org>
parents:
15800
diff
changeset
|
1726 limit = INT_MAX / MB_MAXBYTES; |
|
f043c8931585
patch 8.1.0908: can't handle large value for %{nr}v in regexp
Bram Moolenaar <Bram@vim.org>
parents:
15800
diff
changeset
|
1727 } |
|
f043c8931585
patch 8.1.0908: can't handle large value for %{nr}v in regexp
Bram Moolenaar <Bram@vim.org>
parents:
15800
diff
changeset
|
1728 if (n >= limit) |
|
13192
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
1729 { |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1730 emsg(_(e_percent_value_too_large)); |
|
13192
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
1731 return FAIL; |
|
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
1732 } |
|
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
1733 EMIT((int)n); |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1734 break; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1735 } |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1736 else if (c == '\'' && n == 0) |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1737 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1738 // \%'m \%<'m \%>'m |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1739 EMIT(cmp == '<' ? NFA_MARK_LT : |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1740 cmp == '>' ? NFA_MARK_GT : NFA_MARK); |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
1741 EMIT(getchr()); |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1742 break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
1743 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
1744 } |
|
31233
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1745 semsg(_(e_nfa_regexp_unknown_operator_percent_chr), |
|
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1746 no_Magic(c)); |
| 4444 | 1747 return FAIL; |
| 1748 } | |
| 1749 break; | |
| 1750 | |
| 1751 case Magic('['): | |
|
4517
9a2183bd8295
updated for version 7.3.1006
Bram Moolenaar <bram@vim.org>
parents:
4515
diff
changeset
|
1752 collection: |
| 4444 | 1753 /* |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1754 * [abc] uses NFA_START_COLL - NFA_END_COLL |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1755 * [^abc] uses NFA_START_NEG_COLL - NFA_END_NEG_COLL |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1756 * Each character is produced as a regular state, using |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1757 * NFA_CONCAT to bind them together. |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1758 * Besides normal characters there can be: |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1759 * - character classes NFA_CLASS_* |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1760 * - ranges, two characters followed by NFA_RANGE. |
| 4444 | 1761 */ |
| 1762 | |
| 1763 p = regparse; | |
| 1764 endp = skip_anyof(p); | |
| 1765 if (*endp == ']') | |
| 1766 { | |
| 1767 /* | |
| 1768 * Try to reverse engineer character classes. For example, | |
| 5296 | 1769 * recognize that [0-9] stands for \d and [A-Za-z_] for \h, |
| 4444 | 1770 * and perform the necessary substitutions in the NFA. |
| 1771 */ | |
| 1772 result = nfa_recognize_char_class(regparse, endp, | |
| 5296 | 1773 extra == NFA_ADD_NL); |
| 4444 | 1774 if (result != FAIL) |
| 1775 { | |
| 5296 | 1776 if (result >= NFA_FIRST_NL && result <= NFA_LAST_NL) |
| 4444 | 1777 { |
| 5296 | 1778 EMIT(result - NFA_ADD_NL); |
| 4444 | 1779 EMIT(NFA_NEWL); |
| 1780 EMIT(NFA_OR); | |
| 1781 } | |
| 5296 | 1782 else |
| 1783 EMIT(result); | |
| 4444 | 1784 regparse = endp; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1785 MB_PTR_ADV(regparse); |
| 4444 | 1786 return OK; |
| 1787 } | |
| 1788 /* | |
| 1789 * Failed to recognize a character class. Use the simple | |
| 1790 * version that turns [abc] into 'a' OR 'b' OR 'c' | |
| 1791 */ | |
|
25178
0797c8ce343d
patch 8.2.3125: variables are set but not used
Bram Moolenaar <Bram@vim.org>
parents:
25147
diff
changeset
|
1792 startc = -1; |
| 4444 | 1793 negated = FALSE; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1794 if (*regparse == '^') // negated range |
| 4444 | 1795 { |
| 1796 negated = TRUE; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1797 MB_PTR_ADV(regparse); |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1798 EMIT(NFA_START_NEG_COLL); |
| 4444 | 1799 } |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1800 else |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1801 EMIT(NFA_START_COLL); |
| 4444 | 1802 if (*regparse == '-') |
| 1803 { | |
| 1804 startc = '-'; | |
| 1805 EMIT(startc); | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1806 EMIT(NFA_CONCAT); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1807 MB_PTR_ADV(regparse); |
| 4444 | 1808 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1809 // Emit the OR branches for each character in the [] |
| 4444 | 1810 emit_range = FALSE; |
| 1811 while (regparse < endp) | |
| 1812 { | |
|
25178
0797c8ce343d
patch 8.2.3125: variables are set but not used
Bram Moolenaar <Bram@vim.org>
parents:
25147
diff
changeset
|
1813 int oldstartc = startc; |
|
0797c8ce343d
patch 8.2.3125: variables are set but not used
Bram Moolenaar <Bram@vim.org>
parents:
25147
diff
changeset
|
1814 |
| 4444 | 1815 startc = -1; |
| 1816 got_coll_char = FALSE; | |
| 1817 if (*regparse == '[') | |
| 1818 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1819 // Check for [: :], [= =], [. .] |
| 4444 | 1820 equiclass = collclass = 0; |
| 1821 charclass = get_char_class(®parse); | |
| 1822 if (charclass == CLASS_NONE) | |
| 1823 { | |
| 1824 equiclass = get_equi_class(®parse); | |
| 1825 if (equiclass == 0) | |
| 1826 collclass = get_coll_element(®parse); | |
| 1827 } | |
| 1828 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1829 // Character class like [:alpha:] |
| 4444 | 1830 if (charclass != CLASS_NONE) |
| 1831 { | |
| 1832 switch (charclass) | |
| 1833 { | |
| 1834 case CLASS_ALNUM: | |
| 1835 EMIT(NFA_CLASS_ALNUM); | |
| 1836 break; | |
| 1837 case CLASS_ALPHA: | |
| 1838 EMIT(NFA_CLASS_ALPHA); | |
| 1839 break; | |
| 1840 case CLASS_BLANK: | |
| 1841 EMIT(NFA_CLASS_BLANK); | |
| 1842 break; | |
| 1843 case CLASS_CNTRL: | |
| 1844 EMIT(NFA_CLASS_CNTRL); | |
| 1845 break; | |
| 1846 case CLASS_DIGIT: | |
| 1847 EMIT(NFA_CLASS_DIGIT); | |
| 1848 break; | |
| 1849 case CLASS_GRAPH: | |
| 1850 EMIT(NFA_CLASS_GRAPH); | |
| 1851 break; | |
| 1852 case CLASS_LOWER: | |
|
23471
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
1853 wants_nfa = TRUE; |
| 4444 | 1854 EMIT(NFA_CLASS_LOWER); |
| 1855 break; | |
| 1856 case CLASS_PRINT: | |
| 1857 EMIT(NFA_CLASS_PRINT); | |
| 1858 break; | |
| 1859 case CLASS_PUNCT: | |
| 1860 EMIT(NFA_CLASS_PUNCT); | |
| 1861 break; | |
| 1862 case CLASS_SPACE: | |
| 1863 EMIT(NFA_CLASS_SPACE); | |
| 1864 break; | |
| 1865 case CLASS_UPPER: | |
|
23471
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
1866 wants_nfa = TRUE; |
| 4444 | 1867 EMIT(NFA_CLASS_UPPER); |
| 1868 break; | |
| 1869 case CLASS_XDIGIT: | |
| 1870 EMIT(NFA_CLASS_XDIGIT); | |
| 1871 break; | |
| 1872 case CLASS_TAB: | |
| 1873 EMIT(NFA_CLASS_TAB); | |
| 1874 break; | |
| 1875 case CLASS_RETURN: | |
| 1876 EMIT(NFA_CLASS_RETURN); | |
| 1877 break; | |
| 1878 case CLASS_BACKSPACE: | |
| 1879 EMIT(NFA_CLASS_BACKSPACE); | |
| 1880 break; | |
| 1881 case CLASS_ESCAPE: | |
| 1882 EMIT(NFA_CLASS_ESCAPE); | |
| 1883 break; | |
|
15709
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1884 case CLASS_IDENT: |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1885 EMIT(NFA_CLASS_IDENT); |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1886 break; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1887 case CLASS_KEYWORD: |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1888 EMIT(NFA_CLASS_KEYWORD); |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1889 break; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1890 case CLASS_FNAME: |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1891 EMIT(NFA_CLASS_FNAME); |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
1892 break; |
| 4444 | 1893 } |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1894 EMIT(NFA_CONCAT); |
| 4444 | 1895 continue; |
| 1896 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1897 // Try equivalence class [=a=] and the like |
| 4444 | 1898 if (equiclass != 0) |
| 1899 { | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1900 result = nfa_emit_equi_class(equiclass); |
| 4444 | 1901 if (result == FAIL) |
| 1902 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1903 // should never happen |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
1904 EMSG_RET_FAIL(_(e_error_building_nfa_with_equivalence_class)); |
| 4444 | 1905 } |
| 1906 continue; | |
| 1907 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1908 // Try collating class like [. .] |
| 4444 | 1909 if (collclass != 0) |
| 1910 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1911 startc = collclass; // allow [.a.]-x as a range |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1912 // Will emit the proper atom at the end of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1913 // while loop. |
| 4444 | 1914 } |
| 1915 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1916 // Try a range like 'a-x' or '\t-z'. Also allows '-' as a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1917 // start character. |
|
4677
c1622ff9ed8d
updated for version 7.3.1086
Bram Moolenaar <bram@vim.org>
parents:
4675
diff
changeset
|
1918 if (*regparse == '-' && oldstartc != -1) |
| 4444 | 1919 { |
| 1920 emit_range = TRUE; | |
| 1921 startc = oldstartc; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1922 MB_PTR_ADV(regparse); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1923 continue; // reading the end of the range |
| 4444 | 1924 } |
| 1925 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1926 // Now handle simple and escaped characters. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1927 // Only "\]", "\^", "\]" and "\\" are special in Vi. Vim |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1928 // accepts "\t", "\e", etc., but only when the 'l' flag in |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1929 // 'cpoptions' is not included. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1930 // Posix doesn't recognize backslash at all. |
| 4444 | 1931 if (*regparse == '\\' |
|
4744
a62695305e03
updated for version 7.3.1119
Bram Moolenaar <bram@vim.org>
parents:
4742
diff
changeset
|
1932 && !reg_cpo_bsl |
| 4444 | 1933 && regparse + 1 <= endp |
| 1934 && (vim_strchr(REGEXP_INRANGE, regparse[1]) != NULL | |
|
4744
a62695305e03
updated for version 7.3.1119
Bram Moolenaar <bram@vim.org>
parents:
4742
diff
changeset
|
1935 || (!reg_cpo_lit |
| 4444 | 1936 && vim_strchr(REGEXP_ABBR, regparse[1]) |
| 1937 != NULL) | |
| 1938 ) | |
| 1939 ) | |
| 1940 { | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1941 MB_PTR_ADV(regparse); |
| 4444 | 1942 |
|
4507
9dbbddb2ed10
updated for version 7.3.1001
Bram Moolenaar <bram@vim.org>
parents:
4503
diff
changeset
|
1943 if (*regparse == 'n') |
|
15876
0c49755f460e
patch 8.1.0945: internal error when using pattern with NL in the range
Bram Moolenaar <Bram@vim.org>
parents:
15824
diff
changeset
|
1944 startc = (reg_string || emit_range |
|
0c49755f460e
patch 8.1.0945: internal error when using pattern with NL in the range
Bram Moolenaar <Bram@vim.org>
parents:
15824
diff
changeset
|
1945 || regparse[1] == '-') ? NL : NFA_NEWL; |
|
16162
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
15935
diff
changeset
|
1946 else if (*regparse == 'd' |
| 4444 | 1947 || *regparse == 'o' |
| 1948 || *regparse == 'x' | |
| 1949 || *regparse == 'u' | |
| 1950 || *regparse == 'U' | |
| 1951 ) | |
| 1952 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1953 // TODO(RE) This needs more testing |
| 4444 | 1954 startc = coll_get_char(); |
| 1955 got_coll_char = TRUE; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
1956 MB_PTR_BACK(old_regparse, regparse); |
| 4444 | 1957 } |
| 1958 else | |
| 1959 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1960 // \r,\t,\e,\b |
| 4444 | 1961 startc = backslash_trans(*regparse); |
| 1962 } | |
| 1963 } | |
| 1964 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1965 // Normal printable char |
| 4444 | 1966 if (startc == -1) |
|
4677
c1622ff9ed8d
updated for version 7.3.1086
Bram Moolenaar <bram@vim.org>
parents:
4675
diff
changeset
|
1967 startc = PTR2CHAR(regparse); |
| 4444 | 1968 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1969 // Previous char was '-', so this char is end of range. |
| 4444 | 1970 if (emit_range) |
| 1971 { | |
|
25178
0797c8ce343d
patch 8.2.3125: variables are set but not used
Bram Moolenaar <Bram@vim.org>
parents:
25147
diff
changeset
|
1972 int endc = startc; |
|
0797c8ce343d
patch 8.2.3125: variables are set but not used
Bram Moolenaar <Bram@vim.org>
parents:
25147
diff
changeset
|
1973 |
|
4677
c1622ff9ed8d
updated for version 7.3.1086
Bram Moolenaar <bram@vim.org>
parents:
4675
diff
changeset
|
1974 startc = oldstartc; |
| 4444 | 1975 if (startc > endc) |
|
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26952
diff
changeset
|
1976 EMSG_RET_FAIL(_(e_reverse_range_in_character_class)); |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1977 |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1978 if (endc > startc + 2) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1979 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1980 // Emit a range instead of the sequence of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1981 // individual characters. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1982 if (startc == 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1983 // \x00 is translated to \x0a, start at \x01. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1984 EMIT(1); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1985 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1986 --post_ptr; // remove NFA_CONCAT |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1987 EMIT(endc); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1988 EMIT(NFA_RANGE); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1989 EMIT(NFA_CONCAT); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
1990 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
1991 else if (has_mbyte && ((*mb_char2len)(startc) > 1 |
| 4444 | 1992 || (*mb_char2len)(endc) > 1)) |
| 1993 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1994 // Emit the characters in the range. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1995 // "startc" was already emitted, so skip it. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
1996 // |
| 4444 | 1997 for (c = startc + 1; c <= endc; c++) |
| 1998 { | |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
1999 EMIT(c); |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2000 EMIT(NFA_CONCAT); |
| 4444 | 2001 } |
| 2002 } | |
| 2003 else | |
| 2004 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2005 // Emit the range. "startc" was already emitted, so |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2006 // skip it. |
| 4444 | 2007 for (c = startc + 1; c <= endc; c++) |
|
27490
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
2008 { |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
2009 EMIT(c); |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
2010 EMIT(NFA_CONCAT); |
|
fb4c30606b4a
patch 8.2.4273: the EBCDIC support is outdated
Bram Moolenaar <Bram@vim.org>
parents:
27000
diff
changeset
|
2011 } |
| 4444 | 2012 } |
|
4677
c1622ff9ed8d
updated for version 7.3.1086
Bram Moolenaar <bram@vim.org>
parents:
4675
diff
changeset
|
2013 emit_range = FALSE; |
|
c1622ff9ed8d
updated for version 7.3.1086
Bram Moolenaar <bram@vim.org>
parents:
4675
diff
changeset
|
2014 startc = -1; |
| 4444 | 2015 } |
| 2016 else | |
| 2017 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2018 // This char (startc) is not part of a range. Just |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2019 // emit it. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2020 // Normally, simply emit startc. But if we get char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2021 // code=0 from a collating char, then replace it with |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2022 // 0x0a. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2023 // This is needed to completely mimic the behaviour of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2024 // the backtracking engine. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2025 if (startc == NFA_NEWL) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2026 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2027 // Line break can't be matched as part of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2028 // collection, add an OR below. But not for negated |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2029 // range. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2030 if (!negated) |
| 5296 | 2031 extra = NFA_ADD_NL; |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2032 } |
| 4444 | 2033 else |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2034 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2035 if (got_coll_char == TRUE && startc == 0) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2036 EMIT(0x0a); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2037 else |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2038 EMIT(startc); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2039 EMIT(NFA_CONCAT); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2040 } |
| 4444 | 2041 } |
| 2042 | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
2043 MB_PTR_ADV(regparse); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2044 } // while (p < endp) |
| 4444 | 2045 |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
2046 MB_PTR_BACK(old_regparse, regparse); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2047 if (*regparse == '-') // if last, '-' is just a char |
| 4444 | 2048 { |
| 2049 EMIT('-'); | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2050 EMIT(NFA_CONCAT); |
| 4444 | 2051 } |
| 2052 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2053 // skip the trailing ] |
| 4444 | 2054 regparse = endp; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
10551
diff
changeset
|
2055 MB_PTR_ADV(regparse); |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2056 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2057 // Mark end of the collection. |
| 4444 | 2058 if (negated == TRUE) |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2059 EMIT(NFA_END_NEG_COLL); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2060 else |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2061 EMIT(NFA_END_COLL); |
|
4615
5679b8ddd8cc
updated for version 7.3.1055
Bram Moolenaar <bram@vim.org>
parents:
4583
diff
changeset
|
2062 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2063 // \_[] also matches \n but it's not negated |
| 5296 | 2064 if (extra == NFA_ADD_NL) |
|
4615
5679b8ddd8cc
updated for version 7.3.1055
Bram Moolenaar <bram@vim.org>
parents:
4583
diff
changeset
|
2065 { |
|
5679b8ddd8cc
updated for version 7.3.1055
Bram Moolenaar <bram@vim.org>
parents:
4583
diff
changeset
|
2066 EMIT(reg_string ? NL : NFA_NEWL); |
|
5679b8ddd8cc
updated for version 7.3.1055
Bram Moolenaar <bram@vim.org>
parents:
4583
diff
changeset
|
2067 EMIT(NFA_OR); |
|
5679b8ddd8cc
updated for version 7.3.1055
Bram Moolenaar <bram@vim.org>
parents:
4583
diff
changeset
|
2068 } |
|
5679b8ddd8cc
updated for version 7.3.1055
Bram Moolenaar <bram@vim.org>
parents:
4583
diff
changeset
|
2069 |
| 4444 | 2070 return OK; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2071 } // if exists closing ] |
|
4529
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
2072 |
|
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
2073 if (reg_strict) |
|
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26952
diff
changeset
|
2074 EMSG_RET_FAIL(_(e_missing_rsb_after_str_lsb)); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2075 // FALLTHROUGH |
|
4529
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
2076 |
| 4444 | 2077 default: |
| 2078 { | |
| 2079 int plen; | |
| 2080 | |
| 2081 nfa_do_multibyte: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2082 // plen is length of current char with composing chars |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
2083 if (enc_utf8 && ((*mb_char2len)(c) |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11267
diff
changeset
|
2084 != (plen = utfc_ptr2len(old_regparse)) |
|
4543
08ac46980953
updated for version 7.3.1019
Bram Moolenaar <bram@vim.org>
parents:
4541
diff
changeset
|
2085 || utf_iscomposing(c))) |
| 4444 | 2086 { |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
2087 int i = 0; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
2088 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2089 // A base character plus composing characters, or just one |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2090 // or more composing characters. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2091 // This requires creating a separate atom as if enclosing |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2092 // the characters in (), where NFA_COMPOSING is the ( and |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2093 // NFA_END_COMPOSING is the ). Note that right now we are |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2094 // building the postfix form, not the NFA itself; |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2095 // a composing char could be: a, b, c, NFA_COMPOSING |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2096 // where 'b' and 'c' are chars with codes > 256. |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2097 for (;;) |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2098 { |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2099 EMIT(c); |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2100 if (i > 0) |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2101 EMIT(NFA_CONCAT); |
|
4529
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
2102 if ((i += utf_char2len(c)) >= plen) |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2103 break; |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2104 c = utf_ptr2char(old_regparse + i); |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2105 } |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
2106 EMIT(NFA_COMPOSING); |
| 4444 | 2107 regparse = old_regparse + plen; |
| 2108 } | |
| 2109 else | |
| 2110 { | |
| 2111 c = no_Magic(c); | |
| 2112 EMIT(c); | |
| 2113 } | |
| 2114 return OK; | |
| 2115 } | |
| 2116 } | |
| 2117 | |
| 2118 return OK; | |
| 2119 } | |
| 2120 | |
| 2121 /* | |
| 2122 * Parse something followed by possible [*+=]. | |
| 2123 * | |
| 2124 * A piece is an atom, possibly followed by a multi, an indication of how many | |
| 2125 * times the atom can be matched. Example: "a*" matches any sequence of "a" | |
| 2126 * characters: "", "a", "aa", etc. | |
| 2127 * | |
| 2128 * piece ::= atom | |
| 2129 * or atom multi | |
| 2130 */ | |
| 2131 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2132 nfa_regpiece(void) |
| 4444 | 2133 { |
| 2134 int i; | |
| 2135 int op; | |
| 2136 int ret; | |
| 2137 long minval, maxval; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2138 int greedy = TRUE; // Braces are prefixed with '-' ? |
|
4679
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2139 parse_state_T old_state; |
|
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2140 parse_state_T new_state; |
|
12752
09c856605191
patch 8.0.1254: undefined left shift in gethexchrs()
Christian Brabandt <cb@256bit.org>
parents:
12674
diff
changeset
|
2141 long c2; |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2142 int old_post_pos; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2143 int my_post_start; |
| 4444 | 2144 int quest; |
| 2145 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2146 // Save the current parse state, so that we can use it if <atom>{m,n} is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2147 // next. |
|
4679
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2148 save_parse_state(&old_state); |
|
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2149 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2150 // store current pos in the postfix form, for \{m,n} involving 0s |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2151 my_post_start = (int)(post_ptr - post_start); |
| 4444 | 2152 |
| 2153 ret = nfa_regatom(); | |
| 2154 if (ret == FAIL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2155 return FAIL; // cascaded error |
| 4444 | 2156 |
| 2157 op = peekchr(); | |
| 2158 if (re_multi_type(op) == NOT_MULTI) | |
| 2159 return OK; | |
| 2160 | |
| 2161 skipchr(); | |
| 2162 switch (op) | |
| 2163 { | |
| 2164 case Magic('*'): | |
| 2165 EMIT(NFA_STAR); | |
| 2166 break; | |
| 2167 | |
| 2168 case Magic('+'): | |
| 2169 /* | |
| 2170 * Trick: Normally, (a*)\+ would match the whole input "aaa". The | |
| 2171 * first and only submatch would be "aaa". But the backtracking | |
| 2172 * engine interprets the plus as "try matching one more time", and | |
| 2173 * a* matches a second time at the end of the input, the empty | |
| 2174 * string. | |
|
5255
3c6e2b89875f
updated for version 7.4b.004
Bram Moolenaar <bram@vim.org>
parents:
5253
diff
changeset
|
2175 * The submatch will be the empty string. |
| 4444 | 2176 * |
|
4673
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2177 * In order to be consistent with the old engine, we replace |
|
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2178 * <atom>+ with <atom><atom>* |
| 4444 | 2179 */ |
|
4679
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2180 restore_parse_state(&old_state); |
| 4444 | 2181 curchr = -1; |
| 2182 if (nfa_regatom() == FAIL) | |
| 2183 return FAIL; | |
| 2184 EMIT(NFA_STAR); | |
| 2185 EMIT(NFA_CONCAT); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2186 skipchr(); // skip the \+ |
| 4444 | 2187 break; |
| 2188 | |
| 2189 case Magic('@'): | |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2190 c2 = getdecchrs(); |
| 4444 | 2191 op = no_Magic(getchr()); |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2192 i = 0; |
| 4444 | 2193 switch(op) |
| 2194 { | |
| 2195 case '=': | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2196 // \@= |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2197 i = NFA_PREV_ATOM_NO_WIDTH; |
| 4444 | 2198 break; |
|
4661
0dce3d812e7a
updated for version 7.3.1078
Bram Moolenaar <bram@vim.org>
parents:
4657
diff
changeset
|
2199 case '!': |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2200 // \@! |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2201 i = NFA_PREV_ATOM_NO_WIDTH_NEG; |
|
4661
0dce3d812e7a
updated for version 7.3.1078
Bram Moolenaar <bram@vim.org>
parents:
4657
diff
changeset
|
2202 break; |
| 4444 | 2203 case '<': |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2204 op = no_Magic(getchr()); |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2205 if (op == '=') |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2206 // \@<= |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2207 i = NFA_PREV_ATOM_JUST_BEFORE; |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2208 else if (op == '!') |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2209 // \@<! |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2210 i = NFA_PREV_ATOM_JUST_BEFORE_NEG; |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2211 break; |
| 4444 | 2212 case '>': |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2213 // \@> |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2214 i = NFA_PREV_ATOM_LIKE_PATTERN; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2215 break; |
| 4444 | 2216 } |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2217 if (i == 0) |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2218 { |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
2219 semsg(_(e_nfa_regexp_unknown_operator_at_chr), op); |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2220 return FAIL; |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2221 } |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2222 EMIT(i); |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2223 if (i == NFA_PREV_ATOM_JUST_BEFORE |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2224 || i == NFA_PREV_ATOM_JUST_BEFORE_NEG) |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2225 EMIT(c2); |
| 4444 | 2226 break; |
| 2227 | |
| 2228 case Magic('?'): | |
| 2229 case Magic('='): | |
| 2230 EMIT(NFA_QUEST); | |
| 2231 break; | |
| 2232 | |
| 2233 case Magic('{'): | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2234 // a{2,5} will expand to 'aaa?a?a?' |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2235 // a{-1,3} will expand to 'aa??a??', where ?? is the nongreedy |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2236 // version of '?' |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2237 // \v(ab){2,3} will expand to '(ab)(ab)(ab)?', where all the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2238 // parenthesis have the same id |
| 4444 | 2239 |
| 2240 greedy = TRUE; | |
| 2241 c2 = peekchr(); | |
| 2242 if (c2 == '-' || c2 == Magic('-')) | |
| 2243 { | |
| 2244 skipchr(); | |
| 2245 greedy = FALSE; | |
| 2246 } | |
| 2247 if (!read_limits(&minval, &maxval)) | |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
2248 EMSG_RET_FAIL(_(e_nfa_regexp_error_reading_repetition_limits)); |
|
4762
47906f888725
updated for version 7.3.1128
Bram Moolenaar <bram@vim.org>
parents:
4760
diff
changeset
|
2249 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2250 // <atom>{0,inf}, <atom>{0,} and <atom>{} are equivalent to |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2251 // <atom>* |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2252 if (minval == 0 && maxval == MAX_LIMIT) |
| 4444 | 2253 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2254 if (greedy) // { { (match the braces) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2255 // \{}, \{0,} |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2256 EMIT(NFA_STAR); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2257 else // { { (match the braces) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2258 // \{-}, \{-0,} |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2259 EMIT(NFA_STAR_NONGREEDY); |
| 4444 | 2260 break; |
| 2261 } | |
| 2262 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2263 // Special case: x{0} or x{-0} |
| 4444 | 2264 if (maxval == 0) |
| 2265 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2266 // Ignore result of previous call to nfa_regatom() |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2267 post_ptr = post_start + my_post_start; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2268 // NFA_EMPTY is 0-length and works everywhere |
| 5370 | 2269 EMIT(NFA_EMPTY); |
| 4444 | 2270 return OK; |
| 2271 } | |
| 2272 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2273 // The engine is very inefficient (uses too many states) when the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2274 // maximum is much larger than the minimum and when the maximum is |
|
23471
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2275 // large. However, when maxval is MAX_LIMIT, it is okay, as this |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2276 // will emit NFA_STAR. |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2277 // Bail out if we can use the other engine, but only, when the |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2278 // pattern does not need the NFA engine like (e.g. [[:upper:]]\{2,\} |
|
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
26652
diff
changeset
|
2279 // does not work with characters > 8 bit with the BT engine) |
| 6594 | 2280 if ((nfa_re_flags & RE_AUTO) |
|
23471
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2281 && (maxval > 500 || maxval > minval + 200) |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2282 && (maxval != MAX_LIMIT && minval < 200) |
|
a7cdfc8e4b6e
patch 8.2.2278: falling back to old regexp engine can some patterns
Bram Moolenaar <Bram@vim.org>
parents:
23270
diff
changeset
|
2283 && !wants_nfa) |
| 6533 | 2284 return FAIL; |
| 2285 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2286 // Ignore previous call to nfa_regatom() |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2287 post_ptr = post_start + my_post_start; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2288 // Save parse state after the repeated atom and the \{} |
|
4679
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2289 save_parse_state(&new_state); |
| 4444 | 2290 |
| 2291 quest = (greedy == TRUE? NFA_QUEST : NFA_QUEST_NONGREEDY); | |
| 2292 for (i = 0; i < maxval; i++) | |
| 2293 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2294 // Goto beginning of the repeated atom |
|
4679
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2295 restore_parse_state(&old_state); |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2296 old_post_pos = (int)(post_ptr - post_start); |
| 4444 | 2297 if (nfa_regatom() == FAIL) |
| 2298 return FAIL; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2299 // after "minval" times, atoms are optional |
| 4444 | 2300 if (i + 1 > minval) |
|
4673
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2301 { |
|
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2302 if (maxval == MAX_LIMIT) |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2303 { |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2304 if (greedy) |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2305 EMIT(NFA_STAR); |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2306 else |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2307 EMIT(NFA_STAR_NONGREEDY); |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2308 } |
|
4673
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2309 else |
|
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2310 EMIT(quest); |
|
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2311 } |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2312 if (old_post_pos != my_post_start) |
| 4444 | 2313 EMIT(NFA_CONCAT); |
|
4673
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2314 if (i + 1 > minval && maxval == MAX_LIMIT) |
|
05d57d7c2d55
updated for version 7.3.1084
Bram Moolenaar <bram@vim.org>
parents:
4671
diff
changeset
|
2315 break; |
| 4444 | 2316 } |
| 2317 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2318 // Go to just after the repeated atom and the \{} |
|
4679
4d92b873acef
updated for version 7.3.1087
Bram Moolenaar <bram@vim.org>
parents:
4677
diff
changeset
|
2319 restore_parse_state(&new_state); |
| 4444 | 2320 curchr = -1; |
| 2321 | |
| 2322 break; | |
| 2323 | |
| 2324 | |
| 2325 default: | |
| 2326 break; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2327 } // end switch |
| 4444 | 2328 |
| 2329 if (re_multi_type(peekchr()) != NOT_MULTI) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2330 // Can't have a multi follow a multi. |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
2331 EMSG_RET_FAIL(_(e_nfa_regexp_cant_have_multi_follow_multi)); |
| 4444 | 2332 |
| 2333 return OK; | |
| 2334 } | |
| 2335 | |
| 2336 /* | |
| 2337 * Parse one or more pieces, concatenated. It matches a match for the | |
| 2338 * first piece, followed by a match for the second piece, etc. Example: | |
| 2339 * "f[0-9]b", first matches "f", then a digit and then "b". | |
| 2340 * | |
| 2341 * concat ::= piece | |
| 2342 * or piece piece | |
| 2343 * or piece piece piece | |
| 2344 * etc. | |
| 2345 */ | |
| 2346 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2347 nfa_regconcat(void) |
| 4444 | 2348 { |
| 2349 int cont = TRUE; | |
| 2350 int first = TRUE; | |
| 2351 | |
| 2352 while (cont) | |
| 2353 { | |
| 2354 switch (peekchr()) | |
| 2355 { | |
| 2356 case NUL: | |
| 2357 case Magic('|'): | |
| 2358 case Magic('&'): | |
| 2359 case Magic(')'): | |
| 2360 cont = FALSE; | |
| 2361 break; | |
| 2362 | |
| 2363 case Magic('Z'): | |
| 2364 regflags |= RF_ICOMBINE; | |
| 2365 skipchr_keepstart(); | |
| 2366 break; | |
| 2367 case Magic('c'): | |
| 2368 regflags |= RF_ICASE; | |
| 2369 skipchr_keepstart(); | |
| 2370 break; | |
| 2371 case Magic('C'): | |
| 2372 regflags |= RF_NOICASE; | |
| 2373 skipchr_keepstart(); | |
| 2374 break; | |
| 2375 case Magic('v'): | |
| 2376 reg_magic = MAGIC_ALL; | |
| 2377 skipchr_keepstart(); | |
| 2378 curchr = -1; | |
| 2379 break; | |
| 2380 case Magic('m'): | |
| 2381 reg_magic = MAGIC_ON; | |
| 2382 skipchr_keepstart(); | |
| 2383 curchr = -1; | |
| 2384 break; | |
| 2385 case Magic('M'): | |
| 2386 reg_magic = MAGIC_OFF; | |
| 2387 skipchr_keepstart(); | |
| 2388 curchr = -1; | |
| 2389 break; | |
| 2390 case Magic('V'): | |
| 2391 reg_magic = MAGIC_NONE; | |
| 2392 skipchr_keepstart(); | |
| 2393 curchr = -1; | |
| 2394 break; | |
| 2395 | |
| 2396 default: | |
| 2397 if (nfa_regpiece() == FAIL) | |
| 2398 return FAIL; | |
| 2399 if (first == FALSE) | |
| 2400 EMIT(NFA_CONCAT); | |
| 2401 else | |
| 2402 first = FALSE; | |
| 2403 break; | |
| 2404 } | |
| 2405 } | |
| 2406 | |
| 2407 return OK; | |
| 2408 } | |
| 2409 | |
| 2410 /* | |
| 2411 * Parse a branch, one or more concats, separated by "\&". It matches the | |
| 2412 * last concat, but only if all the preceding concats also match at the same | |
| 2413 * position. Examples: | |
| 2414 * "foobeep\&..." matches "foo" in "foobeep". | |
| 2415 * ".*Peter\&.*Bob" matches in a line containing both "Peter" and "Bob" | |
| 2416 * | |
| 2417 * branch ::= concat | |
| 2418 * or concat \& concat | |
| 2419 * or concat \& concat \& concat | |
| 2420 * etc. | |
| 2421 */ | |
| 2422 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2423 nfa_regbranch(void) |
| 4444 | 2424 { |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2425 int old_post_pos; |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2426 |
|
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2427 old_post_pos = (int)(post_ptr - post_start); |
| 4444 | 2428 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2429 // First branch, possibly the only one |
| 4444 | 2430 if (nfa_regconcat() == FAIL) |
| 2431 return FAIL; | |
| 2432 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2433 // Try next concats |
|
13043
307f2622826f
patch 8.0.1397: pattern with & following nothing gives an error
Christian Brabandt <cb@256bit.org>
parents:
12752
diff
changeset
|
2434 while (peekchr() == Magic('&')) |
| 4444 | 2435 { |
| 2436 skipchr(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2437 // if concat is empty do emit a node |
|
13043
307f2622826f
patch 8.0.1397: pattern with & following nothing gives an error
Christian Brabandt <cb@256bit.org>
parents:
12752
diff
changeset
|
2438 if (old_post_pos == (int)(post_ptr - post_start)) |
|
307f2622826f
patch 8.0.1397: pattern with & following nothing gives an error
Christian Brabandt <cb@256bit.org>
parents:
12752
diff
changeset
|
2439 EMIT(NFA_EMPTY); |
| 4444 | 2440 EMIT(NFA_NOPEN); |
| 2441 EMIT(NFA_PREV_ATOM_NO_WIDTH); | |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2442 old_post_pos = (int)(post_ptr - post_start); |
| 4444 | 2443 if (nfa_regconcat() == FAIL) |
| 2444 return FAIL; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2445 // if concat is empty do emit a node |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2446 if (old_post_pos == (int)(post_ptr - post_start)) |
| 5370 | 2447 EMIT(NFA_EMPTY); |
| 4444 | 2448 EMIT(NFA_CONCAT); |
| 2449 } | |
| 2450 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2451 // if a branch is empty, emit one node for it |
|
4651
f10f63aaec5c
updated for version 7.3.1073
Bram Moolenaar <bram@vim.org>
parents:
4649
diff
changeset
|
2452 if (old_post_pos == (int)(post_ptr - post_start)) |
| 5370 | 2453 EMIT(NFA_EMPTY); |
| 4444 | 2454 |
| 2455 return OK; | |
| 2456 } | |
| 2457 | |
| 2458 /* | |
| 2459 * Parse a pattern, one or more branches, separated by "\|". It matches | |
| 2460 * anything that matches one of the branches. Example: "foo\|beep" matches | |
| 2461 * "foo" and matches "beep". If more than one branch matches, the first one | |
| 2462 * is used. | |
| 2463 * | |
| 2464 * pattern ::= branch | |
| 2465 * or branch \| branch | |
| 2466 * or branch \| branch \| branch | |
| 2467 * etc. | |
| 2468 */ | |
| 2469 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2470 nfa_reg( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2471 int paren) // REG_NOPAREN, REG_PAREN, REG_NPAREN or REG_ZPAREN |
| 4444 | 2472 { |
| 2473 int parno = 0; | |
| 2474 | |
| 2475 if (paren == REG_PAREN) | |
| 2476 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2477 if (regnpar >= NSUBEXP) // Too many `(' |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
2478 EMSG_RET_FAIL(_(e_nfa_regexp_too_many_parens)); |
| 4444 | 2479 parno = regnpar++; |
| 2480 } | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2481 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2482 else if (paren == REG_ZPAREN) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2483 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2484 // Make a ZOPEN node. |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2485 if (regnzpar >= NSUBEXP) |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
2486 EMSG_RET_FAIL(_(e_nfa_regexp_too_many_z)); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2487 parno = regnzpar++; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2488 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2489 #endif |
| 4444 | 2490 |
| 2491 if (nfa_regbranch() == FAIL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2492 return FAIL; // cascaded error |
| 4444 | 2493 |
| 2494 while (peekchr() == Magic('|')) | |
| 2495 { | |
| 2496 skipchr(); | |
| 2497 if (nfa_regbranch() == FAIL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2498 return FAIL; // cascaded error |
| 4444 | 2499 EMIT(NFA_OR); |
| 2500 } | |
| 2501 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2502 // Check for proper termination. |
| 4444 | 2503 if (paren != REG_NOPAREN && getchr() != Magic(')')) |
| 2504 { | |
| 2505 if (paren == REG_NPAREN) | |
|
25320
1e6da8364a02
patch 8.2.3197: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
2506 EMSG2_RET_FAIL(_(e_unmatched_str_percent_open), |
|
1e6da8364a02
patch 8.2.3197: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
2507 reg_magic == MAGIC_ALL); |
| 4444 | 2508 else |
|
25320
1e6da8364a02
patch 8.2.3197: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
2509 EMSG2_RET_FAIL(_(e_unmatched_str_open), reg_magic == MAGIC_ALL); |
| 4444 | 2510 } |
| 2511 else if (paren == REG_NOPAREN && peekchr() != NUL) | |
| 2512 { | |
| 2513 if (peekchr() == Magic(')')) | |
|
25320
1e6da8364a02
patch 8.2.3197: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
2514 EMSG2_RET_FAIL(_(e_unmatched_str_close), reg_magic == MAGIC_ALL); |
| 4444 | 2515 else |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
2516 EMSG_RET_FAIL(_(e_nfa_regexp_proper_termination_error)); |
| 4444 | 2517 } |
| 2518 /* | |
| 2519 * Here we set the flag allowing back references to this set of | |
| 2520 * parentheses. | |
| 2521 */ | |
| 2522 if (paren == REG_PAREN) | |
| 2523 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2524 had_endbrace[parno] = TRUE; // have seen the close paren |
| 4444 | 2525 EMIT(NFA_MOPEN + parno); |
| 2526 } | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2527 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2528 else if (paren == REG_ZPAREN) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2529 EMIT(NFA_ZOPEN + parno); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2530 #endif |
| 4444 | 2531 |
| 2532 return OK; | |
| 2533 } | |
| 2534 | |
| 2535 #ifdef DEBUG | |
| 2536 static char_u code[50]; | |
| 2537 | |
| 2538 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2539 nfa_set_code(int c) |
| 4444 | 2540 { |
| 2541 int addnl = FALSE; | |
| 2542 | |
| 2543 if (c >= NFA_FIRST_NL && c <= NFA_LAST_NL) | |
| 2544 { | |
| 2545 addnl = TRUE; | |
| 5296 | 2546 c -= NFA_ADD_NL; |
| 4444 | 2547 } |
| 2548 | |
| 2549 STRCPY(code, ""); | |
| 2550 switch (c) | |
| 2551 { | |
| 2552 case NFA_MATCH: STRCPY(code, "NFA_MATCH "); break; | |
| 2553 case NFA_SPLIT: STRCPY(code, "NFA_SPLIT "); break; | |
| 2554 case NFA_CONCAT: STRCPY(code, "NFA_CONCAT "); break; | |
| 2555 case NFA_NEWL: STRCPY(code, "NFA_NEWL "); break; | |
| 2556 case NFA_ZSTART: STRCPY(code, "NFA_ZSTART"); break; | |
| 2557 case NFA_ZEND: STRCPY(code, "NFA_ZEND"); break; | |
| 2558 | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2559 case NFA_BACKREF1: STRCPY(code, "NFA_BACKREF1"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2560 case NFA_BACKREF2: STRCPY(code, "NFA_BACKREF2"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2561 case NFA_BACKREF3: STRCPY(code, "NFA_BACKREF3"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2562 case NFA_BACKREF4: STRCPY(code, "NFA_BACKREF4"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2563 case NFA_BACKREF5: STRCPY(code, "NFA_BACKREF5"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2564 case NFA_BACKREF6: STRCPY(code, "NFA_BACKREF6"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2565 case NFA_BACKREF7: STRCPY(code, "NFA_BACKREF7"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2566 case NFA_BACKREF8: STRCPY(code, "NFA_BACKREF8"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2567 case NFA_BACKREF9: STRCPY(code, "NFA_BACKREF9"); break; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2568 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2569 case NFA_ZREF1: STRCPY(code, "NFA_ZREF1"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2570 case NFA_ZREF2: STRCPY(code, "NFA_ZREF2"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2571 case NFA_ZREF3: STRCPY(code, "NFA_ZREF3"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2572 case NFA_ZREF4: STRCPY(code, "NFA_ZREF4"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2573 case NFA_ZREF5: STRCPY(code, "NFA_ZREF5"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2574 case NFA_ZREF6: STRCPY(code, "NFA_ZREF6"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2575 case NFA_ZREF7: STRCPY(code, "NFA_ZREF7"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2576 case NFA_ZREF8: STRCPY(code, "NFA_ZREF8"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2577 case NFA_ZREF9: STRCPY(code, "NFA_ZREF9"); break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2578 #endif |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2579 case NFA_SKIP: STRCPY(code, "NFA_SKIP"); break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
2580 |
| 4444 | 2581 case NFA_PREV_ATOM_NO_WIDTH: |
| 2582 STRCPY(code, "NFA_PREV_ATOM_NO_WIDTH"); break; | |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
2583 case NFA_PREV_ATOM_NO_WIDTH_NEG: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
2584 STRCPY(code, "NFA_PREV_ATOM_NO_WIDTH_NEG"); break; |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2585 case NFA_PREV_ATOM_JUST_BEFORE: |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2586 STRCPY(code, "NFA_PREV_ATOM_JUST_BEFORE"); break; |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2587 case NFA_PREV_ATOM_JUST_BEFORE_NEG: |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2588 STRCPY(code, "NFA_PREV_ATOM_JUST_BEFORE_NEG"); break; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2589 case NFA_PREV_ATOM_LIKE_PATTERN: |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2590 STRCPY(code, "NFA_PREV_ATOM_LIKE_PATTERN"); break; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2591 |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
2592 case NFA_NOPEN: STRCPY(code, "NFA_NOPEN"); break; |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
2593 case NFA_NCLOSE: STRCPY(code, "NFA_NCLOSE"); break; |
| 4444 | 2594 case NFA_START_INVISIBLE: STRCPY(code, "NFA_START_INVISIBLE"); break; |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2595 case NFA_START_INVISIBLE_FIRST: |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2596 STRCPY(code, "NFA_START_INVISIBLE_FIRST"); break; |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
2597 case NFA_START_INVISIBLE_NEG: |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
2598 STRCPY(code, "NFA_START_INVISIBLE_NEG"); break; |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2599 case NFA_START_INVISIBLE_NEG_FIRST: |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2600 STRCPY(code, "NFA_START_INVISIBLE_NEG_FIRST"); break; |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2601 case NFA_START_INVISIBLE_BEFORE: |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
2602 STRCPY(code, "NFA_START_INVISIBLE_BEFORE"); break; |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2603 case NFA_START_INVISIBLE_BEFORE_FIRST: |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2604 STRCPY(code, "NFA_START_INVISIBLE_BEFORE_FIRST"); break; |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
2605 case NFA_START_INVISIBLE_BEFORE_NEG: |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
2606 STRCPY(code, "NFA_START_INVISIBLE_BEFORE_NEG"); break; |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2607 case NFA_START_INVISIBLE_BEFORE_NEG_FIRST: |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
2608 STRCPY(code, "NFA_START_INVISIBLE_BEFORE_NEG_FIRST"); break; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2609 case NFA_START_PATTERN: STRCPY(code, "NFA_START_PATTERN"); break; |
| 4444 | 2610 case NFA_END_INVISIBLE: STRCPY(code, "NFA_END_INVISIBLE"); break; |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
2611 case NFA_END_INVISIBLE_NEG: STRCPY(code, "NFA_END_INVISIBLE_NEG"); break; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
2612 case NFA_END_PATTERN: STRCPY(code, "NFA_END_PATTERN"); break; |
| 4444 | 2613 |
| 2614 case NFA_COMPOSING: STRCPY(code, "NFA_COMPOSING"); break; | |
| 2615 case NFA_END_COMPOSING: STRCPY(code, "NFA_END_COMPOSING"); break; | |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
2616 case NFA_OPT_CHARS: STRCPY(code, "NFA_OPT_CHARS"); break; |
| 4444 | 2617 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2618 case NFA_MOPEN: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2619 case NFA_MOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2620 case NFA_MOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2621 case NFA_MOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2622 case NFA_MOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2623 case NFA_MOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2624 case NFA_MOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2625 case NFA_MOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2626 case NFA_MOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2627 case NFA_MOPEN9: |
| 4444 | 2628 STRCPY(code, "NFA_MOPEN(x)"); |
| 2629 code[10] = c - NFA_MOPEN + '0'; | |
| 2630 break; | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2631 case NFA_MCLOSE: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2632 case NFA_MCLOSE1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2633 case NFA_MCLOSE2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2634 case NFA_MCLOSE3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2635 case NFA_MCLOSE4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2636 case NFA_MCLOSE5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2637 case NFA_MCLOSE6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2638 case NFA_MCLOSE7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2639 case NFA_MCLOSE8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2640 case NFA_MCLOSE9: |
| 4444 | 2641 STRCPY(code, "NFA_MCLOSE(x)"); |
| 2642 code[11] = c - NFA_MCLOSE + '0'; | |
| 2643 break; | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2644 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2645 case NFA_ZOPEN: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2646 case NFA_ZOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2647 case NFA_ZOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2648 case NFA_ZOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2649 case NFA_ZOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2650 case NFA_ZOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2651 case NFA_ZOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2652 case NFA_ZOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2653 case NFA_ZOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2654 case NFA_ZOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2655 STRCPY(code, "NFA_ZOPEN(x)"); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2656 code[10] = c - NFA_ZOPEN + '0'; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2657 break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2658 case NFA_ZCLOSE: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2659 case NFA_ZCLOSE1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2660 case NFA_ZCLOSE2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2661 case NFA_ZCLOSE3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2662 case NFA_ZCLOSE4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2663 case NFA_ZCLOSE5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2664 case NFA_ZCLOSE6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2665 case NFA_ZCLOSE7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2666 case NFA_ZCLOSE8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2667 case NFA_ZCLOSE9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2668 STRCPY(code, "NFA_ZCLOSE(x)"); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2669 code[11] = c - NFA_ZCLOSE + '0'; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2670 break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
2671 #endif |
| 4444 | 2672 case NFA_EOL: STRCPY(code, "NFA_EOL "); break; |
| 2673 case NFA_BOL: STRCPY(code, "NFA_BOL "); break; | |
| 2674 case NFA_EOW: STRCPY(code, "NFA_EOW "); break; | |
| 2675 case NFA_BOW: STRCPY(code, "NFA_BOW "); break; | |
|
4671
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
2676 case NFA_EOF: STRCPY(code, "NFA_EOF "); break; |
|
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
2677 case NFA_BOF: STRCPY(code, "NFA_BOF "); break; |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2678 case NFA_LNUM: STRCPY(code, "NFA_LNUM "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2679 case NFA_LNUM_GT: STRCPY(code, "NFA_LNUM_GT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2680 case NFA_LNUM_LT: STRCPY(code, "NFA_LNUM_LT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2681 case NFA_COL: STRCPY(code, "NFA_COL "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2682 case NFA_COL_GT: STRCPY(code, "NFA_COL_GT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2683 case NFA_COL_LT: STRCPY(code, "NFA_COL_LT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2684 case NFA_VCOL: STRCPY(code, "NFA_VCOL "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2685 case NFA_VCOL_GT: STRCPY(code, "NFA_VCOL_GT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2686 case NFA_VCOL_LT: STRCPY(code, "NFA_VCOL_LT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2687 case NFA_MARK: STRCPY(code, "NFA_MARK "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2688 case NFA_MARK_GT: STRCPY(code, "NFA_MARK_GT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2689 case NFA_MARK_LT: STRCPY(code, "NFA_MARK_LT "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2690 case NFA_CURSOR: STRCPY(code, "NFA_CURSOR "); break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2691 case NFA_VISUAL: STRCPY(code, "NFA_VISUAL "); break; |
| 5901 | 2692 case NFA_ANY_COMPOSING: STRCPY(code, "NFA_ANY_COMPOSING "); break; |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
2693 |
| 4444 | 2694 case NFA_STAR: STRCPY(code, "NFA_STAR "); break; |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2695 case NFA_STAR_NONGREEDY: STRCPY(code, "NFA_STAR_NONGREEDY "); break; |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2696 case NFA_QUEST: STRCPY(code, "NFA_QUEST"); break; |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
2697 case NFA_QUEST_NONGREEDY: STRCPY(code, "NFA_QUEST_NON_GREEDY"); break; |
| 5370 | 2698 case NFA_EMPTY: STRCPY(code, "NFA_EMPTY"); break; |
| 4444 | 2699 case NFA_OR: STRCPY(code, "NFA_OR"); break; |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2700 |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2701 case NFA_START_COLL: STRCPY(code, "NFA_START_COLL"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2702 case NFA_END_COLL: STRCPY(code, "NFA_END_COLL"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2703 case NFA_START_NEG_COLL: STRCPY(code, "NFA_START_NEG_COLL"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2704 case NFA_END_NEG_COLL: STRCPY(code, "NFA_END_NEG_COLL"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2705 case NFA_RANGE: STRCPY(code, "NFA_RANGE"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2706 case NFA_RANGE_MIN: STRCPY(code, "NFA_RANGE_MIN"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2707 case NFA_RANGE_MAX: STRCPY(code, "NFA_RANGE_MAX"); break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2708 |
| 4444 | 2709 case NFA_CLASS_ALNUM: STRCPY(code, "NFA_CLASS_ALNUM"); break; |
| 2710 case NFA_CLASS_ALPHA: STRCPY(code, "NFA_CLASS_ALPHA"); break; | |
| 2711 case NFA_CLASS_BLANK: STRCPY(code, "NFA_CLASS_BLANK"); break; | |
| 2712 case NFA_CLASS_CNTRL: STRCPY(code, "NFA_CLASS_CNTRL"); break; | |
| 2713 case NFA_CLASS_DIGIT: STRCPY(code, "NFA_CLASS_DIGIT"); break; | |
| 2714 case NFA_CLASS_GRAPH: STRCPY(code, "NFA_CLASS_GRAPH"); break; | |
| 2715 case NFA_CLASS_LOWER: STRCPY(code, "NFA_CLASS_LOWER"); break; | |
| 2716 case NFA_CLASS_PRINT: STRCPY(code, "NFA_CLASS_PRINT"); break; | |
| 2717 case NFA_CLASS_PUNCT: STRCPY(code, "NFA_CLASS_PUNCT"); break; | |
| 2718 case NFA_CLASS_SPACE: STRCPY(code, "NFA_CLASS_SPACE"); break; | |
| 2719 case NFA_CLASS_UPPER: STRCPY(code, "NFA_CLASS_UPPER"); break; | |
| 2720 case NFA_CLASS_XDIGIT: STRCPY(code, "NFA_CLASS_XDIGIT"); break; | |
| 2721 case NFA_CLASS_TAB: STRCPY(code, "NFA_CLASS_TAB"); break; | |
| 2722 case NFA_CLASS_RETURN: STRCPY(code, "NFA_CLASS_RETURN"); break; | |
| 2723 case NFA_CLASS_BACKSPACE: STRCPY(code, "NFA_CLASS_BACKSPACE"); break; | |
| 2724 case NFA_CLASS_ESCAPE: STRCPY(code, "NFA_CLASS_ESCAPE"); break; | |
|
15709
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2725 case NFA_CLASS_IDENT: STRCPY(code, "NFA_CLASS_IDENT"); break; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2726 case NFA_CLASS_KEYWORD: STRCPY(code, "NFA_CLASS_KEYWORD"); break; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2727 case NFA_CLASS_FNAME: STRCPY(code, "NFA_CLASS_FNAME"); break; |
| 4444 | 2728 |
| 2729 case NFA_ANY: STRCPY(code, "NFA_ANY"); break; | |
| 2730 case NFA_IDENT: STRCPY(code, "NFA_IDENT"); break; | |
| 2731 case NFA_SIDENT:STRCPY(code, "NFA_SIDENT"); break; | |
| 2732 case NFA_KWORD: STRCPY(code, "NFA_KWORD"); break; | |
| 2733 case NFA_SKWORD:STRCPY(code, "NFA_SKWORD"); break; | |
| 2734 case NFA_FNAME: STRCPY(code, "NFA_FNAME"); break; | |
| 2735 case NFA_SFNAME:STRCPY(code, "NFA_SFNAME"); break; | |
| 2736 case NFA_PRINT: STRCPY(code, "NFA_PRINT"); break; | |
| 2737 case NFA_SPRINT:STRCPY(code, "NFA_SPRINT"); break; | |
| 2738 case NFA_WHITE: STRCPY(code, "NFA_WHITE"); break; | |
| 2739 case NFA_NWHITE:STRCPY(code, "NFA_NWHITE"); break; | |
| 2740 case NFA_DIGIT: STRCPY(code, "NFA_DIGIT"); break; | |
| 2741 case NFA_NDIGIT:STRCPY(code, "NFA_NDIGIT"); break; | |
| 2742 case NFA_HEX: STRCPY(code, "NFA_HEX"); break; | |
| 2743 case NFA_NHEX: STRCPY(code, "NFA_NHEX"); break; | |
| 2744 case NFA_OCTAL: STRCPY(code, "NFA_OCTAL"); break; | |
| 2745 case NFA_NOCTAL:STRCPY(code, "NFA_NOCTAL"); break; | |
| 2746 case NFA_WORD: STRCPY(code, "NFA_WORD"); break; | |
| 2747 case NFA_NWORD: STRCPY(code, "NFA_NWORD"); break; | |
| 2748 case NFA_HEAD: STRCPY(code, "NFA_HEAD"); break; | |
| 2749 case NFA_NHEAD: STRCPY(code, "NFA_NHEAD"); break; | |
| 2750 case NFA_ALPHA: STRCPY(code, "NFA_ALPHA"); break; | |
| 2751 case NFA_NALPHA:STRCPY(code, "NFA_NALPHA"); break; | |
| 2752 case NFA_LOWER: STRCPY(code, "NFA_LOWER"); break; | |
| 2753 case NFA_NLOWER:STRCPY(code, "NFA_NLOWER"); break; | |
| 2754 case NFA_UPPER: STRCPY(code, "NFA_UPPER"); break; | |
| 2755 case NFA_NUPPER:STRCPY(code, "NFA_NUPPER"); break; | |
| 5296 | 2756 case NFA_LOWER_IC: STRCPY(code, "NFA_LOWER_IC"); break; |
| 2757 case NFA_NLOWER_IC: STRCPY(code, "NFA_NLOWER_IC"); break; | |
| 2758 case NFA_UPPER_IC: STRCPY(code, "NFA_UPPER_IC"); break; | |
| 2759 case NFA_NUPPER_IC: STRCPY(code, "NFA_NUPPER_IC"); break; | |
| 4444 | 2760 |
| 2761 default: | |
| 2762 STRCPY(code, "CHAR(x)"); | |
| 2763 code[5] = c; | |
| 2764 } | |
| 2765 | |
| 2766 if (addnl == TRUE) | |
| 2767 STRCAT(code, " + NEWLINE "); | |
| 2768 | |
| 2769 } | |
| 2770 | |
| 2771 #ifdef ENABLE_LOG | |
| 2772 static FILE *log_fd; | |
|
14145
1cf832945469
patch 8.1.0090: "..." used inconsistently in a message
Christian Brabandt <cb@256bit.org>
parents:
14121
diff
changeset
|
2773 static char_u e_log_open_failed[] = N_("Could not open temporary log file for writing, displaying on stderr... "); |
| 4444 | 2774 |
| 2775 /* | |
| 2776 * Print the postfix notation of the current regexp. | |
| 2777 */ | |
| 2778 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2779 nfa_postfix_dump(char_u *expr, int retval) |
| 4444 | 2780 { |
| 2781 int *p; | |
| 2782 FILE *f; | |
| 2783 | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
2784 f = fopen(NFA_REGEXP_DUMP_LOG, "a"); |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2785 if (f == NULL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2786 return; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2787 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2788 fprintf(f, "\n-------------------------\n"); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2789 if (retval == FAIL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2790 fprintf(f, ">>> NFA engine failed... \n"); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2791 else if (retval == OK) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2792 fprintf(f, ">>> NFA engine succeeded !\n"); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2793 fprintf(f, "Regexp: \"%s\"\nPostfix notation (char): \"", expr); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2794 for (p = post_start; *p && p < post_ptr; p++) |
| 4444 | 2795 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2796 nfa_set_code(*p); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2797 fprintf(f, "%s, ", code); |
| 4444 | 2798 } |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2799 fprintf(f, "\"\nPostfix notation (int): "); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2800 for (p = post_start; *p && p < post_ptr; p++) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2801 fprintf(f, "%d ", *p); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2802 fprintf(f, "\n\n"); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2803 fclose(f); |
| 4444 | 2804 } |
| 2805 | |
| 2806 /* | |
| 2807 * Print the NFA starting with a root node "state". | |
| 2808 */ | |
| 2809 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2810 nfa_print_state(FILE *debugf, nfa_state_T *state) |
| 4444 | 2811 { |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2812 garray_T indent; |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2813 |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2814 ga_init2(&indent, 1, 64); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2815 ga_append(&indent, '\0'); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2816 nfa_print_state2(debugf, state, &indent); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2817 ga_clear(&indent); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2818 } |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2819 |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2820 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2821 nfa_print_state2(FILE *debugf, nfa_state_T *state, garray_T *indent) |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2822 { |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2823 char_u *p; |
| 4444 | 2824 |
| 2825 if (state == NULL) | |
| 2826 return; | |
| 2827 | |
| 2828 fprintf(debugf, "(%2d)", abs(state->id)); | |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2829 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2830 // Output indent |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2831 p = (char_u *)indent->ga_data; |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2832 if (indent->ga_len >= 3) |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2833 { |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2834 int last = indent->ga_len - 3; |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2835 char_u save[2]; |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2836 |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2837 STRNCPY(save, &p[last], 2); |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
2838 memcpy(&p[last], "+-", 2); |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2839 fprintf(debugf, " %s", p); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2840 STRNCPY(&p[last], save, 2); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2841 } |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2842 else |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2843 fprintf(debugf, " %s", p); |
| 4444 | 2844 |
| 2845 nfa_set_code(state->c); | |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
2846 fprintf(debugf, "%s (%d) (id=%d) val=%d\n", |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2847 code, |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2848 state->c, |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2849 abs(state->id), |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2850 state->val); |
| 4444 | 2851 if (state->id < 0) |
| 2852 return; | |
| 2853 | |
| 2854 state->id = abs(state->id) * -1; | |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2855 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2856 // grow indent for state->out |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2857 indent->ga_len -= 1; |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2858 if (state->out1) |
|
4537
5cc98a5898cf
updated for version 7.3.1016
Bram Moolenaar <bram@vim.org>
parents:
4535
diff
changeset
|
2859 ga_concat(indent, (char_u *)"| "); |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2860 else |
|
4537
5cc98a5898cf
updated for version 7.3.1016
Bram Moolenaar <bram@vim.org>
parents:
4535
diff
changeset
|
2861 ga_concat(indent, (char_u *)" "); |
|
26652
a3f38923c037
patch 8.2.3855: illegal memory access when displaying a blob
Bram Moolenaar <Bram@vim.org>
parents:
26592
diff
changeset
|
2862 ga_append(indent, NUL); |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2863 |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2864 nfa_print_state2(debugf, state->out, indent); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2865 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2866 // replace last part of indent for state->out1 |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2867 indent->ga_len -= 3; |
|
4537
5cc98a5898cf
updated for version 7.3.1016
Bram Moolenaar <bram@vim.org>
parents:
4535
diff
changeset
|
2868 ga_concat(indent, (char_u *)" "); |
|
26652
a3f38923c037
patch 8.2.3855: illegal memory access when displaying a blob
Bram Moolenaar <Bram@vim.org>
parents:
26592
diff
changeset
|
2869 ga_append(indent, NUL); |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2870 |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2871 nfa_print_state2(debugf, state->out1, indent); |
|
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2872 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2873 // shrink indent |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
2874 indent->ga_len -= 3; |
|
26652
a3f38923c037
patch 8.2.3855: illegal memory access when displaying a blob
Bram Moolenaar <Bram@vim.org>
parents:
26592
diff
changeset
|
2875 ga_append(indent, NUL); |
| 4444 | 2876 } |
| 2877 | |
| 2878 /* | |
| 2879 * Print the NFA state machine. | |
| 2880 */ | |
| 2881 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2882 nfa_dump(nfa_regprog_T *prog) |
| 4444 | 2883 { |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
2884 FILE *debugf = fopen(NFA_REGEXP_DUMP_LOG, "a"); |
| 4444 | 2885 |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2886 if (debugf == NULL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2887 return; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2888 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2889 nfa_print_state(debugf, prog->start); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2890 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2891 if (prog->reganch) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2892 fprintf(debugf, "reganch: %d\n", prog->reganch); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2893 if (prog->regstart != NUL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2894 fprintf(debugf, "regstart: %c (decimal: %d)\n", |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2895 prog->regstart, prog->regstart); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2896 if (prog->match_text != NULL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2897 fprintf(debugf, "match_text: \"%s\"\n", prog->match_text); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2898 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
2899 fclose(debugf); |
| 4444 | 2900 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2901 #endif // ENABLE_LOG |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2902 #endif // DEBUG |
| 4444 | 2903 |
| 2904 /* | |
| 2905 * Parse r.e. @expr and convert it into postfix form. | |
| 2906 * Return the postfix string on success, NULL otherwise. | |
| 2907 */ | |
| 2908 static int * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2909 re2post(void) |
| 4444 | 2910 { |
| 2911 if (nfa_reg(REG_NOPAREN) == FAIL) | |
| 2912 return NULL; | |
| 2913 EMIT(NFA_MOPEN); | |
| 2914 return post_start; | |
| 2915 } | |
| 2916 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2917 // NB. Some of the code below is inspired by Russ's. |
| 4444 | 2918 |
| 2919 /* | |
| 2920 * Represents an NFA state plus zero or one or two arrows exiting. | |
| 2921 * if c == MATCH, no arrows out; matching state. | |
| 2922 * If c == SPLIT, unlabeled arrows to out and out1 (if != NULL). | |
| 2923 * If c < 256, labeled arrow with character c to out. | |
| 2924 */ | |
| 2925 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2926 static nfa_state_T *state_ptr; // points to nfa_prog->state |
| 4444 | 2927 |
| 2928 /* | |
| 2929 * Allocate and initialize nfa_state_T. | |
| 2930 */ | |
| 2931 static nfa_state_T * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2932 alloc_state(int c, nfa_state_T *out, nfa_state_T *out1) |
| 4444 | 2933 { |
| 2934 nfa_state_T *s; | |
| 2935 | |
| 2936 if (istate >= nstate) | |
| 2937 return NULL; | |
| 2938 | |
| 2939 s = &state_ptr[istate++]; | |
| 2940 | |
| 2941 s->c = c; | |
| 2942 s->out = out; | |
| 2943 s->out1 = out1; | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
2944 s->val = 0; |
| 4444 | 2945 |
| 2946 s->id = istate; | |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
2947 s->lastlist[0] = 0; |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
2948 s->lastlist[1] = 0; |
| 4444 | 2949 |
| 2950 return s; | |
| 2951 } | |
| 2952 | |
| 2953 /* | |
| 2954 * A partially built NFA without the matching state filled in. | |
| 2955 * Frag_T.start points at the start state. | |
| 2956 * Frag_T.out is a list of places that need to be set to the | |
| 2957 * next state for this fragment. | |
| 2958 */ | |
|
4555
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2959 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2960 // Since the out pointers in the list are always |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2961 // uninitialized, we use the pointers themselves |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
2962 // as storage for the Ptrlists. |
| 4444 | 2963 typedef union Ptrlist Ptrlist; |
|
4555
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2964 union Ptrlist |
|
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2965 { |
|
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2966 Ptrlist *next; |
|
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2967 nfa_state_T *s; |
|
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2968 }; |
|
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2969 |
| 4444 | 2970 struct Frag |
| 2971 { | |
|
4555
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
2972 nfa_state_T *start; |
| 4444 | 2973 Ptrlist *out; |
| 2974 }; | |
| 2975 typedef struct Frag Frag_T; | |
| 2976 | |
| 2977 /* | |
| 4456 | 2978 * Initialize a Frag_T struct and return it. |
| 4444 | 2979 */ |
| 2980 static Frag_T | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 frag(nfa_state_T *start, Ptrlist *out) |
| 4444 | 2982 { |
| 4456 | 2983 Frag_T n; |
| 2984 | |
| 2985 n.start = start; | |
| 2986 n.out = out; | |
| 4444 | 2987 return n; |
| 2988 } | |
| 2989 | |
| 2990 /* | |
| 2991 * Create singleton list containing just outp. | |
| 2992 */ | |
| 2993 static Ptrlist * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2994 list1( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2995 nfa_state_T **outp) |
| 4444 | 2996 { |
| 2997 Ptrlist *l; | |
| 2998 | |
| 2999 l = (Ptrlist *)outp; | |
| 3000 l->next = NULL; | |
| 3001 return l; | |
| 3002 } | |
| 3003 | |
| 3004 /* | |
| 3005 * Patch the list of states at out to point to start. | |
| 3006 */ | |
| 3007 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3008 patch(Ptrlist *l, nfa_state_T *s) |
| 4444 | 3009 { |
| 3010 Ptrlist *next; | |
| 3011 | |
| 3012 for (; l; l = next) | |
| 3013 { | |
| 3014 next = l->next; | |
| 3015 l->s = s; | |
| 3016 } | |
| 3017 } | |
| 3018 | |
| 3019 | |
| 3020 /* | |
| 3021 * Join the two lists l1 and l2, returning the combination. | |
| 3022 */ | |
| 3023 static Ptrlist * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3024 append(Ptrlist *l1, Ptrlist *l2) |
| 4444 | 3025 { |
| 3026 Ptrlist *oldl1; | |
| 3027 | |
| 3028 oldl1 = l1; | |
| 3029 while (l1->next) | |
| 3030 l1 = l1->next; | |
| 3031 l1->next = l2; | |
| 3032 return oldl1; | |
| 3033 } | |
| 3034 | |
| 3035 /* | |
| 3036 * Stack used for transforming postfix form into NFA. | |
| 3037 */ | |
| 3038 static Frag_T empty; | |
| 3039 | |
| 3040 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3041 st_error(int *postfix UNUSED, int *end UNUSED, int *p UNUSED) |
| 4444 | 3042 { |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
3043 #ifdef NFA_REGEXP_ERROR_LOG |
| 4444 | 3044 FILE *df; |
| 3045 int *p2; | |
| 3046 | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
3047 df = fopen(NFA_REGEXP_ERROR_LOG, "a"); |
| 4444 | 3048 if (df) |
| 3049 { | |
| 3050 fprintf(df, "Error popping the stack!\n"); | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
3051 # ifdef DEBUG |
| 4444 | 3052 fprintf(df, "Current regexp is \"%s\"\n", nfa_regengine.expr); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
3053 # endif |
| 4444 | 3054 fprintf(df, "Postfix form is: "); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
3055 # ifdef DEBUG |
| 4444 | 3056 for (p2 = postfix; p2 < end; p2++) |
| 3057 { | |
| 3058 nfa_set_code(*p2); | |
| 3059 fprintf(df, "%s, ", code); | |
| 3060 } | |
| 3061 nfa_set_code(*p); | |
| 3062 fprintf(df, "\nCurrent position is: "); | |
| 3063 for (p2 = postfix; p2 <= p; p2 ++) | |
| 3064 { | |
| 3065 nfa_set_code(*p2); | |
| 3066 fprintf(df, "%s, ", code); | |
| 3067 } | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
3068 # else |
| 4444 | 3069 for (p2 = postfix; p2 < end; p2++) |
| 3070 fprintf(df, "%d, ", *p2); | |
| 3071 fprintf(df, "\nCurrent position is: "); | |
| 3072 for (p2 = postfix; p2 <= p; p2 ++) | |
| 3073 fprintf(df, "%d, ", *p2); | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
3074 # endif |
| 4444 | 3075 fprintf(df, "\n--------------------------\n"); |
| 3076 fclose(df); | |
| 3077 } | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
3078 #endif |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
3079 emsg(_(e_nfa_regexp_could_not_pop_stack)); |
| 4444 | 3080 } |
| 3081 | |
| 3082 /* | |
| 3083 * Push an item onto the stack. | |
| 3084 */ | |
| 3085 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3086 st_push(Frag_T s, Frag_T **p, Frag_T *stack_end) |
| 4444 | 3087 { |
| 3088 Frag_T *stackp = *p; | |
| 3089 | |
| 3090 if (stackp >= stack_end) | |
| 3091 return; | |
| 3092 *stackp = s; | |
| 3093 *p = *p + 1; | |
| 3094 } | |
| 3095 | |
| 3096 /* | |
| 3097 * Pop an item from the stack. | |
| 3098 */ | |
| 3099 static Frag_T | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3100 st_pop(Frag_T **p, Frag_T *stack) |
| 4444 | 3101 { |
| 3102 Frag_T *stackp; | |
| 3103 | |
| 3104 *p = *p - 1; | |
| 3105 stackp = *p; | |
| 3106 if (stackp < stack) | |
| 3107 return empty; | |
| 3108 return **p; | |
| 3109 } | |
| 3110 | |
| 3111 /* | |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3112 * Estimate the maximum byte length of anything matching "state". |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3113 * When unknown or unlimited return -1. |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3114 */ |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3115 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3116 nfa_max_width(nfa_state_T *startstate, int depth) |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3117 { |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3118 int l, r; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3119 nfa_state_T *state = startstate; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3120 int len = 0; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3121 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3122 // detect looping in a NFA_SPLIT |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3123 if (depth > 4) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3124 return -1; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3125 |
|
4958
0a379dea13c9
updated for version 7.3.1224
Bram Moolenaar <bram@vim.org>
parents:
4944
diff
changeset
|
3126 while (state != NULL) |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3127 { |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3128 switch (state->c) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3129 { |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3130 case NFA_END_INVISIBLE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3131 case NFA_END_INVISIBLE_NEG: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3132 // the end, return what we have |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3133 return len; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3134 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3135 case NFA_SPLIT: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3136 // two alternatives, use the maximum |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3137 l = nfa_max_width(state->out, depth + 1); |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3138 r = nfa_max_width(state->out1, depth + 1); |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3139 if (l < 0 || r < 0) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3140 return -1; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3141 return len + (l > r ? l : r); |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3142 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3143 case NFA_ANY: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3144 case NFA_START_COLL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3145 case NFA_START_NEG_COLL: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3146 // matches some character, including composing chars |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3147 if (enc_utf8) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3148 len += MB_MAXBYTES; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3149 else if (has_mbyte) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3150 len += 2; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3151 else |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3152 ++len; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3153 if (state->c != NFA_ANY) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3154 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3155 // skip over the characters |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3156 state = state->out1->out; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3157 continue; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3158 } |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3159 break; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3160 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3161 case NFA_DIGIT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3162 case NFA_WHITE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3163 case NFA_HEX: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3164 case NFA_OCTAL: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3165 // ascii |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3166 ++len; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3167 break; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3168 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3169 case NFA_IDENT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3170 case NFA_SIDENT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3171 case NFA_KWORD: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3172 case NFA_SKWORD: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3173 case NFA_FNAME: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3174 case NFA_SFNAME: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3175 case NFA_PRINT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3176 case NFA_SPRINT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3177 case NFA_NWHITE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3178 case NFA_NDIGIT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3179 case NFA_NHEX: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3180 case NFA_NOCTAL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3181 case NFA_WORD: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3182 case NFA_NWORD: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3183 case NFA_HEAD: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3184 case NFA_NHEAD: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3185 case NFA_ALPHA: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3186 case NFA_NALPHA: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3187 case NFA_LOWER: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3188 case NFA_NLOWER: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3189 case NFA_UPPER: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3190 case NFA_NUPPER: |
| 5296 | 3191 case NFA_LOWER_IC: |
| 3192 case NFA_NLOWER_IC: | |
| 3193 case NFA_UPPER_IC: | |
| 3194 case NFA_NUPPER_IC: | |
| 5901 | 3195 case NFA_ANY_COMPOSING: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3196 // possibly non-ascii |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3197 if (has_mbyte) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3198 len += 3; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3199 else |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3200 ++len; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3201 break; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3202 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3203 case NFA_START_INVISIBLE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3204 case NFA_START_INVISIBLE_NEG: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3205 case NFA_START_INVISIBLE_BEFORE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3206 case NFA_START_INVISIBLE_BEFORE_NEG: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3207 // zero-width, out1 points to the END state |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3208 state = state->out1->out; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3209 continue; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3210 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3211 case NFA_BACKREF1: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3212 case NFA_BACKREF2: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3213 case NFA_BACKREF3: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3214 case NFA_BACKREF4: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3215 case NFA_BACKREF5: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3216 case NFA_BACKREF6: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3217 case NFA_BACKREF7: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3218 case NFA_BACKREF8: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3219 case NFA_BACKREF9: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3220 #ifdef FEAT_SYN_HL |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3221 case NFA_ZREF1: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3222 case NFA_ZREF2: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3223 case NFA_ZREF3: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3224 case NFA_ZREF4: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3225 case NFA_ZREF5: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3226 case NFA_ZREF6: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3227 case NFA_ZREF7: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3228 case NFA_ZREF8: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3229 case NFA_ZREF9: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3230 #endif |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3231 case NFA_NEWL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3232 case NFA_SKIP: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3233 // unknown width |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3234 return -1; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3235 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3236 case NFA_BOL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3237 case NFA_EOL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3238 case NFA_BOF: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3239 case NFA_EOF: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3240 case NFA_BOW: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3241 case NFA_EOW: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3242 case NFA_MOPEN: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3243 case NFA_MOPEN1: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3244 case NFA_MOPEN2: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3245 case NFA_MOPEN3: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3246 case NFA_MOPEN4: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3247 case NFA_MOPEN5: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3248 case NFA_MOPEN6: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3249 case NFA_MOPEN7: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3250 case NFA_MOPEN8: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3251 case NFA_MOPEN9: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3252 #ifdef FEAT_SYN_HL |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3253 case NFA_ZOPEN: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3254 case NFA_ZOPEN1: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3255 case NFA_ZOPEN2: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3256 case NFA_ZOPEN3: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3257 case NFA_ZOPEN4: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3258 case NFA_ZOPEN5: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3259 case NFA_ZOPEN6: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3260 case NFA_ZOPEN7: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3261 case NFA_ZOPEN8: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3262 case NFA_ZOPEN9: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3263 case NFA_ZCLOSE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3264 case NFA_ZCLOSE1: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3265 case NFA_ZCLOSE2: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3266 case NFA_ZCLOSE3: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3267 case NFA_ZCLOSE4: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3268 case NFA_ZCLOSE5: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3269 case NFA_ZCLOSE6: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3270 case NFA_ZCLOSE7: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3271 case NFA_ZCLOSE8: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3272 case NFA_ZCLOSE9: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3273 #endif |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3274 case NFA_MCLOSE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3275 case NFA_MCLOSE1: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3276 case NFA_MCLOSE2: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3277 case NFA_MCLOSE3: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3278 case NFA_MCLOSE4: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3279 case NFA_MCLOSE5: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3280 case NFA_MCLOSE6: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3281 case NFA_MCLOSE7: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3282 case NFA_MCLOSE8: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3283 case NFA_MCLOSE9: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3284 case NFA_NOPEN: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3285 case NFA_NCLOSE: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3286 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3287 case NFA_LNUM_GT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3288 case NFA_LNUM_LT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3289 case NFA_COL_GT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3290 case NFA_COL_LT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3291 case NFA_VCOL_GT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3292 case NFA_VCOL_LT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3293 case NFA_MARK_GT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3294 case NFA_MARK_LT: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3295 case NFA_VISUAL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3296 case NFA_LNUM: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3297 case NFA_CURSOR: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3298 case NFA_COL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3299 case NFA_VCOL: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3300 case NFA_MARK: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3301 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3302 case NFA_ZSTART: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3303 case NFA_ZEND: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3304 case NFA_OPT_CHARS: |
| 5370 | 3305 case NFA_EMPTY: |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3306 case NFA_START_PATTERN: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3307 case NFA_END_PATTERN: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3308 case NFA_COMPOSING: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3309 case NFA_END_COMPOSING: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3310 // zero-width |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3311 break; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3312 |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3313 default: |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3314 if (state->c < 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3315 // don't know what this is |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3316 return -1; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3317 // normal character |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3318 len += MB_CHAR2LEN(state->c); |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3319 break; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3320 } |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3321 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3322 // normal way to continue |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3323 state = state->out; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3324 } |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3325 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3326 // unrecognized, "cannot happen" |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3327 return -1; |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3328 } |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
3329 |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3330 /* |
| 4444 | 3331 * Convert a postfix form into its equivalent NFA. |
| 3332 * Return the NFA start state on success, NULL otherwise. | |
| 3333 */ | |
| 3334 static nfa_state_T * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3335 post2nfa(int *postfix, int *end, int nfa_calc_size) |
| 4444 | 3336 { |
| 3337 int *p; | |
| 3338 int mopen; | |
| 3339 int mclose; | |
| 3340 Frag_T *stack = NULL; | |
| 3341 Frag_T *stackp = NULL; | |
| 3342 Frag_T *stack_end = NULL; | |
| 3343 Frag_T e1; | |
| 3344 Frag_T e2; | |
| 3345 Frag_T e; | |
| 3346 nfa_state_T *s; | |
| 3347 nfa_state_T *s1; | |
| 3348 nfa_state_T *matchstate; | |
| 4484 | 3349 nfa_state_T *ret = NULL; |
| 4444 | 3350 |
| 3351 if (postfix == NULL) | |
| 3352 return NULL; | |
| 3353 | |
| 4456 | 3354 #define PUSH(s) st_push((s), &stackp, stack_end) |
| 4444 | 3355 #define POP() st_pop(&stackp, stack); \ |
| 3356 if (stackp < stack) \ | |
| 3357 { \ | |
| 3358 st_error(postfix, end, p); \ | |
| 6747 | 3359 vim_free(stack); \ |
| 4444 | 3360 return NULL; \ |
| 3361 } | |
| 3362 | |
| 3363 if (nfa_calc_size == FALSE) | |
| 3364 { | |
|
18498
9e6d5a4abb1c
patch 8.1.2243: typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
3365 // Allocate space for the stack. Max states on the stack: "nstate". |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3366 stack = ALLOC_MULT(Frag_T, nstate + 1); |
|
15265
a7d02a56b5d5
patch 8.1.0641: no check for out-of-memory when converting regexp
Bram Moolenaar <Bram@vim.org>
parents:
14354
diff
changeset
|
3367 if (stack == NULL) |
|
a7d02a56b5d5
patch 8.1.0641: no check for out-of-memory when converting regexp
Bram Moolenaar <Bram@vim.org>
parents:
14354
diff
changeset
|
3368 return NULL; |
| 4444 | 3369 stackp = stack; |
| 4462 | 3370 stack_end = stack + (nstate + 1); |
| 4444 | 3371 } |
| 3372 | |
| 3373 for (p = postfix; p < end; ++p) | |
| 3374 { | |
| 3375 switch (*p) | |
| 3376 { | |
| 3377 case NFA_CONCAT: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3378 // Concatenation. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3379 // Pay attention: this operator does not exist in the r.e. itself |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3380 // (it is implicit, really). It is added when r.e. is translated |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3381 // to postfix form in re2post(). |
| 4444 | 3382 if (nfa_calc_size == TRUE) |
| 3383 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3384 // nstate += 0; |
| 4444 | 3385 break; |
| 3386 } | |
| 3387 e2 = POP(); | |
| 3388 e1 = POP(); | |
| 3389 patch(e1.out, e2.start); | |
| 3390 PUSH(frag(e1.start, e2.out)); | |
| 3391 break; | |
| 3392 | |
| 3393 case NFA_OR: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3394 // Alternation |
| 4444 | 3395 if (nfa_calc_size == TRUE) |
| 3396 { | |
| 4458 | 3397 nstate++; |
| 4444 | 3398 break; |
| 3399 } | |
| 3400 e2 = POP(); | |
| 3401 e1 = POP(); | |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3402 s = alloc_state(NFA_SPLIT, e1.start, e2.start); |
| 4444 | 3403 if (s == NULL) |
| 4484 | 3404 goto theend; |
| 4444 | 3405 PUSH(frag(s, append(e1.out, e2.out))); |
| 3406 break; | |
| 3407 | |
| 3408 case NFA_STAR: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3409 // Zero or more, prefer more |
| 4444 | 3410 if (nfa_calc_size == TRUE) |
| 3411 { | |
| 4458 | 3412 nstate++; |
| 4444 | 3413 break; |
| 3414 } | |
| 3415 e = POP(); | |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3416 s = alloc_state(NFA_SPLIT, e.start, NULL); |
| 4444 | 3417 if (s == NULL) |
| 4484 | 3418 goto theend; |
| 4444 | 3419 patch(e.out, s); |
| 3420 PUSH(frag(s, list1(&s->out1))); | |
| 3421 break; | |
| 3422 | |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3423 case NFA_STAR_NONGREEDY: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3424 // Zero or more, prefer zero |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3425 if (nfa_calc_size == TRUE) |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3426 { |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3427 nstate++; |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3428 break; |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3429 } |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3430 e = POP(); |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3431 s = alloc_state(NFA_SPLIT, NULL, e.start); |
|
4675
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3432 if (s == NULL) |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3433 goto theend; |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3434 patch(e.out, s); |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3435 PUSH(frag(s, list1(&s->out))); |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3436 break; |
|
811a4c9b51d8
updated for version 7.3.1085
Bram Moolenaar <bram@vim.org>
parents:
4673
diff
changeset
|
3437 |
| 4444 | 3438 case NFA_QUEST: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3439 // one or zero atoms=> greedy match |
| 4444 | 3440 if (nfa_calc_size == TRUE) |
| 3441 { | |
| 4458 | 3442 nstate++; |
| 4444 | 3443 break; |
| 3444 } | |
| 3445 e = POP(); | |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3446 s = alloc_state(NFA_SPLIT, e.start, NULL); |
| 4444 | 3447 if (s == NULL) |
| 4484 | 3448 goto theend; |
| 4444 | 3449 PUSH(frag(s, append(e.out, list1(&s->out1)))); |
| 3450 break; | |
| 3451 | |
| 3452 case NFA_QUEST_NONGREEDY: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3453 // zero or one atoms => non-greedy match |
| 4444 | 3454 if (nfa_calc_size == TRUE) |
| 3455 { | |
| 4458 | 3456 nstate++; |
| 4444 | 3457 break; |
| 3458 } | |
| 3459 e = POP(); | |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3460 s = alloc_state(NFA_SPLIT, NULL, e.start); |
| 4444 | 3461 if (s == NULL) |
| 4484 | 3462 goto theend; |
| 4444 | 3463 PUSH(frag(s, append(e.out, list1(&s->out)))); |
| 3464 break; | |
| 3465 | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3466 case NFA_END_COLL: |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3467 case NFA_END_NEG_COLL: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3468 // On the stack is the sequence starting with NFA_START_COLL or |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3469 // NFA_START_NEG_COLL and all possible characters. Patch it to |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3470 // add the output to the start. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3471 if (nfa_calc_size == TRUE) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3472 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3473 nstate++; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3474 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3475 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3476 e = POP(); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3477 s = alloc_state(NFA_END_COLL, NULL, NULL); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3478 if (s == NULL) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3479 goto theend; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3480 patch(e.out, s); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3481 e.start->out1 = s; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3482 PUSH(frag(e.start, list1(&s->out))); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3483 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3484 |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3485 case NFA_RANGE: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3486 // Before this are two characters, the low and high end of a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3487 // range. Turn them into two states with MIN and MAX. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3488 if (nfa_calc_size == TRUE) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3489 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3490 // nstate += 0; |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3491 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3492 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3493 e2 = POP(); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3494 e1 = POP(); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3495 e2.start->val = e2.start->c; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3496 e2.start->c = NFA_RANGE_MAX; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3497 e1.start->val = e1.start->c; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3498 e1.start->c = NFA_RANGE_MIN; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3499 patch(e1.out, e2.start); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3500 PUSH(frag(e1.start, e2.out)); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3501 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3502 |
| 5370 | 3503 case NFA_EMPTY: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3504 // 0-length, used in a repetition with max/min count of 0 |
| 4444 | 3505 if (nfa_calc_size == TRUE) |
| 3506 { | |
| 4458 | 3507 nstate++; |
| 4444 | 3508 break; |
| 3509 } | |
| 5370 | 3510 s = alloc_state(NFA_EMPTY, NULL, NULL); |
| 4444 | 3511 if (s == NULL) |
| 4484 | 3512 goto theend; |
| 4444 | 3513 PUSH(frag(s, list1(&s->out))); |
| 3514 break; | |
| 3515 | |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3516 case NFA_OPT_CHARS: |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3517 { |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3518 int n; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3519 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3520 // \%[abc] implemented as: |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3521 // NFA_SPLIT |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3522 // +-CHAR(a) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3523 // | +-NFA_SPLIT |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3524 // | +-CHAR(b) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3525 // | | +-NFA_SPLIT |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3526 // | | +-CHAR(c) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3527 // | | | +-next |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3528 // | | +- next |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3529 // | +- next |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3530 // +- next |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3531 n = *++p; // get number of characters |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3532 if (nfa_calc_size == TRUE) |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3533 { |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3534 nstate += n; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3535 break; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3536 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3537 s = NULL; // avoid compiler warning |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3538 e1.out = NULL; // stores list with out1's |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3539 s1 = NULL; // previous NFA_SPLIT to connect to |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3540 while (n-- > 0) |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3541 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3542 e = POP(); // get character |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3543 s = alloc_state(NFA_SPLIT, e.start, NULL); |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3544 if (s == NULL) |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3545 goto theend; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3546 if (e1.out == NULL) |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3547 e1 = e; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3548 patch(e.out, s1); |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3549 append(e1.out, list1(&s->out1)); |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3550 s1 = s; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3551 } |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3552 PUSH(frag(s, e1.out)); |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3553 break; |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3554 } |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3555 |
| 4444 | 3556 case NFA_PREV_ATOM_NO_WIDTH: |
|
4661
0dce3d812e7a
updated for version 7.3.1078
Bram Moolenaar <bram@vim.org>
parents:
4657
diff
changeset
|
3557 case NFA_PREV_ATOM_NO_WIDTH_NEG: |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
3558 case NFA_PREV_ATOM_JUST_BEFORE: |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
3559 case NFA_PREV_ATOM_JUST_BEFORE_NEG: |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3560 case NFA_PREV_ATOM_LIKE_PATTERN: |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3561 { |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3562 int before = (*p == NFA_PREV_ATOM_JUST_BEFORE |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3563 || *p == NFA_PREV_ATOM_JUST_BEFORE_NEG); |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3564 int pattern = (*p == NFA_PREV_ATOM_LIKE_PATTERN); |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3565 int start_state; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3566 int end_state; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3567 int n = 0; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3568 nfa_state_T *zend; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3569 nfa_state_T *skip; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3570 |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3571 switch (*p) |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3572 { |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3573 case NFA_PREV_ATOM_NO_WIDTH: |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3574 start_state = NFA_START_INVISIBLE; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3575 end_state = NFA_END_INVISIBLE; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3576 break; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3577 case NFA_PREV_ATOM_NO_WIDTH_NEG: |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3578 start_state = NFA_START_INVISIBLE_NEG; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3579 end_state = NFA_END_INVISIBLE_NEG; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3580 break; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3581 case NFA_PREV_ATOM_JUST_BEFORE: |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3582 start_state = NFA_START_INVISIBLE_BEFORE; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3583 end_state = NFA_END_INVISIBLE; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3584 break; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3585 case NFA_PREV_ATOM_JUST_BEFORE_NEG: |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3586 start_state = NFA_START_INVISIBLE_BEFORE_NEG; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3587 end_state = NFA_END_INVISIBLE_NEG; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3588 break; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3589 default: // NFA_PREV_ATOM_LIKE_PATTERN: |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3590 start_state = NFA_START_PATTERN; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3591 end_state = NFA_END_PATTERN; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
3592 break; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3593 } |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3594 |
|
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3595 if (before) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3596 n = *++p; // get the count |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3597 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3598 // The \@= operator: match the preceding atom with zero width. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3599 // The \@! operator: no match for the preceding atom. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3600 // The \@<= operator: match for the preceding atom. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3601 // The \@<! operator: no match for the preceding atom. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3602 // Surrounds the preceding atom with START_INVISIBLE and |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3603 // END_INVISIBLE, similarly to MOPEN. |
| 4444 | 3604 |
| 3605 if (nfa_calc_size == TRUE) | |
| 3606 { | |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3607 nstate += pattern ? 4 : 2; |
| 4444 | 3608 break; |
| 3609 } | |
| 3610 e = POP(); | |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3611 s1 = alloc_state(end_state, NULL, NULL); |
| 4444 | 3612 if (s1 == NULL) |
| 4484 | 3613 goto theend; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3614 |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3615 s = alloc_state(start_state, e.start, s1); |
| 4444 | 3616 if (s == NULL) |
| 4484 | 3617 goto theend; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3618 if (pattern) |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
3619 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3620 // NFA_ZEND -> NFA_END_PATTERN -> NFA_SKIP -> what follows. |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3621 skip = alloc_state(NFA_SKIP, NULL, NULL); |
|
11896
a941848d8c44
patch 8.0.0828: Coverity: may dereference NULL pointer
Christian Brabandt <cb@256bit.org>
parents:
11525
diff
changeset
|
3622 if (skip == NULL) |
|
a941848d8c44
patch 8.0.0828: Coverity: may dereference NULL pointer
Christian Brabandt <cb@256bit.org>
parents:
11525
diff
changeset
|
3623 goto theend; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3624 zend = alloc_state(NFA_ZEND, s1, NULL); |
|
11896
a941848d8c44
patch 8.0.0828: Coverity: may dereference NULL pointer
Christian Brabandt <cb@256bit.org>
parents:
11525
diff
changeset
|
3625 if (zend == NULL) |
|
a941848d8c44
patch 8.0.0828: Coverity: may dereference NULL pointer
Christian Brabandt <cb@256bit.org>
parents:
11525
diff
changeset
|
3626 goto theend; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3627 s1->out= skip; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3628 patch(e.out, zend); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3629 PUSH(frag(s, list1(&skip->out))); |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
3630 } |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3631 else |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3632 { |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3633 patch(e.out, s1); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3634 PUSH(frag(s, list1(&s1->out))); |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3635 if (before) |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3636 { |
|
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3637 if (n <= 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3638 // See if we can guess the maximum width, it avoids a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3639 // lot of pointless tries. |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3640 n = nfa_max_width(e.start, 0); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3641 s->val = n; // store the count |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
3642 } |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
3643 } |
| 4444 | 3644 break; |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3645 } |
| 4444 | 3646 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3647 case NFA_COMPOSING: // char with composing char |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
3648 #if 0 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3649 // TODO |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
3650 if (regflags & RF_ICOMBINE) |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
3651 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3652 // use the base character only |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
3653 } |
|
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
3654 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3655 // FALLTHROUGH |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3656 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3657 case NFA_MOPEN: // \( \) Submatch |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3658 case NFA_MOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3659 case NFA_MOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3660 case NFA_MOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3661 case NFA_MOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3662 case NFA_MOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3663 case NFA_MOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3664 case NFA_MOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3665 case NFA_MOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3666 case NFA_MOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3667 #ifdef FEAT_SYN_HL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3668 case NFA_ZOPEN: // \z( \) Submatch |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3669 case NFA_ZOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3670 case NFA_ZOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3671 case NFA_ZOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3672 case NFA_ZOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3673 case NFA_ZOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3674 case NFA_ZOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3675 case NFA_ZOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3676 case NFA_ZOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3677 case NFA_ZOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3678 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3679 case NFA_NOPEN: // \%( \) "Invisible Submatch" |
| 4444 | 3680 if (nfa_calc_size == TRUE) |
| 3681 { | |
| 3682 nstate += 2; | |
| 3683 break; | |
| 3684 } | |
| 3685 | |
| 3686 mopen = *p; | |
| 3687 switch (*p) | |
| 3688 { | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3689 case NFA_NOPEN: mclose = NFA_NCLOSE; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3690 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3691 case NFA_ZOPEN: mclose = NFA_ZCLOSE; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3692 case NFA_ZOPEN1: mclose = NFA_ZCLOSE1; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3693 case NFA_ZOPEN2: mclose = NFA_ZCLOSE2; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3694 case NFA_ZOPEN3: mclose = NFA_ZCLOSE3; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3695 case NFA_ZOPEN4: mclose = NFA_ZCLOSE4; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3696 case NFA_ZOPEN5: mclose = NFA_ZCLOSE5; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3697 case NFA_ZOPEN6: mclose = NFA_ZCLOSE6; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3698 case NFA_ZOPEN7: mclose = NFA_ZCLOSE7; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3699 case NFA_ZOPEN8: mclose = NFA_ZCLOSE8; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3700 case NFA_ZOPEN9: mclose = NFA_ZCLOSE9; break; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3701 #endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3702 case NFA_COMPOSING: mclose = NFA_END_COMPOSING; break; |
| 4444 | 3703 default: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3704 // NFA_MOPEN, NFA_MOPEN1 .. NFA_MOPEN9 |
| 4444 | 3705 mclose = *p + NSUBEXP; |
| 3706 break; | |
| 3707 } | |
| 3708 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3709 // Allow "NFA_MOPEN" as a valid postfix representation for |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3710 // the empty regexp "". In this case, the NFA will be |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3711 // NFA_MOPEN -> NFA_MCLOSE. Note that this also allows |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3712 // empty groups of parenthesis, and empty mbyte chars |
| 4444 | 3713 if (stackp == stack) |
| 3714 { | |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3715 s = alloc_state(mopen, NULL, NULL); |
| 4444 | 3716 if (s == NULL) |
| 4484 | 3717 goto theend; |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3718 s1 = alloc_state(mclose, NULL, NULL); |
| 4444 | 3719 if (s1 == NULL) |
| 4484 | 3720 goto theend; |
| 4444 | 3721 patch(list1(&s->out), s1); |
| 3722 PUSH(frag(s, list1(&s1->out))); | |
| 3723 break; | |
| 3724 } | |
| 3725 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3726 // At least one node was emitted before NFA_MOPEN, so |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3727 // at least one node will be between NFA_MOPEN and NFA_MCLOSE |
| 4444 | 3728 e = POP(); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3729 s = alloc_state(mopen, e.start, NULL); // `(' |
| 4444 | 3730 if (s == NULL) |
| 4484 | 3731 goto theend; |
| 4444 | 3732 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3733 s1 = alloc_state(mclose, NULL, NULL); // `)' |
| 4444 | 3734 if (s1 == NULL) |
| 4484 | 3735 goto theend; |
| 4444 | 3736 patch(e.out, s1); |
| 3737 | |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
3738 if (mopen == NFA_COMPOSING) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3739 // COMPOSING->out1 = END_COMPOSING |
| 4444 | 3740 patch(list1(&s->out1), s1); |
| 3741 | |
| 3742 PUSH(frag(s, list1(&s1->out))); | |
| 3743 break; | |
| 3744 | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3745 case NFA_BACKREF1: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3746 case NFA_BACKREF2: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3747 case NFA_BACKREF3: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3748 case NFA_BACKREF4: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3749 case NFA_BACKREF5: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3750 case NFA_BACKREF6: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3751 case NFA_BACKREF7: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3752 case NFA_BACKREF8: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3753 case NFA_BACKREF9: |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3754 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3755 case NFA_ZREF1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3756 case NFA_ZREF2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3757 case NFA_ZREF3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3758 case NFA_ZREF4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3759 case NFA_ZREF5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3760 case NFA_ZREF6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3761 case NFA_ZREF7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3762 case NFA_ZREF8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3763 case NFA_ZREF9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3764 #endif |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3765 if (nfa_calc_size == TRUE) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3766 { |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3767 nstate += 2; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3768 break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3769 } |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3770 s = alloc_state(*p, NULL, NULL); |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3771 if (s == NULL) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3772 goto theend; |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3773 s1 = alloc_state(NFA_SKIP, NULL, NULL); |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3774 if (s1 == NULL) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3775 goto theend; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3776 patch(list1(&s->out), s1); |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3777 PUSH(frag(s, list1(&s1->out))); |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3778 break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3779 |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3780 case NFA_LNUM: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3781 case NFA_LNUM_GT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3782 case NFA_LNUM_LT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3783 case NFA_VCOL: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3784 case NFA_VCOL_GT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3785 case NFA_VCOL_LT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3786 case NFA_COL: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3787 case NFA_COL_GT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3788 case NFA_COL_LT: |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
3789 case NFA_MARK: |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
3790 case NFA_MARK_GT: |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
3791 case NFA_MARK_LT: |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3792 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3793 int n = *++p; // lnum, col or mark name |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3794 |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3795 if (nfa_calc_size == TRUE) |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3796 { |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3797 nstate += 1; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3798 break; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3799 } |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3800 s = alloc_state(p[-1], NULL, NULL); |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3801 if (s == NULL) |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3802 goto theend; |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3803 s->val = n; |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3804 PUSH(frag(s, list1(&s->out))); |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3805 break; |
|
4740
97560c16ca99
updated for version 7.3.1117
Bram Moolenaar <bram@vim.org>
parents:
4738
diff
changeset
|
3806 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
3807 |
| 4444 | 3808 case NFA_ZSTART: |
| 3809 case NFA_ZEND: | |
| 3810 default: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3811 // Operands |
| 4444 | 3812 if (nfa_calc_size == TRUE) |
| 3813 { | |
| 4458 | 3814 nstate++; |
| 4444 | 3815 break; |
| 3816 } | |
|
4696
ed4e689bbea1
updated for version 7.3.1095
Bram Moolenaar <bram@vim.org>
parents:
4694
diff
changeset
|
3817 s = alloc_state(*p, NULL, NULL); |
| 4444 | 3818 if (s == NULL) |
| 4484 | 3819 goto theend; |
| 4444 | 3820 PUSH(frag(s, list1(&s->out))); |
| 3821 break; | |
| 3822 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3823 } // switch(*p) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3824 |
|
32395
2ed95122d59c
patch 9.0.1529: code style test doesn't check for space after "if"
Bram Moolenaar <Bram@vim.org>
parents:
32192
diff
changeset
|
3825 } // for (p = postfix; *p; ++p) |
| 4444 | 3826 |
| 3827 if (nfa_calc_size == TRUE) | |
| 3828 { | |
| 4458 | 3829 nstate++; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3830 goto theend; // Return value when counting size is ignored anyway |
| 4444 | 3831 } |
| 3832 | |
| 3833 e = POP(); | |
| 3834 if (stackp != stack) | |
| 6747 | 3835 { |
| 3836 vim_free(stack); | |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
3837 EMSG_RET_NULL(_(e_nfa_regexp_while_converting_from_postfix_to_nfa_too_many_stats_left_on_stack)); |
| 6747 | 3838 } |
| 4444 | 3839 |
| 3840 if (istate >= nstate) | |
| 6747 | 3841 { |
| 3842 vim_free(stack); | |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
3843 EMSG_RET_NULL(_(e_nfa_regexp_not_enough_space_to_store_whole_nfa)); |
| 6747 | 3844 } |
| 4444 | 3845 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3846 matchstate = &state_ptr[istate++]; // the match state |
| 4444 | 3847 matchstate->c = NFA_MATCH; |
| 3848 matchstate->out = matchstate->out1 = NULL; | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
3849 matchstate->id = 0; |
| 4444 | 3850 |
| 3851 patch(e.out, matchstate); | |
| 4484 | 3852 ret = e.start; |
| 3853 | |
| 3854 theend: | |
| 3855 vim_free(stack); | |
| 3856 return ret; | |
| 4444 | 3857 |
| 3858 #undef POP1 | |
| 3859 #undef PUSH1 | |
| 3860 #undef POP2 | |
| 3861 #undef PUSH2 | |
| 3862 #undef POP | |
| 3863 #undef PUSH | |
| 3864 } | |
| 3865 | |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3866 /* |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3867 * After building the NFA program, inspect it to add optimization hints. |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3868 */ |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3869 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3870 nfa_postprocess(nfa_regprog_T *prog) |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3871 { |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3872 int i; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3873 int c; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3874 |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3875 for (i = 0; i < prog->nstate; ++i) |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3876 { |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3877 c = prog->state[i].c; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3878 if (c == NFA_START_INVISIBLE |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3879 || c == NFA_START_INVISIBLE_NEG |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3880 || c == NFA_START_INVISIBLE_BEFORE |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3881 || c == NFA_START_INVISIBLE_BEFORE_NEG) |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3882 { |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3883 int directly; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3884 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3885 // Do it directly when what follows is possibly the end of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3886 // match. |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3887 if (match_follows(prog->state[i].out1->out, 0)) |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3888 directly = TRUE; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3889 else |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3890 { |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3891 int ch_invisible = failure_chance(prog->state[i].out, 0); |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3892 int ch_follows = failure_chance(prog->state[i].out1->out, 0); |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3893 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3894 // Postpone when the invisible match is expensive or has a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3895 // lower chance of failing. |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3896 if (c == NFA_START_INVISIBLE_BEFORE |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3897 || c == NFA_START_INVISIBLE_BEFORE_NEG) |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3898 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3899 // "before" matches are very expensive when |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3900 // unbounded, always prefer what follows then, |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3901 // unless what follows will always match. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3902 // Otherwise strongly prefer what follows. |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3903 if (prog->state[i].val <= 0 && ch_follows > 0) |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3904 directly = FALSE; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3905 else |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3906 directly = ch_follows * 10 < ch_invisible; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3907 } |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3908 else |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3909 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3910 // normal invisible, first do the one with the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3911 // highest failure chance |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3912 directly = ch_follows < ch_invisible; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3913 } |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3914 } |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3915 if (directly) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3916 // switch to the _FIRST state |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3917 ++prog->state[i].c; |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3918 } |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3919 } |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3920 } |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
3921 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3922 ///////////////////////////////////////////////////////////////// |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3923 // NFA execution code. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3924 ///////////////////////////////////////////////////////////////// |
| 4444 | 3925 |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3926 typedef struct |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3927 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3928 int in_use; // number of subexpr with useful info |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3929 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3930 // When REG_MULTI is TRUE list.multi is used, otherwise list.line. |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3931 union |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3932 { |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3933 struct multipos |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3934 { |
| 6547 | 3935 linenr_T start_lnum; |
| 3936 linenr_T end_lnum; | |
| 3937 colnr_T start_col; | |
| 3938 colnr_T end_col; | |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
3939 } multi[NSUBEXP]; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3940 struct linepos |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3941 { |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3942 char_u *start; |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3943 char_u *end; |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
3944 } line[NSUBEXP]; |
|
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
3945 } list; |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
3946 colnr_T orig_start_col; // list.multi[0].start_col without \zs |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3947 } regsub_T; |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
3948 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3949 typedef struct |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3950 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3951 regsub_T norm; // \( .. \) matches |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3952 #ifdef FEAT_SYN_HL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3953 regsub_T synt; // \z( .. \) matches |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3954 #endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3955 } regsubs_T; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
3956 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3957 // nfa_pim_T stores a Postponed Invisible Match. |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
3958 typedef struct nfa_pim_S nfa_pim_T; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
3959 struct nfa_pim_S |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
3960 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3961 int result; // NFA_PIM_*, see below |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3962 nfa_state_T *state; // the invisible match start state |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3963 regsubs_T subs; // submatch info, only party used |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
3964 union |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
3965 { |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
3966 lpos_T pos; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
3967 char_u *ptr; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3968 } end; // where the match must end |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
3969 }; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
3970 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3971 // Values for done in nfa_pim_T. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3972 #define NFA_PIM_UNUSED 0 // pim not used |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3973 #define NFA_PIM_TODO 1 // pim not done yet |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3974 #define NFA_PIM_MATCH 2 // pim executed, matches |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3975 #define NFA_PIM_NOMATCH 3 // pim executed, no match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3976 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3977 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3978 // nfa_thread_T contains execution information of a NFA state |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
3979 typedef struct |
| 4444 | 3980 { |
| 3981 nfa_state_T *state; | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3982 int count; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3983 nfa_pim_T pim; // if pim.result != NFA_PIM_UNUSED: postponed |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3984 // invisible match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3985 regsubs_T subs; // submatch info, only party used |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
3986 } nfa_thread_T; |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
3987 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3988 // nfa_list_T contains the alternative NFA execution states. |
| 4444 | 3989 typedef struct |
| 3990 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3991 nfa_thread_T *t; // allocated array of states |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3992 int n; // nr of states currently in "t" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3993 int len; // max nr of states in "t" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3994 int id; // ID of the list |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
3995 int has_pim; // TRUE when any state has a PIM |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
3996 } nfa_list_T; |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
3997 |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
3998 #ifdef ENABLE_LOG |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
3999 static void log_subexpr(regsub_T *sub); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4000 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4001 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4002 log_subsexpr(regsubs_T *subs) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4003 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4004 log_subexpr(&subs->norm); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4005 # ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4006 if (rex.nfa_has_zsubexpr) |
|
4770
b20dbf3a5370
updated for version 7.3.1132
Bram Moolenaar <bram@vim.org>
parents:
4768
diff
changeset
|
4007 log_subexpr(&subs->synt); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4008 # endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4009 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4010 |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4011 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4012 log_subexpr(regsub_T *sub) |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4013 { |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4014 int j; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4015 |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4016 for (j = 0; j < sub->in_use; j++) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4017 if (REG_MULTI) |
|
31233
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
4018 fprintf(log_fd, |
|
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
4019 "*** group %d, start: c=%d, l=%d, end: c=%d, l=%d\n", |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4020 j, |
| 6547 | 4021 sub->list.multi[j].start_col, |
| 4022 (int)sub->list.multi[j].start_lnum, | |
| 4023 sub->list.multi[j].end_col, | |
| 4024 (int)sub->list.multi[j].end_lnum); | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4025 else |
|
4746
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4026 { |
|
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4027 char *s = (char *)sub->list.line[j].start; |
|
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4028 char *e = (char *)sub->list.line[j].end; |
|
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4029 |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
4030 fprintf(log_fd, "*** group %d, start: \"%s\", end: \"%s\"\n", |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4031 j, |
|
4746
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4032 s == NULL ? "NULL" : s, |
|
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4033 e == NULL ? "NULL" : e); |
|
d1376091d18b
updated for version 7.3.1120
Bram Moolenaar <bram@vim.org>
parents:
4744
diff
changeset
|
4034 } |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4035 } |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4036 |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4037 static char * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4038 pim_info(nfa_pim_T *pim) |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4039 { |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4040 static char buf[30]; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4041 |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4042 if (pim == NULL || pim->result == NFA_PIM_UNUSED) |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4043 buf[0] = NUL; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4044 else |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4045 { |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4046 sprintf(buf, " PIM col %d", REG_MULTI ? (int)pim->end.pos.col |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4047 : (int)(pim->end.ptr - rex.input)); |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4048 } |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4049 return buf; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4050 } |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4051 |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4052 #endif |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4053 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4054 // Used during execution: whether a match has been found. |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
4055 static int nfa_match; |
| 6573 | 4056 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
4057 static int *nfa_timed_out; |
| 6573 | 4058 #endif |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4059 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
4060 static void copy_sub(regsub_T *to, regsub_T *from); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
4061 static int pim_equal(nfa_pim_T *one, nfa_pim_T *two); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4062 |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4063 /* |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4064 * Copy postponed invisible match info from "from" to "to". |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4065 */ |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4066 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4067 copy_pim(nfa_pim_T *to, nfa_pim_T *from) |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4068 { |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4069 to->result = from->result; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4070 to->state = from->state; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4071 copy_sub(&to->subs.norm, &from->subs.norm); |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4072 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4073 if (rex.nfa_has_zsubexpr) |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4074 copy_sub(&to->subs.synt, &from->subs.synt); |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4075 #endif |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4076 to->end = from->end; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4077 } |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4078 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4079 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4080 clear_sub(regsub_T *sub) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4081 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4082 if (REG_MULTI) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4083 // Use 0xff to set lnum to -1 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4084 vim_memset(sub->list.multi, 0xff, |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4085 sizeof(struct multipos) * rex.nfa_nsubexpr); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4086 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4087 vim_memset(sub->list.line, 0, |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4088 sizeof(struct linepos) * rex.nfa_nsubexpr); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4089 sub->in_use = 0; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4090 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4091 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4092 /* |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4093 * Copy the submatches from "from" to "to". |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4094 */ |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4095 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4096 copy_sub(regsub_T *to, regsub_T *from) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4097 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4098 to->in_use = from->in_use; |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4099 if (from->in_use <= 0) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4100 return; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4101 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4102 // Copy the match start and end positions. |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4103 if (REG_MULTI) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4104 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4105 mch_memmove(&to->list.multi[0], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4106 &from->list.multi[0], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4107 sizeof(struct multipos) * from->in_use); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4108 to->orig_start_col = from->orig_start_col; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4109 } |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4110 else |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4111 mch_memmove(&to->list.line[0], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4112 &from->list.line[0], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4113 sizeof(struct linepos) * from->in_use); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4114 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4115 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4116 /* |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4117 * Like copy_sub() but exclude the main match. |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4118 */ |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4119 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4120 copy_sub_off(regsub_T *to, regsub_T *from) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4121 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4122 if (to->in_use < from->in_use) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4123 to->in_use = from->in_use; |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4124 if (from->in_use <= 1) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4125 return; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4126 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4127 // Copy the match start and end positions. |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4128 if (REG_MULTI) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4129 mch_memmove(&to->list.multi[1], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4130 &from->list.multi[1], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4131 sizeof(struct multipos) * (from->in_use - 1)); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4132 else |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4133 mch_memmove(&to->list.line[1], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4134 &from->list.line[1], |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4135 sizeof(struct linepos) * (from->in_use - 1)); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4136 } |
| 4444 | 4137 |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4138 /* |
| 5372 | 4139 * Like copy_sub() but only do the end of the main match if \ze is present. |
| 4140 */ | |
| 4141 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4142 copy_ze_off(regsub_T *to, regsub_T *from) |
| 5372 | 4143 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4144 if (!rex.nfa_has_zend) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4145 return; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4146 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4147 if (REG_MULTI) |
| 5372 | 4148 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4149 if (from->list.multi[0].end_lnum >= 0) |
| 5372 | 4150 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4151 to->list.multi[0].end_lnum = from->list.multi[0].end_lnum; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4152 to->list.multi[0].end_col = from->list.multi[0].end_col; |
| 5372 | 4153 } |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4154 } |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4155 else |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4156 { |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4157 if (from->list.line[0].end != NULL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
4158 to->list.line[0].end = from->list.line[0].end; |
| 5372 | 4159 } |
| 4160 } | |
| 4161 | |
| 4162 /* | |
|
4893
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4163 * Return TRUE if "sub1" and "sub2" have the same start positions. |
| 5893 | 4164 * When using back-references also check the end position. |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4165 */ |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4166 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4167 sub_equal(regsub_T *sub1, regsub_T *sub2) |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4168 { |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4169 int i; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4170 int todo; |
|
4893
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4171 linenr_T s1; |
|
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4172 linenr_T s2; |
|
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4173 char_u *sp1; |
|
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4174 char_u *sp2; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4175 |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4176 todo = sub1->in_use > sub2->in_use ? sub1->in_use : sub2->in_use; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4177 if (REG_MULTI) |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4178 { |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4179 for (i = 0; i < todo; ++i) |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4180 { |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4181 if (i < sub1->in_use) |
| 6547 | 4182 s1 = sub1->list.multi[i].start_lnum; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4183 else |
|
5006
f451d60ab8ec
updated for version 7.3.1247
Bram Moolenaar <bram@vim.org>
parents:
4997
diff
changeset
|
4184 s1 = -1; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4185 if (i < sub2->in_use) |
| 6547 | 4186 s2 = sub2->list.multi[i].start_lnum; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4187 else |
|
5006
f451d60ab8ec
updated for version 7.3.1247
Bram Moolenaar <bram@vim.org>
parents:
4997
diff
changeset
|
4188 s2 = -1; |
|
4893
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4189 if (s1 != s2) |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4190 return FALSE; |
| 6547 | 4191 if (s1 != -1 && sub1->list.multi[i].start_col |
| 4192 != sub2->list.multi[i].start_col) | |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4193 return FALSE; |
| 5893 | 4194 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4195 if (rex.nfa_has_backref) |
| 5893 | 4196 { |
| 4197 if (i < sub1->in_use) | |
| 6547 | 4198 s1 = sub1->list.multi[i].end_lnum; |
| 5893 | 4199 else |
| 4200 s1 = -1; | |
| 4201 if (i < sub2->in_use) | |
| 6547 | 4202 s2 = sub2->list.multi[i].end_lnum; |
| 5893 | 4203 else |
| 4204 s2 = -1; | |
| 4205 if (s1 != s2) | |
| 4206 return FALSE; | |
| 6547 | 4207 if (s1 != -1 && sub1->list.multi[i].end_col |
| 4208 != sub2->list.multi[i].end_col) | |
| 5893 | 4209 return FALSE; |
| 4210 } | |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4211 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4212 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4213 else |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4214 { |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4215 for (i = 0; i < todo; ++i) |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4216 { |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4217 if (i < sub1->in_use) |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4218 sp1 = sub1->list.line[i].start; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4219 else |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4220 sp1 = NULL; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4221 if (i < sub2->in_use) |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4222 sp2 = sub2->list.line[i].start; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4223 else |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4224 sp2 = NULL; |
|
4893
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4225 if (sp1 != sp2) |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4226 return FALSE; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4227 if (rex.nfa_has_backref) |
| 5893 | 4228 { |
| 4229 if (i < sub1->in_use) | |
| 4230 sp1 = sub1->list.line[i].end; | |
| 4231 else | |
| 4232 sp1 = NULL; | |
| 4233 if (i < sub2->in_use) | |
| 4234 sp2 = sub2->list.line[i].end; | |
| 4235 else | |
| 4236 sp2 = NULL; | |
| 4237 if (sp1 != sp2) | |
| 4238 return FALSE; | |
| 4239 } | |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4240 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4241 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4242 |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4243 return TRUE; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4244 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4245 |
|
29191
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4246 #ifdef FEAT_RELTIME |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4247 /* |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4248 * Check if we are past the time limit, if there is one. |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4249 */ |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4250 static int |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4251 nfa_did_time_out(void) |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4252 { |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4253 if (*timeout_flag) |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4254 { |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4255 if (nfa_timed_out != NULL) |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4256 { |
|
31287
fa309d9af73c
patch 9.0.0977: it is not easy to see what client-server commands are doing
Bram Moolenaar <Bram@vim.org>
parents:
31235
diff
changeset
|
4257 # ifdef FEAT_EVAL |
|
29191
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4258 if (!*nfa_timed_out) |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4259 ch_log(NULL, "NFA regexp timed out"); |
|
29237
c7aa0c46acd5
patch 8.2.5137: cannot build without the +channel feature
Bram Moolenaar <Bram@vim.org>
parents:
29191
diff
changeset
|
4260 # endif |
|
29191
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4261 *nfa_timed_out = TRUE; |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4262 } |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4263 return TRUE; |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4264 } |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4265 return FALSE; |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4266 } |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4267 #endif |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4268 |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4269 #ifdef ENABLE_LOG |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4270 static void |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4271 open_debug_log(int result) |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4272 { |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4273 log_fd = fopen(NFA_REGEXP_RUN_LOG, "a"); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4274 if (log_fd == NULL) |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4275 { |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4276 emsg(_(e_log_open_failed)); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4277 log_fd = stderr; |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4278 } |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4279 |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4280 fprintf(log_fd, "****************************\n"); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4281 fprintf(log_fd, "FINISHED RUNNING nfa_regmatch() recursively\n"); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4282 fprintf(log_fd, "MATCH = %s\n", result == TRUE ? "OK" : result == MAYBE |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4283 ? "MAYBE" : "FALSE"); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4284 fprintf(log_fd, "****************************\n"); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4285 } |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4286 |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4287 static void |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4288 report_state(char *action, |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4289 regsub_T *sub, |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4290 nfa_state_T *state, |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4291 int lid, |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4292 nfa_pim_T *pim) |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4293 { |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4294 int col; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4295 |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4296 if (sub->in_use <= 0) |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4297 col = -1; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4298 else if (REG_MULTI) |
| 6547 | 4299 col = sub->list.multi[0].start_col; |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4300 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4301 col = (int)(sub->list.line[0].start - rex.line); |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4302 nfa_set_code(state->c); |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4303 if (log_fd == NULL) |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4304 open_debug_log(MAYBE); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
4305 |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4306 fprintf(log_fd, "> %s state %d to list %d. char %d: %s (start col %d)%s\n", |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4307 action, abs(state->id), lid, state->c, code, col, |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4308 pim_info(pim)); |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4309 } |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4310 #endif |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4311 |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4312 /* |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4313 * Return TRUE if the same state is already in list "l" with the same |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4314 * positions as "subs". |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4315 */ |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4316 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4317 has_state_with_pos( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4318 nfa_list_T *l, // runtime state list |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4319 nfa_state_T *state, // state to update |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4320 regsubs_T *subs, // pointers to subexpressions |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4321 nfa_pim_T *pim) // postponed match or NULL |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4322 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4323 nfa_thread_T *thread; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4324 int i; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4325 |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4326 for (i = 0; i < l->n; ++i) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4327 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4328 thread = &l->t[i]; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4329 if (thread->state->id == state->id |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4330 && sub_equal(&thread->subs.norm, &subs->norm) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4331 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4332 && (!rex.nfa_has_zsubexpr |
|
4893
07b9c48a30e9
updated for version 7.3.1192
Bram Moolenaar <bram@vim.org>
parents:
4891
diff
changeset
|
4333 || sub_equal(&thread->subs.synt, &subs->synt)) |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4334 #endif |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4335 && pim_equal(&thread->pim, pim)) |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4336 return TRUE; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4337 } |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4338 return FALSE; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4339 } |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4340 |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4341 /* |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4342 * Return TRUE if "one" and "two" are equal. That includes when both are not |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4343 * set. |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4344 */ |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4345 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4346 pim_equal(nfa_pim_T *one, nfa_pim_T *two) |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4347 { |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4348 int one_unused = (one == NULL || one->result == NFA_PIM_UNUSED); |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4349 int two_unused = (two == NULL || two->result == NFA_PIM_UNUSED); |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4350 |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4351 if (one_unused) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4352 // one is unused: equal when two is also unused |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4353 return two_unused; |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4354 if (two_unused) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4355 // one is used and two is not: not equal |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4356 return FALSE; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4357 // compare the state id |
| 5298 | 4358 if (one->state->id != two->state->id) |
| 4359 return FALSE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4360 // compare the position |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4361 if (REG_MULTI) |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4362 return one->end.pos.lnum == two->end.pos.lnum |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4363 && one->end.pos.col == two->end.pos.col; |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4364 return one->end.ptr == two->end.ptr; |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4365 } |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4366 |
|
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4367 /* |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4368 * Return TRUE if "state" leads to a NFA_MATCH without advancing the input. |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4369 */ |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4370 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4371 match_follows(nfa_state_T *startstate, int depth) |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4372 { |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4373 nfa_state_T *state = startstate; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4374 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4375 // avoid too much recursion |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4376 if (depth > 10) |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4377 return FALSE; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4378 |
|
5184
c6dd0c545e5c
updated for version 7.4a.018
Bram Moolenaar <bram@vim.org>
parents:
5074
diff
changeset
|
4379 while (state != NULL) |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4380 { |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4381 switch (state->c) |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4382 { |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4383 case NFA_MATCH: |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4384 case NFA_MCLOSE: |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4385 case NFA_END_INVISIBLE: |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4386 case NFA_END_INVISIBLE_NEG: |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4387 case NFA_END_PATTERN: |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4388 return TRUE; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4389 |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4390 case NFA_SPLIT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4391 return match_follows(state->out, depth + 1) |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4392 || match_follows(state->out1, depth + 1); |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4393 |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4394 case NFA_START_INVISIBLE: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
4395 case NFA_START_INVISIBLE_FIRST: |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4396 case NFA_START_INVISIBLE_BEFORE: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
4397 case NFA_START_INVISIBLE_BEFORE_FIRST: |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4398 case NFA_START_INVISIBLE_NEG: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
4399 case NFA_START_INVISIBLE_NEG_FIRST: |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4400 case NFA_START_INVISIBLE_BEFORE_NEG: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
4401 case NFA_START_INVISIBLE_BEFORE_NEG_FIRST: |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4402 case NFA_COMPOSING: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4403 // skip ahead to next state |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4404 state = state->out1->out; |
|
5184
c6dd0c545e5c
updated for version 7.4a.018
Bram Moolenaar <bram@vim.org>
parents:
5074
diff
changeset
|
4405 continue; |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4406 |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4407 case NFA_ANY: |
| 5901 | 4408 case NFA_ANY_COMPOSING: |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4409 case NFA_IDENT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4410 case NFA_SIDENT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4411 case NFA_KWORD: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4412 case NFA_SKWORD: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4413 case NFA_FNAME: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4414 case NFA_SFNAME: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4415 case NFA_PRINT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4416 case NFA_SPRINT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4417 case NFA_WHITE: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4418 case NFA_NWHITE: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4419 case NFA_DIGIT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4420 case NFA_NDIGIT: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4421 case NFA_HEX: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4422 case NFA_NHEX: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4423 case NFA_OCTAL: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4424 case NFA_NOCTAL: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4425 case NFA_WORD: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4426 case NFA_NWORD: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4427 case NFA_HEAD: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4428 case NFA_NHEAD: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4429 case NFA_ALPHA: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4430 case NFA_NALPHA: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4431 case NFA_LOWER: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4432 case NFA_NLOWER: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4433 case NFA_UPPER: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4434 case NFA_NUPPER: |
| 5296 | 4435 case NFA_LOWER_IC: |
| 4436 case NFA_NLOWER_IC: | |
| 4437 case NFA_UPPER_IC: | |
| 4438 case NFA_NUPPER_IC: | |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4439 case NFA_START_COLL: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4440 case NFA_START_NEG_COLL: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4441 case NFA_NEWL: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4442 // state will advance input |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4443 return FALSE; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4444 |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4445 default: |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4446 if (state->c > 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4447 // state will advance input |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4448 return FALSE; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4449 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4450 // Others: zero-width or possibly zero-width, might still find |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4451 // a match at the same position, keep looking. |
|
4809
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4452 break; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4453 } |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4454 state = state->out; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4455 } |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4456 return FALSE; |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4457 } |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4458 |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4459 |
|
4d7e3df04256
updated for version 7.3.1151
Bram Moolenaar <bram@vim.org>
parents:
4807
diff
changeset
|
4460 /* |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4461 * Return TRUE if "state" is already in list "l". |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4462 */ |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4463 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4464 state_in_list( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4465 nfa_list_T *l, // runtime state list |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4466 nfa_state_T *state, // state to update |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4467 regsubs_T *subs) // pointers to subexpressions |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4468 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4469 if (state->lastlist[nfa_ll_index] == l->id) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4470 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4471 if (!rex.nfa_has_backref || has_state_with_pos(l, state, subs, NULL)) |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4472 return TRUE; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4473 } |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4474 return FALSE; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4475 } |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4476 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4477 // Offset used for "off" by addstate_here(). |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4478 #define ADDSTATE_HERE_OFFSET 10 |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4479 |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4480 /* |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4481 * Add "state" and possibly what follows to state list ".". |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4482 * Returns "subs_arg", possibly copied into temp_subs. |
|
29191
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4483 * Returns NULL when recursiveness is too deep or timed out. |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4484 */ |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4485 static regsubs_T * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4486 addstate( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4487 nfa_list_T *l, // runtime state list |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4488 nfa_state_T *state, // state to update |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4489 regsubs_T *subs_arg, // pointers to subexpressions |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4490 nfa_pim_T *pim, // postponed look-behind match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4491 int off_arg) // byte offset, when -1 go to next line |
| 4444 | 4492 { |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4493 int subidx; |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4494 int off = off_arg; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4495 int add_here = FALSE; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4496 int listindex = 0; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4497 int k; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4498 int found = FALSE; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4499 nfa_thread_T *thread; |
|
10168
3c37899baa8d
commit https://github.com/vim/vim/commit/d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4500 struct multipos save_multipos; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4501 int save_in_use; |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4502 char_u *save_ptr; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4503 int i; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4504 regsub_T *sub; |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4505 regsubs_T *subs = subs_arg; |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4506 static regsubs_T temp_subs; |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4507 #ifdef ENABLE_LOG |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4508 int did_print = FALSE; |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4509 #endif |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4510 static int depth = 0; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4511 |
|
29191
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4512 #ifdef FEAT_RELTIME |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4513 if (nfa_did_time_out()) |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4514 return NULL; |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4515 #endif |
|
0af5fe160e4e
patch 8.2.5115: search timeout is overrun with some patterns
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
4516 |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4517 // This function is called recursively. When the depth is too much we run |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4518 // out of stack and crash, limit recursiveness here. |
|
15800
483fda269100
patch 8.1.0907: CI tests on AppVeyor are failing
Bram Moolenaar <Bram@vim.org>
parents:
15796
diff
changeset
|
4519 if (++depth >= 5000 || subs == NULL) |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4520 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4521 --depth; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4522 return NULL; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4523 } |
| 4444 | 4524 |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4525 if (off_arg <= -ADDSTATE_HERE_OFFSET) |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4526 { |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4527 add_here = TRUE; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4528 off = 0; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4529 listindex = -(off_arg + ADDSTATE_HERE_OFFSET); |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4530 } |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4531 |
| 4444 | 4532 switch (state->c) |
| 4533 { | |
| 4534 case NFA_NCLOSE: | |
| 4535 case NFA_MCLOSE: | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4536 case NFA_MCLOSE1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4537 case NFA_MCLOSE2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4538 case NFA_MCLOSE3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4539 case NFA_MCLOSE4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4540 case NFA_MCLOSE5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4541 case NFA_MCLOSE6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4542 case NFA_MCLOSE7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4543 case NFA_MCLOSE8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4544 case NFA_MCLOSE9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4545 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4546 case NFA_ZCLOSE: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4547 case NFA_ZCLOSE1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4548 case NFA_ZCLOSE2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4549 case NFA_ZCLOSE3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4550 case NFA_ZCLOSE4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4551 case NFA_ZCLOSE5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4552 case NFA_ZCLOSE6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4553 case NFA_ZCLOSE7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4554 case NFA_ZCLOSE8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4555 case NFA_ZCLOSE9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4556 #endif |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4557 case NFA_MOPEN: |
|
4748
4b9503f0c7d3
updated for version 7.3.1121
Bram Moolenaar <bram@vim.org>
parents:
4746
diff
changeset
|
4558 case NFA_ZEND: |
|
4815
6419ee8098c8
updated for version 7.3.1154
Bram Moolenaar <bram@vim.org>
parents:
4813
diff
changeset
|
4559 case NFA_SPLIT: |
| 5370 | 4560 case NFA_EMPTY: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4561 // These nodes are not added themselves but their "out" and/or |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4562 // "out1" may be added below. |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4563 break; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4564 |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4565 case NFA_BOL: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4566 case NFA_BOF: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4567 // "^" won't match past end-of-line, don't bother trying. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4568 // Except when at the end of the line, or when we are going to the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4569 // next line for a look-behind match. |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4570 if (rex.input > rex.line |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4571 && *rex.input != NUL |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4572 && (nfa_endp == NULL |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4573 || !REG_MULTI |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4574 || rex.lnum == nfa_endp->se_u.pos.lnum)) |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4575 goto skip_add; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4576 // FALLTHROUGH |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4577 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4578 case NFA_MOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4579 case NFA_MOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4580 case NFA_MOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4581 case NFA_MOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4582 case NFA_MOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4583 case NFA_MOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4584 case NFA_MOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4585 case NFA_MOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4586 case NFA_MOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4587 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4588 case NFA_ZOPEN: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4589 case NFA_ZOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4590 case NFA_ZOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4591 case NFA_ZOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4592 case NFA_ZOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4593 case NFA_ZOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4594 case NFA_ZOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4595 case NFA_ZOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4596 case NFA_ZOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4597 case NFA_ZOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4598 #endif |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
4599 case NFA_NOPEN: |
|
4748
4b9503f0c7d3
updated for version 7.3.1121
Bram Moolenaar <bram@vim.org>
parents:
4746
diff
changeset
|
4600 case NFA_ZSTART: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4601 // These nodes need to be added so that we can bail out when it |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4602 // was added to this list before at the same position to avoid an |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4603 // endless loop for "\(\)*" |
|
4694
efc4fb311d5d
updated for version 7.3.1094
Bram Moolenaar <bram@vim.org>
parents:
4692
diff
changeset
|
4604 |
| 4444 | 4605 default: |
| 5502 | 4606 if (state->lastlist[nfa_ll_index] == l->id && state->c != NFA_SKIP) |
| 4444 | 4607 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4608 // This state is already in the list, don't add it again, |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4609 // unless it is an MOPEN that is used for a backreference or |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4610 // when there is a PIM. For NFA_MATCH check the position, |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4611 // lower position is preferred. |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4612 if (!rex.nfa_has_backref && pim == NULL && !l->has_pim |
| 5895 | 4613 && state->c != NFA_MATCH) |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4614 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4615 // When called from addstate_here() do insert before |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4616 // existing states. |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4617 if (add_here) |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4618 { |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4619 for (k = 0; k < l->n && k < listindex; ++k) |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4620 if (l->t[k].state->id == state->id) |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4621 { |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4622 found = TRUE; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4623 break; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4624 } |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4625 } |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4626 if (!add_here || found) |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4627 { |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4628 skip_add: |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4629 #ifdef ENABLE_LOG |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4630 nfa_set_code(state->c); |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4631 fprintf(log_fd, "> Not adding state %d to list %d. char %d: %s pim: %s has_pim: %d found: %d\n", |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4632 abs(state->id), l->id, state->c, code, |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4633 pim == NULL ? "NULL" : "yes", l->has_pim, found); |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4634 #endif |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4635 --depth; |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4636 return subs; |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4637 } |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4638 } |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4639 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4640 // Do not add the state again when it exists with the same |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4641 // positions. |
|
5212
2741b46e96bf
updated for version 7.4a.032
Bram Moolenaar <bram@vim.org>
parents:
5210
diff
changeset
|
4642 if (has_state_with_pos(l, state, subs, pim)) |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
4643 goto skip_add; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4644 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4645 |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4646 // When there are backreferences or PIMs the number of states may |
|
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4647 // be (a lot) bigger than anticipated. |
|
5006
f451d60ab8ec
updated for version 7.3.1247
Bram Moolenaar <bram@vim.org>
parents:
4997
diff
changeset
|
4648 if (l->n == l->len) |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4649 { |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4650 int newlen = l->len * 3 / 2 + 50; |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4651 size_t newsize = newlen * sizeof(nfa_thread_T); |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4652 nfa_thread_T *newt; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4653 |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4654 if ((long)(newsize >> 10) >= p_mmp) |
|
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4655 { |
|
26883
7f150a4936f2
patch 8.2.3970: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
4656 emsg(_(e_pattern_uses_more_memory_than_maxmempattern)); |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4657 --depth; |
|
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4658 return NULL; |
|
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4659 } |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4660 if (subs != &temp_subs) |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4661 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4662 // "subs" may point into the current array, need to make a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4663 // copy before it becomes invalid. |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4664 copy_sub(&temp_subs.norm, &subs->norm); |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4665 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4666 if (rex.nfa_has_zsubexpr) |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4667 copy_sub(&temp_subs.synt, &subs->synt); |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4668 #endif |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4669 subs = &temp_subs; |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4670 } |
|
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4671 |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4672 newt = vim_realloc(l->t, newsize); |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4673 if (newt == NULL) |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4674 { |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4675 // out of memory |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4676 --depth; |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4677 return NULL; |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4678 } |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4679 l->t = newt; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4680 l->len = newlen; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4681 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4682 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4683 // add the state to the list |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
4684 state->lastlist[nfa_ll_index] = l->id; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4685 thread = &l->t[l->n++]; |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4686 thread->state = state; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4687 if (pim == NULL) |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4688 thread->pim.result = NFA_PIM_UNUSED; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4689 else |
|
5227
a08fa2919f2b
updated for version 7.4a.039
Bram Moolenaar <bram@vim.org>
parents:
5221
diff
changeset
|
4690 { |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4691 copy_pim(&thread->pim, pim); |
|
5227
a08fa2919f2b
updated for version 7.4a.039
Bram Moolenaar <bram@vim.org>
parents:
5221
diff
changeset
|
4692 l->has_pim = TRUE; |
|
a08fa2919f2b
updated for version 7.4a.039
Bram Moolenaar <bram@vim.org>
parents:
5221
diff
changeset
|
4693 } |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4694 copy_sub(&thread->subs.norm, &subs->norm); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4695 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4696 if (rex.nfa_has_zsubexpr) |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4697 copy_sub(&thread->subs.synt, &subs->synt); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4698 #endif |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4699 #ifdef ENABLE_LOG |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4700 report_state("Adding", &thread->subs.norm, state, l->id, pim); |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
4701 did_print = TRUE; |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4702 #endif |
| 4444 | 4703 } |
| 4704 | |
| 4705 #ifdef ENABLE_LOG | |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
4706 if (!did_print) |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
4707 report_state("Processing", &subs->norm, state, l->id, pim); |
| 4444 | 4708 #endif |
| 4709 switch (state->c) | |
| 4710 { | |
| 4711 case NFA_MATCH: | |
| 4712 break; | |
| 4713 | |
| 4714 case NFA_SPLIT: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4715 // order matters here |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4716 subs = addstate(l, state->out, subs, pim, off_arg); |
|
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4717 subs = addstate(l, state->out1, subs, pim, off_arg); |
| 4444 | 4718 break; |
| 4719 | |
| 5370 | 4720 case NFA_EMPTY: |
| 4444 | 4721 case NFA_NOPEN: |
| 4722 case NFA_NCLOSE: | |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4723 subs = addstate(l, state->out, subs, pim, off_arg); |
| 4444 | 4724 break; |
| 4725 | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4726 case NFA_MOPEN: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4727 case NFA_MOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4728 case NFA_MOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4729 case NFA_MOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4730 case NFA_MOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4731 case NFA_MOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4732 case NFA_MOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4733 case NFA_MOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4734 case NFA_MOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4735 case NFA_MOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4736 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4737 case NFA_ZOPEN: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4738 case NFA_ZOPEN1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4739 case NFA_ZOPEN2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4740 case NFA_ZOPEN3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4741 case NFA_ZOPEN4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4742 case NFA_ZOPEN5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4743 case NFA_ZOPEN6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4744 case NFA_ZOPEN7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4745 case NFA_ZOPEN8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4746 case NFA_ZOPEN9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4747 #endif |
| 4444 | 4748 case NFA_ZSTART: |
| 4749 if (state->c == NFA_ZSTART) | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4750 { |
| 4444 | 4751 subidx = 0; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4752 sub = &subs->norm; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4753 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4754 #ifdef FEAT_SYN_HL |
| 5300 | 4755 else if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4756 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4757 subidx = state->c - NFA_ZOPEN; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4758 sub = &subs->synt; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4759 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4760 #endif |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4761 else |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4762 { |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4763 subidx = state->c - NFA_MOPEN; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4764 sub = &subs->norm; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4765 } |
| 4444 | 4766 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4767 // avoid compiler warnings |
|
5210
839ebe7c1b2f
updated for version 7.4a.031
Bram Moolenaar <bram@vim.org>
parents:
5188
diff
changeset
|
4768 save_ptr = NULL; |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19405
diff
changeset
|
4769 CLEAR_FIELD(save_multipos); |
|
5210
839ebe7c1b2f
updated for version 7.4a.031
Bram Moolenaar <bram@vim.org>
parents:
5188
diff
changeset
|
4770 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4771 // Set the position (with "off" added) in the subexpression. Save |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4772 // and restore it when it was in use. Otherwise fill any gap. |
| 4444 | 4773 if (REG_MULTI) |
| 4774 { | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4775 if (subidx < sub->in_use) |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4776 { |
|
10168
3c37899baa8d
commit https://github.com/vim/vim/commit/d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4777 save_multipos = sub->list.multi[subidx]; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4778 save_in_use = -1; |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4779 } |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4780 else |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4781 { |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4782 save_in_use = sub->in_use; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4783 for (i = sub->in_use; i < subidx; ++i) |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4784 { |
| 6547 | 4785 sub->list.multi[i].start_lnum = -1; |
| 4786 sub->list.multi[i].end_lnum = -1; | |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4787 } |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4788 sub->in_use = subidx + 1; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4789 } |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4790 if (off == -1) |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4791 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4792 sub->list.multi[subidx].start_lnum = rex.lnum + 1; |
| 6547 | 4793 sub->list.multi[subidx].start_col = 0; |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4794 } |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4795 else |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4796 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4797 sub->list.multi[subidx].start_lnum = rex.lnum; |
| 6547 | 4798 sub->list.multi[subidx].start_col = |
|
31233
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
4799 (colnr_T)(rex.input - rex.line + off); |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4800 } |
|
7152
cbdc02d71a18
commit https://github.com/vim/vim/commit/c2b717ebd6719e722dcb5f10e4c74033a53ff7c7
Christian Brabandt <cb@256bit.org>
parents:
6914
diff
changeset
|
4801 sub->list.multi[subidx].end_lnum = -1; |
| 4444 | 4802 } |
| 4803 else | |
| 4804 { | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4805 if (subidx < sub->in_use) |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4806 { |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
4807 save_ptr = sub->list.line[subidx].start; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4808 save_in_use = -1; |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4809 } |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4810 else |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4811 { |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4812 save_in_use = sub->in_use; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4813 for (i = sub->in_use; i < subidx; ++i) |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4814 { |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
4815 sub->list.line[i].start = NULL; |
|
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
4816 sub->list.line[i].end = NULL; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4817 } |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4818 sub->in_use = subidx + 1; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4819 } |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4820 sub->list.line[subidx].start = rex.input + off; |
| 4444 | 4821 } |
| 4822 | |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4823 subs = addstate(l, state->out, subs, pim, off_arg); |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4824 if (subs == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4825 break; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4826 // "subs" may have changed, need to set "sub" again |
| 5300 | 4827 #ifdef FEAT_SYN_HL |
| 4828 if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9) | |
| 4829 sub = &subs->synt; | |
| 4830 else | |
| 4831 #endif | |
| 4832 sub = &subs->norm; | |
| 4444 | 4833 |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4834 if (save_in_use == -1) |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4835 { |
|
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4836 if (REG_MULTI) |
|
10168
3c37899baa8d
commit https://github.com/vim/vim/commit/d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4837 sub->list.multi[subidx] = save_multipos; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4838 else |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
4839 sub->list.line[subidx].start = save_ptr; |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
4840 } |
| 4444 | 4841 else |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4842 sub->in_use = save_in_use; |
| 4444 | 4843 break; |
| 4844 | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4845 case NFA_MCLOSE: |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4846 if (rex.nfa_has_zend && (REG_MULTI |
| 6547 | 4847 ? subs->norm.list.multi[0].end_lnum >= 0 |
| 5336 | 4848 : subs->norm.list.line[0].end != NULL)) |
| 4444 | 4849 { |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4850 // Do not overwrite the position set by \ze. |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4851 subs = addstate(l, state->out, subs, pim, off_arg); |
| 4444 | 4852 break; |
| 4853 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4854 // FALLTHROUGH |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4855 case NFA_MCLOSE1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4856 case NFA_MCLOSE2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4857 case NFA_MCLOSE3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4858 case NFA_MCLOSE4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4859 case NFA_MCLOSE5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4860 case NFA_MCLOSE6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4861 case NFA_MCLOSE7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4862 case NFA_MCLOSE8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4863 case NFA_MCLOSE9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4864 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4865 case NFA_ZCLOSE: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4866 case NFA_ZCLOSE1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4867 case NFA_ZCLOSE2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4868 case NFA_ZCLOSE3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4869 case NFA_ZCLOSE4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4870 case NFA_ZCLOSE5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4871 case NFA_ZCLOSE6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4872 case NFA_ZCLOSE7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4873 case NFA_ZCLOSE8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4874 case NFA_ZCLOSE9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4875 #endif |
| 4444 | 4876 case NFA_ZEND: |
| 4877 if (state->c == NFA_ZEND) | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4878 { |
| 4444 | 4879 subidx = 0; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4880 sub = &subs->norm; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4881 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4882 #ifdef FEAT_SYN_HL |
| 5300 | 4883 else if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4884 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4885 subidx = state->c - NFA_ZCLOSE; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4886 sub = &subs->synt; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4887 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4888 #endif |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4889 else |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4890 { |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
4891 subidx = state->c - NFA_MCLOSE; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4892 sub = &subs->norm; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
4893 } |
| 4444 | 4894 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4895 // We don't fill in gaps here, there must have been an MOPEN that |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4896 // has done that. |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4897 save_in_use = sub->in_use; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4898 if (sub->in_use <= subidx) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4899 sub->in_use = subidx + 1; |
| 4444 | 4900 if (REG_MULTI) |
| 4901 { | |
|
10168
3c37899baa8d
commit https://github.com/vim/vim/commit/d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4902 save_multipos = sub->list.multi[subidx]; |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4903 if (off == -1) |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4904 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4905 sub->list.multi[subidx].end_lnum = rex.lnum + 1; |
| 6547 | 4906 sub->list.multi[subidx].end_col = 0; |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4907 } |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4908 else |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4909 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4910 sub->list.multi[subidx].end_lnum = rex.lnum; |
| 6547 | 4911 sub->list.multi[subidx].end_col = |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4912 (colnr_T)(rex.input - rex.line + off); |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
4913 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4914 // avoid compiler warnings |
|
5210
839ebe7c1b2f
updated for version 7.4a.031
Bram Moolenaar <bram@vim.org>
parents:
5188
diff
changeset
|
4915 save_ptr = NULL; |
| 4444 | 4916 } |
| 4917 else | |
| 4918 { | |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
4919 save_ptr = sub->list.line[subidx].end; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
4920 sub->list.line[subidx].end = rex.input + off; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4921 // avoid compiler warnings |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19405
diff
changeset
|
4922 CLEAR_FIELD(save_multipos); |
| 4444 | 4923 } |
| 4924 | |
|
10170
4acacf4081ce
commit https://github.com/vim/vim/commit/16b3578f355282846f2600ce77fb344950f0b9ce
Christian Brabandt <cb@256bit.org>
parents:
10168
diff
changeset
|
4925 subs = addstate(l, state->out, subs, pim, off_arg); |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4926 if (subs == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4927 break; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4928 // "subs" may have changed, need to set "sub" again |
| 5300 | 4929 #ifdef FEAT_SYN_HL |
| 4930 if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9) | |
| 4931 sub = &subs->synt; | |
| 4932 else | |
| 4933 #endif | |
| 4934 sub = &subs->norm; | |
| 4444 | 4935 |
| 4936 if (REG_MULTI) | |
|
10168
3c37899baa8d
commit https://github.com/vim/vim/commit/d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4937 sub->list.multi[subidx] = save_multipos; |
| 4444 | 4938 else |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
4939 sub->list.line[subidx].end = save_ptr; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
4940 sub->in_use = save_in_use; |
| 4444 | 4941 break; |
| 4942 } | |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4943 --depth; |
|
5074
1cacf785299e
updated for version 7.3.1280
Bram Moolenaar <bram@vim.org>
parents:
5058
diff
changeset
|
4944 return subs; |
| 4444 | 4945 } |
| 4946 | |
| 4947 /* | |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4948 * Like addstate(), but the new state(s) are put at position "*ip". |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4949 * Used for zero-width matches, next state to use is the added one. |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4950 * This makes sure the order of states to be tried does not change, which |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4951 * matters for alternatives. |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4952 */ |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4953 static regsubs_T * |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4954 addstate_here( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4955 nfa_list_T *l, // runtime state list |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4956 nfa_state_T *state, // state to update |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4957 regsubs_T *subs, // pointers to subexpressions |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4958 nfa_pim_T *pim, // postponed look-behind match |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4959 int *ip) |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4960 { |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4961 int tlen = l->n; |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4962 int count; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
4963 int listidx = *ip; |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4964 regsubs_T *r; |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4965 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4966 // First add the state(s) at the end, so that we know how many there are. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4967 // Pass the listidx as offset (avoids adding another argument to |
|
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
26652
diff
changeset
|
4968 // addstate()). |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4969 r = addstate(l, state, subs, pim, -listidx - ADDSTATE_HERE_OFFSET); |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4970 if (r == NULL) |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4971 return NULL; |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4972 |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4973 // when "*ip" was at the end of the list, nothing to do |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
4974 if (listidx + 1 == tlen) |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4975 return r; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4976 |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4977 // re-order to put the new state at the current position |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4978 count = l->n - tlen; |
|
4924
6ae32a64e153
updated for version 7.3.1207
Bram Moolenaar <bram@vim.org>
parents:
4897
diff
changeset
|
4979 if (count == 0) |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4980 return r; // no state got added |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4981 if (count == 1) |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4982 { |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
4983 // overwrite the current state |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
4984 l->t[listidx] = l->t[l->n - 1]; |
|
4647
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4985 } |
|
857f6c53f117
updated for version 7.3.1071
Bram Moolenaar <bram@vim.org>
parents:
4615
diff
changeset
|
4986 else if (count > 1) |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
4987 { |
|
5058
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
4988 if (l->n + count - 1 >= l->len) |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
4989 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4990 // not enough space to move the new states, reallocate the list |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
4991 // and move the states to the right position |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4992 int newlen = l->len * 3 / 2 + 50; |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4993 size_t newsize = newlen * sizeof(nfa_thread_T); |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4994 nfa_thread_T *newl; |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
4995 |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4996 if ((long)(newsize >> 10) >= p_mmp) |
|
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4997 { |
|
26883
7f150a4936f2
patch 8.2.3970: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
4998 emsg(_(e_pattern_uses_more_memory_than_maxmempattern)); |
|
15812
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
4999 return NULL; |
|
3808b583889e
patch 8.1.0913: CI crashes when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
15806
diff
changeset
|
5000 } |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5001 newl = alloc(newsize); |
|
5058
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5002 if (newl == NULL) |
|
15806
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
5003 return NULL; |
|
6a4e9d9f1d66
patch 8.1.0910: crash with tricky search pattern
Bram Moolenaar <Bram@vim.org>
parents:
15802
diff
changeset
|
5004 l->len = newlen; |
|
5058
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5005 mch_memmove(&(newl[0]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5006 &(l->t[0]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5007 sizeof(nfa_thread_T) * listidx); |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5008 mch_memmove(&(newl[listidx]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5009 &(l->t[l->n - count]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5010 sizeof(nfa_thread_T) * count); |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5011 mch_memmove(&(newl[listidx + count]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5012 &(l->t[listidx + 1]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5013 sizeof(nfa_thread_T) * (l->n - count - listidx - 1)); |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5014 vim_free(l->t); |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5015 l->t = newl; |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5016 } |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5017 else |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5018 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5019 // make space for new states, then move them from the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5020 // end to the current position |
|
5058
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5021 mch_memmove(&(l->t[listidx + count]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5022 &(l->t[listidx + 1]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5023 sizeof(nfa_thread_T) * (l->n - listidx - 1)); |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5024 mch_memmove(&(l->t[listidx]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5025 &(l->t[l->n - 1]), |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5026 sizeof(nfa_thread_T) * count); |
|
a00cd1839ac4
updated for version 7.3.1272
Bram Moolenaar <bram@vim.org>
parents:
5029
diff
changeset
|
5027 } |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5028 } |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5029 --l->n; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5030 *ip = listidx - 1; |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5031 |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5032 return r; |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5033 } |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5034 |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5035 /* |
| 4444 | 5036 * Check character class "class" against current character c. |
| 5037 */ | |
| 5038 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5039 check_char_class(int class, int c) |
| 4444 | 5040 { |
| 5041 switch (class) | |
| 5042 { | |
| 5043 case NFA_CLASS_ALNUM: | |
|
9015
42b228c8701b
commit https://github.com/vim/vim/commit/e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
5044 if (c >= 1 && c < 128 && isalnum(c)) |
| 4444 | 5045 return OK; |
| 5046 break; | |
| 5047 case NFA_CLASS_ALPHA: | |
|
9015
42b228c8701b
commit https://github.com/vim/vim/commit/e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
5048 if (c >= 1 && c < 128 && isalpha(c)) |
| 4444 | 5049 return OK; |
| 5050 break; | |
| 5051 case NFA_CLASS_BLANK: | |
| 5052 if (c == ' ' || c == '\t') | |
| 5053 return OK; | |
| 5054 break; | |
| 5055 case NFA_CLASS_CNTRL: | |
|
11267
588de97b40e7
patch 8.0.0519: character classes are not well tested
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5056 if (c >= 1 && c <= 127 && iscntrl(c)) |
| 4444 | 5057 return OK; |
| 5058 break; | |
| 5059 case NFA_CLASS_DIGIT: | |
| 5060 if (VIM_ISDIGIT(c)) | |
| 5061 return OK; | |
| 5062 break; | |
| 5063 case NFA_CLASS_GRAPH: | |
|
11267
588de97b40e7
patch 8.0.0519: character classes are not well tested
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5064 if (c >= 1 && c <= 127 && isgraph(c)) |
| 4444 | 5065 return OK; |
| 5066 break; | |
| 5067 case NFA_CLASS_LOWER: | |
|
9015
42b228c8701b
commit https://github.com/vim/vim/commit/e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
5068 if (MB_ISLOWER(c) && c != 170 && c != 186) |
| 4444 | 5069 return OK; |
| 5070 break; | |
| 5071 case NFA_CLASS_PRINT: | |
| 5072 if (vim_isprintc(c)) | |
| 5073 return OK; | |
| 5074 break; | |
| 5075 case NFA_CLASS_PUNCT: | |
|
9015
42b228c8701b
commit https://github.com/vim/vim/commit/e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
5076 if (c >= 1 && c < 128 && ispunct(c)) |
| 4444 | 5077 return OK; |
| 5078 break; | |
| 5079 case NFA_CLASS_SPACE: | |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
5080 if ((c >= 9 && c <= 13) || (c == ' ')) |
| 4444 | 5081 return OK; |
| 5082 break; | |
| 5083 case NFA_CLASS_UPPER: | |
| 5084 if (MB_ISUPPER(c)) | |
| 5085 return OK; | |
| 5086 break; | |
| 5087 case NFA_CLASS_XDIGIT: | |
| 5088 if (vim_isxdigit(c)) | |
| 5089 return OK; | |
| 5090 break; | |
| 5091 case NFA_CLASS_TAB: | |
| 5092 if (c == '\t') | |
| 5093 return OK; | |
| 5094 break; | |
| 5095 case NFA_CLASS_RETURN: | |
| 5096 if (c == '\r') | |
| 5097 return OK; | |
| 5098 break; | |
| 5099 case NFA_CLASS_BACKSPACE: | |
| 5100 if (c == '\b') | |
| 5101 return OK; | |
| 5102 break; | |
| 5103 case NFA_CLASS_ESCAPE: | |
| 5104 if (c == '\033') | |
| 5105 return OK; | |
| 5106 break; | |
|
15709
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5107 case NFA_CLASS_IDENT: |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5108 if (vim_isIDc(c)) |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5109 return OK; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5110 break; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5111 case NFA_CLASS_KEYWORD: |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5112 if (reg_iswordc(c)) |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5113 return OK; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5114 break; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5115 case NFA_CLASS_FNAME: |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5116 if (vim_isfilec(c)) |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5117 return OK; |
|
2e2f07561f4b
patch 8.1.0862: no verbose version of character classes
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
5118 break; |
| 4444 | 5119 |
| 5120 default: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5121 // should not be here :P |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
5122 siemsg(_(e_nfa_regexp_invalid_character_class_nr), class); |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
5123 return FAIL; |
| 4444 | 5124 } |
| 5125 return FAIL; | |
| 5126 } | |
| 5127 | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5128 /* |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5129 * Check for a match with subexpression "subidx". |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5130 * Return TRUE if it matches. |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5131 */ |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5132 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5133 match_backref( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5134 regsub_T *sub, // pointers to subexpressions |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5135 int subidx, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5136 int *bytelen) // out: length of match in bytes |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5137 { |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5138 int len; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5139 |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5140 if (sub->in_use <= subidx) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5141 { |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5142 retempty: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5143 // backref was not set, match an empty string |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5144 *bytelen = 0; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5145 return TRUE; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5146 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5147 |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5148 if (REG_MULTI) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5149 { |
| 6547 | 5150 if (sub->list.multi[subidx].start_lnum < 0 |
| 5151 || sub->list.multi[subidx].end_lnum < 0) | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5152 goto retempty; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5153 if (sub->list.multi[subidx].start_lnum == rex.lnum |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5154 && sub->list.multi[subidx].end_lnum == rex.lnum) |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5155 { |
| 6547 | 5156 len = sub->list.multi[subidx].end_col |
| 5157 - sub->list.multi[subidx].start_col; | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5158 if (cstrncmp(rex.line + sub->list.multi[subidx].start_col, |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5159 rex.input, &len) == 0) |
|
4891
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5160 { |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5161 *bytelen = len; |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5162 return TRUE; |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5163 } |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5164 } |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5165 else |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5166 { |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5167 if (match_with_backref( |
| 6547 | 5168 sub->list.multi[subidx].start_lnum, |
| 5169 sub->list.multi[subidx].start_col, | |
| 5170 sub->list.multi[subidx].end_lnum, | |
| 5171 sub->list.multi[subidx].end_col, | |
|
4891
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5172 bytelen) == RA_MATCH) |
|
4c42efb4c098
updated for version 7.3.1191
Bram Moolenaar <bram@vim.org>
parents:
4887
diff
changeset
|
5173 return TRUE; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5174 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5175 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5176 else |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5177 { |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
5178 if (sub->list.line[subidx].start == NULL |
|
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
5179 || sub->list.line[subidx].end == NULL) |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5180 goto retempty; |
|
4577
b22bff1a6af8
updated for version 7.3.1036
Bram Moolenaar <bram@vim.org>
parents:
4573
diff
changeset
|
5181 len = (int)(sub->list.line[subidx].end - sub->list.line[subidx].start); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5182 if (cstrncmp(sub->list.line[subidx].start, rex.input, &len) == 0) |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5183 { |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5184 *bytelen = len; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5185 return TRUE; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5186 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5187 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5188 return FALSE; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5189 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
5190 |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5191 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5192 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5193 /* |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5194 * Check for a match with \z subexpression "subidx". |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5195 * Return TRUE if it matches. |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5196 */ |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5197 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5198 match_zref( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5199 int subidx, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5200 int *bytelen) // out: length of match in bytes |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5201 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5202 int len; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5203 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5204 cleanup_zsubexpr(); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5205 if (re_extmatch_in == NULL || re_extmatch_in->matches[subidx] == NULL) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5206 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5207 // backref was not set, match an empty string |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5208 *bytelen = 0; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5209 return TRUE; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5210 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5211 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5212 len = (int)STRLEN(re_extmatch_in->matches[subidx]); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5213 if (cstrncmp(re_extmatch_in->matches[subidx], rex.input, &len) == 0) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5214 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5215 *bytelen = len; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5216 return TRUE; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5217 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5218 return FALSE; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5219 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5220 #endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5221 |
| 4444 | 5222 /* |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5223 * Save list IDs for all NFA states of "prog" into "list". |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5224 * Also reset the IDs to zero. |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5225 * Only used for the recursive value lastlist[1]. |
| 4444 | 5226 */ |
| 5227 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5228 nfa_save_listids(nfa_regprog_T *prog, int *list) |
| 4444 | 5229 { |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5230 int i; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5231 nfa_state_T *p; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5232 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5233 // Order in the list is reverse, it's a bit faster that way. |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5234 p = &prog->state[0]; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5235 for (i = prog->nstate; --i >= 0; ) |
| 4444 | 5236 { |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5237 list[i] = p->lastlist[1]; |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5238 p->lastlist[1] = 0; |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5239 ++p; |
| 4444 | 5240 } |
| 5241 } | |
| 5242 | |
| 5243 /* | |
| 5244 * Restore list IDs from "list" to all NFA states. | |
| 5245 */ | |
| 5246 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5247 nfa_restore_listids(nfa_regprog_T *prog, int *list) |
| 4444 | 5248 { |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5249 int i; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5250 nfa_state_T *p; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5251 |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5252 p = &prog->state[0]; |
|
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5253 for (i = prog->nstate; --i >= 0; ) |
| 4444 | 5254 { |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5255 p->lastlist[1] = list[i]; |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5256 ++p; |
| 4444 | 5257 } |
| 5258 } | |
| 5259 | |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5260 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5261 nfa_re_num_cmp(long_u val, int op, long_u pos) |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5262 { |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5263 if (op == 1) return pos > val; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5264 if (op == 2) return pos < val; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5265 return val == pos; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5266 } |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
5267 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7258
diff
changeset
|
5268 static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *submatch, regsubs_T *m); |
|
4563
e7016af0cbf9
updated for version 7.3.1029
Bram Moolenaar <bram@vim.org>
parents:
4561
diff
changeset
|
5269 |
| 4444 | 5270 /* |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5271 * Recursively call nfa_regmatch() |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5272 * "pim" is NULL or contains info about a Postponed Invisible Match (start |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5273 * position). |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5274 */ |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5275 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5276 recursive_regmatch( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5277 nfa_state_T *state, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5278 nfa_pim_T *pim, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5279 nfa_regprog_T *prog, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5280 regsubs_T *submatch, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5281 regsubs_T *m, |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
5282 int **listids, |
|
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
5283 int *listids_len) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5284 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5285 int save_reginput_col = (int)(rex.input - rex.line); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5286 int save_reglnum = rex.lnum; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5287 int save_nfa_match = nfa_match; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5288 int save_nfa_listid = rex.nfa_listid; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5289 save_se_T *save_nfa_endp = nfa_endp; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5290 save_se_T endpos; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5291 save_se_T *endposp = NULL; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5292 int result; |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5293 int need_restore = FALSE; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5294 |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5295 if (pim != NULL) |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5296 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5297 // start at the position where the postponed match was |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5298 if (REG_MULTI) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5299 rex.input = rex.line + pim->end.pos.col; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5300 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5301 rex.input = pim->end.ptr; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5302 } |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5303 |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
5304 if (state->c == NFA_START_INVISIBLE_BEFORE |
|
13192
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
5305 || state->c == NFA_START_INVISIBLE_BEFORE_FIRST |
|
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
5306 || state->c == NFA_START_INVISIBLE_BEFORE_NEG |
|
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
5307 || state->c == NFA_START_INVISIBLE_BEFORE_NEG_FIRST) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5308 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5309 // The recursive match must end at the current position. When "pim" is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5310 // not NULL it specifies the current position. |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5311 endposp = &endpos; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5312 if (REG_MULTI) |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5313 { |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5314 if (pim == NULL) |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5315 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5316 endpos.se_u.pos.col = (int)(rex.input - rex.line); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5317 endpos.se_u.pos.lnum = rex.lnum; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5318 } |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5319 else |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5320 endpos.se_u.pos = pim->end.pos; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5321 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5322 else |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5323 { |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5324 if (pim == NULL) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5325 endpos.se_u.ptr = rex.input; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5326 else |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5327 endpos.se_u.ptr = pim->end.ptr; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5328 } |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5329 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5330 // Go back the specified number of bytes, or as far as the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5331 // start of the previous line, to try matching "\@<=" or |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5332 // not matching "\@<!". This is very inefficient, limit the number of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5333 // bytes if possible. |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5334 if (state->val <= 0) |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5335 { |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5336 if (REG_MULTI) |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5337 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5338 rex.line = reg_getline(--rex.lnum); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5339 if (rex.line == NULL) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5340 // can't go before the first line |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5341 rex.line = reg_getline(++rex.lnum); |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5342 } |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5343 rex.input = rex.line; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5344 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5345 else |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5346 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5347 if (REG_MULTI && (int)(rex.input - rex.line) < state->val) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5348 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5349 // Not enough bytes in this line, go to end of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5350 // previous line. |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5351 rex.line = reg_getline(--rex.lnum); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5352 if (rex.line == NULL) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5353 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5354 // can't go before the first line |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5355 rex.line = reg_getline(++rex.lnum); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5356 rex.input = rex.line; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5357 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5358 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5359 rex.input = rex.line + STRLEN(rex.line); |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5360 } |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5361 if ((int)(rex.input - rex.line) >= state->val) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5362 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5363 rex.input -= state->val; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5364 if (has_mbyte) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5365 rex.input -= mb_head_off(rex.line, rex.input); |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5366 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5367 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5368 rex.input = rex.line; |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5369 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5370 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5371 |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5372 #ifdef ENABLE_LOG |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5373 if (log_fd != stderr) |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5374 fclose(log_fd); |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5375 log_fd = NULL; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5376 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5377 // Have to clear the lastlist field of the NFA nodes, so that |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5378 // nfa_regmatch() and addstate() can run properly after recursion. |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5379 if (nfa_ll_index == 1) |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5380 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5381 // Already calling nfa_regmatch() recursively. Save the lastlist[1] |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5382 // values and clear them. |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5383 if (*listids == NULL || *listids_len < prog->nstate) |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5384 { |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
5385 vim_free(*listids); |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5386 *listids = ALLOC_MULT(int, prog->nstate); |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5387 if (*listids == NULL) |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5388 { |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
5389 emsg(_(e_nfa_regexp_could_not_allocate_memory_for_branch_traversal)); |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5390 return 0; |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5391 } |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5392 *listids_len = prog->nstate; |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5393 } |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5394 nfa_save_listids(prog, *listids); |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5395 need_restore = TRUE; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5396 // any value of rex.nfa_listid will do |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5397 } |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5398 else |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5399 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5400 // First recursive nfa_regmatch() call, switch to the second lastlist |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5401 // entry. Make sure rex.nfa_listid is different from a previous |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5402 // recursive call, because some states may still have this ID. |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5403 ++nfa_ll_index; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5404 if (rex.nfa_listid <= rex.nfa_alt_listid) |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5405 rex.nfa_listid = rex.nfa_alt_listid; |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5406 } |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5407 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5408 // Call nfa_regmatch() to check if the current concat matches at this |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5409 // position. The concat ends with the node NFA_END_INVISIBLE |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5410 nfa_endp = endposp; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5411 result = nfa_regmatch(prog, state->out, submatch, m); |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5412 |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5413 if (need_restore) |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5414 nfa_restore_listids(prog, *listids); |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5415 else |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5416 { |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5417 --nfa_ll_index; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5418 rex.nfa_alt_listid = rex.nfa_listid; |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
5419 } |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5420 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5421 // restore position in input text |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5422 rex.lnum = save_reglnum; |
|
4877
9e36c6b1ebf4
updated for version 7.3.1184
Bram Moolenaar <bram@vim.org>
parents:
4845
diff
changeset
|
5423 if (REG_MULTI) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5424 rex.line = reg_getline(rex.lnum); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5425 rex.input = rex.line + save_reginput_col; |
|
9371
3666915cac0b
commit https://github.com/vim/vim/commit/6747fabc7348bf5f41ccfe851e2be3e900ec8ee0
Christian Brabandt <cb@256bit.org>
parents:
9015
diff
changeset
|
5426 if (result != NFA_TOO_EXPENSIVE) |
|
3666915cac0b
commit https://github.com/vim/vim/commit/6747fabc7348bf5f41ccfe851e2be3e900ec8ee0
Christian Brabandt <cb@256bit.org>
parents:
9015
diff
changeset
|
5427 { |
|
3666915cac0b
commit https://github.com/vim/vim/commit/6747fabc7348bf5f41ccfe851e2be3e900ec8ee0
Christian Brabandt <cb@256bit.org>
parents:
9015
diff
changeset
|
5428 nfa_match = save_nfa_match; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5429 rex.nfa_listid = save_nfa_listid; |
|
9371
3666915cac0b
commit https://github.com/vim/vim/commit/6747fabc7348bf5f41ccfe851e2be3e900ec8ee0
Christian Brabandt <cb@256bit.org>
parents:
9015
diff
changeset
|
5430 } |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5431 nfa_endp = save_nfa_endp; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5432 |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5433 #ifdef ENABLE_LOG |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5434 open_debug_log(result); |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5435 #endif |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5436 |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5437 return result; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5438 } |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5439 |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5440 /* |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5441 * Estimate the chance of a match with "state" failing. |
|
4821
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
5442 * empty match: 0 |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5443 * NFA_ANY: 1 |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5444 * specific character: 99 |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5445 */ |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5446 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5447 failure_chance(nfa_state_T *state, int depth) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5448 { |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5449 int c = state->c; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5450 int l, r; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5451 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5452 // detect looping |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5453 if (depth > 4) |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5454 return 1; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5455 |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5456 switch (c) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5457 { |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5458 case NFA_SPLIT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5459 if (state->out->c == NFA_SPLIT || state->out1->c == NFA_SPLIT) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5460 // avoid recursive stuff |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5461 return 1; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5462 // two alternatives, use the lowest failure chance |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5463 l = failure_chance(state->out, depth + 1); |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5464 r = failure_chance(state->out1, depth + 1); |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5465 return l < r ? l : r; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5466 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5467 case NFA_ANY: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5468 // matches anything, unlikely to fail |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5469 return 1; |
|
4821
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
5470 |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5471 case NFA_MATCH: |
|
4821
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
5472 case NFA_MCLOSE: |
| 5901 | 5473 case NFA_ANY_COMPOSING: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5474 // empty match works always |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5475 return 0; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5476 |
|
4897
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5477 case NFA_START_INVISIBLE: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5478 case NFA_START_INVISIBLE_FIRST: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5479 case NFA_START_INVISIBLE_NEG: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5480 case NFA_START_INVISIBLE_NEG_FIRST: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5481 case NFA_START_INVISIBLE_BEFORE: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5482 case NFA_START_INVISIBLE_BEFORE_FIRST: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5483 case NFA_START_INVISIBLE_BEFORE_NEG: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5484 case NFA_START_INVISIBLE_BEFORE_NEG_FIRST: |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5485 case NFA_START_PATTERN: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5486 // recursive regmatch is expensive, use low failure chance |
|
4897
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5487 return 5; |
|
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
5488 |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5489 case NFA_BOL: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5490 case NFA_EOL: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5491 case NFA_BOF: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5492 case NFA_EOF: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5493 case NFA_NEWL: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5494 return 99; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5495 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5496 case NFA_BOW: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5497 case NFA_EOW: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5498 return 90; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5499 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5500 case NFA_MOPEN: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5501 case NFA_MOPEN1: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5502 case NFA_MOPEN2: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5503 case NFA_MOPEN3: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5504 case NFA_MOPEN4: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5505 case NFA_MOPEN5: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5506 case NFA_MOPEN6: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5507 case NFA_MOPEN7: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5508 case NFA_MOPEN8: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5509 case NFA_MOPEN9: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5510 #ifdef FEAT_SYN_HL |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5511 case NFA_ZOPEN: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5512 case NFA_ZOPEN1: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5513 case NFA_ZOPEN2: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5514 case NFA_ZOPEN3: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5515 case NFA_ZOPEN4: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5516 case NFA_ZOPEN5: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5517 case NFA_ZOPEN6: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5518 case NFA_ZOPEN7: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5519 case NFA_ZOPEN8: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5520 case NFA_ZOPEN9: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5521 case NFA_ZCLOSE: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5522 case NFA_ZCLOSE1: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5523 case NFA_ZCLOSE2: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5524 case NFA_ZCLOSE3: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5525 case NFA_ZCLOSE4: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5526 case NFA_ZCLOSE5: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5527 case NFA_ZCLOSE6: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5528 case NFA_ZCLOSE7: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5529 case NFA_ZCLOSE8: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5530 case NFA_ZCLOSE9: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5531 #endif |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5532 case NFA_NOPEN: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5533 case NFA_MCLOSE1: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5534 case NFA_MCLOSE2: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5535 case NFA_MCLOSE3: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5536 case NFA_MCLOSE4: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5537 case NFA_MCLOSE5: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5538 case NFA_MCLOSE6: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5539 case NFA_MCLOSE7: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5540 case NFA_MCLOSE8: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5541 case NFA_MCLOSE9: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5542 case NFA_NCLOSE: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5543 return failure_chance(state->out, depth + 1); |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5544 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5545 case NFA_BACKREF1: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5546 case NFA_BACKREF2: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5547 case NFA_BACKREF3: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5548 case NFA_BACKREF4: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5549 case NFA_BACKREF5: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5550 case NFA_BACKREF6: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5551 case NFA_BACKREF7: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5552 case NFA_BACKREF8: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5553 case NFA_BACKREF9: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5554 #ifdef FEAT_SYN_HL |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5555 case NFA_ZREF1: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5556 case NFA_ZREF2: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5557 case NFA_ZREF3: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5558 case NFA_ZREF4: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5559 case NFA_ZREF5: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5560 case NFA_ZREF6: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5561 case NFA_ZREF7: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5562 case NFA_ZREF8: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5563 case NFA_ZREF9: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5564 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5565 // backreferences don't match in many places |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5566 return 94; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5567 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5568 case NFA_LNUM_GT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5569 case NFA_LNUM_LT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5570 case NFA_COL_GT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5571 case NFA_COL_LT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5572 case NFA_VCOL_GT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5573 case NFA_VCOL_LT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5574 case NFA_MARK_GT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5575 case NFA_MARK_LT: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5576 case NFA_VISUAL: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5577 // before/after positions don't match very often |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5578 return 85; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5579 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5580 case NFA_LNUM: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5581 return 90; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5582 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5583 case NFA_CURSOR: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5584 case NFA_COL: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5585 case NFA_VCOL: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5586 case NFA_MARK: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5587 // specific positions rarely match |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5588 return 98; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5589 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5590 case NFA_COMPOSING: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5591 return 95; |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5592 |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5593 default: |
|
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5594 if (c > 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5595 // character match fails often |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5596 return 95; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5597 } |
|
4742
6a706ca7a889
updated for version 7.3.1118
Bram Moolenaar <bram@vim.org>
parents:
4740
diff
changeset
|
5598 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5599 // something else, includes character classes |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5600 return 50; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5601 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5602 |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5603 /* |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5604 * Skip until the char "c" we know a match must start with. |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5605 */ |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5606 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5607 skip_to_start(int c, colnr_T *colp) |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5608 { |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5609 char_u *s; |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5610 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5611 // Used often, do some work to avoid call overhead. |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
5612 if (!rex.reg_ic && !has_mbyte) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5613 s = vim_strbyte(rex.line + *colp, c); |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5614 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5615 s = cstrchr(rex.line + *colp, c); |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5616 if (s == NULL) |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5617 return FAIL; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5618 *colp = (int)(s - rex.line); |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5619 return OK; |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5620 } |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5621 |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
5622 /* |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5623 * Check for a match with match_text. |
|
4807
3dbd251777de
updated for version 7.3.1150
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
5624 * Called after skip_to_start() has found regstart. |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5625 * Returns zero for no match, 1 for a match. |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5626 */ |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5627 static long |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
5628 find_match_text(colnr_T *startcol, int regstart, char_u *match_text) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5629 { |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
5630 colnr_T col = *startcol; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5631 int c1, c2; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5632 int len1, len2; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5633 int match; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5634 |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5635 for (;;) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5636 { |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5637 match = TRUE; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5638 len2 = MB_CHAR2LEN(regstart); // skip regstart |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5639 for (len1 = 0; match_text[len1] != NUL; len1 += MB_CHAR2LEN(c1)) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5640 { |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5641 c1 = PTR2CHAR(match_text + len1); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5642 c2 = PTR2CHAR(rex.line + col + len2); |
|
20772
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
5643 if (c1 != c2 && (!rex.reg_ic || MB_CASEFOLD(c1) != MB_CASEFOLD(c2))) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5644 { |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5645 match = FALSE; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5646 break; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5647 } |
|
25747
1c999a6e9d92
patch 8.2.3409: reading beyond end of line with invalid utf-8 character
Bram Moolenaar <Bram@vim.org>
parents:
25320
diff
changeset
|
5648 len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2) |
|
1c999a6e9d92
patch 8.2.3409: reading beyond end of line with invalid utf-8 character
Bram Moolenaar <Bram@vim.org>
parents:
25320
diff
changeset
|
5649 : MB_CHAR2LEN(c2); |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5650 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5651 if (match |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5652 // check that no composing char follows |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5653 && !(enc_utf8 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
5654 && utf_iscomposing(PTR2CHAR(rex.line + col + len2)))) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5655 { |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5656 cleanup_subexpr(); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5657 if (REG_MULTI) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5658 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5659 rex.reg_startpos[0].lnum = rex.lnum; |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
5660 rex.reg_startpos[0].col = col; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5661 rex.reg_endpos[0].lnum = rex.lnum; |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
5662 rex.reg_endpos[0].col = col + len2; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5663 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5664 else |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5665 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5666 rex.reg_startp[0] = rex.line + col; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5667 rex.reg_endp[0] = rex.line + col + len2; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5668 } |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
5669 *startcol = col; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5670 return 1L; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5671 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5672 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5673 // Try finding regstart after the current match. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5674 col += MB_CHAR2LEN(regstart); // skip regstart |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5675 if (skip_to_start(regstart, &col) == FAIL) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5676 break; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5677 } |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
5678 |
|
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
5679 *startcol = col; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5680 return 0L; |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5681 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5682 |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
5683 /* |
| 4444 | 5684 * Main matching routine. |
| 5685 * | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5686 * Run NFA to determine whether it matches rex.input. |
| 4444 | 5687 * |
|
4694
efc4fb311d5d
updated for version 7.3.1094
Bram Moolenaar <bram@vim.org>
parents:
4692
diff
changeset
|
5688 * When "nfa_endp" is not NULL it is a required end-of-match position. |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
5689 * |
|
16491
38a323a6fd18
patch 8.1.1249: compiler warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5690 * Return TRUE if there is a match, FALSE if there is no match, |
|
38a323a6fd18
patch 8.1.1249: compiler warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5691 * NFA_TOO_EXPENSIVE if we end up with too many states. |
| 5372 | 5692 * When there is a match "submatch" contains the positions. |
|
16491
38a323a6fd18
patch 8.1.1249: compiler warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5693 * |
| 4444 | 5694 * Note: Caller must ensure that: start != NULL. |
| 5695 */ | |
| 5696 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5697 nfa_regmatch( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5698 nfa_regprog_T *prog, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5699 nfa_state_T *start, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5700 regsubs_T *submatch, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5701 regsubs_T *m) |
| 4444 | 5702 { |
|
16491
38a323a6fd18
patch 8.1.1249: compiler warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5703 int result = FALSE; |
| 6545 | 5704 size_t size = 0; |
| 4444 | 5705 int flag = 0; |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5706 int go_to_nextline = FALSE; |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5707 nfa_thread_T *t; |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
5708 nfa_list_T list[2]; |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5709 int listidx; |
|
4539
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5710 nfa_list_T *thislist; |
|
532c2e850256
updated for version 7.3.1017
Bram Moolenaar <bram@vim.org>
parents:
4537
diff
changeset
|
5711 nfa_list_T *nextlist; |
| 4444 | 5712 int *listids = NULL; |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
5713 int listids_len = 0; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5714 nfa_state_T *add_state; |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
5715 int add_here; |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5716 int add_count; |
|
4819
8c4324e6f477
updated for version 7.3.1156
Bram Moolenaar <bram@vim.org>
parents:
4815
diff
changeset
|
5717 int add_off = 0; |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5718 int toplevel = start->c == NFA_MOPEN; |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5719 regsubs_T *r; |
| 4460 | 5720 #ifdef NFA_REGEXP_DEBUG_LOG |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5721 FILE *debug; |
| 4444 | 5722 #endif |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5723 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5724 // Some patterns may take a long time to match, especially when using |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5725 // recursive_regmatch(). Allow interrupting them with CTRL-C. |
| 5310 | 5726 fast_breakcheck(); |
| 5727 if (got_int) | |
| 5728 return FALSE; | |
| 6573 | 5729 #ifdef FEAT_RELTIME |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29028
diff
changeset
|
5730 if (nfa_did_time_out()) |
| 6573 | 5731 return FALSE; |
| 5732 #endif | |
| 5310 | 5733 |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5734 #ifdef NFA_REGEXP_DEBUG_LOG |
|
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5735 debug = fopen(NFA_REGEXP_DEBUG_LOG, "a"); |
|
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5736 if (debug == NULL) |
|
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5737 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15265
diff
changeset
|
5738 semsg("(NFA) COULD NOT OPEN %s!", NFA_REGEXP_DEBUG_LOG); |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5739 return FALSE; |
|
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5740 } |
|
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8841
diff
changeset
|
5741 #endif |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
5742 nfa_match = FALSE; |
| 4444 | 5743 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5744 // Allocate memory for the lists of nodes. |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5745 size = (prog->nstate + 1) * sizeof(nfa_thread_T); |
| 6547 | 5746 |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5747 list[0].t = alloc(size); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5748 list[0].len = prog->nstate + 1; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5749 list[1].t = alloc(size); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5750 list[1].len = prog->nstate + 1; |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
5751 if (list[0].t == NULL || list[1].t == NULL) |
| 4444 | 5752 goto theend; |
| 5753 | |
| 5754 #ifdef ENABLE_LOG | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
5755 log_fd = fopen(NFA_REGEXP_RUN_LOG, "a"); |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5756 if (log_fd == NULL) |
| 4444 | 5757 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15265
diff
changeset
|
5758 emsg(_(e_log_open_failed)); |
| 4444 | 5759 log_fd = stderr; |
| 5760 } | |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5761 fprintf(log_fd, "**********************************\n"); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5762 nfa_set_code(start->c); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5763 fprintf(log_fd, " RUNNING nfa_regmatch() starting with state %d, code %s\n", |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5764 abs(start->id), code); |
|
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
5765 fprintf(log_fd, "**********************************\n"); |
| 4444 | 5766 #endif |
| 5767 | |
| 5768 thislist = &list[0]; | |
| 5769 thislist->n = 0; | |
|
5227
a08fa2919f2b
updated for version 7.4a.039
Bram Moolenaar <bram@vim.org>
parents:
5221
diff
changeset
|
5770 thislist->has_pim = FALSE; |
| 4444 | 5771 nextlist = &list[1]; |
| 5772 nextlist->n = 0; | |
|
5227
a08fa2919f2b
updated for version 7.4a.039
Bram Moolenaar <bram@vim.org>
parents:
5221
diff
changeset
|
5773 nextlist->has_pim = FALSE; |
| 4444 | 5774 #ifdef ENABLE_LOG |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5775 fprintf(log_fd, "(---) STARTSTATE first\n"); |
| 4444 | 5776 #endif |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5777 thislist->id = rex.nfa_listid + 1; |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5778 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5779 // Inline optimized code for addstate(thislist, start, m, 0) if we know |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5780 // it's the first MOPEN. |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5781 if (toplevel) |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5782 { |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5783 if (REG_MULTI) |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5784 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5785 m->norm.list.multi[0].start_lnum = rex.lnum; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5786 m->norm.list.multi[0].start_col = (colnr_T)(rex.input - rex.line); |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
5787 m->norm.orig_start_col = m->norm.list.multi[0].start_col; |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5788 } |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5789 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5790 m->norm.list.line[0].start = rex.input; |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5791 m->norm.in_use = 1; |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5792 r = addstate(thislist, start->out, m, NULL, 0); |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5793 } |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
5794 else |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5795 r = addstate(thislist, start, m, NULL, 0); |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5796 if (r == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5797 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5798 nfa_match = NFA_TOO_EXPENSIVE; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5799 goto theend; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
5800 } |
| 4444 | 5801 |
|
31804
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31778
diff
changeset
|
5802 #define ADD_STATE_IF_MATCH(state) \ |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31778
diff
changeset
|
5803 if (result) \ |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31778
diff
changeset
|
5804 { \ |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31778
diff
changeset
|
5805 add_state = state->out; \ |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31778
diff
changeset
|
5806 add_off = clen; \ |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5807 } |
| 4444 | 5808 |
| 5809 /* | |
| 5810 * Run for each character. | |
| 5811 */ | |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
5812 for (;;) |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
5813 { |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5814 int curc; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5815 int clen; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5816 |
| 4444 | 5817 if (has_mbyte) |
| 5818 { | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5819 curc = (*mb_ptr2char)(rex.input); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5820 clen = (*mb_ptr2len)(rex.input); |
| 4444 | 5821 } |
| 5822 else | |
| 5823 { | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5824 curc = *rex.input; |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5825 clen = 1; |
| 4444 | 5826 } |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5827 if (curc == NUL) |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
5828 { |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5829 clen = 0; |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
5830 go_to_nextline = FALSE; |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
5831 } |
| 4444 | 5832 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5833 // swap lists |
| 4444 | 5834 thislist = &list[flag]; |
| 5835 nextlist = &list[flag ^= 1]; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5836 nextlist->n = 0; // clear nextlist |
|
5227
a08fa2919f2b
updated for version 7.4a.039
Bram Moolenaar <bram@vim.org>
parents:
5221
diff
changeset
|
5837 nextlist->has_pim = FALSE; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5838 ++rex.nfa_listid; |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14159
diff
changeset
|
5839 if (prog->re_engine == AUTOMATIC_ENGINE |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5840 && (rex.nfa_listid >= NFA_MAX_STATES |
|
14173
4b59671bce9c
patch 8.1.0104: can't build without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14163
diff
changeset
|
5841 # ifdef FEAT_EVAL |
|
4b59671bce9c
patch 8.1.0104: can't build without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14163
diff
changeset
|
5842 || nfa_fail_for_testing |
|
4b59671bce9c
patch 8.1.0104: can't build without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14163
diff
changeset
|
5843 # endif |
|
4b59671bce9c
patch 8.1.0104: can't build without the +eval feature
Christian Brabandt <cb@256bit.org>
parents:
14163
diff
changeset
|
5844 )) |
| 6328 | 5845 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5846 // too many states, retry with old engine |
| 6328 | 5847 nfa_match = NFA_TOO_EXPENSIVE; |
| 5848 goto theend; | |
| 5849 } | |
| 5850 | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5851 thislist->id = rex.nfa_listid; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5852 nextlist->id = rex.nfa_listid + 1; |
| 4444 | 5853 |
| 5854 #ifdef ENABLE_LOG | |
| 5855 fprintf(log_fd, "------------------------------------------\n"); | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5856 fprintf(log_fd, ">>> Reginput is \"%s\"\n", rex.input); |
|
14145
1cf832945469
patch 8.1.0090: "..." used inconsistently in a message
Christian Brabandt <cb@256bit.org>
parents:
14121
diff
changeset
|
5857 fprintf(log_fd, ">>> Advanced one character... Current char is %c (code %d) \n", curc, (int)curc); |
| 4444 | 5858 fprintf(log_fd, ">>> Thislist has %d states available: ", thislist->n); |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5859 { |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5860 int i; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5861 |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5862 for (i = 0; i < thislist->n; i++) |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5863 fprintf(log_fd, "%d ", abs(thislist->t[i].state->id)); |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
5864 } |
| 4444 | 5865 fprintf(log_fd, "\n"); |
| 5866 #endif | |
| 5867 | |
| 4460 | 5868 #ifdef NFA_REGEXP_DEBUG_LOG |
| 4444 | 5869 fprintf(debug, "\n-------------------\n"); |
| 5870 #endif | |
| 4480 | 5871 /* |
| 5872 * If the state lists are empty we can stop. | |
| 5873 */ | |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
5874 if (thislist->n == 0) |
| 4480 | 5875 break; |
| 4444 | 5876 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5877 // compute nextlist |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
5878 for (listidx = 0; listidx < thislist->n; ++listidx) |
| 4444 | 5879 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5880 // If the list gets very long there probably is something wrong. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5881 // At least allow interrupting with CTRL-C. |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
5882 fast_breakcheck(); |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
5883 if (got_int) |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
5884 break; |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
5885 #ifdef FEAT_RELTIME |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29028
diff
changeset
|
5886 if (nfa_did_time_out()) |
|
29028
e0cf900448c1
patch 8.2.5036: using two counters for timeout check in NFA engine
Bram Moolenaar <Bram@vim.org>
parents:
29012
diff
changeset
|
5887 break; |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
5888 #endif |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
5889 t = &thislist->t[listidx]; |
| 4444 | 5890 |
| 4460 | 5891 #ifdef NFA_REGEXP_DEBUG_LOG |
| 4444 | 5892 nfa_set_code(t->state->c); |
| 5893 fprintf(debug, "%s, ", code); | |
| 5894 #endif | |
| 5895 #ifdef ENABLE_LOG | |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5896 { |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5897 int col; |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5898 |
|
4690
9d97a0c045ef
updated for version 7.3.1092
Bram Moolenaar <bram@vim.org>
parents:
4688
diff
changeset
|
5899 if (t->subs.norm.in_use <= 0) |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5900 col = -1; |
|
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5901 else if (REG_MULTI) |
| 6547 | 5902 col = t->subs.norm.list.multi[0].start_col; |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5903 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5904 col = (int)(t->subs.norm.list.line[0].start - rex.line); |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5905 nfa_set_code(t->state->c); |
|
14145
1cf832945469
patch 8.1.0090: "..." used inconsistently in a message
Christian Brabandt <cb@256bit.org>
parents:
14121
diff
changeset
|
5906 fprintf(log_fd, "(%d) char %d %s (start col %d)%s... \n", |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5907 abs(t->state->id), (int)t->state->c, code, col, |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
5908 pim_info(&t->pim)); |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
5909 } |
| 4444 | 5910 #endif |
| 5911 | |
| 5912 /* | |
| 5913 * Handle the possible codes of the current state. | |
| 5914 * The most important is NFA_MATCH. | |
| 5915 */ | |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5916 add_state = NULL; |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
5917 add_here = FALSE; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
5918 add_count = 0; |
| 4444 | 5919 switch (t->state->c) |
| 5920 { | |
| 5921 case NFA_MATCH: | |
|
4567
96c1a7850097
updated for version 7.3.1031
Bram Moolenaar <bram@vim.org>
parents:
4565
diff
changeset
|
5922 { |
|
23262
dca9e6b931d3
patch 8.2.2177: pattern "^" does not match if first character is combining
Bram Moolenaar <Bram@vim.org>
parents:
23251
diff
changeset
|
5923 // If the match is not at the start of the line, ends before a |
|
dca9e6b931d3
patch 8.2.2177: pattern "^" does not match if first character is combining
Bram Moolenaar <Bram@vim.org>
parents:
23251
diff
changeset
|
5924 // composing characters and rex.reg_icombine is not set, that |
|
dca9e6b931d3
patch 8.2.2177: pattern "^" does not match if first character is combining
Bram Moolenaar <Bram@vim.org>
parents:
23251
diff
changeset
|
5925 // is not really a match. |
|
dca9e6b931d3
patch 8.2.2177: pattern "^" does not match if first character is combining
Bram Moolenaar <Bram@vim.org>
parents:
23251
diff
changeset
|
5926 if (enc_utf8 && !rex.reg_icombine |
|
dca9e6b931d3
patch 8.2.2177: pattern "^" does not match if first character is combining
Bram Moolenaar <Bram@vim.org>
parents:
23251
diff
changeset
|
5927 && rex.input != rex.line && utf_iscomposing(curc)) |
| 5901 | 5928 break; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
5929 |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
5930 nfa_match = TRUE; |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5931 copy_sub(&submatch->norm, &t->subs.norm); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5932 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5933 if (rex.nfa_has_zsubexpr) |
|
4712
832bf8136d86
updated for version 7.3.1103
Bram Moolenaar <bram@vim.org>
parents:
4696
diff
changeset
|
5934 copy_sub(&submatch->synt, &t->subs.synt); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5935 #endif |
| 4444 | 5936 #ifdef ENABLE_LOG |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5937 log_subsexpr(&t->subs); |
| 4444 | 5938 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5939 // Found the left-most longest match, do not look at any other |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5940 // states at this position. When the list of states is going |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5941 // to be empty quit without advancing, so that "rex.input" is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5942 // correct. |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
5943 if (nextlist->n == 0) |
|
4553
7b835b2969af
updated for version 7.3.1024
Bram Moolenaar <bram@vim.org>
parents:
4551
diff
changeset
|
5944 clen = 0; |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
5945 goto nextchar; |
|
4567
96c1a7850097
updated for version 7.3.1031
Bram Moolenaar <bram@vim.org>
parents:
4565
diff
changeset
|
5946 } |
| 4444 | 5947 |
| 5948 case NFA_END_INVISIBLE: | |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
5949 case NFA_END_INVISIBLE_NEG: |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
5950 case NFA_END_PATTERN: |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5951 /* |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5952 * This is only encountered after a NFA_START_INVISIBLE or |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
5953 * NFA_START_INVISIBLE_BEFORE node. |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
5954 * They surround a zero-width group, used with "\@=", "\&", |
|
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
5955 * "\@!", "\@<=" and "\@<!". |
| 4444 | 5956 * If we got here, it means that the current "invisible" group |
| 5957 * finished successfully, so return control to the parent | |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5958 * nfa_regmatch(). For a look-behind match only when it ends |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5959 * in the position in "nfa_endp". |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5960 * Submatches are stored in *m, and used in the parent call. |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5961 */ |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
5962 #ifdef ENABLE_LOG |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5963 if (nfa_endp != NULL) |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5964 { |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5965 if (REG_MULTI) |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5966 fprintf(log_fd, "Current lnum: %d, endp lnum: %d; current col: %d, endp col: %d\n", |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5967 (int)rex.lnum, |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5968 (int)nfa_endp->se_u.pos.lnum, |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5969 (int)(rex.input - rex.line), |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5970 nfa_endp->se_u.pos.col); |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5971 else |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5972 fprintf(log_fd, "Current col: %d, endp col: %d\n", |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5973 (int)(rex.input - rex.line), |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5974 (int)(nfa_endp->se_u.ptr - rex.input)); |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5975 } |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
5976 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5977 // If "nfa_endp" is set it's only a match if it ends at |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5978 // "nfa_endp" |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5979 if (nfa_endp != NULL && (REG_MULTI |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5980 ? (rex.lnum != nfa_endp->se_u.pos.lnum |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5981 || (int)(rex.input - rex.line) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5982 != nfa_endp->se_u.pos.col) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5983 : rex.input != nfa_endp->se_u.ptr)) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5984 break; |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5985 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
5986 // do not set submatches for \@! |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
5987 if (t->state->c != NFA_END_INVISIBLE_NEG) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5988 { |
|
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5989 copy_sub(&m->norm, &t->subs.norm); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5990 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
5991 if (rex.nfa_has_zsubexpr) |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5992 copy_sub(&m->synt, &t->subs.synt); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
5993 #endif |
| 4444 | 5994 } |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
5995 #ifdef ENABLE_LOG |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
5996 fprintf(log_fd, "Match found:\n"); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
5997 log_subsexpr(m); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
5998 #endif |
|
4716
a804309e7327
updated for version 7.3.1105
Bram Moolenaar <bram@vim.org>
parents:
4714
diff
changeset
|
5999 nfa_match = TRUE; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6000 // See comment above at "goto nextchar". |
| 5334 | 6001 if (nextlist->n == 0) |
| 6002 clen = 0; | |
| 6003 goto nextchar; | |
| 4444 | 6004 |
| 6005 case NFA_START_INVISIBLE: | |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6006 case NFA_START_INVISIBLE_FIRST: |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6007 case NFA_START_INVISIBLE_NEG: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6008 case NFA_START_INVISIBLE_NEG_FIRST: |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
6009 case NFA_START_INVISIBLE_BEFORE: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6010 case NFA_START_INVISIBLE_BEFORE_FIRST: |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6011 case NFA_START_INVISIBLE_BEFORE_NEG: |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6012 case NFA_START_INVISIBLE_BEFORE_NEG_FIRST: |
| 4444 | 6013 { |
|
4821
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
6014 #ifdef ENABLE_LOG |
|
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
6015 fprintf(log_fd, "Failure chance invisible: %d, what follows: %d\n", |
|
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
6016 failure_chance(t->state->out, 0), |
|
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
6017 failure_chance(t->state->out1->out, 0)); |
|
2f1ee97f5f23
updated for version 7.3.1157
Bram Moolenaar <bram@vim.org>
parents:
4819
diff
changeset
|
6018 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6019 // Do it directly if there already is a PIM or when |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6020 // nfa_postprocess() detected it will work better. |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6021 if (t->pim.result != NFA_PIM_UNUSED |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6022 || t->state->c == NFA_START_INVISIBLE_FIRST |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6023 || t->state->c == NFA_START_INVISIBLE_NEG_FIRST |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6024 || t->state->c == NFA_START_INVISIBLE_BEFORE_FIRST |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6025 || t->state->c == NFA_START_INVISIBLE_BEFORE_NEG_FIRST) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6026 { |
|
5029
c9e2ccc53f2e
updated for version 7.3.1258
Bram Moolenaar <bram@vim.org>
parents:
5006
diff
changeset
|
6027 int in_use = m->norm.in_use; |
|
c9e2ccc53f2e
updated for version 7.3.1258
Bram Moolenaar <bram@vim.org>
parents:
5006
diff
changeset
|
6028 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6029 // Copy submatch info for the recursive call, opposite |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6030 // of what happens on success below. |
|
4997
8a7d3a73adab
updated for version 7.3.1243
Bram Moolenaar <bram@vim.org>
parents:
4958
diff
changeset
|
6031 copy_sub_off(&m->norm, &t->subs.norm); |
| 5370 | 6032 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6033 if (rex.nfa_has_zsubexpr) |
| 5370 | 6034 copy_sub_off(&m->synt, &t->subs.synt); |
| 6035 #endif | |
|
4997
8a7d3a73adab
updated for version 7.3.1243
Bram Moolenaar <bram@vim.org>
parents:
4958
diff
changeset
|
6036 |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6037 /* |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6038 * First try matching the invisible match, then what |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6039 * follows. |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6040 */ |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6041 result = recursive_regmatch(t->state, NULL, prog, |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
6042 submatch, m, &listids, &listids_len); |
| 6328 | 6043 if (result == NFA_TOO_EXPENSIVE) |
| 6044 { | |
| 6045 nfa_match = result; | |
| 6046 goto theend; | |
| 6047 } | |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6048 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6049 // for \@! and \@<! it is a match when the result is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6050 // FALSE |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6051 if (result != (t->state->c == NFA_START_INVISIBLE_NEG |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6052 || t->state->c == NFA_START_INVISIBLE_NEG_FIRST |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6053 || t->state->c |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6054 == NFA_START_INVISIBLE_BEFORE_NEG |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6055 || t->state->c |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6056 == NFA_START_INVISIBLE_BEFORE_NEG_FIRST)) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6057 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6058 // Copy submatch info from the recursive call |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6059 copy_sub_off(&t->subs.norm, &m->norm); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6060 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6061 if (rex.nfa_has_zsubexpr) |
|
4768
82e6588762e4
updated for version 7.3.1131
Bram Moolenaar <bram@vim.org>
parents:
4762
diff
changeset
|
6062 copy_sub_off(&t->subs.synt, &m->synt); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6063 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6064 // If the pattern has \ze and it matched in the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6065 // sub pattern, use it. |
| 5372 | 6066 copy_ze_off(&t->subs.norm, &m->norm); |
|
4657
93b7ed814bec
updated for version 7.3.1076
Bram Moolenaar <bram@vim.org>
parents:
4655
diff
changeset
|
6067 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6068 // t->state->out1 is the corresponding |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6069 // END_INVISIBLE node; Add its out to the current |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6070 // list (zero-width match). |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6071 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6072 add_state = t->state->out1->out; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6073 } |
|
5029
c9e2ccc53f2e
updated for version 7.3.1258
Bram Moolenaar <bram@vim.org>
parents:
5006
diff
changeset
|
6074 m->norm.in_use = in_use; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6075 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6076 else |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6077 { |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6078 nfa_pim_T pim; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6079 |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6080 /* |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6081 * First try matching what follows. Only if a match |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6082 * is found verify the invisible match matches. Add a |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6083 * nfa_pim_T to the following states, it contains info |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6084 * about the invisible match. |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6085 */ |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6086 pim.state = t->state; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6087 pim.result = NFA_PIM_TODO; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6088 pim.subs.norm.in_use = 0; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6089 #ifdef FEAT_SYN_HL |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6090 pim.subs.synt.in_use = 0; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6091 #endif |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6092 if (REG_MULTI) |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6093 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6094 pim.end.pos.col = (int)(rex.input - rex.line); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6095 pim.end.pos.lnum = rex.lnum; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6096 } |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6097 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6098 pim.end.ptr = rex.input; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6099 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6100 // t->state->out1 is the corresponding END_INVISIBLE |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6101 // node; Add its out to the current list (zero-width |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6102 // match). |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
6103 if (addstate_here(thislist, t->state->out1->out, |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
6104 &t->subs, &pim, &listidx) == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
6105 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
6106 nfa_match = NFA_TOO_EXPENSIVE; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
6107 goto theend; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
6108 } |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6109 } |
| 4444 | 6110 } |
| 6111 break; | |
| 6112 | |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6113 case NFA_START_PATTERN: |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6114 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6115 nfa_state_T *skip = NULL; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6116 #ifdef ENABLE_LOG |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6117 int skip_lid = 0; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6118 #endif |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6119 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6120 // There is no point in trying to match the pattern if the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6121 // output state is not going to be added to the list. |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6122 if (state_in_list(nextlist, t->state->out1->out, &t->subs)) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6123 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6124 skip = t->state->out1->out; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6125 #ifdef ENABLE_LOG |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6126 skip_lid = nextlist->id; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6127 #endif |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6128 } |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6129 else if (state_in_list(nextlist, |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6130 t->state->out1->out->out, &t->subs)) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6131 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6132 skip = t->state->out1->out->out; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6133 #ifdef ENABLE_LOG |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6134 skip_lid = nextlist->id; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6135 #endif |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6136 } |
|
4897
91136a41f83f
updated for version 7.3.1194
Bram Moolenaar <bram@vim.org>
parents:
4893
diff
changeset
|
6137 else if (state_in_list(thislist, |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6138 t->state->out1->out->out, &t->subs)) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6139 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6140 skip = t->state->out1->out->out; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6141 #ifdef ENABLE_LOG |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6142 skip_lid = thislist->id; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6143 #endif |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6144 } |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6145 if (skip != NULL) |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6146 { |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6147 #ifdef ENABLE_LOG |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6148 nfa_set_code(skip->c); |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6149 fprintf(log_fd, "> Not trying to match pattern, output state %d is already in list %d. char %d: %s\n", |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6150 abs(skip->id), skip_lid, skip->c, code); |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6151 #endif |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6152 break; |
|
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6153 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6154 // Copy submatch info to the recursive call, opposite of what |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6155 // happens afterwards. |
| 5370 | 6156 copy_sub_off(&m->norm, &t->subs.norm); |
| 6157 #ifdef FEAT_SYN_HL | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6158 if (rex.nfa_has_zsubexpr) |
| 5370 | 6159 copy_sub_off(&m->synt, &t->subs.synt); |
| 6160 #endif | |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6161 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6162 // First try matching the pattern. |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6163 result = recursive_regmatch(t->state, NULL, prog, |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
6164 submatch, m, &listids, &listids_len); |
| 6328 | 6165 if (result == NFA_TOO_EXPENSIVE) |
| 6166 { | |
| 6167 nfa_match = result; | |
| 6168 goto theend; | |
| 6169 } | |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6170 if (result) |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6171 { |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6172 int bytelen; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6173 |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6174 #ifdef ENABLE_LOG |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6175 fprintf(log_fd, "NFA_START_PATTERN matches:\n"); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6176 log_subsexpr(m); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6177 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6178 // Copy submatch info from the recursive call |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6179 copy_sub_off(&t->subs.norm, &m->norm); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6180 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6181 if (rex.nfa_has_zsubexpr) |
|
4768
82e6588762e4
updated for version 7.3.1131
Bram Moolenaar <bram@vim.org>
parents:
4762
diff
changeset
|
6182 copy_sub_off(&t->subs.synt, &m->synt); |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6183 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6184 // Now we need to skip over the matched text and then |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6185 // continue with what follows. |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6186 if (REG_MULTI) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6187 // TODO: multi-line match |
| 6547 | 6188 bytelen = m->norm.list.multi[0].end_col |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6189 - (int)(rex.input - rex.line); |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6190 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6191 bytelen = (int)(m->norm.list.line[0].end - rex.input); |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6192 |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6193 #ifdef ENABLE_LOG |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6194 fprintf(log_fd, "NFA_START_PATTERN length: %d\n", bytelen); |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6195 #endif |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6196 if (bytelen == 0) |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6197 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6198 // empty match, output of corresponding |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6199 // NFA_END_PATTERN/NFA_SKIP to be used at current |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6200 // position |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6201 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6202 add_state = t->state->out1->out->out; |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6203 } |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6204 else if (bytelen <= clen) |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6205 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6206 // match current character, output of corresponding |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6207 // NFA_END_PATTERN to be used at next position. |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6208 add_state = t->state->out1->out->out; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6209 add_off = clen; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6210 } |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6211 else |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6212 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6213 // skip over the matched characters, set character |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6214 // count in NFA_SKIP |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6215 add_state = t->state->out1->out; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6216 add_off = bytelen; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6217 add_count = bytelen - clen; |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6218 } |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6219 } |
|
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6220 break; |
|
4787
7fde662e1db2
updated for version 7.3.1140
Bram Moolenaar <bram@vim.org>
parents:
4785
diff
changeset
|
6221 } |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
6222 |
| 4444 | 6223 case NFA_BOL: |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6224 if (rex.input == rex.line) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6225 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6226 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6227 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6228 } |
| 4444 | 6229 break; |
| 6230 | |
| 6231 case NFA_EOL: | |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6232 if (curc == NUL) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6233 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6234 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6235 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6236 } |
| 4444 | 6237 break; |
| 6238 | |
| 6239 case NFA_BOW: | |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6240 result = TRUE; |
| 4444 | 6241 |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6242 if (curc == NUL) |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6243 result = FALSE; |
| 4444 | 6244 else if (has_mbyte) |
| 6245 { | |
| 6246 int this_class; | |
| 6247 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6248 // Get class of current and previous char (if it exists). |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6249 this_class = mb_get_class_buf(rex.input, rex.reg_buf); |
| 4444 | 6250 if (this_class <= 1) |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6251 result = FALSE; |
| 4444 | 6252 else if (reg_prev_class() == this_class) |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6253 result = FALSE; |
| 4444 | 6254 } |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6255 else if (!vim_iswordc_buf(curc, rex.reg_buf) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6256 || (rex.input > rex.line |
|
31233
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
6257 && vim_iswordc_buf(rex.input[-1], rex.reg_buf))) |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6258 result = FALSE; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6259 if (result) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6260 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6261 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6262 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6263 } |
| 4444 | 6264 break; |
| 6265 | |
| 6266 case NFA_EOW: | |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6267 result = TRUE; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6268 if (rex.input == rex.line) |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6269 result = FALSE; |
| 4444 | 6270 else if (has_mbyte) |
| 6271 { | |
| 6272 int this_class, prev_class; | |
| 6273 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6274 // Get class of current and previous char (if it exists). |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6275 this_class = mb_get_class_buf(rex.input, rex.reg_buf); |
| 4444 | 6276 prev_class = reg_prev_class(); |
| 6277 if (this_class == prev_class | |
| 6278 || prev_class == 0 || prev_class == 1) | |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6279 result = FALSE; |
| 4444 | 6280 } |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6281 else if (!vim_iswordc_buf(rex.input[-1], rex.reg_buf) |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6282 || (rex.input[0] != NUL |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6283 && vim_iswordc_buf(curc, rex.reg_buf))) |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6284 result = FALSE; |
|
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6285 if (result) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6286 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6287 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6288 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6289 } |
| 4444 | 6290 break; |
| 6291 | |
|
4671
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
6292 case NFA_BOF: |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6293 if (rex.lnum == 0 && rex.input == rex.line |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6294 && (!REG_MULTI || rex.reg_firstlnum == 1)) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6295 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6296 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6297 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6298 } |
|
4671
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
6299 break; |
|
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
6300 |
|
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
6301 case NFA_EOF: |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6302 if (rex.lnum == rex.reg_maxline && curc == NUL) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6303 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6304 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6305 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6306 } |
|
4671
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
6307 break; |
|
b3c59716e700
updated for version 7.3.1083
Bram Moolenaar <bram@vim.org>
parents:
4669
diff
changeset
|
6308 |
| 4444 | 6309 case NFA_COMPOSING: |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
6310 { |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6311 int mc = curc; |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
6312 int len = 0; |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
6313 nfa_state_T *end; |
|
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
6314 nfa_state_T *sta; |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6315 int cchars[MAX_MCO]; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6316 int ccount = 0; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6317 int j; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6318 |
| 4444 | 6319 sta = t->state->out; |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
6320 len = 0; |
|
4535
45f97c349537
updated for version 7.3.1015
Bram Moolenaar <bram@vim.org>
parents:
4533
diff
changeset
|
6321 if (utf_iscomposing(sta->c)) |
|
45f97c349537
updated for version 7.3.1015
Bram Moolenaar <bram@vim.org>
parents:
4533
diff
changeset
|
6322 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6323 // Only match composing character(s), ignore base |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6324 // character. Used for ".{composing}" and "{composing}" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6325 // (no preceding character). |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6326 len += mb_char2len(mc); |
|
4535
45f97c349537
updated for version 7.3.1015
Bram Moolenaar <bram@vim.org>
parents:
4533
diff
changeset
|
6327 } |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6328 if (rex.reg_icombine && len == 0) |
| 4444 | 6329 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6330 // If \Z was present, then ignore composing characters. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6331 // When ignoring the base character this always matches. |
|
13208
e96663c35bab
patch 8.0.1478: unnecessary condition
Christian Brabandt <cb@256bit.org>
parents:
13192
diff
changeset
|
6332 if (sta->c != curc) |
|
4529
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6333 result = FAIL; |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6334 else |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6335 result = OK; |
|
4529
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6336 while (sta->c != NFA_END_COMPOSING) |
|
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6337 sta = sta->out; |
| 4444 | 6338 } |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6339 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6340 // Check base character matches first, unless ignored. |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6341 else if (len > 0 || mc == sta->c) |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6342 { |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6343 if (len == 0) |
|
4529
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6344 { |
|
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6345 len += mb_char2len(mc); |
|
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6346 sta = sta->out; |
|
432a6b8c7d93
updated for version 7.3.1012
Bram Moolenaar <bram@vim.org>
parents:
4527
diff
changeset
|
6347 } |
| 4444 | 6348 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6349 // We don't care about the order of composing characters. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6350 // Get them into cchars[] first. |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6351 while (len < clen) |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6352 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6353 mc = mb_ptr2char(rex.input + len); |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6354 cchars[ccount++] = mc; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6355 len += mb_char2len(mc); |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6356 if (ccount == MAX_MCO) |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6357 break; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6358 } |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6359 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6360 // Check that each composing char in the pattern matches a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6361 // composing char in the text. We do not check if all |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6362 // composing chars are matched. |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6363 result = OK; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6364 while (sta->c != NFA_END_COMPOSING) |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6365 { |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6366 for (j = 0; j < ccount; ++j) |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6367 if (cchars[j] == sta->c) |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6368 break; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6369 if (j == ccount) |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6370 { |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6371 result = FAIL; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6372 break; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6373 } |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6374 sta = sta->out; |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6375 } |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6376 } |
|
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6377 else |
|
4525
36ddcf4cecbc
updated for version 7.3.1010
Bram Moolenaar <bram@vim.org>
parents:
4517
diff
changeset
|
6378 result = FAIL; |
|
4547
fc997f05cbc7
updated for version 7.3.1021
Bram Moolenaar <bram@vim.org>
parents:
4543
diff
changeset
|
6379 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6380 end = t->state->out1; // NFA_END_COMPOSING |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6381 ADD_STATE_IF_MATCH(end); |
| 4444 | 6382 break; |
|
4527
55bcaa1d2749
updated for version 7.3.1011
Bram Moolenaar <bram@vim.org>
parents:
4525
diff
changeset
|
6383 } |
| 4444 | 6384 |
| 6385 case NFA_NEWL: | |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6386 if (curc == NUL && !rex.reg_line_lbr && REG_MULTI |
|
31233
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
6387 && rex.lnum <= rex.reg_maxline) |
| 4444 | 6388 { |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
6389 go_to_nextline = TRUE; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6390 // Pass -1 for the offset, which means taking the position |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6391 // at the start of the next line. |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6392 add_state = t->state->out; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6393 add_off = -1; |
| 4444 | 6394 } |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6395 else if (curc == '\n' && rex.reg_line_lbr) |
|
4555
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
6396 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6397 // match \n as if it is an ordinary character |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6398 add_state = t->state->out; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6399 add_off = 1; |
|
4555
b2946c06d1b6
updated for version 7.3.1025
Bram Moolenaar <bram@vim.org>
parents:
4553
diff
changeset
|
6400 } |
| 4444 | 6401 break; |
| 6402 | |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6403 case NFA_START_COLL: |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6404 case NFA_START_NEG_COLL: |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6405 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6406 // What follows is a list of characters, until NFA_END_COLL. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6407 // One of them must match or none of them must match. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6408 nfa_state_T *state; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6409 int result_if_matched; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6410 int c1, c2; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6411 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6412 // Never match EOL. If it's part of the collection it is added |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6413 // as a separate state with an OR. |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6414 if (curc == NUL) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6415 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6416 |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6417 state = t->state->out; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6418 result_if_matched = (t->state->c == NFA_START_COLL); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6419 for (;;) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6420 { |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6421 if (state->c == NFA_END_COLL) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6422 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6423 result = !result_if_matched; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6424 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6425 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6426 if (state->c == NFA_RANGE_MIN) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6427 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6428 c1 = state->val; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6429 state = state->out; // advance to NFA_RANGE_MAX |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6430 c2 = state->val; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6431 #ifdef ENABLE_LOG |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6432 fprintf(log_fd, "NFA_RANGE_MIN curc=%d c1=%d c2=%d\n", |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6433 curc, c1, c2); |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6434 #endif |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6435 if (curc >= c1 && curc <= c2) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6436 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6437 result = result_if_matched; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6438 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6439 } |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6440 if (rex.reg_ic) |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6441 { |
|
20772
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
6442 int curc_low = MB_CASEFOLD(curc); |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6443 int done = FALSE; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6444 |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6445 for ( ; c1 <= c2; ++c1) |
|
20772
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
6446 if (MB_CASEFOLD(c1) == curc_low) |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6447 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6448 result = result_if_matched; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6449 done = TRUE; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6450 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6451 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6452 if (done) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6453 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6454 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6455 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6456 else if (state->c < 0 ? check_char_class(state->c, curc) |
|
13192
9bd4151e5aeb
patch 8.0.1470: integer overflow when using regexp pattern
Christian Brabandt <cb@256bit.org>
parents:
13043
diff
changeset
|
6457 : (curc == state->c |
|
20772
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
6458 || (rex.reg_ic && MB_CASEFOLD(curc) |
|
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
6459 == MB_CASEFOLD(state->c)))) |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6460 { |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6461 result = result_if_matched; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6462 break; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6463 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6464 state = state->out; |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6465 } |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6466 if (result) |
|
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6467 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6468 // next state is in out of the NFA_END_COLL, out1 of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6469 // START points to the END state |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6470 add_state = t->state->out1->out; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6471 add_off = clen; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6472 } |
| 4444 | 6473 break; |
|
4781
c02c7df9bdc9
updated for version 7.3.1137
Bram Moolenaar <bram@vim.org>
parents:
4772
diff
changeset
|
6474 } |
| 4444 | 6475 |
| 6476 case NFA_ANY: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6477 // Any char except '\0', (end of input) does not match. |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6478 if (curc > 0) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6479 { |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6480 add_state = t->state->out; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6481 add_off = clen; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6482 } |
| 4444 | 6483 break; |
| 6484 | |
| 5901 | 6485 case NFA_ANY_COMPOSING: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6486 // On a composing character skip over it. Otherwise do |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6487 // nothing. Always matches. |
| 5901 | 6488 if (enc_utf8 && utf_iscomposing(curc)) |
| 6489 { | |
| 6490 add_off = clen; | |
| 6491 } | |
| 6492 else | |
| 6493 { | |
| 6494 add_here = TRUE; | |
| 6495 add_off = 0; | |
| 6496 } | |
| 6497 add_state = t->state->out; | |
| 6498 break; | |
| 6499 | |
| 4444 | 6500 /* |
| 6501 * Character classes like \a for alpha, \d for digit etc. | |
| 6502 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6503 case NFA_IDENT: // \i |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6504 result = vim_isIDc(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6505 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6506 break; |
| 6507 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6508 case NFA_SIDENT: // \I |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6509 result = !VIM_ISDIGIT(curc) && vim_isIDc(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6510 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6511 break; |
| 6512 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6513 case NFA_KWORD: // \k |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6514 result = vim_iswordp_buf(rex.input, rex.reg_buf); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6515 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6516 break; |
| 6517 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6518 case NFA_SKWORD: // \K |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6519 result = !VIM_ISDIGIT(curc) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6520 && vim_iswordp_buf(rex.input, rex.reg_buf); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6521 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6522 break; |
| 6523 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6524 case NFA_FNAME: // \f |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6525 result = vim_isfilec(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6526 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6527 break; |
| 6528 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6529 case NFA_SFNAME: // \F |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6530 result = !VIM_ISDIGIT(curc) && vim_isfilec(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6531 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6532 break; |
| 6533 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6534 case NFA_PRINT: // \p |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6535 result = vim_isprintc(PTR2CHAR(rex.input)); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6536 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6537 break; |
| 6538 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6539 case NFA_SPRINT: // \P |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6540 result = !VIM_ISDIGIT(curc) && vim_isprintc(PTR2CHAR(rex.input)); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6541 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6542 break; |
| 6543 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6544 case NFA_WHITE: // \s |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6545 result = VIM_ISWHITE(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6546 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6547 break; |
| 6548 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6549 case NFA_NWHITE: // \S |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6550 result = curc != NUL && !VIM_ISWHITE(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6551 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6552 break; |
| 6553 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6554 case NFA_DIGIT: // \d |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6555 result = ri_digit(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6556 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6557 break; |
| 6558 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6559 case NFA_NDIGIT: // \D |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6560 result = curc != NUL && !ri_digit(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6561 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6562 break; |
| 6563 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6564 case NFA_HEX: // \x |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6565 result = ri_hex(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6566 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6567 break; |
| 6568 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6569 case NFA_NHEX: // \X |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6570 result = curc != NUL && !ri_hex(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6571 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6572 break; |
| 6573 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6574 case NFA_OCTAL: // \o |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6575 result = ri_octal(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6576 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6577 break; |
| 6578 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6579 case NFA_NOCTAL: // \O |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6580 result = curc != NUL && !ri_octal(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6581 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6582 break; |
| 6583 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6584 case NFA_WORD: // \w |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6585 result = ri_word(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6586 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6587 break; |
| 6588 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6589 case NFA_NWORD: // \W |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6590 result = curc != NUL && !ri_word(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6591 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6592 break; |
| 6593 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6594 case NFA_HEAD: // \h |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6595 result = ri_head(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6596 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6597 break; |
| 6598 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6599 case NFA_NHEAD: // \H |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6600 result = curc != NUL && !ri_head(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6601 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6602 break; |
| 6603 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6604 case NFA_ALPHA: // \a |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6605 result = ri_alpha(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6606 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6607 break; |
| 6608 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6609 case NFA_NALPHA: // \A |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6610 result = curc != NUL && !ri_alpha(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6611 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6612 break; |
| 6613 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6614 case NFA_LOWER: // \l |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6615 result = ri_lower(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6616 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6617 break; |
| 6618 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6619 case NFA_NLOWER: // \L |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6620 result = curc != NUL && !ri_lower(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6621 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6622 break; |
| 6623 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6624 case NFA_UPPER: // \u |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6625 result = ri_upper(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6626 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6627 break; |
| 6628 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6629 case NFA_NUPPER: // \U |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
6630 result = curc != NUL && !ri_upper(curc); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6631 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6632 break; |
| 6633 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6634 case NFA_LOWER_IC: // [a-z] |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6635 result = ri_lower(curc) || (rex.reg_ic && ri_upper(curc)); |
| 5296 | 6636 ADD_STATE_IF_MATCH(t->state); |
| 6637 break; | |
| 6638 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6639 case NFA_NLOWER_IC: // [^a-z] |
| 5296 | 6640 result = curc != NUL |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6641 && !(ri_lower(curc) || (rex.reg_ic && ri_upper(curc))); |
| 5296 | 6642 ADD_STATE_IF_MATCH(t->state); |
| 6643 break; | |
| 6644 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6645 case NFA_UPPER_IC: // [A-Z] |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6646 result = ri_upper(curc) || (rex.reg_ic && ri_lower(curc)); |
| 5296 | 6647 ADD_STATE_IF_MATCH(t->state); |
| 6648 break; | |
| 6649 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6650 case NFA_NUPPER_IC: // ^[A-Z] |
| 5296 | 6651 result = curc != NUL |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6652 && !(ri_upper(curc) || (rex.reg_ic && ri_lower(curc))); |
| 5296 | 6653 ADD_STATE_IF_MATCH(t->state); |
| 6654 break; | |
| 6655 | |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6656 case NFA_BACKREF1: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6657 case NFA_BACKREF2: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6658 case NFA_BACKREF3: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6659 case NFA_BACKREF4: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6660 case NFA_BACKREF5: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6661 case NFA_BACKREF6: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6662 case NFA_BACKREF7: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6663 case NFA_BACKREF8: |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6664 case NFA_BACKREF9: |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6665 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6666 case NFA_ZREF1: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6667 case NFA_ZREF2: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6668 case NFA_ZREF3: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6669 case NFA_ZREF4: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6670 case NFA_ZREF5: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6671 case NFA_ZREF6: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6672 case NFA_ZREF7: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6673 case NFA_ZREF8: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6674 case NFA_ZREF9: |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6675 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6676 // \1 .. \9 \z1 .. \z9 |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6677 { |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6678 int subidx; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6679 int bytelen; |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6680 |
|
32192
e70c4cdad31d
patch 9.0.1427: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
31877
diff
changeset
|
6681 #ifdef FEAT_SYN_HL |
|
e70c4cdad31d
patch 9.0.1427: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
31877
diff
changeset
|
6682 if (t->state->c >= NFA_BACKREF1 && t->state->c <= NFA_BACKREF9) |
|
e70c4cdad31d
patch 9.0.1427: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
31877
diff
changeset
|
6683 #endif |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6684 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6685 subidx = t->state->c - NFA_BACKREF1 + 1; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6686 result = match_backref(&t->subs.norm, subidx, &bytelen); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6687 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6688 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6689 else |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6690 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6691 subidx = t->state->c - NFA_ZREF1 + 1; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6692 result = match_zref(subidx, &bytelen); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6693 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6694 #endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
6695 |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6696 if (result) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6697 { |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6698 if (bytelen == 0) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6699 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6700 // empty match always works, output of NFA_SKIP to be |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6701 // used next |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6702 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6703 add_state = t->state->out->out; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6704 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6705 else if (bytelen <= clen) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6706 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6707 // match current character, jump ahead to out of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6708 // NFA_SKIP |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6709 add_state = t->state->out->out; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6710 add_off = clen; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6711 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6712 else |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6713 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6714 // skip over the matched characters, set character |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6715 // count in NFA_SKIP |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6716 add_state = t->state->out; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6717 add_off = bytelen; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6718 add_count = bytelen - clen; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6719 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6720 } |
| 4482 | 6721 break; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6722 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6723 case NFA_SKIP: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6724 // character of previous matching \1 .. \9 or \@> |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6725 if (t->count - clen <= 0) |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6726 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6727 // end of match, go to what follows |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6728 add_state = t->state->out; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6729 add_off = clen; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6730 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6731 else |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6732 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6733 // add state again with decremented count |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6734 add_state = t->state; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6735 add_off = 0; |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6736 add_count = t->count - clen; |
|
4571
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6737 } |
|
b2a8e3a66f8c
updated for version 7.3.1033
Bram Moolenaar <bram@vim.org>
parents:
4569
diff
changeset
|
6738 break; |
| 4482 | 6739 |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6740 case NFA_LNUM: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6741 case NFA_LNUM_GT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6742 case NFA_LNUM_LT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6743 result = (REG_MULTI && |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6744 nfa_re_num_cmp(t->state->val, t->state->c - NFA_LNUM, |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6745 (long_u)(rex.lnum + rex.reg_firstlnum))); |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6746 if (result) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6747 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6748 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6749 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6750 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6751 break; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6752 |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6753 case NFA_COL: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6754 case NFA_COL_GT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6755 case NFA_COL_LT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6756 result = nfa_re_num_cmp(t->state->val, t->state->c - NFA_COL, |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6757 (long_u)(rex.input - rex.line) + 1); |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6758 if (result) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6759 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6760 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6761 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6762 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6763 break; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6764 |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6765 case NFA_VCOL: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6766 case NFA_VCOL_GT: |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6767 case NFA_VCOL_LT: |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6768 { |
| 6499 | 6769 int op = t->state->c - NFA_VCOL; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6770 colnr_T col = (colnr_T)(rex.input - rex.line); |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6771 win_T *wp = rex.reg_win == NULL ? curwin : rex.reg_win; |
| 6499 | 6772 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6773 // Bail out quickly when there can't be a match, avoid the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6774 // overhead of win_linetabsize() on long lines. |
| 6653 | 6775 if (op != 1 && col > t->state->val |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
6776 * (has_mbyte ? MB_MAXBYTES : 1)) |
| 6499 | 6777 break; |
| 6510 | 6778 result = FALSE; |
| 6779 if (op == 1 && col - 1 > t->state->val && col > 100) | |
| 6780 { | |
| 6781 int ts = wp->w_buffer->b_p_ts; | |
| 6782 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6783 // Guess that a character won't use more columns than |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6784 // 'tabstop', with a minimum of 4. |
| 6510 | 6785 if (ts < 4) |
| 6786 ts = 4; | |
| 6787 result = col > t->state->val * ts; | |
| 6788 } | |
| 6789 if (!result) | |
|
29777
f1c5bd4acbbc
patch 9.0.0228: crash when pattern looks below the last line
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
6790 { |
|
30156
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6791 linenr_T lnum = REG_MULTI |
|
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6792 ? rex.reg_firstlnum + rex.lnum : 1; |
|
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6793 long_u vcol; |
|
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6794 |
|
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6795 if (REG_MULTI && (lnum <= 0 |
|
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6796 || lnum > wp->w_buffer->b_ml.ml_line_count)) |
|
d58331e0f14a
patch 9.0.0414: matchstr() still does not match column offset
Bram Moolenaar <Bram@vim.org>
parents:
30142
diff
changeset
|
6797 lnum = 1; |
|
31140
a52697bcffa6
patch 9.0.0904: various comment and indent flaws
Bram Moolenaar <Bram@vim.org>
parents:
30156
diff
changeset
|
6798 vcol = (long_u)win_linetabsize(wp, lnum, rex.line, col); |
|
29777
f1c5bd4acbbc
patch 9.0.0228: crash when pattern looks below the last line
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
6799 result = nfa_re_num_cmp(t->state->val, op, vcol + 1); |
|
f1c5bd4acbbc
patch 9.0.0228: crash when pattern looks below the last line
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
6800 } |
| 6499 | 6801 if (result) |
| 6802 { | |
| 6803 add_here = TRUE; | |
| 6804 add_state = t->state->out; | |
| 6805 } | |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6806 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6807 break; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6808 |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6809 case NFA_MARK: |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6810 case NFA_MARK_GT: |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6811 case NFA_MARK_LT: |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6812 { |
|
28247
f70015784777
patch 8.2.4649: various formatting problems
Bram Moolenaar <Bram@vim.org>
parents:
28135
diff
changeset
|
6813 pos_T *pos; |
|
f70015784777
patch 8.2.4649: various formatting problems
Bram Moolenaar <Bram@vim.org>
parents:
28135
diff
changeset
|
6814 size_t col = REG_MULTI ? rex.input - rex.line : 0; |
|
f70015784777
patch 8.2.4649: various formatting problems
Bram Moolenaar <Bram@vim.org>
parents:
28135
diff
changeset
|
6815 |
|
f70015784777
patch 8.2.4649: various formatting problems
Bram Moolenaar <Bram@vim.org>
parents:
28135
diff
changeset
|
6816 pos = getmark_buf(rex.reg_buf, t->state->val, FALSE); |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6817 |
|
26161
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6818 // Line may have been freed, get it again. |
|
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6819 if (REG_MULTI) |
|
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6820 { |
|
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6821 rex.line = reg_getline(rex.lnum); |
|
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6822 rex.input = rex.line + col; |
|
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6823 } |
|
9835f424bef5
patch 8.2.3612: using freed memory with regexp using a mark
Bram Moolenaar <Bram@vim.org>
parents:
25747
diff
changeset
|
6824 |
|
24693
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6825 // Compare the mark position to the match position, if the mark |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6826 // exists and mark is set in reg_buf. |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6827 if (pos != NULL && pos->lnum > 0) |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6828 { |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6829 colnr_T pos_col = pos->lnum == rex.lnum + rex.reg_firstlnum |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6830 && pos->col == MAXCOL |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6831 ? (colnr_T)STRLEN(reg_getline( |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6832 pos->lnum - rex.reg_firstlnum)) |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6833 : pos->col; |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6834 |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6835 result = (pos->lnum == rex.lnum + rex.reg_firstlnum |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6836 ? (pos_col == (colnr_T)(rex.input - rex.line) |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6837 ? t->state->c == NFA_MARK |
|
24693
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6838 : (pos_col < (colnr_T)(rex.input - rex.line) |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6839 ? t->state->c == NFA_MARK_GT |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6840 : t->state->c == NFA_MARK_LT)) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6841 : (pos->lnum < rex.lnum + rex.reg_firstlnum |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6842 ? t->state->c == NFA_MARK_GT |
|
24693
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6843 : t->state->c == NFA_MARK_LT)); |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6844 if (result) |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6845 { |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6846 add_here = TRUE; |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6847 add_state = t->state->out; |
|
97789fcef0cf
patch 8.2.2885: searching for %'> does not match linewise end of line
Bram Moolenaar <Bram@vim.org>
parents:
24580
diff
changeset
|
6848 } |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6849 } |
|
4732
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6850 break; |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6851 } |
|
0798b096bab3
updated for version 7.3.1113
Bram Moolenaar <bram@vim.org>
parents:
4730
diff
changeset
|
6852 |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6853 case NFA_CURSOR: |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6854 result = (rex.reg_win != NULL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6855 && (rex.lnum + rex.reg_firstlnum |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6856 == rex.reg_win->w_cursor.lnum) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6857 && ((colnr_T)(rex.input - rex.line) |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6858 == rex.reg_win->w_cursor.col)); |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6859 if (result) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6860 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6861 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6862 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6863 } |
|
4583
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6864 break; |
|
321cfbef9431
updated for version 7.3.1039
Bram Moolenaar <bram@vim.org>
parents:
4579
diff
changeset
|
6865 |
|
4756
96f3348f9f11
updated for version 7.3.1125
Bram Moolenaar <bram@vim.org>
parents:
4750
diff
changeset
|
6866 case NFA_VISUAL: |
|
4730
749e2b2755d5
updated for version 7.3.1112
Bram Moolenaar <bram@vim.org>
parents:
4728
diff
changeset
|
6867 result = reg_match_visual(); |
|
749e2b2755d5
updated for version 7.3.1112
Bram Moolenaar <bram@vim.org>
parents:
4728
diff
changeset
|
6868 if (result) |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6869 { |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6870 add_here = TRUE; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6871 add_state = t->state->out; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
6872 } |
|
4730
749e2b2755d5
updated for version 7.3.1112
Bram Moolenaar <bram@vim.org>
parents:
4728
diff
changeset
|
6873 break; |
|
749e2b2755d5
updated for version 7.3.1112
Bram Moolenaar <bram@vim.org>
parents:
4728
diff
changeset
|
6874 |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6875 case NFA_MOPEN1: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6876 case NFA_MOPEN2: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6877 case NFA_MOPEN3: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6878 case NFA_MOPEN4: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6879 case NFA_MOPEN5: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6880 case NFA_MOPEN6: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6881 case NFA_MOPEN7: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6882 case NFA_MOPEN8: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6883 case NFA_MOPEN9: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6884 #ifdef FEAT_SYN_HL |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6885 case NFA_ZOPEN: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6886 case NFA_ZOPEN1: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6887 case NFA_ZOPEN2: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6888 case NFA_ZOPEN3: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6889 case NFA_ZOPEN4: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6890 case NFA_ZOPEN5: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6891 case NFA_ZOPEN6: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6892 case NFA_ZOPEN7: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6893 case NFA_ZOPEN8: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6894 case NFA_ZOPEN9: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6895 #endif |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6896 case NFA_NOPEN: |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6897 case NFA_ZSTART: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6898 // These states are only added to be able to bail out when |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6899 // they are added again, nothing is to be done. |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6900 break; |
|
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6901 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6902 default: // regular character |
|
4559
04086e297563
updated for version 7.3.1027
Bram Moolenaar <bram@vim.org>
parents:
4557
diff
changeset
|
6903 { |
|
04086e297563
updated for version 7.3.1027
Bram Moolenaar <bram@vim.org>
parents:
4557
diff
changeset
|
6904 int c = t->state->c; |
|
04086e297563
updated for version 7.3.1027
Bram Moolenaar <bram@vim.org>
parents:
4557
diff
changeset
|
6905 |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6906 #ifdef DEBUG |
|
4785
3b5a023a4543
updated for version 7.3.1139
Bram Moolenaar <bram@vim.org>
parents:
4783
diff
changeset
|
6907 if (c < 0) |
|
27000
8c0730eca2ce
patch 8.2.4029: debugging NFA regexp my crash, cached indent may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
6908 siemsg("INTERNAL: Negative state char: %ld", (long)c); |
|
5251
2e63b6c763f7
updated for version 7.4b.002
Bram Moolenaar <bram@vim.org>
parents:
5227
diff
changeset
|
6909 #endif |
|
4559
04086e297563
updated for version 7.3.1027
Bram Moolenaar <bram@vim.org>
parents:
4557
diff
changeset
|
6910 result = (c == curc); |
|
04086e297563
updated for version 7.3.1027
Bram Moolenaar <bram@vim.org>
parents:
4557
diff
changeset
|
6911 |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6912 if (!result && rex.reg_ic) |
|
20772
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
6913 result = MB_CASEFOLD(c) == MB_CASEFOLD(curc); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6914 // If rex.reg_icombine is not set only skip over the character |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6915 // itself. When it is set skip over composing characters. |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
6916 if (result && enc_utf8 && !rex.reg_icombine) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6917 clen = utf_ptr2len(rex.input); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
6918 ADD_STATE_IF_MATCH(t->state); |
| 4444 | 6919 break; |
|
4559
04086e297563
updated for version 7.3.1027
Bram Moolenaar <bram@vim.org>
parents:
4557
diff
changeset
|
6920 } |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6921 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6922 } // switch (t->state->c) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6923 |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6924 if (add_state != NULL) |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6925 { |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6926 nfa_pim_T *pim; |
| 5401 | 6927 nfa_pim_T pim_copy; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6928 |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6929 if (t->pim.result == NFA_PIM_UNUSED) |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6930 pim = NULL; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6931 else |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6932 pim = &t->pim; |
|
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6933 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6934 // Handle the postponed invisible match if the match might end |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6935 // without advancing and before the end of the line. |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6936 if (pim != NULL && (clen == 0 || match_follows(add_state, 0))) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6937 { |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6938 if (pim->result == NFA_PIM_TODO) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6939 { |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6940 #ifdef ENABLE_LOG |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6941 fprintf(log_fd, "\n"); |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6942 fprintf(log_fd, "==================================\n"); |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6943 fprintf(log_fd, "Postponed recursive nfa_regmatch()\n"); |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6944 fprintf(log_fd, "\n"); |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6945 #endif |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6946 result = recursive_regmatch(pim->state, pim, |
|
14309
15530de011bc
patch 8.1.0170: invalid memory use with complicated pattern
Christian Brabandt <cb@256bit.org>
parents:
14173
diff
changeset
|
6947 prog, submatch, m, &listids, &listids_len); |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6948 pim->result = result ? NFA_PIM_MATCH : NFA_PIM_NOMATCH; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6949 // for \@! and \@<! it is a match when the result is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6950 // FALSE |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6951 if (result != (pim->state->c == NFA_START_INVISIBLE_NEG |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6952 || pim->state->c == NFA_START_INVISIBLE_NEG_FIRST |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6953 || pim->state->c |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6954 == NFA_START_INVISIBLE_BEFORE_NEG |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6955 || pim->state->c |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6956 == NFA_START_INVISIBLE_BEFORE_NEG_FIRST)) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6957 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6958 // Copy submatch info from the recursive call |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6959 copy_sub_off(&pim->subs.norm, &m->norm); |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6960 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6961 if (rex.nfa_has_zsubexpr) |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6962 copy_sub_off(&pim->subs.synt, &m->synt); |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6963 #endif |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6964 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6965 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6966 else |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6967 { |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6968 result = (pim->result == NFA_PIM_MATCH); |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6969 #ifdef ENABLE_LOG |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6970 fprintf(log_fd, "\n"); |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6971 fprintf(log_fd, "Using previous recursive nfa_regmatch() result, result == %d\n", pim->result); |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6972 fprintf(log_fd, "MATCH = %s\n", result == TRUE ? "OK" : "FALSE"); |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6973 fprintf(log_fd, "\n"); |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6974 #endif |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6975 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6976 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6977 // for \@! and \@<! it is a match when result is FALSE |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6978 if (result != (pim->state->c == NFA_START_INVISIBLE_NEG |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6979 || pim->state->c == NFA_START_INVISIBLE_NEG_FIRST |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6980 || pim->state->c |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6981 == NFA_START_INVISIBLE_BEFORE_NEG |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6982 || pim->state->c |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
6983 == NFA_START_INVISIBLE_BEFORE_NEG_FIRST)) |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6984 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6985 // Copy submatch info from the recursive call |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6986 copy_sub_off(&t->subs.norm, &pim->subs.norm); |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6987 #ifdef FEAT_SYN_HL |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
6988 if (rex.nfa_has_zsubexpr) |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6989 copy_sub_off(&t->subs.synt, &pim->subs.synt); |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6990 #endif |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6991 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6992 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6993 // look-behind match failed, don't add the state |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6994 continue; |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6995 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6996 // Postponed invisible match was handled, don't add it to |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
6997 // following states. |
|
4813
bc3f4804cf47
updated for version 7.3.1153
Bram Moolenaar <bram@vim.org>
parents:
4811
diff
changeset
|
6998 pim = NULL; |
|
4726
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
6999 } |
|
3849c811cc0b
updated for version 7.3.1110
Bram Moolenaar <bram@vim.org>
parents:
4720
diff
changeset
|
7000 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7001 // If "pim" points into l->t it will become invalid when |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7002 // adding the state causes the list to be reallocated. Make a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7003 // local copy to avoid that. |
| 5401 | 7004 if (pim == &t->pim) |
| 7005 { | |
| 7006 copy_pim(&pim_copy, pim); | |
| 7007 pim = &pim_copy; | |
| 7008 } | |
| 7009 | |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
7010 if (add_here) |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7011 r = addstate_here(thislist, add_state, &t->subs, |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7012 pim, &listidx); |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
7013 else |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
7014 { |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7015 r = addstate(nextlist, add_state, &t->subs, pim, add_off); |
|
4799
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
7016 if (add_count > 0) |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
7017 nextlist->t[nextlist->n - 1].count = add_count; |
|
e3f9e33fb28c
updated for version 7.3.1146
Bram Moolenaar <bram@vim.org>
parents:
4797
diff
changeset
|
7018 } |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7019 if (r == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7020 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7021 nfa_match = NFA_TOO_EXPENSIVE; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7022 goto theend; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7023 } |
| 4444 | 7024 } |
| 7025 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7026 } // for (thislist = thislist; thislist->state; thislist++) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7027 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7028 // Look for the start of a match in the current position by adding the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7029 // start state to the list of states. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7030 // The first found match is the leftmost one, thus the order of states |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7031 // matters! |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7032 // Do not add the start state in recursive calls of nfa_regmatch(), |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7033 // because recursive calls should only start in the first position. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7034 // Unless "nfa_endp" is not NULL, then we match the end position. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7035 // Also don't start a match past the first line. |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
7036 if (nfa_match == FALSE |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
7037 && ((toplevel |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7038 && rex.lnum == 0 |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
7039 && clen != 0 |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7040 && (rex.reg_maxcol == 0 |
|
31233
d80066065462
patch 9.0.0950: the pattern "_szs" matches at EOL
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
7041 || (colnr_T)(rex.input - rex.line) < rex.reg_maxcol)) |
|
4694
efc4fb311d5d
updated for version 7.3.1094
Bram Moolenaar <bram@vim.org>
parents:
4692
diff
changeset
|
7042 || (nfa_endp != NULL |
|
4682
2f51ee8825db
updated for version 7.3.1088
Bram Moolenaar <bram@vim.org>
parents:
4679
diff
changeset
|
7043 && (REG_MULTI |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7044 ? (rex.lnum < nfa_endp->se_u.pos.lnum |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7045 || (rex.lnum == nfa_endp->se_u.pos.lnum |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7046 && (int)(rex.input - rex.line) |
|
4694
efc4fb311d5d
updated for version 7.3.1094
Bram Moolenaar <bram@vim.org>
parents:
4692
diff
changeset
|
7047 < nfa_endp->se_u.pos.col)) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7048 : rex.input < nfa_endp->se_u.ptr)))) |
| 4444 | 7049 { |
| 7050 #ifdef ENABLE_LOG | |
| 7051 fprintf(log_fd, "(---) STARTSTATE\n"); | |
| 7052 #endif | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7053 // Inline optimized code for addstate() if we know the state is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7054 // the first MOPEN. |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
7055 if (toplevel) |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
7056 { |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7057 int add = TRUE; |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7058 int c; |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7059 |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7060 if (prog->regstart != NUL && clen != 0) |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7061 { |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7062 if (nextlist->n == 0) |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7063 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7064 colnr_T col = (colnr_T)(rex.input - rex.line) + clen; |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7065 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7066 // Nextlist is empty, we can skip ahead to the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7067 // character that must appear at the start. |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7068 if (skip_to_start(prog->regstart, &col) == FAIL) |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7069 break; |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7070 #ifdef ENABLE_LOG |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7071 fprintf(log_fd, " Skipping ahead %d bytes to regstart\n", |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7072 col - ((colnr_T)(rex.input - rex.line) + clen)); |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7073 #endif |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7074 rex.input = rex.line + col - clen; |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7075 } |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7076 else |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7077 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7078 // Checking if the required start character matches is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7079 // cheaper than adding a state that won't match. |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7080 c = PTR2CHAR(rex.input + clen); |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7081 if (c != prog->regstart && (!rex.reg_ic |
|
20772
097f5b5c907b
patch 8.2.0938: NFA regexp uses tolower ()to compare ignore-case
Bram Moolenaar <Bram@vim.org>
parents:
20677
diff
changeset
|
7082 || MB_CASEFOLD(c) != MB_CASEFOLD(prog->regstart))) |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7083 { |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7084 #ifdef ENABLE_LOG |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7085 fprintf(log_fd, " Skipping start state, regstart does not match\n"); |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7086 #endif |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7087 add = FALSE; |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7088 } |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7089 } |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7090 } |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7091 |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7092 if (add) |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7093 { |
|
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7094 if (REG_MULTI) |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7095 { |
| 6547 | 7096 m->norm.list.multi[0].start_col = |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7097 (colnr_T)(rex.input - rex.line) + clen; |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7098 m->norm.orig_start_col = |
|
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7099 m->norm.list.multi[0].start_col; |
|
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7100 } |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7101 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7102 m->norm.list.line[0].start = rex.input + clen; |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7103 if (addstate(nextlist, start->out, m, NULL, clen) == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7104 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7105 nfa_match = NFA_TOO_EXPENSIVE; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7106 goto theend; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7107 } |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7108 } |
|
4797
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
7109 } |
|
a30e3762957d
updated for version 7.3.1145
Bram Moolenaar <bram@vim.org>
parents:
4787
diff
changeset
|
7110 else |
|
15796
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7111 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7112 if (addstate(nextlist, start, m, NULL, clen) == NULL) |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7113 { |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7114 nfa_match = NFA_TOO_EXPENSIVE; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7115 goto theend; |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7116 } |
|
481452f6687c
patch 8.1.0905: complicated regexp causes a crash
Bram Moolenaar <Bram@vim.org>
parents:
15709
diff
changeset
|
7117 } |
| 4444 | 7118 } |
| 7119 | |
| 7120 #ifdef ENABLE_LOG | |
| 7121 fprintf(log_fd, ">>> Thislist had %d states available: ", thislist->n); | |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7122 { |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7123 int i; |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7124 |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7125 for (i = 0; i < thislist->n; i++) |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7126 fprintf(log_fd, "%d ", abs(thislist->t[i].state->id)); |
|
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7127 } |
| 4444 | 7128 fprintf(log_fd, "\n"); |
| 7129 #endif | |
| 7130 | |
| 7131 nextchar: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7132 // Advance to the next character, or advance to the next line, or |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7133 // finish. |
|
4549
849180347ac3
updated for version 7.3.1022
Bram Moolenaar <bram@vim.org>
parents:
4547
diff
changeset
|
7134 if (clen != 0) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7135 rex.input += clen; |
|
4694
efc4fb311d5d
updated for version 7.3.1094
Bram Moolenaar <bram@vim.org>
parents:
4692
diff
changeset
|
7136 else if (go_to_nextline || (nfa_endp != NULL && REG_MULTI |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7137 && rex.lnum < nfa_endp->se_u.pos.lnum)) |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
7138 reg_nextline(); |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
7139 else |
|
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
7140 break; |
| 6499 | 7141 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7142 // Allow interrupting with CTRL-C. |
| 6573 | 7143 line_breakcheck(); |
| 6499 | 7144 if (got_int) |
| 7145 break; | |
| 6573 | 7146 #ifdef FEAT_RELTIME |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29028
diff
changeset
|
7147 if (nfa_did_time_out()) |
|
29028
e0cf900448c1
patch 8.2.5036: using two counters for timeout check in NFA engine
Bram Moolenaar <Bram@vim.org>
parents:
29012
diff
changeset
|
7148 break; |
| 6573 | 7149 #endif |
|
4515
90e9917d4114
updated for version 7.3.1005
Bram Moolenaar <bram@vim.org>
parents:
4507
diff
changeset
|
7150 } |
| 4444 | 7151 |
| 7152 #ifdef ENABLE_LOG | |
| 7153 if (log_fd != stderr) | |
| 7154 fclose(log_fd); | |
| 7155 log_fd = NULL; | |
| 7156 #endif | |
| 7157 | |
| 7158 theend: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7159 // Free memory |
| 4444 | 7160 vim_free(list[0].t); |
| 7161 vim_free(list[1].t); | |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
7162 vim_free(listids); |
|
4783
47222d8b1e94
updated for version 7.3.1138
Bram Moolenaar <bram@vim.org>
parents:
4781
diff
changeset
|
7163 #undef ADD_STATE_IF_MATCH |
| 4460 | 7164 #ifdef NFA_REGEXP_DEBUG_LOG |
| 4444 | 7165 fclose(debug); |
| 7166 #endif | |
| 7167 | |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
7168 return nfa_match; |
| 4444 | 7169 } |
| 7170 | |
| 7171 /* | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7172 * Try match of "prog" with at rex.line["col"]. |
| 6392 | 7173 * Returns <= 0 for failure, number of lines contained in the match otherwise. |
| 4444 | 7174 */ |
| 7175 static long | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7176 nfa_regtry( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7177 nfa_regprog_T *prog, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7178 colnr_T col, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7179 int *timed_out UNUSED) // flag set on timeout or NULL |
| 4444 | 7180 { |
| 7181 int i; | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7182 regsubs_T subs, m; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7183 nfa_state_T *start = prog->start; |
| 6328 | 7184 int result; |
| 4444 | 7185 #ifdef ENABLE_LOG |
| 7186 FILE *f; | |
| 7187 #endif | |
| 7188 | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7189 rex.input = rex.line + col; |
| 6573 | 7190 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11480
diff
changeset
|
7191 nfa_timed_out = timed_out; |
| 6573 | 7192 #endif |
| 4444 | 7193 |
| 7194 #ifdef ENABLE_LOG | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
7195 f = fopen(NFA_REGEXP_RUN_LOG, "a"); |
| 4444 | 7196 if (f != NULL) |
| 7197 { | |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
7198 fprintf(f, "\n\n\t=======================================================\n"); |
| 4444 | 7199 #ifdef DEBUG |
| 7200 fprintf(f, "\tRegexp is \"%s\"\n", nfa_regengine.expr); | |
| 7201 #endif | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7202 fprintf(f, "\tInput text is \"%s\" \n", rex.input); |
|
4750
7793e737ec87
updated for version 7.3.1122
Bram Moolenaar <bram@vim.org>
parents:
4748
diff
changeset
|
7203 fprintf(f, "\t=======================================================\n\n"); |
|
4533
6a2005efa02b
updated for version 7.3.1014
Bram Moolenaar <bram@vim.org>
parents:
4531
diff
changeset
|
7204 nfa_print_state(f, start); |
| 4444 | 7205 fprintf(f, "\n\n"); |
| 7206 fclose(f); | |
| 7207 } | |
| 7208 else | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15265
diff
changeset
|
7209 emsg("Could not open temporary log file for writing"); |
| 4444 | 7210 #endif |
| 7211 | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7212 clear_sub(&subs.norm); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7213 clear_sub(&m.norm); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7214 #ifdef FEAT_SYN_HL |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7215 clear_sub(&subs.synt); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7216 clear_sub(&m.synt); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7217 #endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7218 |
| 6328 | 7219 result = nfa_regmatch(prog, start, &subs, &m); |
| 7220 if (result == FALSE) | |
| 4444 | 7221 return 0; |
| 6328 | 7222 else if (result == NFA_TOO_EXPENSIVE) |
| 7223 return result; | |
| 4444 | 7224 |
| 7225 cleanup_subexpr(); | |
| 7226 if (REG_MULTI) | |
| 7227 { | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7228 for (i = 0; i < subs.norm.in_use; i++) |
| 4444 | 7229 { |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7230 rex.reg_startpos[i].lnum = subs.norm.list.multi[i].start_lnum; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7231 rex.reg_startpos[i].col = subs.norm.list.multi[i].start_col; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7232 |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7233 rex.reg_endpos[i].lnum = subs.norm.list.multi[i].end_lnum; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7234 rex.reg_endpos[i].col = subs.norm.list.multi[i].end_col; |
| 4444 | 7235 } |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7236 if (rex.reg_mmatch != NULL) |
|
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7237 rex.reg_mmatch->rmm_matchcol = subs.norm.orig_start_col; |
| 4444 | 7238 |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7239 if (rex.reg_startpos[0].lnum < 0) |
| 4444 | 7240 { |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7241 rex.reg_startpos[0].lnum = 0; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7242 rex.reg_startpos[0].col = col; |
| 4444 | 7243 } |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7244 if (rex.reg_endpos[0].lnum < 0) |
| 4444 | 7245 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7246 // pattern has a \ze but it didn't match, use current end |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7247 rex.reg_endpos[0].lnum = rex.lnum; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7248 rex.reg_endpos[0].col = (int)(rex.input - rex.line); |
| 4444 | 7249 } |
| 7250 else | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7251 // Use line number of "\ze". |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7252 rex.lnum = rex.reg_endpos[0].lnum; |
| 4444 | 7253 } |
| 7254 else | |
| 7255 { | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7256 for (i = 0; i < subs.norm.in_use; i++) |
| 4444 | 7257 { |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7258 rex.reg_startp[i] = subs.norm.list.line[i].start; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7259 rex.reg_endp[i] = subs.norm.list.line[i].end; |
| 4444 | 7260 } |
| 7261 | |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7262 if (rex.reg_startp[0] == NULL) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7263 rex.reg_startp[0] = rex.line + col; |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7264 if (rex.reg_endp[0] == NULL) |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7265 rex.reg_endp[0] = rex.input; |
| 4444 | 7266 } |
| 7267 | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7268 #ifdef FEAT_SYN_HL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7269 // Package any found \z(...\) matches for export. Default is none. |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7270 unref_extmatch(re_extmatch_out); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7271 re_extmatch_out = NULL; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7272 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7273 if (prog->reghasz == REX_SET) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7274 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7275 cleanup_zsubexpr(); |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7276 re_extmatch_out = make_extmatch(); |
|
18945
c62d63d2b9f0
patch 8.2.0033: crash when make_extmatch() runs out of memory
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
7277 if (re_extmatch_out == NULL) |
|
c62d63d2b9f0
patch 8.2.0033: crash when make_extmatch() runs out of memory
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
7278 return 0; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7279 // Loop over \z1, \z2, etc. There is no \z0. |
|
7258
7245d8635ac7
commit https://github.com/vim/vim/commit/5ad075c0735d3d8b97708d17c22de8facb15f997
Christian Brabandt <cb@256bit.org>
parents:
7152
diff
changeset
|
7280 for (i = 1; i < subs.synt.in_use; i++) |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7281 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7282 if (REG_MULTI) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7283 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7284 struct multipos *mpos = &subs.synt.list.multi[i]; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7285 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7286 // Only accept single line matches that are valid. |
| 6547 | 7287 if (mpos->start_lnum >= 0 |
| 7288 && mpos->start_lnum == mpos->end_lnum | |
| 7289 && mpos->end_col >= mpos->start_col) | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7290 re_extmatch_out->matches[i] = |
| 6547 | 7291 vim_strnsave(reg_getline(mpos->start_lnum) |
| 7292 + mpos->start_col, | |
| 7293 mpos->end_col - mpos->start_col); | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7294 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7295 else |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7296 { |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7297 struct linepos *lpos = &subs.synt.list.line[i]; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7298 |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7299 if (lpos->start != NULL && lpos->end != NULL) |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7300 re_extmatch_out->matches[i] = |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20772
diff
changeset
|
7301 vim_strnsave(lpos->start, lpos->end - lpos->start); |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7302 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7303 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7304 } |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7305 #endif |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7306 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7307 return 1 + rex.lnum; |
| 4444 | 7308 } |
| 7309 | |
| 7310 /* | |
| 7311 * Match a regexp against a string ("line" points to the string) or multiple | |
|
24580
87ff80c08e4b
patch 8.2.2829: some comments are not correct or clear
Bram Moolenaar <Bram@vim.org>
parents:
24351
diff
changeset
|
7312 * lines (if "line" is NULL, use reg_getline()). |
| 4444 | 7313 * |
| 6392 | 7314 * Returns <= 0 for failure, number of lines contained in the match otherwise. |
| 4444 | 7315 */ |
| 7316 static long | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7317 nfa_regexec_both( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7318 char_u *line, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7319 colnr_T startcol, // column to start looking for match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7320 int *timed_out) // flag set on timeout or NULL |
| 4444 | 7321 { |
| 7322 nfa_regprog_T *prog; | |
| 7323 long retval = 0L; | |
| 7324 int i; | |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7325 colnr_T col = startcol; |
| 4444 | 7326 |
| 7327 if (REG_MULTI) | |
| 7328 { | |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7329 prog = (nfa_regprog_T *)rex.reg_mmatch->regprog; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7330 line = reg_getline((linenr_T)0); // relative to the cursor |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7331 rex.reg_startpos = rex.reg_mmatch->startpos; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7332 rex.reg_endpos = rex.reg_mmatch->endpos; |
| 4444 | 7333 } |
| 7334 else | |
| 7335 { | |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7336 prog = (nfa_regprog_T *)rex.reg_match->regprog; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7337 rex.reg_startp = rex.reg_match->startp; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7338 rex.reg_endp = rex.reg_match->endp; |
| 4444 | 7339 } |
| 7340 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7341 // Be paranoid... |
| 4444 | 7342 if (prog == NULL || line == NULL) |
| 7343 { | |
|
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25178
diff
changeset
|
7344 iemsg(_(e_null_argument)); |
| 4444 | 7345 goto theend; |
| 7346 } | |
| 7347 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7348 // If pattern contains "\c" or "\C": overrule value of rex.reg_ic |
| 4444 | 7349 if (prog->regflags & RF_ICASE) |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7350 rex.reg_ic = TRUE; |
| 4444 | 7351 else if (prog->regflags & RF_NOICASE) |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7352 rex.reg_ic = FALSE; |
| 4444 | 7353 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7354 // If pattern contains "\Z" overrule value of rex.reg_icombine |
| 4444 | 7355 if (prog->regflags & RF_ICOMBINE) |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7356 rex.reg_icombine = TRUE; |
| 4444 | 7357 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7358 rex.line = line; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7359 rex.lnum = 0; // relative to line |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7360 |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7361 rex.nfa_has_zend = prog->has_zend; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7362 rex.nfa_has_backref = prog->has_backref; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7363 rex.nfa_nsubexpr = prog->nsubexp; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7364 rex.nfa_listid = 1; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7365 rex.nfa_alt_listid = 2; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7366 #ifdef DEBUG |
|
4690
9d97a0c045ef
updated for version 7.3.1092
Bram Moolenaar <bram@vim.org>
parents:
4688
diff
changeset
|
7367 nfa_regengine.expr = prog->pattern; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7368 #endif |
|
4553
7b835b2969af
updated for version 7.3.1024
Bram Moolenaar <bram@vim.org>
parents:
4551
diff
changeset
|
7369 |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7370 if (prog->reganch && col > 0) |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7371 return 0L; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7372 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7373 rex.need_clear_subexpr = TRUE; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7374 #ifdef FEAT_SYN_HL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7375 // Clear the external match subpointers if necessary. |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7376 if (prog->reghasz == REX_SET) |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7377 { |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7378 rex.nfa_has_zsubexpr = TRUE; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7379 rex.need_clear_zsubexpr = TRUE; |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7380 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7381 else |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7382 { |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7383 rex.nfa_has_zsubexpr = FALSE; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7384 rex.need_clear_zsubexpr = FALSE; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7385 } |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7386 #endif |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7387 |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7388 if (prog->regstart != NUL) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7389 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7390 // Skip ahead until a character we know the match must start with. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7391 // When there is none there is no match. |
|
4801
3cd3cc1e9119
updated for version 7.3.1147
Bram Moolenaar <bram@vim.org>
parents:
4799
diff
changeset
|
7392 if (skip_to_start(prog->regstart, &col) == FAIL) |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7393 return 0L; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7394 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7395 // If match_text is set it contains the full text that must match. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7396 // Nothing else to try. Doesn't handle combining chars well. |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15490
diff
changeset
|
7397 if (prog->match_text != NULL && !rex.reg_icombine) |
|
31235
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7398 { |
|
31428
fe508e94b73d
patch 9.0.1047: matchparen is slow
Bram Moolenaar <Bram@vim.org>
parents:
31287
diff
changeset
|
7399 retval = find_match_text(&col, prog->regstart, prog->match_text); |
|
31235
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7400 if (REG_MULTI) |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7401 rex.reg_mmatch->rmm_matchcol = col; |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7402 else |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7403 rex.reg_match->rm_matchcol = col; |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7404 return retval; |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7405 } |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7406 } |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7407 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7408 // If the start column is past the maximum column: no need to try. |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7409 if (rex.reg_maxcol > 0 && col >= rex.reg_maxcol) |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7410 goto theend; |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7411 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7412 // Set the "nstate" used by nfa_regcomp() to zero to trigger an error when |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7413 // it's accidentally used during execution. |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7414 nstate = 0; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7415 for (i = 0; i < prog->nstate; ++i) |
| 4444 | 7416 { |
| 7417 prog->state[i].id = i; | |
|
4718
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
7418 prog->state[i].lastlist[0] = 0; |
|
ec72bb4a0fc2
updated for version 7.3.1106
Bram Moolenaar <bram@vim.org>
parents:
4716
diff
changeset
|
7419 prog->state[i].lastlist[1] = 0; |
| 4444 | 7420 } |
| 7421 | |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29028
diff
changeset
|
7422 retval = nfa_regtry(prog, col, timed_out); |
| 4444 | 7423 |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7424 #ifdef DEBUG |
|
4690
9d97a0c045ef
updated for version 7.3.1092
Bram Moolenaar <bram@vim.org>
parents:
4688
diff
changeset
|
7425 nfa_regengine.expr = NULL; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7426 #endif |
|
4690
9d97a0c045ef
updated for version 7.3.1092
Bram Moolenaar <bram@vim.org>
parents:
4688
diff
changeset
|
7427 |
| 4444 | 7428 theend: |
|
23270
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7429 if (retval > 0) |
|
23150
90b16a0022e5
patch 8.2.2121: internal error when using ze before zs in a pattern
Bram Moolenaar <Bram@vim.org>
parents:
22167
diff
changeset
|
7430 { |
|
23270
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7431 // Make sure the end is never before the start. Can happen when \zs and |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7432 // \ze are used. |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7433 if (REG_MULTI) |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7434 { |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7435 lpos_T *start = &rex.reg_mmatch->startpos[0]; |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7436 lpos_T *end = &rex.reg_mmatch->endpos[0]; |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7437 |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7438 if (end->lnum < start->lnum |
|
23150
90b16a0022e5
patch 8.2.2121: internal error when using ze before zs in a pattern
Bram Moolenaar <Bram@vim.org>
parents:
22167
diff
changeset
|
7439 || (end->lnum == start->lnum && end->col < start->col)) |
|
23270
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7440 rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0]; |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7441 } |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7442 else |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7443 { |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7444 if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) |
|
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7445 rex.reg_match->endp[0] = rex.reg_match->startp[0]; |
|
31235
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7446 |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7447 // startpos[0] may be set by "\zs", also return the column where |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7448 // the whole pattern matched. |
|
7fb4e244b16e
patch 9.0.0951: trying every character position for a match is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
31233
diff
changeset
|
7449 rex.reg_match->rm_matchcol = col; |
|
23270
22d0c25869d8
patch 8.2.2181: valgrind warnings for using uninitialized value
Bram Moolenaar <Bram@vim.org>
parents:
23262
diff
changeset
|
7450 } |
|
23150
90b16a0022e5
patch 8.2.2121: internal error when using ze before zs in a pattern
Bram Moolenaar <Bram@vim.org>
parents:
22167
diff
changeset
|
7451 } |
|
90b16a0022e5
patch 8.2.2121: internal error when using ze before zs in a pattern
Bram Moolenaar <Bram@vim.org>
parents:
22167
diff
changeset
|
7452 |
| 4444 | 7453 return retval; |
| 7454 } | |
| 7455 | |
| 7456 /* | |
| 7457 * Compile a regular expression into internal code for the NFA matcher. | |
| 7458 * Returns the program in allocated space. Returns NULL for an error. | |
| 7459 */ | |
| 7460 static regprog_T * | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7461 nfa_regcomp(char_u *expr, int re_flags) |
| 4444 | 7462 { |
|
4541
80170d61a85c
updated for version 7.3.1018
Bram Moolenaar <bram@vim.org>
parents:
4539
diff
changeset
|
7463 nfa_regprog_T *prog = NULL; |
| 4458 | 7464 size_t prog_size; |
| 4444 | 7465 int *postfix; |
| 7466 | |
| 7467 if (expr == NULL) | |
| 7468 return NULL; | |
| 7469 | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7470 #ifdef DEBUG |
| 4444 | 7471 nfa_regengine.expr = expr; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7472 #endif |
| 6533 | 7473 nfa_re_flags = re_flags; |
| 4444 | 7474 |
| 7475 init_class_tab(); | |
| 7476 | |
| 7477 if (nfa_regcomp_start(expr, re_flags) == FAIL) | |
| 7478 return NULL; | |
| 7479 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7480 // Build postfix form of the regexp. Needed to build the NFA |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7481 // (and count its size). |
| 4444 | 7482 postfix = re2post(); |
| 7483 if (postfix == NULL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7484 goto fail; // Cascaded (syntax?) error |
| 4444 | 7485 |
| 7486 /* | |
| 7487 * In order to build the NFA, we parse the input regexp twice: | |
| 7488 * 1. first pass to count size (so we can allocate space) | |
| 7489 * 2. second to emit code | |
| 7490 */ | |
| 7491 #ifdef ENABLE_LOG | |
| 7492 { | |
|
4531
1be43c095aff
updated for version 7.3.1013
Bram Moolenaar <bram@vim.org>
parents:
4529
diff
changeset
|
7493 FILE *f = fopen(NFA_REGEXP_RUN_LOG, "a"); |
| 4444 | 7494 |
| 7495 if (f != NULL) | |
| 7496 { | |
|
14145
1cf832945469
patch 8.1.0090: "..." used inconsistently in a message
Christian Brabandt <cb@256bit.org>
parents:
14121
diff
changeset
|
7497 fprintf(f, "\n*****************************\n\n\n\n\tCompiling regexp \"%s\"... hold on !\n", expr); |
| 4444 | 7498 fclose(f); |
| 7499 } | |
| 7500 } | |
| 7501 #endif | |
| 7502 | |
| 7503 /* | |
| 7504 * PASS 1 | |
| 7505 * Count number of NFA states in "nstate". Do not build the NFA. | |
| 7506 */ | |
| 7507 post2nfa(postfix, post_ptr, TRUE); | |
|
4541
80170d61a85c
updated for version 7.3.1018
Bram Moolenaar <bram@vim.org>
parents:
4539
diff
changeset
|
7508 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7509 // allocate the regprog with space for the compiled regexp |
|
31877
9f28cca2410a
patch 9.0.1271: using sizeof() and subtract array size is tricky
Bram Moolenaar <Bram@vim.org>
parents:
31804
diff
changeset
|
7510 prog_size = offsetof(nfa_regprog_T, state) + sizeof(nfa_state_T) * nstate; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
7511 prog = alloc(prog_size); |
|
4541
80170d61a85c
updated for version 7.3.1018
Bram Moolenaar <bram@vim.org>
parents:
4539
diff
changeset
|
7512 if (prog == NULL) |
|
80170d61a85c
updated for version 7.3.1018
Bram Moolenaar <bram@vim.org>
parents:
4539
diff
changeset
|
7513 goto fail; |
| 4444 | 7514 state_ptr = prog->state; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7515 prog->re_in_use = FALSE; |
| 4444 | 7516 |
| 7517 /* | |
| 7518 * PASS 2 | |
| 7519 * Build the NFA | |
| 7520 */ | |
| 7521 prog->start = post2nfa(postfix, post_ptr, FALSE); | |
| 7522 if (prog->start == NULL) | |
| 7523 goto fail; | |
| 7524 | |
| 7525 prog->regflags = regflags; | |
| 7526 prog->engine = &nfa_regengine; | |
| 7527 prog->nstate = nstate; | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7528 prog->has_zend = rex.nfa_has_zend; |
|
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7529 prog->has_backref = rex.nfa_has_backref; |
|
4561
4d81fdda8f35
updated for version 7.3.1028
Bram Moolenaar <bram@vim.org>
parents:
4559
diff
changeset
|
7530 prog->nsubexp = regnpar; |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7531 |
|
4845
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
7532 nfa_postprocess(prog); |
|
a83fb2bd8c8e
updated for version 7.3.1169
Bram Moolenaar <bram@vim.org>
parents:
4837
diff
changeset
|
7533 |
|
4772
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7534 prog->reganch = nfa_get_reganch(prog->start, 0); |
|
03375ccf28a2
updated for version 7.3.1133
Bram Moolenaar <bram@vim.org>
parents:
4770
diff
changeset
|
7535 prog->regstart = nfa_get_regstart(prog->start, 0); |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7536 prog->match_text = nfa_get_match_text(prog->start); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7537 |
| 4444 | 7538 #ifdef ENABLE_LOG |
| 7539 nfa_postfix_dump(expr, OK); | |
| 7540 nfa_dump(prog); | |
| 7541 #endif | |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7542 #ifdef FEAT_SYN_HL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7543 // Remember whether this pattern has any \z specials in it. |
|
4686
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7544 prog->reghasz = re_has_z; |
|
8db697ae406a
updated for version 7.3.1090
Bram Moolenaar <bram@vim.org>
parents:
4682
diff
changeset
|
7545 #endif |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7546 prog->pattern = vim_strsave(expr); |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7547 #ifdef DEBUG |
|
4690
9d97a0c045ef
updated for version 7.3.1092
Bram Moolenaar <bram@vim.org>
parents:
4688
diff
changeset
|
7548 nfa_regengine.expr = NULL; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7549 #endif |
| 4444 | 7550 |
| 7551 out: | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13208
diff
changeset
|
7552 VIM_CLEAR(post_start); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13208
diff
changeset
|
7553 post_ptr = post_end = NULL; |
| 4444 | 7554 state_ptr = NULL; |
| 7555 return (regprog_T *)prog; | |
| 7556 | |
| 7557 fail: | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13208
diff
changeset
|
7558 VIM_CLEAR(prog); |
| 4444 | 7559 #ifdef ENABLE_LOG |
| 7560 nfa_postfix_dump(expr, FAIL); | |
| 7561 #endif | |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7562 #ifdef DEBUG |
| 4444 | 7563 nfa_regengine.expr = NULL; |
|
14354
ffd834f893aa
patch 8.1.0192: executing regexp recursively fails with a crash
Christian Brabandt <cb@256bit.org>
parents:
14309
diff
changeset
|
7564 #endif |
| 4444 | 7565 goto out; |
| 7566 } | |
| 7567 | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7568 /* |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7569 * Free a compiled regexp program, returned by nfa_regcomp(). |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7570 */ |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7571 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7572 nfa_regfree(regprog_T *prog) |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7573 { |
|
31778
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
7574 if (prog == NULL) |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
7575 return; |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
7576 |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
7577 vim_free(((nfa_regprog_T *)prog)->match_text); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
7578 vim_free(((nfa_regprog_T *)prog)->pattern); |
|
579c846086eb
patch 9.0.1221: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31428
diff
changeset
|
7579 vim_free(prog); |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4801
diff
changeset
|
7580 } |
| 4444 | 7581 |
| 7582 /* | |
| 7583 * Match a regexp against a string. | |
| 7584 * "rmp->regprog" is a compiled regexp as returned by nfa_regcomp(). | |
| 7585 * Uses curbuf for line count and 'iskeyword'. | |
| 5838 | 7586 * If "line_lbr" is TRUE consider a "\n" in "line" to be a line break. |
| 4444 | 7587 * |
| 6392 | 7588 * Returns <= 0 for failure, number of lines contained in the match otherwise. |
| 4444 | 7589 */ |
| 7590 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7591 nfa_regexec_nl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7592 regmatch_T *rmp, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7593 char_u *line, // string to match against |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7594 colnr_T col, // column to start looking for match |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7595 int line_lbr) |
| 4444 | 7596 { |
|
10245
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7597 rex.reg_match = rmp; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7598 rex.reg_mmatch = NULL; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7599 rex.reg_maxline = 0; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7600 rex.reg_line_lbr = line_lbr; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7601 rex.reg_buf = curbuf; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7602 rex.reg_win = NULL; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7603 rex.reg_ic = rmp->rm_ic; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7604 rex.reg_icombine = FALSE; |
|
d76ccdacb41e
commit https://github.com/vim/vim/commit/6100d02aab7c8294b581cb299250eea164b50e9d
Christian Brabandt <cb@256bit.org>
parents:
10170
diff
changeset
|
7605 rex.reg_maxcol = 0; |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29028
diff
changeset
|
7606 return nfa_regexec_both(line, col, NULL); |
| 4444 | 7607 } |
| 7608 | |
| 7609 | |
| 7610 /* | |
| 7611 * Match a regexp against multiple lines. | |
| 7612 * "rmp->regprog" is a compiled regexp as returned by vim_regcomp(). | |
| 7613 * Uses curbuf for line count and 'iskeyword'. | |
| 7614 * | |
| 6392 | 7615 * Return <= 0 if there is no match. Return number of lines contained in the |
| 4444 | 7616 * match otherwise. |
| 7617 * | |
| 7618 * Note: the body is the same as bt_regexec() except for nfa_regexec_both() | |
| 7619 * | |
| 7620 * ! Also NOTE : match may actually be in another line. e.g.: | |
| 7621 * when r.e. is \nc, cursor is at 'a' and the text buffer looks like | |
| 7622 * | |
| 7623 * +-------------------------+ | |
| 7624 * |a | | |
| 7625 * |b | | |
| 7626 * |c | | |
| 7627 * | | | |
| 7628 * +-------------------------+ | |
| 7629 * | |
| 7630 * then nfa_regexec_multi() returns 3. while the original | |
| 7631 * vim_regexec_multi() returns 0 and a second call at line 2 will return 2. | |
| 7632 * | |
| 7633 * FIXME if this behavior is not compatible. | |
| 7634 */ | |
| 7635 static long | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7636 nfa_regexec_multi( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7637 regmmatch_T *rmp, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7638 win_T *win, // window in which to search or NULL |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7639 buf_T *buf, // buffer in which to search |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7640 linenr_T lnum, // nr of line to start looking for match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7641 colnr_T col, // column to start looking for match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18498
diff
changeset
|
7642 int *timed_out) // flag set on timeout or NULL |
| 4444 | 7643 { |
|
19405
08f4dc2ba716
patch 8.2.0260: several lines of code are duplicated
Bram Moolenaar <Bram@vim.org>
parents:
18945
diff
changeset
|
7644 init_regexec_multi(rmp, win, buf, lnum); |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29028
diff
changeset
|
7645 return nfa_regexec_both(NULL, col, timed_out); |
| 4444 | 7646 } |
| 7647 | |
| 7648 #ifdef DEBUG | |
| 7649 # undef ENABLE_LOG | |
| 7650 #endif |