summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.stephenson@samsung.com>2018-11-29 17:54:02 +0000
committerPeter Stephenson <p.stephenson@samsung.com>2018-11-29 17:54:02 +0000
commitef20425381e83ebd5a10c2ab270a347018371162 (patch)
treeb9c26265cda1003d5de0ff6fca91f5ce18ac1197
parent50f8fa972c3795a115e7faff0b4c140b40eab5f0 (diff)
downloadzsh-ef20425381e83ebd5a10c2ab270a347018371162.tar.gz
zsh-ef20425381e83ebd5a10c2ab270a347018371162.tar.xz
zsh-ef20425381e83ebd5a10c2ab270a347018371162.zip
43854: Set tok to LEXERR on generic parse error.
Needed by main loop which detects an error this way.
-rw-r--r--ChangeLog5
-rw-r--r--Src/lex.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 69a94687c..0c4b0bf19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-29  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 43854: Src/lex.c: set tok to LEXERR on generic parser error so
+	this gets picked up by main loop.
+
 2018-11-21  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 43837 (test from Daniel): Src/subst.c, Test/D04parameter.ztst:
diff --git a/Src/lex.c b/Src/lex.c
index fa29da3a2..f43bcc7db 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1613,6 +1613,7 @@ parsestr(char **s)
 		zerr("parse error near `%c'", err);
 	    else
 		zerr("parse error");
+	    tok = LEXERR;
 	}
     }
     return err;