From 75d112c4842295daa6542064aede617b774e3ff7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 29 May 2019 19:34:42 +0000
Subject: The line number needs to be updated only after the \n is processed by
 the parser, so store a flag and update it next time around. Also each new
 line needs its own shared data.

---
 cmd-parse.y | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'cmd-parse.y')

diff --git a/cmd-parse.y b/cmd-parse.y
index f347280b..d984b9d3 100644
--- a/cmd-parse.y
+++ b/cmd-parse.y
@@ -58,6 +58,7 @@ struct cmd_parse_state {
 	size_t				 len;
 	size_t				 off;
 
+	int				 eol;
 	int				 eof;
 	struct cmd_parse_input		*input;
 	u_int				 escapes;
@@ -933,6 +934,10 @@ yylex(void)
 	char			*token, *cp;
 	int			 ch, next;
 
+	if (ps->eol)
+		ps->input->line++;
+	ps->eol = 0;
+
 	for (;;) {
 		ch = yylex_getc();
 
@@ -959,7 +964,7 @@ yylex(void)
 			/*
 			 * End of line. Update the line number.
 			 */
-			ps->input->line++;
+			ps->eol = 1;
 			return ('\n');
 		}
 
-- 
cgit