pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-07 10:42:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20040909 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-03 13:36:10 -05:00
parent 37c41ab12b
commit 301e21427e
69 changed files with 38515 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
+16 -1
View File
@@ -50,6 +50,7 @@
#include "parser.h"
#include "mailcheck.h"
#include "test.h"
#include "builtins.h"
#include "builtins/common.h"
#include "builtins/builtext.h"
@@ -1028,6 +1029,7 @@ timespec: TIME
#define PST_ALEXPAND 0x0800 /* OK to expand aliases - unused */
#define PST_CMDTOKEN 0x1000 /* command token OK - unused */
#define PST_COMPASSIGN 0x2000 /* parsing x=(...) compound assignment */
#define PST_ASSIGNOK 0x4000 /* assignment statement ok in this context */
/* Initial size to allocate for tokens, and the
amount to grow them by. */
@@ -2567,6 +2569,8 @@ read_token (command)
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
parser_state &= ~PST_ASSIGNOK;
return (character);
}
@@ -2580,6 +2584,8 @@ read_token (command)
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
parser_state &= ~PST_ASSIGNOK;
peek_char = shell_getc (1);
if (character == peek_char)
{
@@ -2607,6 +2613,7 @@ read_token (command)
#if defined (ALIAS)
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
return (SEMI_SEMI);
case '&':
@@ -3515,7 +3522,7 @@ read_token_word (character)
goto next_character;
}
/* Identify possible compound array variable assignment. */
else if MBTEST(character == '=' && token_index > 0 && token_is_assignment (token, token_index))
else if MBTEST(character == '=' && token_index > 0 && (assignment_acceptable (last_read_token) || (parser_state & PST_ASSIGNOK)) && token_is_assignment (token, token_index))
{
peek_char = shell_getc (1);
if MBTEST(peek_char == '(') /* ) */
@@ -3642,6 +3649,14 @@ got_token:
the_word->flags |= W_NOSPLIT;
}
if (command_token_position (last_read_token))
{
struct builtin *b;
b = builtin_address_internal (token, 0);
if (b && (b->flags & ASSIGNMENT_BUILTIN))
parser_state |= PST_ASSIGNOK;
}
yylval.word = the_word;
result = ((the_word->flags & (W_ASSIGNMENT|W_NOSPLIT)) == (W_ASSIGNMENT|W_NOSPLIT))