aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r--src/nvim/regexp.c276
1 files changed, 139 insertions, 137 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index d57bc889ac..69c2119697 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2735,150 +2735,152 @@ static int peekchr(void)
{
static int after_slash = FALSE;
- if (curchr == -1) {
- switch (curchr = regparse[0]) {
- case '.':
- case '[':
- case '~':
- /* magic when 'magic' is on */
- if (reg_magic >= MAGIC_ON)
- curchr = Magic(curchr);
- break;
- case '(':
- case ')':
- case '{':
- case '%':
- case '+':
- case '=':
- case '?':
- case '@':
- case '!':
- case '&':
- case '|':
- case '<':
- case '>':
- case '#': /* future ext. */
- case '"': /* future ext. */
- case '\'': /* future ext. */
- case ',': /* future ext. */
- case '-': /* future ext. */
- case ':': /* future ext. */
- case ';': /* future ext. */
- case '`': /* future ext. */
- case '/': /* Can't be used in / command */
- /* magic only after "\v" */
- if (reg_magic == MAGIC_ALL)
- curchr = Magic(curchr);
- break;
- case '*':
- /* * is not magic as the very first character, eg "?*ptr", when
- * after '^', eg "/^*ptr" and when after "\(", "\|", "\&". But
- * "\(\*" is not magic, thus must be magic if "after_slash" */
- if (reg_magic >= MAGIC_ON
- && !at_start
- && !(prev_at_start && prevchr == Magic('^'))
- && (after_slash
- || (prevchr != Magic('(')
- && prevchr != Magic('&')
- && prevchr != Magic('|'))))
- curchr = Magic('*');
- break;
- case '^':
- /* '^' is only magic as the very first character and if it's after
- * "\(", "\|", "\&' or "\n" */
- if (reg_magic >= MAGIC_OFF
- && (at_start
- || reg_magic == MAGIC_ALL
- || prevchr == Magic('(')
- || prevchr == Magic('|')
- || prevchr == Magic('&')
- || prevchr == Magic('n')
- || (no_Magic(prevchr) == '('
- && prevprevchr == Magic('%')))) {
- curchr = Magic('^');
- at_start = TRUE;
- prev_at_start = FALSE;
- }
- break;
- case '$':
- /* '$' is only magic as the very last char and if it's in front of
- * either "\|", "\)", "\&", or "\n" */
- if (reg_magic >= MAGIC_OFF) {
- char_u *p = regparse + 1;
- bool is_magic_all = (reg_magic == MAGIC_ALL);
-
- // ignore \c \C \m \M \v \V and \Z after '$'
- while (p[0] == '\\' && (p[1] == 'c' || p[1] == 'C'
- || p[1] == 'm' || p[1] == 'M'
- || p[1] == 'v' || p[1] == 'V'
- || p[1] == 'Z')) {
- if (p[1] == 'v') {
- is_magic_all = true;
- } else if (p[1] == 'm' || p[1] == 'M' || p[1] == 'V') {
- is_magic_all = false;
- }
- p += 2;
- }
- if (p[0] == NUL
- || (p[0] == '\\'
- && (p[1] == '|' || p[1] == '&' || p[1] == ')'
- || p[1] == 'n'))
- || (is_magic_all
- && (p[0] == '|' || p[0] == '&' || p[0] == ')'))
- || reg_magic == MAGIC_ALL) {
- curchr = Magic('$');
+ if (curchr != -1) {
+ return curchr;
+ }
+
+ switch (curchr = regparse[0]) {
+ case '.':
+ case '[':
+ case '~':
+ /* magic when 'magic' is on */
+ if (reg_magic >= MAGIC_ON)
+ curchr = Magic(curchr);
+ break;
+ case '(':
+ case ')':
+ case '{':
+ case '%':
+ case '+':
+ case '=':
+ case '?':
+ case '@':
+ case '!':
+ case '&':
+ case '|':
+ case '<':
+ case '>':
+ case '#': /* future ext. */
+ case '"': /* future ext. */
+ case '\'': /* future ext. */
+ case ',': /* future ext. */
+ case '-': /* future ext. */
+ case ':': /* future ext. */
+ case ';': /* future ext. */
+ case '`': /* future ext. */
+ case '/': /* Can't be used in / command */
+ /* magic only after "\v" */
+ if (reg_magic == MAGIC_ALL)
+ curchr = Magic(curchr);
+ break;
+ case '*':
+ /* * is not magic as the very first character, eg "?*ptr", when
+ * after '^', eg "/^*ptr" and when after "\(", "\|", "\&". But
+ * "\(\*" is not magic, thus must be magic if "after_slash" */
+ if (reg_magic >= MAGIC_ON
+ && !at_start
+ && !(prev_at_start && prevchr == Magic('^'))
+ && (after_slash
+ || (prevchr != Magic('(')
+ && prevchr != Magic('&')
+ && prevchr != Magic('|'))))
+ curchr = Magic('*');
+ break;
+ case '^':
+ /* '^' is only magic as the very first character and if it's after
+ * "\(", "\|", "\&' or "\n" */
+ if (reg_magic >= MAGIC_OFF
+ && (at_start
+ || reg_magic == MAGIC_ALL
+ || prevchr == Magic('(')
+ || prevchr == Magic('|')
+ || prevchr == Magic('&')
+ || prevchr == Magic('n')
+ || (no_Magic(prevchr) == '('
+ && prevprevchr == Magic('%')))) {
+ curchr = Magic('^');
+ at_start = TRUE;
+ prev_at_start = FALSE;
+ }
+ break;
+ case '$':
+ /* '$' is only magic as the very last char and if it's in front of
+ * either "\|", "\)", "\&", or "\n" */
+ if (reg_magic >= MAGIC_OFF) {
+ char_u *p = regparse + 1;
+ bool is_magic_all = (reg_magic == MAGIC_ALL);
+
+ // ignore \c \C \m \M \v \V and \Z after '$'
+ while (p[0] == '\\' && (p[1] == 'c' || p[1] == 'C'
+ || p[1] == 'm' || p[1] == 'M'
+ || p[1] == 'v' || p[1] == 'V'
+ || p[1] == 'Z')) {
+ if (p[1] == 'v') {
+ is_magic_all = true;
+ } else if (p[1] == 'm' || p[1] == 'M' || p[1] == 'V') {
+ is_magic_all = false;
}
+ p += 2;
}
- break;
- case '\\':
- {
- int c = regparse[1];
-
- if (c == NUL)
- curchr = '\\'; /* trailing '\' */
- else if (
- c <= '~' && META_flags[c]
- ) {
- /*
- * META contains everything that may be magic sometimes,
- * except ^ and $ ("\^" and "\$" are only magic after
- * "\v"). We now fetch the next character and toggle its
- * magicness. Therefore, \ is so meta-magic that it is
- * not in META.
- */
- curchr = -1;
- prev_at_start = at_start;
- at_start = FALSE; /* be able to say "/\*ptr" */
- ++regparse;
- ++after_slash;
- peekchr();
- --regparse;
- --after_slash;
- curchr = toggle_Magic(curchr);
- } else if (vim_strchr(REGEXP_ABBR, c)) {
- /*
- * Handle abbreviations, like "\t" for TAB -- webb
- */
- curchr = backslash_trans(c);
- } else if (reg_magic == MAGIC_NONE && (c == '$' || c == '^'))
- curchr = toggle_Magic(c);
- else {
- /*
- * Next character can never be (made) magic?
- * Then backslashing it won't do anything.
- */
- if (has_mbyte)
- curchr = (*mb_ptr2char)(regparse + 1);
- else
- curchr = c;
+ if (p[0] == NUL
+ || (p[0] == '\\'
+ && (p[1] == '|' || p[1] == '&' || p[1] == ')'
+ || p[1] == 'n'))
+ || (is_magic_all
+ && (p[0] == '|' || p[0] == '&' || p[0] == ')'))
+ || reg_magic == MAGIC_ALL) {
+ curchr = Magic('$');
}
- break;
}
+ break;
+ case '\\':
+ {
+ int c = regparse[1];
- default:
+ if (c == NUL)
+ curchr = '\\'; /* trailing '\' */
+ else if (
+ c <= '~' && META_flags[c]
+ ) {
+ /*
+ * META contains everything that may be magic sometimes,
+ * except ^ and $ ("\^" and "\$" are only magic after
+ * "\v"). We now fetch the next character and toggle its
+ * magicness. Therefore, \ is so meta-magic that it is
+ * not in META.
+ */
+ curchr = -1;
+ prev_at_start = at_start;
+ at_start = FALSE; /* be able to say "/\*ptr" */
+ ++regparse;
+ ++after_slash;
+ peekchr();
+ --regparse;
+ --after_slash;
+ curchr = toggle_Magic(curchr);
+ } else if (vim_strchr(REGEXP_ABBR, c)) {
+ /*
+ * Handle abbreviations, like "\t" for TAB -- webb
+ */
+ curchr = backslash_trans(c);
+ } else if (reg_magic == MAGIC_NONE && (c == '$' || c == '^'))
+ curchr = toggle_Magic(c);
+ else {
+ /*
+ * Next character can never be (made) magic?
+ * Then backslashing it won't do anything.
+ */
if (has_mbyte)
- curchr = (*mb_ptr2char)(regparse);
+ curchr = (*mb_ptr2char)(regparse + 1);
+ else
+ curchr = c;
}
+ break;
+ }
+
+ default:
+ if (has_mbyte)
+ curchr = (*mb_ptr2char)(regparse);
}
return curchr;
generated by cgit (git 2.34.1) at 2025-05-02 18:18:00 +0000