aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

updated for version 7.3.1121

Browse Source 
Problem:    New regexp engine: adding states that are not used.
Solution:   Don't add the states.
This commit is contained in:
Bram Moolenaar
2013-06-05 16:51:57 +02:00
parent 5b84ddccea
commit 67604aed75
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/regexp_nfa.c
View File

@@ -3169,6 +3169,7 @@ addstate(l, state, subs, off)
case NFA_SPLIT: case NFA_SPLIT:
case NFA_NOT: case NFA_NOT:
case NFA_NOPEN: case NFA_NOPEN:
case NFA_SKIP_CHAR:
case NFA_NCLOSE: case NFA_NCLOSE:
case NFA_MCLOSE: case NFA_MCLOSE:
case NFA_MCLOSE1: case NFA_MCLOSE1:
@@ -3192,6 +3193,7 @@ addstate(l, state, subs, off)
case NFA_ZCLOSE8: case NFA_ZCLOSE8:
case NFA_ZCLOSE9: case NFA_ZCLOSE9:
#endif #endif
case NFA_ZEND:
/* These nodes are not added themselves but their "out" and/or /* These nodes are not added themselves but their "out" and/or
* "out1" may be added below. */ * "out1" may be added below. */
break; break;
@@ -3218,6 +3220,7 @@ addstate(l, state, subs, off)
case NFA_ZOPEN8: case NFA_ZOPEN8:
case NFA_ZOPEN9: case NFA_ZOPEN9:
#endif #endif
case NFA_ZSTART:
/* These nodes do not need to be added, but we need to bail out /* These nodes do not need to be added, but we need to bail out
* when it was tried to be added to this list before. */ * when it was tried to be added to this list before. */
if (state->lastlist[nfa_ll_index] == l->id) if (state->lastlist[nfa_ll_index] == l->id)
@@ -4362,10 +4365,6 @@ nfa_regmatch(prog, start, submatch, m)
case NFA_START_INVISIBLE: case NFA_START_INVISIBLE:
case NFA_START_INVISIBLE_BEFORE: case NFA_START_INVISIBLE_BEFORE:
/* If invisible match has a higher chance to fail, do it
* right away. Otherwise postpone it until what follows is
* matching and causes addstate(nextlist, ..) to be called.
* This is indicated by the "pim" field. */
{ {
nfa_pim_T *pim; nfa_pim_T *pim;
int cout = t->state->out1->out->c; int cout = t->state->out1->out->c;
@@ -4863,12 +4862,11 @@ nfa_regmatch(prog, start, submatch, m)
log_subsexpr(&nextlist->t[nextlist->n - 1].subs); log_subsexpr(&nextlist->t[nextlist->n - 1].subs);
#endif #endif
} }
} }
break; break;
} }
case NFA_SKIP: case NFA_SKIP:
/* charater of previous matching \1 .. \9 */ /* character of previous matching \1 .. \9 or \@> */
if (t->count - clen <= 0) if (t->count - clen <= 0)
{ {
/* end of match, go to what follows */ /* end of match, go to what follows */
@@ -4892,12 +4890,6 @@ nfa_regmatch(prog, start, submatch, m)
} }
break; break;
case NFA_SKIP_CHAR:
case NFA_ZSTART:
case NFA_ZEND:
/* TODO: should not happen? */
break;
case NFA_LNUM: case NFA_LNUM:
case NFA_LNUM_GT: case NFA_LNUM_GT:
case NFA_LNUM_LT: case NFA_LNUM_LT:

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 */
/**/
1121,
/**/ /**/
1120, 1120,
/**/ /**/