From d6d5649dba0ac3deb827062dc1344c0561b41d0d Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Thu, 13 Aug 2015 15:38:42 -0400 Subject: Bash-4.3 patch 42 Change-Id: I6f01effd47b78771c7747f4314bda10cbd3a5c99 --- parse.y | 2 ++ patchlevel.h | 2 +- y.tab.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/parse.y b/parse.y index b887a89..484e6fe 100644 --- a/parse.y +++ b/parse.y @@ -3708,6 +3708,8 @@ eof_error: /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/ tflags |= LEX_INWORD; lex_wlen = 0; + if (tflags & LEX_RESWDOK) + lex_rwlen = 0; } } diff --git a/patchlevel.h b/patchlevel.h index 44f59c7..9b7b0e5 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 41 +#define PATCHLEVEL 42 #endif /* _PATCHLEVEL_H_ */ diff --git a/y.tab.c b/y.tab.c index 4a804e4..83c9367 100644 --- a/y.tab.c +++ b/y.tab.c @@ -6020,6 +6020,8 @@ eof_error: /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/ tflags |= LEX_INWORD; lex_wlen = 0; + if (tflags & LEX_RESWDOK) + lex_rwlen = 0; } } -- cgit v1.2.3