Mercurial > vim
changeset 4555:b2946c06d1b6 v7.3.1025
updated for version 7.3.1025
Problem: New regexp: not matching newline in string. (Marc Weber)
Solution: Check for "\n" character.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 26 May 2013 17:45:49 +0200 |
| parents | 0bd4cf62bcdc |
| children | 13fff3bf438e |
| files | src/regexp_nfa.c src/testdir/test64.in src/testdir/test64.ok src/version.c |
| diffstat | 4 files changed, 42 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -165,9 +165,9 @@ static int *post_start; /* holds the po static int *post_end; static int *post_ptr; -static int nstate; /* Number of states in the NFA. */ +static int nstate; /* Number of states in the NFA. Also used when + * executing. */ static int istate; /* Index in the state vector, used in new_state() */ -static int nstate_max; /* Upper bound of estimated number of states. */ static int nfa_regcomp_start __ARGS((char_u*expr, int re_flags)); @@ -219,10 +219,11 @@ nfa_regcomp_start(expr, re_flags) int re_flags; /* see vim_regcomp() */ { size_t postfix_size; + int nstate_max; nstate = 0; istate = 0; - /* A reasonable estimation for size */ + /* A reasonable estimation for maximum size */ nstate_max = (int)(STRLEN(expr) + 1) * NFA_POSTFIX_MULTIPLIER; /* Some items blow up in size, such as [A-z]. Add more space for that. @@ -1968,10 +1969,20 @@ new_state(c, out, out1) * Frag_T.out is a list of places that need to be set to the * next state for this fragment. */ + +/* Since the out pointers in the list are always + * uninitialized, we use the pointers themselves + * as storage for the Ptrlists. */ typedef union Ptrlist Ptrlist; +union Ptrlist +{ + Ptrlist *next; + nfa_state_T *s; +}; + struct Frag { - nfa_state_T *start; + nfa_state_T *start; Ptrlist *out; }; typedef struct Frag Frag_T; @@ -1999,17 +2010,6 @@ frag(start, out) } /* - * Since the out pointers in the list are always - * uninitialized, we use the pointers themselves - * as storage for the Ptrlists. - */ -union Ptrlist -{ - Ptrlist *next; - nfa_state_T *s; -}; - -/* * Create singleton list containing just outp. */ static Ptrlist * @@ -3358,8 +3358,8 @@ nfa_regmatch(start, submatch, m) #endif case NFA_NEWL: - if (!reg_line_lbr && REG_MULTI - && curc == NUL && reglnum <= reg_maxline) + if (curc == NUL && !reg_line_lbr && REG_MULTI + && reglnum <= reg_maxline) { go_to_nextline = TRUE; /* Pass -1 for the offset, which means taking the position @@ -3367,6 +3367,12 @@ nfa_regmatch(start, submatch, m) addstate(nextlist, t->state->out, &t->sub, -1, listid + 1, &match); } + else if (curc == '\n' && reg_line_lbr) + { + /* match \n as if it is an ordinary character */ + addstate(nextlist, t->state->out, &t->sub, 1, + listid + 1, &match); + } break; case NFA_CLASS_ALNUM: @@ -3832,7 +3838,12 @@ nfa_regcomp(expr, re_flags) * (and count its size). */ postfix = re2post(); if (postfix == NULL) + { + /* TODO: only give this error for debugging? */ + if (post_ptr >= post_end) + EMSGN("Internal error: estimated max number of states insufficient: %ld", post_end - post_start); goto fail; /* Cascaded (syntax?) error */ + } /* * In order to build the NFA, we parse the input regexp twice:
--- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -250,6 +250,9 @@ STARTTEST :call add(tl, [2, 'abc[0-9]*ddd', 'adf abc44482ddd oijs', 'abc44482ddd']) :call add(tl, [2, '\_[0-9]\+', 'asfi9888u', '9888']) :call add(tl, [2, '[0-9\n]\+', 'asfi9888u', '9888']) +:call add(tl, [2, '\_[0-9]\+', "asfi\n9888u", "\n9888"]) +:call add(tl, [2, '\_f', " \na ", "\n"]) +:call add(tl, [2, '\_f\+', " \na ", "\na"]) :" :" :"""" Test recognition of some character classes
--- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -576,6 +576,15 @@ OK 2 - \_[0-9]\+ OK 0 - [0-9\n]\+ OK 1 - [0-9\n]\+ OK 2 - [0-9\n]\+ +OK 0 - \_[0-9]\+ +OK 1 - \_[0-9]\+ +OK 2 - \_[0-9]\+ +OK 0 - \_f +OK 1 - \_f +OK 2 - \_f +OK 0 - \_f\+ +OK 1 - \_f\+ +OK 2 - \_f\+ OK 0 - [0-9] OK 1 - [0-9] OK 2 - [0-9]