Mercurial > vim

diff src/regexp_nfa.c @ 13043:307f2622826f v8.0.1397

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1397: pattern with & following nothing gives an error commit https://github.com/vim/vim/commit/890dd05492d88d48eee1dda7f7a1811d027ce7ca Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 16 19:59:37 2017 +0100 patch 8.0.1397: pattern with \& following nothing gives an error Problem: Pattern with \& following nothing gives an error. Solution: Emit an empty node when needed.
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Dec 2017 20:00:05 +0100
parents 09c856605191
children 9bd4151e5aeb
line wrap: on
line diff
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2321,7 +2321,6 @@ nfa_regconcat(void)
     static int
 nfa_regbranch(void)
 {
-    int		ch;
     int		old_post_pos;
 
     old_post_pos = (int)(post_ptr - post_start);
@@ -2330,11 +2329,13 @@ nfa_regbranch(void)
     if (nfa_regconcat() == FAIL)
 	return FAIL;
 
-    ch = peekchr();
     /* Try next concats */
-    while (ch == Magic('&'))
+    while (peekchr() == Magic('&'))
     {
 	skipchr();
+	/* if concat is empty do emit a node */
+	if (old_post_pos == (int)(post_ptr - post_start))
+	    EMIT(NFA_EMPTY);
 	EMIT(NFA_NOPEN);
 	EMIT(NFA_PREV_ATOM_NO_WIDTH);
 	old_post_pos = (int)(post_ptr - post_start);
@@ -2344,7 +2345,6 @@ nfa_regbranch(void)
 	if (old_post_pos == (int)(post_ptr - post_start))
 	    EMIT(NFA_EMPTY);
 	EMIT(NFA_CONCAT);
-	ch = peekchr();
     }
 
     /* if a branch is empty, emit one node for it */