# HG changeset patch # User Bram Moolenaar # Date 1370534691 -7200 # Node ID b20dbf3a5370543ffaa1d6fc337df1969843477e # Parent 92d20f095c05a759b65a0036b62d8fce8f711de8 updated for version 7.3.1132 Problem: Crash when debugging regexp. Solution: Do not try to dump subexpr that were not set. Skip over count of \% items. diff --git a/src/regexp.c b/src/regexp.c --- a/src/regexp.c +++ b/src/regexp.c @@ -6548,6 +6548,12 @@ regdump(pattern, r) fprintf(f, " count %ld", OPERAND_MIN(s)); s += 4; } + else if (op == RE_LNUM || op == RE_COL || op == RE_VCOL) + { + /* one int plus comperator */ + fprintf(f, " count %ld", OPERAND_MIN(s)); + s += 5; + } s += 3; if (op == ANYOF || op == ANYOF + ADD_NL || op == ANYBUT || op == ANYBUT + ADD_NL diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -256,7 +256,7 @@ static int nfa_alt_listid; /* 0 for first call to nfa_regmatch(), 1 for recursive call. */ static int nfa_ll_index = 0; -static int nfa_regcomp_start __ARGS((char_u*expr, int re_flags)); +static int nfa_regcomp_start __ARGS((char_u *expr, int re_flags)); static int nfa_recognize_char_class __ARGS((char_u *start, char_u *end, int extra_newl)); static int nfa_emit_equi_class __ARGS((int c, int neg)); static int nfa_regatom __ARGS((void)); @@ -2927,7 +2927,8 @@ log_subsexpr(subs) { log_subexpr(&subs->norm); # ifdef FEAT_SYN_HL - log_subexpr(&subs->synt); + if (nfa_has_zsubexpr) + log_subexpr(&subs->synt); # endif } diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1132, +/**/ 1131, /**/ 1130,