mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 20:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0451: some macros are in lower case

Browse Source 
Problem:    Some macros are in lower case.
Solution:   Make a few more macros upper case. Avoid lower case macros use an
            argument twice.
91acfffc1e
This commit is contained in:
Jan Edmund Lazo
2018-06-11 23:43:14 -04:00
parent fa2ad305e3
commit 3c7ea8d619
33 changed files with 426 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/nvim/regexp.c
View File

@@ -1142,24 +1142,28 @@ static char_u *skip_anyof(char_u *p)
if (*p == ']' || *p == '-')
++p;
while (*p != NUL && *p != ']') {
if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1)
if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) {
p += l;
else if (*p == '-') {
++p;
if (*p != ']' && *p != NUL)
mb_ptr_adv(p);
} else if (*p == '-') {
p++;
if (*p != ']' && *p != NUL) {
MB_PTR_ADV(p);
}
} else if (*p == '\\'
&& (vim_strchr(REGEXP_INRANGE, p[1]) != NULL
|| (!reg_cpo_lit && vim_strchr(REGEXP_ABBR, p[1]) != NULL)))
|| (!reg_cpo_lit
&& vim_strchr(REGEXP_ABBR, p[1]) != NULL))) {
p += 2;
else if (*p == '[') {
} else if (*p == '[') {
if (get_char_class(&p) == CLASS_NONE
&& get_equi_class(&p) == 0
&& get_coll_element(&p) == 0
&& *p != NUL)
++p; /* It is not a class name and not NUL */
} else
++p;
&& *p != NUL) {
p++; // It is not a class name and not NUL
}
} else {
p++;
}
}
return p;
@@ -1185,9 +1189,10 @@ char_u *skip_regexp(char_u *startp, int dirc, int magic, char_u **newp)
mymagic = MAGIC_OFF;
get_cpo_flags();
for (; p[0] != NUL; mb_ptr_adv(p)) {
if (p[0] == dirc) /* found end of regexp */
for (; p[0] != NUL; MB_PTR_ADV(p)) {
if (p[0] == dirc) { // found end of regexp
break;
}
if ((p[0] == '[' && mymagic >= MAGIC_ON)
|| (p[0] == '\\' && p[1] == '[' && mymagic <= MAGIC_OFF)) {
p = skip_anyof(p + 1);
@@ -3476,14 +3481,14 @@ static long bt_regexec_both(char_u *line,
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0) {
break; // Found it.
}
mb_ptr_adv(s);
MB_PTR_ADV(s);
}
} else {
while ((s = cstrchr(s, c)) != NULL) {
if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0) {
break; // Found it.
}
mb_ptr_adv(s);
MB_PTR_ADV(s);
}
}
if (s == NULL) { // Not present.
@@ -3753,7 +3758,7 @@ static int reg_match_visual(void)
return TRUE;
}
#define ADVANCE_REGINPUT() mb_ptr_adv(reginput)
#define ADVANCE_REGINPUT() MB_PTR_ADV(reginput)
/*
* The arguments from BRACE_LIMITS are stored here. They are actually local
@@ -4287,7 +4292,7 @@ regmatch (
if (enc_utf8) {
// Skip composing characters.
while (utf_iscomposing(utf_ptr2char(reginput))) {
mb_cptr_adv(reginput);
MB_CPTR_ADV(reginput);
}
}
break;
@@ -4951,21 +4956,24 @@ regmatch (
(colnr_T)STRLEN(regline);
}
} else {
if (has_mbyte)
if (has_mbyte) {
rp->rs_un.regsave.rs_u.pos.col -=
(*mb_head_off)(regline, regline
+ rp->rs_un.regsave.rs_u.pos.col - 1) + 1;
else
--rp->rs_un.regsave.rs_u.pos.col;
} else {
rp->rs_un.regsave.rs_u.pos.col--;
}
}
} else {
if (rp->rs_un.regsave.rs_u.ptr == regline)
if (rp->rs_un.regsave.rs_u.ptr == regline) {
no = FAIL;
else {
mb_ptr_back(regline, rp->rs_un.regsave.rs_u.ptr);
if (limit > 0 && (long)(behind_pos.rs_u.ptr
- rp->rs_un.regsave.rs_u.ptr) > limit)
} else {
MB_PTR_BACK(regline, rp->rs_un.regsave.rs_u.ptr);
if (limit > 0
&& (long)(behind_pos.rs_u.ptr
- rp->rs_un.regsave.rs_u.ptr) > limit) {
no = FAIL;
}
}
}
if (no == OK) {
@@ -5025,17 +5033,18 @@ regmatch (
if (--rst->count < rst->minval)
break;
if (reginput == regline) {
/* backup to last char of previous line */
--reglnum;
// backup to last char of previous line
reglnum--;
regline = reg_getline(reglnum);
/* Just in case regrepeat() didn't count
* right. */
if (regline == NULL)
// Just in case regrepeat() didn't count right.
if (regline == NULL) {
break;
}
reginput = regline + STRLEN(regline);
fast_breakcheck();
} else
mb_ptr_back(regline, reginput);
} else {
MB_PTR_BACK(regline, reginput);
}
} else {
/* Range is backwards, use shortest match first.
* Careful: maxval and minval are exchanged!
@@ -5165,8 +5174,8 @@ regrepeat (
/* Matching anything means we continue until end-of-line (or
* end-of-file for ANY + ADD_NL), only limited by maxcount. */
while (*scan != NUL && count < maxcount) {
++count;
mb_ptr_adv(scan);
count++;
MB_PTR_ADV(scan);
}
if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > rex.reg_maxline
|| rex.reg_line_lbr || count == maxcount) {
@@ -5188,7 +5197,7 @@ regrepeat (
case SIDENT + ADD_NL:
while (count < maxcount) {
if (vim_isIDc(PTR2CHAR(scan)) && (testval || !ascii_isdigit(*scan))) {
mb_ptr_adv(scan);
MB_PTR_ADV(scan);
} else if (*scan == NUL) {
if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > rex.reg_maxline
|| rex.reg_line_lbr) {
@@ -5216,7 +5225,7 @@ regrepeat (
while (count < maxcount) {
if (vim_iswordp_buf(scan, rex.reg_buf)
&& (testval || !ascii_isdigit(*scan))) {
mb_ptr_adv(scan);
MB_PTR_ADV(scan);
} else if (*scan == NUL) {
if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > rex.reg_maxline
|| rex.reg_line_lbr) {
@@ -5244,7 +5253,7 @@ regrepeat (
case SFNAME + ADD_NL:
while (count < maxcount) {
if (vim_isfilec(PTR2CHAR(scan)) && (testval || !ascii_isdigit(*scan))) {
mb_ptr_adv(scan);
MB_PTR_ADV(scan);
} else if (*scan == NUL) {
if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > rex.reg_maxline
|| rex.reg_line_lbr) {
@@ -5283,7 +5292,7 @@ regrepeat (
}
} else if (vim_isprintc(PTR2CHAR(scan)) == 1
&& (testval || !ascii_isdigit(*scan))) {
mb_ptr_adv(scan);
MB_PTR_ADV(scan);
} else if (rex.reg_line_lbr && *scan == '\n' && WITH_NL(OP(p))) {
scan++;
} else {
@@ -6679,7 +6688,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
if (eval_result != NULL) {
int had_backslash = FALSE;
for (s = eval_result; *s != NUL; mb_ptr_adv(s)) {
for (s = eval_result; *s != NUL; MB_PTR_ADV(s)) {
// Change NL to CR, so that it becomes a line break,
// unless called from vim_regexec_nl().
// Skip over a backslashed character.