From c839339fbfd2bb7ee4a523b64c7f3734ba36b9bc Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Wed, 17 Nov 2021 16:46:40 -0500 Subject: [PATCH] Bash-5.1 patch 11: save and restore alias parsing when performing compound array assignment --- parse.y | 4 ---- patchlevel.h | 2 +- y.tab.c | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/parse.y b/parse.y index df1231da..f25575b5 100644 --- a/parse.y +++ b/parse.y @@ -6493,10 +6493,8 @@ parse_string_to_word_list (s, flags, whom) old_expand_aliases = expand_aliases; push_stream (1); -#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev 11/17/2020 */ if (ea = expanding_alias ()) parser_save_alias (); -#endif last_read_token = WORD; /* WORD to allow reserved words here */ current_command_line_count = 0; echo_input_at_read = expand_aliases = 0; @@ -6531,10 +6529,8 @@ parse_string_to_word_list (s, flags, whom) last_read_token = '\n'; pop_stream (); -#if 0 /* TAG: bash-5.2 */ if (ea) parser_restore_alias (); -#endif #if defined (HISTORY) remember_on_history = old_remember_on_history; diff --git a/patchlevel.h b/patchlevel.h index 75246e44..8b14f289 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 10 +#define PATCHLEVEL 11 #endif /* _PATCHLEVEL_H_ */ diff --git a/y.tab.c b/y.tab.c index dcc5b7f3..c11d7aaa 100644 --- a/y.tab.c +++ b/y.tab.c @@ -8787,10 +8787,8 @@ parse_string_to_word_list (s, flags, whom) old_expand_aliases = expand_aliases; push_stream (1); -#if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev 11/17/2020 */ if (ea = expanding_alias ()) parser_save_alias (); -#endif last_read_token = WORD; /* WORD to allow reserved words here */ current_command_line_count = 0; echo_input_at_read = expand_aliases = 0; @@ -8825,10 +8823,8 @@ parse_string_to_word_list (s, flags, whom) last_read_token = '\n'; pop_stream (); -#if 0 /* TAG: bash-5.2 */ if (ea) parser_restore_alias (); -#endif #if defined (HISTORY) remember_on_history = old_remember_on_history; -- 2.31.1