aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.1016

Browse Source 
Problem:    Unused field in nfa_state.
Solution:   Remove lastthread.
This commit is contained in:
Bram Moolenaar 2013-05-25 15:31:05 +02:00
parent 56d58d51bf
commit f47ca63dbc
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/regexp.h
View File

@ -74,7 +74,6 @@ struct nfa_state
int id; int id;
int lastlist; int lastlist;
int visits; int visits;
thread_T *lastthread;
int negated; int negated;
}; };

17
src/regexp_nfa.c
View File

@ -1865,16 +1865,16 @@ nfa_print_state2(debugf, state, indent)
/* grow indent for state->out */ /* grow indent for state->out */
indent->ga_len -= 1; indent->ga_len -= 1;
if (state->out1) if (state->out1)
ga_concat(indent, "| "); ga_concat(indent, (char_u *)"| ");
else else
ga_concat(indent, " "); ga_concat(indent, (char_u *)" ");
ga_append(indent, '\0'); ga_append(indent, '\0');
nfa_print_state2(debugf, state->out, indent); nfa_print_state2(debugf, state->out, indent);
/* replace last part of indent for state->out1 */ /* replace last part of indent for state->out1 */
indent->ga_len -= 3; indent->ga_len -= 3;
ga_concat(indent, " "); ga_concat(indent, (char_u *)" ");
ga_append(indent, '\0'); ga_append(indent, '\0');
nfa_print_state2(debugf, state->out1, indent); nfa_print_state2(debugf, state->out1, indent);
@ -1948,7 +1948,6 @@ new_state(c, out, out1)
s->id = istate; s->id = istate;
s->lastlist = 0; s->lastlist = 0;
s->lastthread = NULL;
s->visits = 0; s->visits = 0;
s->negated = FALSE; s->negated = FALSE;
@ -2498,6 +2497,7 @@ addstate(l, state, m, off, lid, match)
{ {
regsub_T save; regsub_T save;
int subidx = 0; int subidx = 0;
thread_T *lastthread;
if (l == NULL || state == NULL) if (l == NULL || state == NULL)
return; return;
@ -2531,9 +2531,9 @@ addstate(l, state, m, off, lid, match)
{ {
/* add the state to the list */ /* add the state to the list */
state->lastlist = lid; state->lastlist = lid;
state->lastthread = &l->t[l->n++]; lastthread = &l->t[l->n++];
state->lastthread->state = state; lastthread->state = state;
state->lastthread->sub = *m; lastthread->sub = *m;
} }
} }
@ -2983,7 +2983,7 @@ nfa_regmatch(start, submatch, m)
fprintf(log_fd, ">>> Reginput is \"%s\"\n", reginput); fprintf(log_fd, ">>> Reginput is \"%s\"\n", reginput);
fprintf(log_fd, ">>> Advanced one character ... Current char is %c (code %d) \n", c, (int)c); fprintf(log_fd, ">>> Advanced one character ... Current char is %c (code %d) \n", c, (int)c);
fprintf(log_fd, ">>> Thislist has %d states available: ", thislist->n); fprintf(log_fd, ">>> Thislist has %d states available: ", thislist->n);
for (i = 0; i< thislist->n; i++) for (i = 0; i < thislist->n; i++)
fprintf(log_fd, "%d ", abs(thislist->t[i].state->id)); fprintf(log_fd, "%d ", abs(thislist->t[i].state->id));
fprintf(log_fd, "\n"); fprintf(log_fd, "\n");
#endif #endif
@ -3690,7 +3690,6 @@ nfa_regexec_both(line, col)
prog->state[i].id = i; prog->state[i].id = i;
prog->state[i].lastlist = 0; prog->state[i].lastlist = 0;
prog->state[i].visits = 0; prog->state[i].visits = 0;
prog->state[i].lastthread = NULL;
} }
retval = nfa_regtry(prog->start, col); retval = nfa_regtry(prog->start, col);

2
src/version.c
View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1016,
/**/ /**/
1015, 1015,
/**/ /**/