mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-06 17:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8843 from janlazo/vim-8.0.0828

Browse Source
This commit is contained in:
Justin M. Keyes
2018-08-12 19:35:20 +02:00
committed by GitHub
parent ff19f08477 d6a25f89b8
commit 97331cab67
3 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/nvim/regexp.c
View File

@@ -1664,9 +1664,8 @@ static char_u *regpiece(int *flagp)
case Magic('@'):
{
int lop = END;
int nr;
int64_t nr = getdecchrs();
nr = getdecchrs();
switch (no_Magic(getchr())) {
case '=': lop = MATCH; break; /* \@= */
case '!': lop = NOMATCH; break; /* \@! */
@@ -2087,7 +2086,7 @@ static char_u *regatom(int *flagp)
case 'u': /* %uabcd hex 4 */
case 'U': /* %U1234abcd hex 8 */
{
int i;
int64_t i;
switch (c) {
case 'd': i = getdecchrs(); break;
@@ -2976,9 +2975,9 @@ static void ungetchr(void)
* The parameter controls the maximum number of input characters. This will be
* 2 when reading a \%x20 sequence and 4 when reading a \%u20AC sequence.
*/
static int gethexchrs(int maxinputlen)
static int64_t gethexchrs(int maxinputlen)
{
int nr = 0;
int64_t nr = 0;
int c;
int i;
@@ -3000,9 +2999,9 @@ static int gethexchrs(int maxinputlen)
* Get and return the value of the decimal string immediately after the
* current position. Return -1 for invalid. Consumes all digits.
*/
static int getdecchrs(void)
static int64_t getdecchrs(void)
{
int nr = 0;
int64_t nr = 0;
int c;
int i;
@@ -3029,9 +3028,9 @@ static int getdecchrs(void)
* blahblah\%o210asdf
* before-^ ^-after
*/
static int getoctchrs(void)
static int64_t getoctchrs(void)
{
int nr = 0;
int64_t nr = 0;
int c;
int i;
@@ -3055,7 +3054,7 @@ static int getoctchrs(void)
*/
static int coll_get_char(void)
{
int nr = -1;
int64_t nr = -1;
switch (*regparse++) {
case 'd': nr = getdecchrs(); break;
@@ -4922,13 +4921,13 @@ regmatch (
(colnr_T)STRLEN(regline);
}
} else {
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--;
}
const char_u *const line =
reg_getline(behind_pos.rs_u.pos.lnum);
rp->rs_un.regsave.rs_u.pos.col -=
utf_head_off(line,
line + rp->rs_un.regsave.rs_u.pos.col - 1)
+ 1;
}
} else {
if (rp->rs_un.regsave.rs_u.ptr == regline) {

77
src/nvim/regexp_nfa.c
View File

@@ -1409,7 +1409,7 @@ static int nfa_regatom(void)
case 'u': /* %uabcd hex 4 */
case 'U': /* %U1234abcd hex 8 */
{
int nr;
int64_t nr;
switch (c) {
case 'd': nr = getdecchrs(); break;
@@ -1485,7 +1485,7 @@ static int nfa_regatom(void)
default:
{
int n = 0;
long n = 0;
int cmp = c;
if (c == '<' || c == '>')
@@ -1511,7 +1511,13 @@ static int nfa_regatom(void)
EMIT(cmp == '<' ? NFA_VCOL_LT :
cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
}
EMIT(n);
#if SIZEOF_INT < SIZEOF_LONG
if (n > INT_MAX) {
EMSG(_("E951: \\% value too large"));
return FAIL;
}
#endif
EMIT((int)n);
break;
} else if (c == '\'' && n == 0) {
/* \%'m \%<'m \%>'m */
@@ -1859,7 +1865,7 @@ static int nfa_regpiece(void)
int greedy = TRUE; /* Braces are prefixed with '-' ? */
parse_state_T old_state;
parse_state_T new_state;
int c2;
int64_t c2;
int old_post_pos;
int my_post_start;
int quest;
@@ -2032,9 +2038,10 @@ static int nfa_regpiece(void)
break;
} /* end switch */
if (re_multi_type(peekchr()) != NOT_MULTI)
/* Can't have a multi follow a multi. */
EMSG_RET_FAIL(_("E871: (NFA regexp) Can't have a multi follow a multi !"));
if (re_multi_type(peekchr()) != NOT_MULTI) {
// Can't have a multi follow a multi.
EMSG_RET_FAIL(_("E871: (NFA regexp) Can't have a multi follow a multi"));
}
return OK;
}
@@ -2447,6 +2454,8 @@ static void nfa_set_code(int c)
}
static FILE *log_fd;
static char_u e_log_open_failed[] = N_(
"Could not open temporary log file for writing, displaying on stderr... ");
/*
* Print the postfix notation of the current regexp.
@@ -2459,10 +2468,11 @@ static void nfa_postfix_dump(char_u *expr, int retval)
f = fopen(NFA_REGEXP_DUMP_LOG, "a");
if (f != NULL) {
fprintf(f, "\n-------------------------\n");
if (retval == FAIL)
fprintf(f, ">>> NFA engine failed ... \n");
else if (retval == OK)
if (retval == FAIL) {
fprintf(f, ">>> NFA engine failed... \n");
} else if (retval == OK) {
fprintf(f, ">>> NFA engine succeeded !\n");
}
fprintf(f, "Regexp: \"%s\"\nPostfix notation (char): \"", expr);
for (p = post_start; *p && p < post_ptr; p++) {
nfa_set_code(*p);
@@ -2716,7 +2726,7 @@ static void st_error(int *postfix, int *end, int *p)
fclose(df);
}
#endif
EMSG(_("E874: (NFA) Could not pop the stack !"));
EMSG(_("E874: (NFA) Could not pop the stack!"));
}
/*
@@ -3224,7 +3234,13 @@ static nfa_state_T *post2nfa(int *postfix, int *end, int nfa_calc_size)
if (pattern) {
/* NFA_ZEND -> NFA_END_PATTERN -> NFA_SKIP -> what follows. */
skip = alloc_state(NFA_SKIP, NULL, NULL);
if (skip == NULL) {
goto theend;
}
zend = alloc_state(NFA_ZEND, s1, NULL);
if (zend == NULL) {
goto theend;
}
s1->out= skip;
patch(e.out, zend);
PUSH(frag(s, list1(&skip->out)));
@@ -4685,8 +4701,7 @@ static int recursive_regmatch(nfa_state_T *state, nfa_pim_T *pim, nfa_regprog_T
fprintf(log_fd, "MATCH = %s\n", !result ? "FALSE" : "OK");
fprintf(log_fd, "****************************\n");
} else {
EMSG(_(
"Could not open temporary log file for writing, displaying on stderr ... "));
EMSG(_(e_log_open_failed));
log_fd = stderr;
}
#endif
@@ -4952,7 +4967,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
FILE *debug = fopen(NFA_REGEXP_DEBUG_LOG, "a");
if (debug == NULL) {
EMSG2(_("(NFA) COULD NOT OPEN %s !"), NFA_REGEXP_DEBUG_LOG);
EMSG2("(NFA) COULD NOT OPEN %s!", NFA_REGEXP_DEBUG_LOG);
return false;
}
#endif
@@ -4990,8 +5005,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
abs(start->id), code);
fprintf(log_fd, "**********************************\n");
} else {
EMSG(_(
"Could not open temporary log file for writing, displaying on stderr ... "));
EMSG(_(e_log_open_failed));
log_fd = stderr;
}
#endif
@@ -5056,8 +5070,9 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
fprintf(log_fd, "------------------------------------------\n");
fprintf(log_fd, ">>> Reginput is \"%s\"\n", reginput);
fprintf(log_fd,
">>> Advanced one character ... Current char is %c (code %d) \n", curc,
(int)curc);
">>> Advanced one character... Current char is %c (code %d) \n",
curc,
(int)curc);
fprintf(log_fd, ">>> Thislist has %d states available: ", thislist->n);
{
int i;
@@ -5089,16 +5104,17 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
{
int col;
if (t->subs.norm.in_use <= 0)
if (t->subs.norm.in_use <= 0) {
col = -1;
else if (REG_MULTI)
} else if (REG_MULTI) {
col = t->subs.norm.list.multi[0].start_col;
else
} else {
col = (int)(t->subs.norm.list.line[0].start - regline);
}
nfa_set_code(t->state->c);
fprintf(log_fd, "(%d) char %d %s (start col %d)%s ... \n",
abs(t->state->id), (int)t->state->c, code, col,
pim_info(&t->pim));
fprintf(log_fd, "(%d) char %d %s (start col %d)%s... \n",
abs(t->state->id), (int)t->state->c, code, col,
pim_info(&t->pim));
}
#endif
@@ -6252,8 +6268,9 @@ static long nfa_regtry(nfa_regprog_T *prog, colnr_T col, proftime_T *tm)
nfa_print_state(f, start);
fprintf(f, "\n\n");
fclose(f);
} else
EMSG(_("Could not open temporary log file for writing "));
} else {
EMSG("Could not open temporary log file for writing");
}
#endif
clear_sub(&subs.norm);
@@ -6479,10 +6496,10 @@ static regprog_T *nfa_regcomp(char_u *expr, int re_flags)
FILE *f = fopen(NFA_REGEXP_RUN_LOG, "a");
if (f != NULL) {
fprintf(
f,
"\n*****************************\n\n\n\n\tCompiling regexp \"%s\" ... hold on !\n",
expr);
fprintf(f,
"\n*****************************\n\n\n\n\t"
"Compiling regexp \"%s\"... hold on !\n",
expr);
fclose(f);
}
}

10
src/nvim/spellfile.c
View File

@@ -1993,7 +1993,7 @@ static afffile_T *spell_read_aff(spellinfo_T *spin, char_u *fname)
return NULL;
}
vim_snprintf((char *)IObuff, IOSIZE, _("Reading affix file %s ..."), fname);
vim_snprintf((char *)IObuff, IOSIZE, _("Reading affix file %s..."), fname);
spell_message(spin, IObuff);
// Only do REP lines when not done in another .aff file already.
@@ -3032,7 +3032,7 @@ static int spell_read_dic(spellinfo_T *spin, char_u *fname, afffile_T *affile)
hash_init(&ht);
vim_snprintf((char *)IObuff, IOSIZE,
_("Reading dictionary file %s ..."), fname);
_("Reading dictionary file %s..."), fname);
spell_message(spin, IObuff);
// start with a message for the first line
@@ -3548,7 +3548,7 @@ static int spell_read_wordfile(spellinfo_T *spin, char_u *fname)
return FAIL;
}
vim_snprintf((char *)IObuff, IOSIZE, _("Reading word file %s ..."), fname);
vim_snprintf((char *)IObuff, IOSIZE, _("Reading word file %s..."), fname);
spell_message(spin, IObuff);
// Read all the lines in the file one by one.
@@ -4998,7 +4998,7 @@ static void sug_write(spellinfo_T *spin, char_u *fname)
}
vim_snprintf((char *)IObuff, IOSIZE,
_("Writing suggestion file %s ..."), fname);
_("Writing suggestion file %s..."), fname);
spell_message(spin, IObuff);
// <SUGHEADER>: <fileID> <versionnr> <timestamp>
@@ -5234,7 +5234,7 @@ mkspell (
if (!error && !got_int) {
// Write the info in the spell file.
vim_snprintf((char *)IObuff, IOSIZE,
_("Writing spell file %s ..."), wfname);
_("Writing spell file %s..."), wfname);
spell_message(&spin, IObuff);
error = write_vim_spell(&spin, wfname) == FAIL;