thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.979

Browse Source 
Problem:    Complex NFA regexp doesn't work.
Solution:   Set actual state stack end instead of using an arbitrary number.
            (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2013-05-20 21:57:03 +02:00
parent 7fcff1f781
commit e3c7b86aab
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/regexp_nfa.c
View File

@@ -17,8 +17,6 @@
#define NFA_BRACES_MAXLIMIT 10 #define NFA_BRACES_MAXLIMIT 10
/* For allocating space for the postfix representation */ /* For allocating space for the postfix representation */
#define NFA_POSTFIX_MULTIPLIER (NFA_BRACES_MAXLIMIT + 2)*2 #define NFA_POSTFIX_MULTIPLIER (NFA_BRACES_MAXLIMIT + 2)*2
/* Size of stack, used when converting the postfix regexp into NFA */
#define NFA_STACK_SIZE 1024
enum enum
{ {
@@ -2160,9 +2158,9 @@ post2nfa(postfix, end, nfa_calc_size)
if (nfa_calc_size == FALSE) if (nfa_calc_size == FALSE)
{ {
/* Allocate space for the stack. Max states on the stack : nstate */ /* Allocate space for the stack. Max states on the stack : nstate */
stack = (Frag_T *) lalloc((nstate + 1)*sizeof(Frag_T), TRUE); stack = (Frag_T *) lalloc((nstate + 1) * sizeof(Frag_T), TRUE);
stackp = stack; stackp = stack;
stack_end = stack + NFA_STACK_SIZE; stack_end = stack + (nstate + 1);
} }
for (p = postfix; p < end; ++p) for (p = postfix; p < end; ++p)

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 */
/**/
979,
/**/ /**/
978, 978,
/**/ /**/