diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-05-25 15:31:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-05-25 15:31:05 +0200 |
| commit | f47ca63dbcc547fa7d16ff4a0e8729ba9c3c508a (patch) | |
| tree | 8fc19fd5ee0e1914b103cc8e663451f2a28ba228 | |
| parent | 56d58d51bfefe428c9fcbb6dd0e87b08c0ea30b2 (diff) | |
| download | vim-git-f47ca63dbcc547fa7d16ff4a0e8729ba9c3c508a.tar.gz | |
updated for version 7.3.1016v7.3.1016
Problem: Unused field in nfa_state.
Solution: Remove lastthread.
| -rw-r--r-- | src/regexp.h | 1 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/regexp.h b/src/regexp.h index 55b4722b8..1fe42729e 100644 --- a/src/regexp.h +++ b/src/regexp.h @@ -74,7 +74,6 @@ struct nfa_state int id; int lastlist; int visits; - thread_T *lastthread; int negated; }; diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 19b8d925e..0f212554e 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1865,16 +1865,16 @@ nfa_print_state2(debugf, state, indent) /* grow indent for state->out */ indent->ga_len -= 1; if (state->out1) - ga_concat(indent, "| "); + ga_concat(indent, (char_u *)"| "); else - ga_concat(indent, " "); + ga_concat(indent, (char_u *)" "); ga_append(indent, '\0'); nfa_print_state2(debugf, state->out, indent); /* replace last part of indent for state->out1 */ indent->ga_len -= 3; - ga_concat(indent, " "); + ga_concat(indent, (char_u *)" "); ga_append(indent, '\0'); nfa_print_state2(debugf, state->out1, indent); @@ -1948,7 +1948,6 @@ new_state(c, out, out1) s->id = istate; s->lastlist = 0; - s->lastthread = NULL; s->visits = 0; s->negated = FALSE; @@ -2498,6 +2497,7 @@ addstate(l, state, m, off, lid, match) { regsub_T save; int subidx = 0; + thread_T *lastthread; if (l == NULL || state == NULL) return; @@ -2531,9 +2531,9 @@ addstate(l, state, m, off, lid, match) { /* add the state to the list */ state->lastlist = lid; - state->lastthread = &l->t[l->n++]; - state->lastthread->state = state; - state->lastthread->sub = *m; + lastthread = &l->t[l->n++]; + lastthread->state = state; + lastthread->sub = *m; } } @@ -2983,7 +2983,7 @@ nfa_regmatch(start, submatch, m) 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, ">>> 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, "\n"); #endif @@ -3690,7 +3690,6 @@ nfa_regexec_both(line, col) prog->state[i].id = i; prog->state[i].lastlist = 0; prog->state[i].visits = 0; - prog->state[i].lastthread = NULL; } retval = nfa_regtry(prog->start, col); diff --git a/src/version.c b/src/version.c index 0d4ca1871..d03fed52a 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1016, +/**/ 1015, /**/ 1014, |