-/* A Bison parser, made from /usr/homes/chet/src/bash/src/parse.y
+/* A Bison parser, made from /Users/chet/src/bash/src/parse.y
by GNU Bison version 1.28 */
#define YYBISON 1 /* Identify Bison output. */
#define GREATER_GREATER 286
#define LESS_LESS 287
#define LESS_AND 288
-#define GREATER_AND 289
-#define SEMI_SEMI 290
-#define LESS_LESS_MINUS 291
-#define AND_GREATER 292
-#define LESS_GREATER 293
-#define GREATER_BAR 294
-#define yacc_EOF 295
+#define LESS_LESS_LESS 289
+#define GREATER_AND 290
+#define SEMI_SEMI 291
+#define LESS_LESS_MINUS 292
+#define AND_GREATER 293
+#define LESS_GREATER 294
+#define GREATER_BAR 295
+#define yacc_EOF 296
-#line 21 "/usr/homes/chet/src/bash/src/parse.y"
+#line 21 "/Users/chet/src/bash/src/parse.y"
#include "config.h"
#include "memalloc.h"
+#include "bashintl.h"
+
+#define NEED_STRFTIME_DECL /* used in externs.h */
+
#include "shell.h"
#include "trap.h"
#include "flags.h"
#include "parser.h"
#include "mailcheck.h"
#include "test.h"
+#include "builtins.h"
#include "builtins/common.h"
#include "builtins/builtext.h"
+#include "shmbutil.h"
+
#if defined (READLINE)
# include "bashline.h"
# include <readline/readline.h>
#if defined (ALIAS)
# include "alias.h"
+#else
+typedef void *alias_t;
#endif /* ALIAS */
#if defined (PROMPT_STRING_DECODE)
# include <sys/param.h>
# endif
# include <time.h>
+# if defined (TM_IN_SYS_TIME)
+# include <sys/types.h>
+# include <sys/time.h>
+# endif /* TM_IN_SYS_TIME */
# include "maxpath.h"
#endif /* PROMPT_STRING_DECODE */
#define RE_READ_TOKEN -99
#define NO_EXPANSION -100
-#define YYDEBUG 0
+#ifdef DEBUG
+# define YYDEBUG 1
+#else
+# define YYDEBUG 0
+#endif
+
+#if defined (HANDLE_MULTIBYTE)
+# define last_shell_getc_is_singlebyte \
+ ((shell_input_line_index > 1) \
+ ? shell_input_line_property[shell_input_line_index - 1] \
+ : 1)
+# define MBTEST(x) ((x) && last_shell_getc_is_singlebyte)
+#else
+# define last_shell_getc_is_singlebyte 1
+# define MBTEST(x) ((x))
+#endif
#if defined (EXTENDED_GLOB)
extern int extended_glob;
extern int sourcelevel;
extern int posixly_correct;
extern int last_command_exit_value;
-extern int interrupt_immediately;
extern char *shell_name, *current_host_name;
extern char *dist_version;
extern int patch_level;
static char *read_a_line __P((int));
-static char *ansiexpand __P((char *, int, int, int *));
-static char *mk_msgstr __P((char *, int *));
-static char *localeexpand __P((char *, int, int, int, int *));
static int reserved_word_acceptable __P((int));
static int yylex __P((void));
static int alias_expand_token __P((char *));
static int special_case_tokens __P((char *));
static int read_token __P((int));
static char *parse_matched_pair __P((int, int, int, int *, int));
+#if defined (ARRAY_VARS)
+static char *parse_compound_assignment __P((int *));
+#endif
#if defined (DPAREN_ARITHMETIC) || defined (ARITH_FOR_COMMAND)
-static int parse_arith_cmd __P((char **));
+static int parse_dparen __P((int));
+static int parse_arith_cmd __P((char **, int));
#endif
#if defined (COND_COMMAND)
+static void cond_error __P((void));
static COND_COM *cond_expr __P((void));
static COND_COM *cond_or __P((void));
static COND_COM *cond_and __P((void));
static int cond_skip_newlines __P((void));
static COMMAND *parse_cond_command __P((void));
#endif
+#if defined (ARRAY_VARS)
+static int token_is_assignment __P((char *, int));
+static int token_is_ident __P((char *, int));
+#endif
static int read_token_word __P((int));
static void discard_parser_constructs __P((int));
+static char *error_token_from_token __P((int));
+static char *error_token_from_text __P((void));
+static void print_offending_line __P((void));
static void report_syntax_error __P((char *));
+
static void handle_eof_input_unit __P((void));
static void prompt_again __P((void));
#if 0
#endif
static void print_prompt __P((void));
-#if defined (HISTORY)
-char *history_delimiting_chars __P((void));
+#if defined (HANDLE_MULTIBYTE)
+static void set_line_mbstate __P((void));
+static char *shell_input_line_property = NULL;
+#else
+# define set_line_mbstate()
#endif
extern int yyerror __P((const char *));
+#ifdef DEBUG
+extern int yydebug;
+#endif
+
/* Default prompt strings */
char *primary_prompt = PPROMPT;
char *secondary_prompt = SPROMPT;
decode_prompt_string. */
int promptvars = 1;
+/* If non-zero, $'...' and $"..." are expanded when they appear within
+ a ${...} expansion, even when the expansion appears within double
+ quotes. */
+int extended_quote = 1;
+
/* The decoded prompt string. Used if READLINE is not defined or if
editing is turned off. Analogous to current_readline_prompt. */
static char *current_decoded_prompt;
/* The line number in a script at which an arithmetic for command starts. */
static int arith_for_lineno;
+/* The line number in a script where the word in a `case WORD', `select WORD'
+ or `for WORD' begins. This is a nested command maximum, since the array
+ index is decremented after a case, select, or for command is parsed. */
+#define MAX_CASE_NEST 128
+static int word_lineno[MAX_CASE_NEST];
+static int word_top = -1;
+
+/* If non-zero, it is the token that we want read_token to return
+ regardless of what text is (or isn't) present to be read. This
+ is reset by read_token. If token_to_read == WORD or
+ ASSIGNMENT_WORD, yylval.word should be set to word_desc_to_read. */
+static int token_to_read;
+static WORD_DESC *word_desc_to_read;
+
static REDIRECTEE redir;
-#line 232 "/usr/homes/chet/src/bash/src/parse.y"
+#line 295 "/Users/chet/src/bash/src/parse.y"
typedef union {
WORD_DESC *word; /* the word that we read. */
int number; /* the number that we read. */
-#define YYFINAL 295
+#define YYFINAL 302
#define YYFLAG -32768
-#define YYNTBASE 53
+#define YYNTBASE 54
-#define YYTRANSLATE(x) ((unsigned)(x) <= 295 ? yytranslate[x] : 88)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 296 ? yytranslate[x] : 90)
static const char yytranslate[] = { 0,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 43,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 44,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 41, 2, 51,
- 52, 2, 2, 2, 48, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 42, 47,
- 2, 46, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 42, 2, 52,
+ 53, 2, 2, 2, 49, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 43, 48,
+ 2, 47, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 49, 45, 50, 2, 2, 2, 2, 2,
+ 2, 2, 50, 46, 51, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 44
+ 37, 38, 39, 40, 41, 45
};
#if YYDEBUG != 0
0, 3, 5, 8, 10, 12, 15, 18, 21, 25,
29, 32, 36, 39, 43, 46, 50, 53, 57, 60,
64, 67, 71, 74, 78, 81, 85, 88, 92, 95,
- 99, 102, 105, 109, 111, 113, 115, 117, 120, 122,
- 125, 127, 129, 132, 134, 136, 138, 144, 150, 152,
- 154, 156, 158, 160, 162, 164, 171, 178, 186, 194,
- 205, 216, 226, 236, 244, 252, 258, 264, 271, 278,
- 286, 294, 305, 316, 323, 331, 338, 344, 351, 356,
- 358, 361, 365, 371, 379, 386, 390, 392, 396, 401,
- 408, 414, 416, 419, 424, 429, 435, 441, 444, 448,
- 450, 454, 457, 459, 462, 466, 470, 474, 479, 484,
- 489, 494, 499, 501, 503, 505, 507, 508, 511, 513,
- 516, 519, 524, 529, 533, 537, 539, 541, 544, 547,
- 551, 555, 560, 562, 564
+ 99, 102, 106, 109, 112, 116, 118, 120, 122, 124,
+ 127, 129, 132, 134, 136, 139, 141, 143, 145, 151,
+ 157, 159, 161, 163, 165, 167, 169, 171, 178, 185,
+ 193, 201, 212, 223, 233, 243, 251, 259, 265, 271,
+ 278, 285, 293, 301, 312, 323, 330, 338, 345, 351,
+ 358, 363, 365, 368, 372, 378, 386, 393, 397, 399,
+ 403, 408, 415, 421, 423, 426, 431, 436, 442, 448,
+ 451, 455, 457, 461, 464, 466, 469, 473, 477, 481,
+ 486, 491, 496, 501, 506, 508, 510, 512, 514, 516,
+ 518, 519, 522, 524, 527, 530, 535, 540, 544, 548,
+ 550, 552, 555, 558, 562, 566, 569, 574, 576, 578
};
-static const short yyrhs[] = { 83,
- 43, 0, 43, 0, 1, 43, 0, 44, 0, 24,
- 0, 54, 24, 0, 46, 24, 0, 47, 24, 0,
- 26, 46, 24, 0, 26, 47, 24, 0, 32, 24,
+static const short yyrhs[] = { 85,
+ 82, 0, 44, 0, 1, 44, 0, 45, 0, 24,
+ 0, 55, 24, 0, 47, 24, 0, 48, 24, 0,
+ 26, 47, 24, 0, 26, 48, 24, 0, 32, 24,
0, 26, 32, 24, 0, 33, 24, 0, 26, 33,
- 24, 0, 34, 26, 0, 26, 34, 26, 0, 35,
- 26, 0, 26, 35, 26, 0, 34, 24, 0, 26,
- 34, 24, 0, 35, 24, 0, 26, 35, 24, 0,
- 37, 24, 0, 26, 37, 24, 0, 35, 48, 0,
- 26, 35, 48, 0, 34, 48, 0, 26, 34, 48,
- 0, 38, 24, 0, 26, 39, 24, 0, 39, 24,
- 0, 40, 24, 0, 26, 40, 24, 0, 24, 0,
- 25, 0, 55, 0, 55, 0, 57, 55, 0, 56,
- 0, 58, 56, 0, 58, 0, 60, 0, 60, 57,
- 0, 65, 0, 61, 0, 64, 0, 12, 78, 14,
- 78, 15, 0, 13, 78, 14, 78, 15, 0, 63,
- 0, 68, 0, 67, 0, 69, 0, 70, 0, 71,
- 0, 62, 0, 10, 24, 82, 14, 78, 15, 0,
- 10, 24, 82, 49, 78, 50, 0, 10, 24, 42,
- 82, 14, 78, 15, 0, 10, 24, 42, 82, 49,
- 78, 50, 0, 10, 24, 82, 20, 54, 81, 82,
- 14, 78, 15, 0, 10, 24, 82, 20, 54, 81,
- 82, 49, 78, 50, 0, 10, 24, 82, 20, 81,
- 82, 14, 78, 15, 0, 10, 24, 82, 20, 81,
- 82, 49, 78, 50, 0, 10, 28, 81, 82, 14,
- 78, 15, 0, 10, 28, 81, 82, 49, 78, 50,
- 0, 10, 28, 14, 78, 15, 0, 10, 28, 49,
- 78, 50, 0, 11, 24, 82, 14, 77, 15, 0,
- 11, 24, 82, 49, 77, 50, 0, 11, 24, 42,
- 82, 14, 77, 15, 0, 11, 24, 42, 82, 49,
- 77, 50, 0, 11, 24, 82, 20, 54, 81, 82,
- 14, 77, 15, 0, 11, 24, 82, 20, 54, 81,
- 82, 49, 77, 50, 0, 8, 24, 82, 20, 82,
- 9, 0, 8, 24, 82, 20, 75, 82, 9, 0,
- 8, 24, 82, 20, 73, 9, 0, 24, 51, 52,
- 82, 66, 0, 16, 24, 51, 52, 82, 66, 0,
- 16, 24, 82, 66, 0, 60, 0, 60, 57, 0,
- 51, 78, 52, 0, 3, 78, 4, 78, 7, 0,
- 3, 78, 4, 78, 5, 78, 7, 0, 3, 78,
- 4, 78, 72, 7, 0, 49, 78, 50, 0, 27,
- 0, 17, 29, 18, 0, 6, 78, 4, 78, 0,
- 6, 78, 4, 78, 5, 78, 0, 6, 78, 4,
- 78, 72, 0, 74, 0, 75, 74, 0, 82, 76,
- 52, 78, 0, 82, 76, 52, 82, 0, 82, 51,
- 76, 52, 78, 0, 82, 51, 76, 52, 82, 0,
- 74, 36, 0, 75, 74, 36, 0, 24, 0, 76,
- 45, 24, 0, 82, 79, 0, 77, 0, 82, 80,
- 0, 80, 43, 82, 0, 80, 41, 82, 0, 80,
- 42, 82, 0, 80, 30, 82, 80, 0, 80, 31,
- 82, 80, 0, 80, 41, 82, 80, 0, 80, 42,
- 82, 80, 0, 80, 43, 82, 80, 0, 85, 0,
- 43, 0, 42, 0, 44, 0, 0, 82, 43, 0,
- 84, 0, 84, 41, 0, 84, 42, 0, 84, 30,
- 82, 84, 0, 84, 31, 82, 84, 0, 84, 41,
- 84, 0, 84, 42, 84, 0, 85, 0, 86, 0,
- 21, 86, 0, 87, 86, 0, 87, 21, 86, 0,
- 21, 87, 86, 0, 86, 45, 82, 86, 0, 59,
- 0, 22, 0, 22, 23, 0
+ 24, 0, 35, 24, 0, 26, 35, 24, 0, 34,
+ 26, 0, 26, 34, 26, 0, 36, 26, 0, 26,
+ 36, 26, 0, 34, 24, 0, 26, 34, 24, 0,
+ 36, 24, 0, 26, 36, 24, 0, 38, 24, 0,
+ 26, 38, 24, 0, 36, 49, 0, 26, 36, 49,
+ 0, 34, 49, 0, 26, 34, 49, 0, 39, 24,
+ 0, 26, 40, 24, 0, 40, 24, 0, 41, 24,
+ 0, 26, 41, 24, 0, 24, 0, 25, 0, 56,
+ 0, 56, 0, 58, 56, 0, 57, 0, 59, 57,
+ 0, 59, 0, 61, 0, 61, 58, 0, 66, 0,
+ 62, 0, 65, 0, 12, 79, 14, 79, 15, 0,
+ 13, 79, 14, 79, 15, 0, 64, 0, 69, 0,
+ 68, 0, 70, 0, 71, 0, 72, 0, 63, 0,
+ 10, 24, 84, 14, 79, 15, 0, 10, 24, 84,
+ 50, 79, 51, 0, 10, 24, 43, 84, 14, 79,
+ 15, 0, 10, 24, 43, 84, 50, 79, 51, 0,
+ 10, 24, 84, 20, 55, 83, 84, 14, 79, 15,
+ 0, 10, 24, 84, 20, 55, 83, 84, 50, 79,
+ 51, 0, 10, 24, 84, 20, 83, 84, 14, 79,
+ 15, 0, 10, 24, 84, 20, 83, 84, 50, 79,
+ 51, 0, 10, 28, 83, 84, 14, 79, 15, 0,
+ 10, 28, 83, 84, 50, 79, 51, 0, 10, 28,
+ 14, 79, 15, 0, 10, 28, 50, 79, 51, 0,
+ 11, 24, 84, 14, 78, 15, 0, 11, 24, 84,
+ 50, 78, 51, 0, 11, 24, 43, 84, 14, 78,
+ 15, 0, 11, 24, 43, 84, 50, 78, 51, 0,
+ 11, 24, 84, 20, 55, 83, 84, 14, 78, 15,
+ 0, 11, 24, 84, 20, 55, 83, 84, 50, 78,
+ 51, 0, 8, 24, 84, 20, 84, 9, 0, 8,
+ 24, 84, 20, 76, 84, 9, 0, 8, 24, 84,
+ 20, 74, 9, 0, 24, 52, 53, 84, 67, 0,
+ 16, 24, 52, 53, 84, 67, 0, 16, 24, 84,
+ 67, 0, 61, 0, 61, 58, 0, 52, 79, 53,
+ 0, 3, 79, 4, 79, 7, 0, 3, 79, 4,
+ 79, 5, 79, 7, 0, 3, 79, 4, 79, 73,
+ 7, 0, 50, 79, 51, 0, 27, 0, 17, 29,
+ 18, 0, 6, 79, 4, 79, 0, 6, 79, 4,
+ 79, 5, 79, 0, 6, 79, 4, 79, 73, 0,
+ 75, 0, 76, 75, 0, 84, 77, 53, 79, 0,
+ 84, 77, 53, 84, 0, 84, 52, 77, 53, 79,
+ 0, 84, 52, 77, 53, 84, 0, 75, 37, 0,
+ 76, 75, 37, 0, 24, 0, 77, 46, 24, 0,
+ 84, 80, 0, 78, 0, 84, 81, 0, 81, 44,
+ 84, 0, 81, 42, 84, 0, 81, 43, 84, 0,
+ 81, 30, 84, 81, 0, 81, 31, 84, 81, 0,
+ 81, 42, 84, 81, 0, 81, 43, 84, 81, 0,
+ 81, 44, 84, 81, 0, 87, 0, 44, 0, 45,
+ 0, 44, 0, 43, 0, 45, 0, 0, 84, 44,
+ 0, 86, 0, 86, 42, 0, 86, 43, 0, 86,
+ 30, 84, 86, 0, 86, 31, 84, 86, 0, 86,
+ 42, 86, 0, 86, 43, 86, 0, 87, 0, 88,
+ 0, 21, 88, 0, 89, 88, 0, 89, 21, 88,
+ 0, 21, 89, 88, 0, 89, 83, 0, 88, 46,
+ 84, 88, 0, 60, 0, 22, 0, 22, 23, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 282, 291, 298, 313, 323, 325, 329, 334, 339, 344,
- 349, 354, 359, 365, 371, 376, 381, 386, 391, 396,
- 401, 406, 411, 418, 425, 430, 435, 440, 445, 450,
- 455, 460, 465, 472, 474, 476, 480, 484, 495, 497,
- 501, 503, 505, 521, 525, 527, 529, 531, 533, 535,
- 537, 539, 541, 543, 545, 549, 551, 553, 555, 557,
- 559, 561, 563, 567, 569, 571, 573, 577, 581, 585,
- 589, 593, 597, 603, 605, 607, 611, 614, 617, 622,
- 624, 655, 662, 664, 666, 671, 675, 679, 683, 685,
- 687, 691, 692, 696, 698, 700, 702, 706, 707, 711,
- 713, 722, 730, 731, 737, 738, 745, 749, 751, 753,
- 760, 762, 764, 768, 769, 770, 773, 774, 783, 789,
- 798, 806, 808, 810, 817, 820, 824, 826, 831, 836,
- 841, 848, 851, 855, 857
+ 346, 355, 362, 377, 387, 389, 393, 398, 403, 408,
+ 413, 418, 423, 429, 435, 440, 445, 450, 455, 460,
+ 465, 470, 475, 480, 485, 492, 499, 504, 509, 514,
+ 519, 524, 529, 534, 539, 546, 548, 550, 554, 558,
+ 569, 571, 575, 577, 579, 595, 599, 601, 603, 605,
+ 607, 609, 611, 613, 615, 617, 619, 623, 628, 633,
+ 638, 643, 648, 653, 658, 665, 670, 675, 680, 687,
+ 692, 697, 702, 707, 712, 719, 724, 729, 736, 739,
+ 742, 747, 749, 780, 787, 789, 791, 796, 800, 804,
+ 808, 810, 812, 816, 817, 821, 823, 825, 827, 831,
+ 832, 836, 838, 847, 855, 856, 862, 863, 870, 874,
+ 876, 878, 885, 887, 889, 893, 894, 897, 899, 901,
+ 905, 906, 915, 921, 930, 938, 940, 942, 949, 952,
+ 956, 958, 964, 970, 976, 982, 1002, 1005, 1009, 1011
};
#endif
"ELSE","ELIF","FI","CASE","ESAC","FOR","SELECT","WHILE","UNTIL","DO","DONE",
"FUNCTION","COND_START","COND_END","COND_ERROR","IN","BANG","TIME","TIMEOPT",
"WORD","ASSIGNMENT_WORD","NUMBER","ARITH_CMD","ARITH_FOR_EXPRS","COND_CMD","AND_AND",
-"OR_OR","GREATER_GREATER","LESS_LESS","LESS_AND","GREATER_AND","SEMI_SEMI","LESS_LESS_MINUS",
-"AND_GREATER","LESS_GREATER","GREATER_BAR","'&'","';'","'\\n'","yacc_EOF","'|'",
-"'>'","'<'","'-'","'{'","'}'","'('","')'","inputunit","word_list","redirection",
-"simple_command_element","redirection_list","simple_command","command","shell_command",
-"for_command","arith_for_command","select_command","case_command","function_def",
-"function_body","subshell","if_command","group_command","arith_command","cond_command",
-"elif_clause","case_clause","pattern_list","case_clause_sequence","pattern",
-"list","compound_list","list0","list1","list_terminator","newline_list","simple_list",
-"simple_list1","pipeline_command","pipeline","timespec", NULL
+"OR_OR","GREATER_GREATER","LESS_LESS","LESS_AND","LESS_LESS_LESS","GREATER_AND",
+"SEMI_SEMI","LESS_LESS_MINUS","AND_GREATER","LESS_GREATER","GREATER_BAR","'&'",
+"';'","'\\n'","yacc_EOF","'|'","'>'","'<'","'-'","'{'","'}'","'('","')'","inputunit",
+"word_list","redirection","simple_command_element","redirection_list","simple_command",
+"command","shell_command","for_command","arith_for_command","select_command",
+"case_command","function_def","function_body","subshell","if_command","group_command",
+"arith_command","cond_command","elif_clause","case_clause","pattern_list","case_clause_sequence",
+"pattern","list","compound_list","list0","list1","simple_list_terminator","list_terminator",
+"newline_list","simple_list","simple_list1","pipeline_command","pipeline","timespec", NULL
};
#endif
static const short yyr1[] = { 0,
- 53, 53, 53, 53, 54, 54, 55, 55, 55, 55,
- 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
- 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
- 55, 55, 55, 56, 56, 56, 57, 57, 58, 58,
- 59, 59, 59, 59, 60, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 61, 61, 61, 61, 61,
- 61, 61, 61, 62, 62, 62, 62, 63, 63, 63,
- 63, 63, 63, 64, 64, 64, 65, 65, 65, 66,
- 66, 67, 68, 68, 68, 69, 70, 71, 72, 72,
- 72, 73, 73, 74, 74, 74, 74, 75, 75, 76,
- 76, 77, 78, 78, 79, 79, 79, 80, 80, 80,
- 80, 80, 80, 81, 81, 81, 82, 82, 83, 83,
- 83, 84, 84, 84, 84, 84, 85, 85, 85, 85,
- 85, 86, 86, 87, 87
+ 54, 54, 54, 54, 55, 55, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 57, 57, 57, 58, 58,
+ 59, 59, 60, 60, 60, 60, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 62, 62, 62,
+ 62, 62, 62, 62, 62, 63, 63, 63, 63, 64,
+ 64, 64, 64, 64, 64, 65, 65, 65, 66, 66,
+ 66, 67, 67, 68, 69, 69, 69, 70, 71, 72,
+ 73, 73, 73, 74, 74, 75, 75, 75, 75, 76,
+ 76, 77, 77, 78, 79, 79, 80, 80, 80, 81,
+ 81, 81, 81, 81, 81, 82, 82, 83, 83, 83,
+ 84, 84, 85, 85, 85, 86, 86, 86, 86, 86,
+ 87, 87, 87, 87, 87, 87, 88, 88, 89, 89
};
static const short yyr2[] = { 0,
2, 1, 2, 1, 1, 2, 2, 2, 3, 3,
2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
- 2, 2, 3, 1, 1, 1, 1, 2, 1, 2,
- 1, 1, 2, 1, 1, 1, 5, 5, 1, 1,
- 1, 1, 1, 1, 1, 6, 6, 7, 7, 10,
- 10, 9, 9, 7, 7, 5, 5, 6, 6, 7,
- 7, 10, 10, 6, 7, 6, 5, 6, 4, 1,
- 2, 3, 5, 7, 6, 3, 1, 3, 4, 6,
- 5, 1, 2, 4, 4, 5, 5, 2, 3, 1,
- 3, 2, 1, 2, 3, 3, 3, 4, 4, 4,
- 4, 4, 1, 1, 1, 1, 0, 2, 1, 2,
- 2, 4, 4, 3, 3, 1, 1, 2, 2, 3,
- 3, 4, 1, 1, 2
+ 2, 3, 2, 2, 3, 1, 1, 1, 1, 2,
+ 1, 2, 1, 1, 2, 1, 1, 1, 5, 5,
+ 1, 1, 1, 1, 1, 1, 1, 6, 6, 7,
+ 7, 10, 10, 9, 9, 7, 7, 5, 5, 6,
+ 6, 7, 7, 10, 10, 6, 7, 6, 5, 6,
+ 4, 1, 2, 3, 5, 7, 6, 3, 1, 3,
+ 4, 6, 5, 1, 2, 4, 4, 5, 5, 2,
+ 3, 1, 3, 2, 1, 2, 3, 3, 3, 4,
+ 4, 4, 4, 4, 1, 1, 1, 1, 1, 1,
+ 0, 2, 1, 2, 2, 4, 4, 3, 3, 1,
+ 1, 2, 2, 3, 3, 2, 4, 1, 1, 2
};
static const short yydefact[] = { 0,
- 0, 117, 0, 0, 0, 117, 117, 0, 0, 0,
- 134, 34, 35, 0, 87, 0, 0, 0, 0, 0,
- 0, 0, 0, 2, 4, 0, 0, 117, 117, 36,
- 39, 41, 133, 42, 45, 55, 49, 46, 44, 51,
- 50, 52, 53, 54, 0, 119, 126, 127, 0, 3,
- 103, 0, 0, 117, 117, 0, 117, 0, 0, 117,
- 0, 128, 0, 135, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 11, 13, 19, 15, 27, 21,
- 17, 25, 23, 29, 31, 32, 7, 8, 0, 0,
- 34, 40, 37, 43, 1, 117, 117, 120, 121, 117,
- 0, 129, 117, 118, 102, 104, 113, 0, 117, 0,
- 117, 115, 114, 116, 117, 117, 117, 0, 117, 117,
- 0, 0, 88, 131, 117, 12, 14, 20, 16, 28,
- 22, 18, 26, 24, 30, 33, 9, 10, 86, 82,
- 38, 0, 0, 124, 125, 0, 130, 0, 117, 117,
- 117, 117, 117, 117, 0, 117, 0, 117, 0, 0,
- 0, 0, 117, 0, 117, 0, 0, 117, 80, 79,
- 0, 122, 123, 0, 0, 132, 117, 117, 83, 0,
- 0, 0, 106, 107, 105, 0, 92, 117, 0, 117,
- 117, 0, 5, 0, 117, 0, 66, 67, 117, 117,
- 117, 117, 0, 0, 0, 0, 47, 48, 0, 81,
- 77, 0, 0, 85, 108, 109, 110, 111, 112, 76,
- 98, 93, 0, 74, 100, 0, 0, 0, 0, 56,
- 6, 117, 0, 57, 0, 0, 0, 0, 68, 0,
- 117, 69, 78, 84, 117, 117, 117, 117, 99, 75,
- 0, 0, 117, 58, 59, 0, 117, 117, 64, 65,
- 70, 71, 0, 89, 0, 0, 0, 117, 101, 94,
- 95, 117, 117, 0, 0, 117, 117, 117, 91, 96,
- 97, 0, 0, 62, 63, 0, 0, 90, 60, 61,
- 72, 73, 0, 0, 0
+ 0, 121, 0, 0, 0, 121, 121, 0, 0, 0,
+ 139, 36, 37, 0, 89, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2, 4, 0, 0, 121, 121,
+ 38, 41, 43, 138, 44, 47, 57, 51, 48, 46,
+ 53, 52, 54, 55, 56, 0, 123, 130, 131, 0,
+ 3, 105, 0, 0, 121, 121, 0, 121, 0, 0,
+ 121, 0, 132, 0, 140, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 11, 13, 21, 17,
+ 29, 15, 23, 19, 27, 25, 31, 33, 34, 7,
+ 8, 0, 0, 36, 42, 39, 45, 116, 117, 1,
+ 121, 121, 124, 125, 121, 0, 119, 118, 120, 136,
+ 133, 121, 122, 104, 106, 115, 0, 121, 0, 121,
+ 121, 121, 121, 0, 121, 121, 0, 0, 90, 135,
+ 121, 12, 14, 22, 18, 30, 16, 24, 20, 28,
+ 26, 32, 35, 9, 10, 88, 84, 40, 0, 0,
+ 128, 129, 0, 134, 0, 121, 121, 121, 121, 121,
+ 121, 0, 121, 0, 121, 0, 0, 0, 0, 121,
+ 0, 121, 0, 0, 121, 82, 81, 0, 126, 127,
+ 0, 0, 137, 121, 121, 85, 0, 0, 0, 108,
+ 109, 107, 0, 94, 121, 0, 121, 121, 0, 5,
+ 0, 121, 0, 68, 69, 121, 121, 121, 121, 0,
+ 0, 0, 0, 49, 50, 0, 83, 79, 0, 0,
+ 87, 110, 111, 112, 113, 114, 78, 100, 95, 0,
+ 76, 102, 0, 0, 0, 0, 58, 6, 121, 0,
+ 59, 0, 0, 0, 0, 70, 0, 121, 71, 80,
+ 86, 121, 121, 121, 121, 101, 77, 0, 0, 121,
+ 60, 61, 0, 121, 121, 66, 67, 72, 73, 0,
+ 91, 0, 0, 0, 121, 103, 96, 97, 121, 121,
+ 0, 0, 121, 121, 121, 93, 98, 99, 0, 0,
+ 64, 65, 0, 0, 92, 62, 63, 74, 75, 0,
+ 0, 0
};
-static const short yydefgoto[] = { 293,
- 194, 30, 31, 94, 32, 33, 34, 35, 36, 37,
- 38, 39, 170, 40, 41, 42, 43, 44, 180, 186,
- 187, 188, 227, 51, 52, 105, 106, 116, 53, 45,
- 144, 107, 48, 49
+static const short yydefgoto[] = { 300,
+ 201, 31, 32, 97, 33, 34, 35, 36, 37, 38,
+ 39, 40, 177, 41, 42, 43, 44, 45, 187, 193,
+ 194, 195, 234, 52, 53, 114, 115, 100, 110, 54,
+ 46, 151, 116, 49, 50
};
-static const short yypact[] = { 267,
- -30,-32768, 2, 1, 7,-32768,-32768, 13, 25, 393,
- 17, 29,-32768, 557,-32768, 44, 47, 48, 82, 61,
- 78, 83, 105,-32768,-32768, 111, 125,-32768,-32768,-32768,
--32768, 178,-32768, 541,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768, 50, 34,-32768, 113, 435,-32768,
--32768, 155, 309,-32768, 118, 35, 120, 150, 151, 115,
- 149, 113, 519,-32768, 117, 146, 152, 107, 108, 153,
- 159, 164, 171, 173,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 123, 156,
--32768,-32768,-32768, 541,-32768,-32768,-32768, 351, 351,-32768,
- 519, 113,-32768,-32768,-32768, 201,-32768, 0,-32768, 72,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 97,-32768,-32768,
- 175, 179,-32768, 113,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 274,
+ -23,-32768, 5, 55, 10,-32768,-32768, 21, 31, 446,
+ 32, 19,-32768, 553,-32768, 56, 72, -12, 89, -11,
+ 92, 102, 111, 113,-32768,-32768, 117, 124,-32768,-32768,
+-32768,-32768, 183,-32768, 202,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768, -13, 134,-32768, 52, 317,
+-32768,-32768, 148, 360,-32768, 115, 22, 120, 154, 173,
+ 114, 155, 52, 532,-32768, 140, 180, 181, 101, 182,
+ 112, 186, 188, 189, 190, 205,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 309, 309, 4, 4, 477, 113, 137,-32768,-32768,
--32768,-32768,-32768,-32768, -2,-32768, 157,-32768, 183, 184,
- 18, 38,-32768, 185,-32768, 192, 208,-32768, 541,-32768,
- 179,-32768,-32768, 351, 351, 113,-32768,-32768,-32768, 222,
- 309, 309, 309, 309, 309, 224, 200,-32768, 12,-32768,
--32768, 223,-32768, 211,-32768, 187,-32768,-32768,-32768,-32768,
--32768,-32768, 225, 309, 211, 195,-32768,-32768, 179, 541,
--32768, 239, 244,-32768,-32768,-32768, 20, 20, 20,-32768,
--32768, 220, 15,-32768,-32768, 233, -38, 243, 209,-32768,
--32768,-32768, 69,-32768, 245, 213, 246, 214,-32768, 201,
+-32768, 193, 195,-32768,-32768,-32768, 202,-32768,-32768,-32768,
+-32768,-32768, 403, 403,-32768, 532,-32768,-32768,-32768,-32768,
+ 52,-32768,-32768,-32768, 221,-32768, -9,-32768, 42,-32768,
+-32768,-32768,-32768, 61,-32768,-32768, 200, 41,-32768, 52,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 43, 241,-32768,-32768,-32768, 102,-32768,-32768,-32768,-32768,
--32768,-32768, 114, 54, 309, 309, 309,-32768,-32768,-32768,
- 309,-32768,-32768, 254, 221,-32768,-32768,-32768,-32768,-32768,
- 309, 258, 226,-32768,-32768, 259, 231,-32768,-32768,-32768,
--32768,-32768, 282, 285,-32768
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 360, 360,
+ 152, 152, 489, 52, 192,-32768,-32768,-32768,-32768,-32768,
+-32768, 26,-32768, 127,-32768, 218, 194, 34, 73,-32768,
+ 215,-32768, 242, 245,-32768, 202,-32768, 41,-32768,-32768,
+ 403, 403, 52,-32768,-32768,-32768, 254, 360, 360, 360,
+ 360, 360, 253, 229,-32768, -2,-32768,-32768, 252,-32768,
+ 151,-32768, 217,-32768,-32768,-32768,-32768,-32768,-32768, 255,
+ 360, 151, 220,-32768,-32768, 41, 202,-32768, 265, 272,
+-32768,-32768,-32768, 159, 159, 159,-32768,-32768, 241, 17,
+-32768,-32768, 256, 36, 266, 232,-32768,-32768,-32768, 74,
+-32768, 273, 238, 277, 243,-32768, 221,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 116, 269,-32768,
+-32768,-32768, 90,-32768,-32768,-32768,-32768,-32768,-32768, 95,
+ 197, 360, 360, 360,-32768,-32768,-32768, 360,-32768,-32768,
+ 282, 251,-32768,-32768,-32768,-32768,-32768, 360, 288, 260,
+-32768,-32768, 289, 280,-32768,-32768,-32768,-32768,-32768, 305,
+ 316,-32768
};
static const short yypgoto[] = {-32768,
- 122, -32, 255, 121,-32768,-32768, -118,-32768,-32768,-32768,
--32768,-32768, -161,-32768,-32768,-32768,-32768,-32768, 31,-32768,
- 109,-32768, 70, -157, -6,-32768, -166, -148, -27,-32768,
- 11, 5, -7, 288
+ 146, -33, 290, 156,-32768,-32768, -119,-32768,-32768,-32768,
+-32768,-32768, -153,-32768,-32768,-32768,-32768,-32768, 64,-32768,
+ 141,-32768, 104, -162, -6,-32768, -172,-32768, -52, -28,
+-32768, 6, 4, -7, 329
};
-#define YYLAST 604
-
-
-static const short yytable[] = { 58,
- 59, 93, 62, 169, 47, 203, 252, 206, 195, 211,
- 46, 190, 50, 253, 215, 216, 217, 218, 219, 154,
- 224, 89, 90, 250, 55, 54, 108, 110, 56, 118,
- 57, 199, 122, 96, 97, 225, 60, 240, 225, 64,
- 104, 102, 104, 237, 238, 232, 191, 243, 111, 149,
- 150, 201, 169, 61, 104, 124, 241, 104, 278, 178,
- 104, 141, 226, 96, 97, 226, 200, 75, 142, 143,
- 76, 77, 146, 78, 98, 99, 112, 113, 114, 65,
- 104, 155, 257, 115, 83, 156, 202, 252, 161, 162,
- 169, 157, 95, 147, 268, 79, 148, 171, 217, 218,
- 219, 84, 47, 47, 159, 80, 85, 81, 160, 145,
- 163, 104, 166, 167, 104, 272, 164, 258, 286, 287,
- 158, 181, 182, 183, 184, 185, 189, 276, 86, 82,
- 128, 131, 129, 132, 87, 204, 93, 204, 176, 104,
- 209, 177, 178, 179, 104, 165, 47, 47, 88, 192,
- 273, 196, 172, 173, 130, 133, 104, 100, 103, 109,
- 223, 117, 277, 119, 120, 121, 123, 233, 125, 126,
- 212, 213, 139, 204, 204, 127, 134, 141, 47, 47,
- 193, 2, 135, 228, 229, 145, 3, 136, 4, 5,
- 6, 7, 235, 236, 137, 9, 138, 197, 112, 113,
- 114, 91, 13, 14, 256, 15, 207, 140, 193, 16,
- 17, 18, 19, 263, 20, 21, 22, 23, 265, 266,
- 267, 104, 208, 26, 27, 271, 168, 28, 214, 29,
- 149, 150, 220, 198, 231, 221, 234, 230, 264, 239,
- 281, 151, 152, 153, 242, 244, 270, 245, 204, 204,
- 274, 275, 112, 113, 114, 249, 225, 254, 255, 259,
- 261, 280, 260, 262, 269, 282, 283, 1, 284, 2,
- 285, 288, 289, 291, 3, 290, 4, 5, 6, 7,
- 292, 294, 8, 9, 295, 205, 92, 10, 11, 210,
- 12, 13, 14, 15, 279, 251, 222, 63, 16, 17,
- 18, 19, 0, 20, 21, 22, 23, 0, 0, 24,
- 25, 2, 26, 27, 0, 28, 3, 29, 4, 5,
- 6, 7, 0, 0, 8, 9, 0, 0, 0, 10,
- 11, 0, 12, 13, 14, 15, 0, 0, 0, 0,
- 16, 17, 18, 19, 0, 20, 21, 22, 23, 0,
- 0, 104, 0, 2, 26, 27, 0, 28, 3, 29,
- 4, 5, 6, 7, 0, 0, 8, 9, 0, 0,
- 0, 10, 11, 0, 12, 13, 14, 15, 0, 0,
- 0, 0, 16, 17, 18, 19, 0, 20, 21, 22,
- 23, 0, 0, 0, 0, 2, 26, 27, 0, 28,
- 3, 29, 4, 5, 6, 7, 0, 0, 8, 9,
- 0, 0, 0, 0, 11, 0, 12, 13, 14, 15,
- 0, 0, 0, 0, 16, 17, 18, 19, 0, 20,
- 21, 22, 23, 0, 0, 0, 0, 2, 26, 27,
- 0, 28, 3, 29, 4, 5, 6, 7, 0, 0,
- 8, 9, 0, 0, 0, 101, 0, 0, 12, 13,
- 14, 15, 0, 0, 0, 0, 16, 17, 18, 19,
- 0, 20, 21, 22, 23, 0, 0, 0, 0, 2,
- 26, 27, 0, 28, 3, 29, 4, 5, 6, 7,
- 0, 0, 8, 9, 0, 0, 0, 0, 0, 0,
+#define YYLAST 601
+
+
+static const short yytable[] = { 59,
+ 60, 96, 63, 48, 122, 47, 231, 210, 176, 213,
+ 161, 79, 83, 80, 84, 222, 223, 224, 225, 226,
+ 51, 232, 92, 93, 218, 257, 117, 119, 55, 124,
+ 98, 99, 128, 58, 113, 120, 81, 85, 247, 197,
+ 232, 113, 111, 2, 61, 244, 245, 206, 3, 233,
+ 4, 5, 6, 7, 65, 163, 130, 9, 176, 62,
+ 113, 164, 250, 148, 107, 108, 109, 15, 233, 113,
+ 66, 121, 149, 150, 170, 198, 153, 113, 56, 77,
+ 171, 259, 57, 207, 113, 113, 208, 264, 260, 162,
+ 29, 165, 30, 168, 169, 78, 176, 105, 154, 224,
+ 225, 226, 178, 279, 113, 155, 48, 48, 283, 152,
+ 172, 202, 82, 166, 167, 86, 113, 113, 173, 174,
+ 293, 294, 209, 265, 134, 87, 135, 188, 189, 190,
+ 191, 192, 196, 113, 88, 138, 89, 139, 113, 280,
+ 90, 211, 96, 211, 284, 183, 216, 91, 239, 136,
+ 200, 112, 48, 48, 179, 180, 199, 118, 203, 248,
+ 140, 259, 123, 101, 102, 127, 230, 125, 275, 107,
+ 108, 109, 129, 240, 238, 103, 104, 219, 220, 211,
+ 211, 101, 102, 148, 48, 48, 126, 152, 156, 157,
+ 235, 236, 131, 107, 108, 109, 184, 185, 186, 242,
+ 243, 285, 185, 132, 133, 137, 94, 13, 14, 141,
+ 263, 142, 143, 144, 16, 17, 18, 19, 20, 270,
+ 21, 22, 23, 24, 272, 273, 274, 14, 145, 27,
+ 28, 278, 204, 16, 17, 18, 19, 20, 200, 21,
+ 22, 23, 24, 146, 205, 271, 288, 147, 27, 28,
+ 156, 157, 175, 277, 211, 211, 214, 281, 282, 215,
+ 221, 227, 158, 159, 160, 228, 237, 241, 287, 246,
+ 249, 251, 289, 290, 1, 252, 2, 256, 295, 232,
+ 261, 3, 262, 4, 5, 6, 7, 266, 267, 8,
+ 9, 268, 276, 269, 10, 11, 291, 12, 13, 14,
+ 15, 292, 296, 298, 301, 16, 17, 18, 19, 20,
+ 297, 21, 22, 23, 24, 302, 212, 25, 26, 2,
+ 27, 28, 95, 29, 3, 30, 4, 5, 6, 7,
+ 299, 217, 8, 9, 286, 229, 258, 106, 64, 0,
12, 13, 14, 15, 0, 0, 0, 0, 16, 17,
- 18, 19, 0, 20, 21, 22, 23, 0, 0, 104,
- 0, 2, 26, 27, 0, 28, 3, 29, 4, 5,
+ 18, 19, 20, 0, 21, 22, 23, 24, 0, 107,
+ 108, 109, 2, 27, 28, 0, 29, 3, 30, 4,
+ 5, 6, 7, 0, 0, 8, 9, 0, 0, 0,
+ 10, 11, 0, 12, 13, 14, 15, 0, 0, 0,
+ 0, 16, 17, 18, 19, 20, 0, 21, 22, 23,
+ 24, 0, 0, 113, 0, 2, 27, 28, 0, 29,
+ 3, 30, 4, 5, 6, 7, 0, 0, 8, 9,
+ 0, 0, 0, 10, 11, 0, 12, 13, 14, 15,
+ 0, 0, 0, 0, 16, 17, 18, 19, 20, 0,
+ 21, 22, 23, 24, 0, 0, 0, 0, 2, 27,
+ 28, 0, 29, 3, 30, 4, 5, 6, 7, 0,
+ 0, 8, 9, 0, 0, 0, 0, 11, 0, 12,
+ 13, 14, 15, 0, 0, 0, 0, 16, 17, 18,
+ 19, 20, 0, 21, 22, 23, 24, 0, 0, 0,
+ 0, 2, 27, 28, 0, 29, 3, 30, 4, 5,
6, 7, 0, 0, 8, 9, 0, 0, 0, 0,
0, 0, 12, 13, 14, 15, 0, 0, 0, 0,
- 16, 17, 18, 19, 0, 20, 21, 22, 23, 0,
- 0, 0, 0, 0, 26, 27, 14, 28, 0, 29,
- 0, 0, 16, 17, 18, 19, 0, 20, 21, 22,
- 23, 0, 0, 0, 0, 0, 26, 27, 66, 67,
- 68, 69, 0, 70, 0, 71, 72, 0, 0, 0,
- 0, 0, 73, 74
+ 16, 17, 18, 19, 20, 0, 21, 22, 23, 24,
+ 0, 0, 113, 0, 2, 27, 28, 0, 29, 3,
+ 30, 4, 5, 6, 7, 0, 0, 8, 9, 0,
+ 0, 0, 0, 0, 0, 12, 13, 14, 15, 0,
+ 0, 0, 0, 16, 17, 18, 19, 20, 0, 21,
+ 22, 23, 24, 0, 0, 0, 0, 0, 27, 28,
+ 0, 29, 0, 30, 67, 68, 69, 70, 71, 0,
+ 72, 0, 73, 74, 0, 0, 0, 0, 0, 75,
+ 76
};
static const short yycheck[] = { 6,
- 7, 34, 10, 122, 0, 163, 45, 165, 157, 171,
- 0, 14, 43, 52, 181, 182, 183, 184, 185, 20,
- 9, 28, 29, 9, 24, 24, 54, 55, 28, 57,
- 24, 14, 60, 30, 31, 24, 24, 204, 24, 23,
- 43, 49, 43, 201, 202, 194, 49, 209, 14, 30,
- 31, 14, 171, 29, 43, 63, 205, 43, 5, 6,
- 43, 94, 51, 30, 31, 51, 49, 24, 96, 97,
- 24, 24, 100, 26, 41, 42, 42, 43, 44, 51,
- 43, 109, 14, 49, 24, 14, 49, 45, 116, 117,
- 209, 20, 43, 101, 52, 48, 103, 125, 265, 266,
- 267, 24, 98, 99, 111, 24, 24, 26, 115, 99,
- 14, 43, 119, 120, 43, 14, 20, 49, 276, 277,
- 49, 149, 150, 151, 152, 153, 154, 14, 24, 48,
- 24, 24, 26, 26, 24, 163, 169, 165, 146, 43,
- 168, 5, 6, 7, 43, 49, 142, 143, 24, 156,
- 49, 158, 142, 143, 48, 48, 43, 45, 4, 42,
- 188, 42, 49, 14, 14, 51, 18, 195, 52, 24,
- 177, 178, 50, 201, 202, 24, 24, 210, 174, 175,
- 24, 3, 24, 190, 191, 175, 8, 24, 10, 11,
- 12, 13, 199, 200, 24, 17, 24, 15, 42, 43,
- 44, 24, 25, 26, 232, 27, 15, 52, 24, 32,
- 33, 34, 35, 241, 37, 38, 39, 40, 246, 247,
- 248, 43, 15, 46, 47, 253, 52, 49, 7, 51,
- 30, 31, 9, 50, 24, 36, 50, 15, 245, 15,
- 268, 41, 42, 43, 50, 7, 253, 4, 276, 277,
- 257, 258, 42, 43, 44, 36, 24, 15, 50, 15,
- 15, 268, 50, 50, 24, 272, 273, 1, 15, 3,
- 50, 278, 15, 15, 8, 50, 10, 11, 12, 13,
- 50, 0, 16, 17, 0, 164, 32, 21, 22, 169,
- 24, 25, 26, 27, 264, 226, 188, 10, 32, 33,
- 34, 35, -1, 37, 38, 39, 40, -1, -1, 43,
- 44, 3, 46, 47, -1, 49, 8, 51, 10, 11,
- 12, 13, -1, -1, 16, 17, -1, -1, -1, 21,
- 22, -1, 24, 25, 26, 27, -1, -1, -1, -1,
- 32, 33, 34, 35, -1, 37, 38, 39, 40, -1,
- -1, 43, -1, 3, 46, 47, -1, 49, 8, 51,
- 10, 11, 12, 13, -1, -1, 16, 17, -1, -1,
- -1, 21, 22, -1, 24, 25, 26, 27, -1, -1,
- -1, -1, 32, 33, 34, 35, -1, 37, 38, 39,
- 40, -1, -1, -1, -1, 3, 46, 47, -1, 49,
- 8, 51, 10, 11, 12, 13, -1, -1, 16, 17,
- -1, -1, -1, -1, 22, -1, 24, 25, 26, 27,
- -1, -1, -1, -1, 32, 33, 34, 35, -1, 37,
- 38, 39, 40, -1, -1, -1, -1, 3, 46, 47,
- -1, 49, 8, 51, 10, 11, 12, 13, -1, -1,
- 16, 17, -1, -1, -1, 21, -1, -1, 24, 25,
- 26, 27, -1, -1, -1, -1, 32, 33, 34, 35,
- -1, 37, 38, 39, 40, -1, -1, -1, -1, 3,
- 46, 47, -1, 49, 8, 51, 10, 11, 12, 13,
- -1, -1, 16, 17, -1, -1, -1, -1, -1, -1,
+ 7, 35, 10, 0, 57, 0, 9, 170, 128, 172,
+ 20, 24, 24, 26, 26, 188, 189, 190, 191, 192,
+ 44, 24, 29, 30, 178, 9, 55, 56, 24, 58,
+ 44, 45, 61, 24, 44, 14, 49, 49, 211, 14,
+ 24, 44, 50, 3, 24, 208, 209, 14, 8, 52,
+ 10, 11, 12, 13, 23, 14, 64, 17, 178, 29,
+ 44, 20, 216, 97, 43, 44, 45, 27, 52, 44,
+ 52, 50, 101, 102, 14, 50, 105, 44, 24, 24,
+ 20, 46, 28, 50, 44, 44, 14, 14, 53, 118,
+ 50, 50, 52, 122, 123, 24, 216, 46, 106, 272,
+ 273, 274, 131, 14, 44, 112, 103, 104, 14, 104,
+ 50, 164, 24, 120, 121, 24, 44, 44, 125, 126,
+ 283, 284, 50, 50, 24, 24, 26, 156, 157, 158,
+ 159, 160, 161, 44, 24, 24, 24, 26, 44, 50,
+ 24, 170, 176, 172, 50, 153, 175, 24, 201, 49,
+ 24, 4, 149, 150, 149, 150, 163, 43, 165, 212,
+ 49, 46, 43, 30, 31, 52, 195, 14, 53, 43,
+ 44, 45, 18, 202, 24, 42, 43, 184, 185, 208,
+ 209, 30, 31, 217, 181, 182, 14, 182, 30, 31,
+ 197, 198, 53, 43, 44, 45, 5, 6, 7, 206,
+ 207, 5, 6, 24, 24, 24, 24, 25, 26, 24,
+ 239, 24, 24, 24, 32, 33, 34, 35, 36, 248,
+ 38, 39, 40, 41, 253, 254, 255, 26, 24, 47,
+ 48, 260, 15, 32, 33, 34, 35, 36, 24, 38,
+ 39, 40, 41, 51, 51, 252, 275, 53, 47, 48,
+ 30, 31, 53, 260, 283, 284, 15, 264, 265, 15,
+ 7, 9, 42, 43, 44, 37, 15, 51, 275, 15,
+ 51, 7, 279, 280, 1, 4, 3, 37, 285, 24,
+ 15, 8, 51, 10, 11, 12, 13, 15, 51, 16,
+ 17, 15, 24, 51, 21, 22, 15, 24, 25, 26,
+ 27, 51, 15, 15, 0, 32, 33, 34, 35, 36,
+ 51, 38, 39, 40, 41, 0, 171, 44, 45, 3,
+ 47, 48, 33, 50, 8, 52, 10, 11, 12, 13,
+ 51, 176, 16, 17, 271, 195, 233, 21, 10, -1,
24, 25, 26, 27, -1, -1, -1, -1, 32, 33,
- 34, 35, -1, 37, 38, 39, 40, -1, -1, 43,
- -1, 3, 46, 47, -1, 49, 8, 51, 10, 11,
+ 34, 35, 36, -1, 38, 39, 40, 41, -1, 43,
+ 44, 45, 3, 47, 48, -1, 50, 8, 52, 10,
+ 11, 12, 13, -1, -1, 16, 17, -1, -1, -1,
+ 21, 22, -1, 24, 25, 26, 27, -1, -1, -1,
+ -1, 32, 33, 34, 35, 36, -1, 38, 39, 40,
+ 41, -1, -1, 44, -1, 3, 47, 48, -1, 50,
+ 8, 52, 10, 11, 12, 13, -1, -1, 16, 17,
+ -1, -1, -1, 21, 22, -1, 24, 25, 26, 27,
+ -1, -1, -1, -1, 32, 33, 34, 35, 36, -1,
+ 38, 39, 40, 41, -1, -1, -1, -1, 3, 47,
+ 48, -1, 50, 8, 52, 10, 11, 12, 13, -1,
+ -1, 16, 17, -1, -1, -1, -1, 22, -1, 24,
+ 25, 26, 27, -1, -1, -1, -1, 32, 33, 34,
+ 35, 36, -1, 38, 39, 40, 41, -1, -1, -1,
+ -1, 3, 47, 48, -1, 50, 8, 52, 10, 11,
12, 13, -1, -1, 16, 17, -1, -1, -1, -1,
-1, -1, 24, 25, 26, 27, -1, -1, -1, -1,
- 32, 33, 34, 35, -1, 37, 38, 39, 40, -1,
- -1, -1, -1, -1, 46, 47, 26, 49, -1, 51,
- -1, -1, 32, 33, 34, 35, -1, 37, 38, 39,
- 40, -1, -1, -1, -1, -1, 46, 47, 32, 33,
- 34, 35, -1, 37, -1, 39, 40, -1, -1, -1,
- -1, -1, 46, 47
+ 32, 33, 34, 35, 36, -1, 38, 39, 40, 41,
+ -1, -1, 44, -1, 3, 47, 48, -1, 50, 8,
+ 52, 10, 11, 12, 13, -1, -1, 16, 17, -1,
+ -1, -1, -1, -1, -1, 24, 25, 26, 27, -1,
+ -1, -1, -1, 32, 33, 34, 35, 36, -1, 38,
+ 39, 40, 41, -1, -1, -1, -1, -1, 47, 48,
+ -1, 50, -1, 52, 32, 33, 34, 35, 36, -1,
+ 38, -1, 40, 41, -1, -1, -1, -1, -1, 47,
+ 48
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/local/share/bison.simple"
+#line 3 "/usr/share/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
#endif
#endif
\f
-#line 217 "/usr/local/share/bison.simple"
+#line 217 "/usr/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
switch (yyn) {
case 1:
-#line 283 "/usr/homes/chet/src/bash/src/parse.y"
+#line 347 "/Users/chet/src/bash/src/parse.y"
{
/* Case of regular command. Discard the error
safety net,and return the command just parsed. */
global_command = yyvsp[-1].command;
eof_encountered = 0;
- discard_parser_constructs (0);
+ /* discard_parser_constructs (0); */
YYACCEPT;
;
break;}
case 2:
-#line 292 "/usr/homes/chet/src/bash/src/parse.y"
+#line 356 "/Users/chet/src/bash/src/parse.y"
{
/* Case of regular command, but not a very
interesting one. Return a NULL command. */
;
break;}
case 3:
-#line 299 "/usr/homes/chet/src/bash/src/parse.y"
+#line 363 "/Users/chet/src/bash/src/parse.y"
{
/* Error during parsing. Return NULL command. */
global_command = (COMMAND *)NULL;
eof_encountered = 0;
- discard_parser_constructs (1);
+ /* discard_parser_constructs (1); */
if (interactive)
{
YYACCEPT;
;
break;}
case 4:
-#line 314 "/usr/homes/chet/src/bash/src/parse.y"
+#line 378 "/Users/chet/src/bash/src/parse.y"
{
/* Case of EOF seen by itself. Do ignoreeof or
not. */
;
break;}
case 5:
-#line 324 "/usr/homes/chet/src/bash/src/parse.y"
+#line 388 "/Users/chet/src/bash/src/parse.y"
{ yyval.word_list = make_word_list (yyvsp[0].word, (WORD_LIST *)NULL); ;
break;}
case 6:
-#line 326 "/usr/homes/chet/src/bash/src/parse.y"
+#line 390 "/Users/chet/src/bash/src/parse.y"
{ yyval.word_list = make_word_list (yyvsp[0].word, yyvsp[-1].word_list); ;
break;}
case 7:
-#line 330 "/usr/homes/chet/src/bash/src/parse.y"
+#line 394 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (1, r_output_direction, redir);
;
break;}
case 8:
-#line 335 "/usr/homes/chet/src/bash/src/parse.y"
+#line 399 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (0, r_input_direction, redir);
;
break;}
case 9:
-#line 340 "/usr/homes/chet/src/bash/src/parse.y"
+#line 404 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_output_direction, redir);
;
break;}
case 10:
-#line 345 "/usr/homes/chet/src/bash/src/parse.y"
+#line 409 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_input_direction, redir);
;
break;}
case 11:
-#line 350 "/usr/homes/chet/src/bash/src/parse.y"
+#line 414 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (1, r_appending_to, redir);
;
break;}
case 12:
-#line 355 "/usr/homes/chet/src/bash/src/parse.y"
+#line 419 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_appending_to, redir);
;
break;}
case 13:
-#line 360 "/usr/homes/chet/src/bash/src/parse.y"
+#line 424 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (0, r_reading_until, redir);
;
break;}
case 14:
-#line 366 "/usr/homes/chet/src/bash/src/parse.y"
+#line 430 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_reading_until, redir);
;
break;}
case 15:
-#line 372 "/usr/homes/chet/src/bash/src/parse.y"
+#line 436 "/Users/chet/src/bash/src/parse.y"
+{
+ redir.filename = yyvsp[0].word;
+ yyval.redirect = make_redirection (0, r_reading_string, redir);
+ ;
+ break;}
+case 16:
+#line 441 "/Users/chet/src/bash/src/parse.y"
+{
+ redir.filename = yyvsp[0].word;
+ yyval.redirect = make_redirection (yyvsp[-2].number, r_reading_string, redir);
+ ;
+ break;}
+case 17:
+#line 446 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = yyvsp[0].number;
yyval.redirect = make_redirection (0, r_duplicating_input, redir);
;
break;}
-case 16:
-#line 377 "/usr/homes/chet/src/bash/src/parse.y"
+case 18:
+#line 451 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = yyvsp[0].number;
yyval.redirect = make_redirection (yyvsp[-2].number, r_duplicating_input, redir);
;
break;}
-case 17:
-#line 382 "/usr/homes/chet/src/bash/src/parse.y"
+case 19:
+#line 456 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = yyvsp[0].number;
yyval.redirect = make_redirection (1, r_duplicating_output, redir);
;
break;}
-case 18:
-#line 387 "/usr/homes/chet/src/bash/src/parse.y"
+case 20:
+#line 461 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = yyvsp[0].number;
yyval.redirect = make_redirection (yyvsp[-2].number, r_duplicating_output, redir);
;
break;}
-case 19:
-#line 392 "/usr/homes/chet/src/bash/src/parse.y"
+case 21:
+#line 466 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (0, r_duplicating_input_word, redir);
;
break;}
-case 20:
-#line 397 "/usr/homes/chet/src/bash/src/parse.y"
+case 22:
+#line 471 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_duplicating_input_word, redir);
;
break;}
-case 21:
-#line 402 "/usr/homes/chet/src/bash/src/parse.y"
+case 23:
+#line 476 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (1, r_duplicating_output_word, redir);
;
break;}
-case 22:
-#line 407 "/usr/homes/chet/src/bash/src/parse.y"
+case 24:
+#line 481 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_duplicating_output_word, redir);
;
break;}
-case 23:
-#line 412 "/usr/homes/chet/src/bash/src/parse.y"
+case 25:
+#line 486 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection
redir_stack[need_here_doc++] = yyval.redirect;
;
break;}
-case 24:
-#line 419 "/usr/homes/chet/src/bash/src/parse.y"
+case 26:
+#line 493 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection
redir_stack[need_here_doc++] = yyval.redirect;
;
break;}
-case 25:
-#line 426 "/usr/homes/chet/src/bash/src/parse.y"
+case 27:
+#line 500 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = 0;
yyval.redirect = make_redirection (1, r_close_this, redir);
;
break;}
-case 26:
-#line 431 "/usr/homes/chet/src/bash/src/parse.y"
+case 28:
+#line 505 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = 0;
yyval.redirect = make_redirection (yyvsp[-2].number, r_close_this, redir);
;
break;}
-case 27:
-#line 436 "/usr/homes/chet/src/bash/src/parse.y"
+case 29:
+#line 510 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = 0;
yyval.redirect = make_redirection (0, r_close_this, redir);
;
break;}
-case 28:
-#line 441 "/usr/homes/chet/src/bash/src/parse.y"
+case 30:
+#line 515 "/Users/chet/src/bash/src/parse.y"
{
redir.dest = 0;
yyval.redirect = make_redirection (yyvsp[-2].number, r_close_this, redir);
;
break;}
-case 29:
-#line 446 "/usr/homes/chet/src/bash/src/parse.y"
+case 31:
+#line 520 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (1, r_err_and_out, redir);
;
break;}
-case 30:
-#line 451 "/usr/homes/chet/src/bash/src/parse.y"
+case 32:
+#line 525 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_input_output, redir);
;
break;}
-case 31:
-#line 456 "/usr/homes/chet/src/bash/src/parse.y"
+case 33:
+#line 530 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (0, r_input_output, redir);
;
break;}
-case 32:
-#line 461 "/usr/homes/chet/src/bash/src/parse.y"
+case 34:
+#line 535 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (1, r_output_force, redir);
;
break;}
-case 33:
-#line 466 "/usr/homes/chet/src/bash/src/parse.y"
+case 35:
+#line 540 "/Users/chet/src/bash/src/parse.y"
{
redir.filename = yyvsp[0].word;
yyval.redirect = make_redirection (yyvsp[-2].number, r_output_force, redir);
;
break;}
-case 34:
-#line 473 "/usr/homes/chet/src/bash/src/parse.y"
+case 36:
+#line 547 "/Users/chet/src/bash/src/parse.y"
{ yyval.element.word = yyvsp[0].word; yyval.element.redirect = 0; ;
break;}
-case 35:
-#line 475 "/usr/homes/chet/src/bash/src/parse.y"
+case 37:
+#line 549 "/Users/chet/src/bash/src/parse.y"
{ yyval.element.word = yyvsp[0].word; yyval.element.redirect = 0; ;
break;}
-case 36:
-#line 477 "/usr/homes/chet/src/bash/src/parse.y"
+case 38:
+#line 551 "/Users/chet/src/bash/src/parse.y"
{ yyval.element.redirect = yyvsp[0].redirect; yyval.element.word = 0; ;
break;}
-case 37:
-#line 481 "/usr/homes/chet/src/bash/src/parse.y"
+case 39:
+#line 555 "/Users/chet/src/bash/src/parse.y"
{
yyval.redirect = yyvsp[0].redirect;
;
break;}
-case 38:
-#line 485 "/usr/homes/chet/src/bash/src/parse.y"
+case 40:
+#line 559 "/Users/chet/src/bash/src/parse.y"
{
register REDIRECT *t;
yyval.redirect = yyvsp[-1].redirect;
;
break;}
-case 39:
-#line 496 "/usr/homes/chet/src/bash/src/parse.y"
+case 41:
+#line 570 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_simple_command (yyvsp[0].element, (COMMAND *)NULL); ;
break;}
-case 40:
-#line 498 "/usr/homes/chet/src/bash/src/parse.y"
+case 42:
+#line 572 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_simple_command (yyvsp[0].element, yyvsp[-1].command); ;
break;}
-case 41:
-#line 502 "/usr/homes/chet/src/bash/src/parse.y"
+case 43:
+#line 576 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = clean_simple_command (yyvsp[0].command); ;
break;}
-case 42:
-#line 504 "/usr/homes/chet/src/bash/src/parse.y"
+case 44:
+#line 578 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
-case 43:
-#line 506 "/usr/homes/chet/src/bash/src/parse.y"
+case 45:
+#line 580 "/Users/chet/src/bash/src/parse.y"
{
COMMAND *tc;
yyval.command = yyvsp[-1].command;
;
break;}
-case 44:
-#line 522 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = yyvsp[0].command; ;
- break;}
-case 45:
-#line 526 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = yyvsp[0].command; ;
- break;}
case 46:
-#line 528 "/usr/homes/chet/src/bash/src/parse.y"
+#line 596 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
case 47:
-#line 530 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_while_command (yyvsp[-3].command, yyvsp[-1].command); ;
+#line 600 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = yyvsp[0].command; ;
break;}
case 48:
-#line 532 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_until_command (yyvsp[-3].command, yyvsp[-1].command); ;
+#line 602 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = yyvsp[0].command; ;
break;}
case 49:
-#line 534 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = yyvsp[0].command; ;
+#line 604 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = make_while_command (yyvsp[-3].command, yyvsp[-1].command); ;
break;}
case 50:
-#line 536 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = yyvsp[0].command; ;
+#line 606 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = make_until_command (yyvsp[-3].command, yyvsp[-1].command); ;
break;}
case 51:
-#line 538 "/usr/homes/chet/src/bash/src/parse.y"
+#line 608 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
case 52:
-#line 540 "/usr/homes/chet/src/bash/src/parse.y"
+#line 610 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
case 53:
-#line 542 "/usr/homes/chet/src/bash/src/parse.y"
+#line 612 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
case 54:
-#line 544 "/usr/homes/chet/src/bash/src/parse.y"
+#line 614 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
case 55:
-#line 546 "/usr/homes/chet/src/bash/src/parse.y"
+#line 616 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
case 56:
-#line 550 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-4].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command); ;
+#line 618 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = yyvsp[0].command; ;
break;}
case 57:
-#line 552 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-4].word, add_string_to_list ("$@", (WORD_LIST *)NULL), yyvsp[-1].command); ;
+#line 620 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = yyvsp[0].command; ;
break;}
case 58:
-#line 554 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command); ;
+#line 624 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-4].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 59:
-#line 556 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command); ;
+#line 629 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-4].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 60:
-#line 558 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-8].word, REVERSE_LIST (yyvsp[-5].word_list, WORD_LIST *), yyvsp[-1].command); ;
+#line 634 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 61:
-#line 560 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-8].word, REVERSE_LIST (yyvsp[-5].word_list, WORD_LIST *), yyvsp[-1].command); ;
+#line 639 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 62:
-#line 562 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-7].word, (WORD_LIST *)NULL, yyvsp[-1].command); ;
+#line 644 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-8].word, REVERSE_LIST (yyvsp[-5].word_list, WORD_LIST *), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 63:
-#line 564 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_for_command (yyvsp[-7].word, (WORD_LIST *)NULL, yyvsp[-1].command); ;
+#line 649 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-8].word, REVERSE_LIST (yyvsp[-5].word_list, WORD_LIST *), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 64:
-#line 568 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_arith_for_command (yyvsp[-5].word_list, yyvsp[-1].command, arith_for_lineno); ;
+#line 654 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-7].word, (WORD_LIST *)NULL, yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 65:
-#line 570 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_arith_for_command (yyvsp[-5].word_list, yyvsp[-1].command, arith_for_lineno); ;
+#line 659 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_for_command (yyvsp[-7].word, (WORD_LIST *)NULL, yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 66:
-#line 572 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_arith_for_command (yyvsp[-3].word_list, yyvsp[-1].command, arith_for_lineno); ;
+#line 666 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_arith_for_command (yyvsp[-5].word_list, yyvsp[-1].command, arith_for_lineno);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 67:
-#line 574 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_arith_for_command (yyvsp[-3].word_list, yyvsp[-1].command, arith_for_lineno); ;
+#line 671 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_arith_for_command (yyvsp[-5].word_list, yyvsp[-1].command, arith_for_lineno);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 68:
-#line 578 "/usr/homes/chet/src/bash/src/parse.y"
+#line 676 "/Users/chet/src/bash/src/parse.y"
{
- yyval.command = make_select_command (yyvsp[-4].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command);
- ;
+ yyval.command = make_arith_for_command (yyvsp[-3].word_list, yyvsp[-1].command, arith_for_lineno);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 69:
-#line 582 "/usr/homes/chet/src/bash/src/parse.y"
+#line 681 "/Users/chet/src/bash/src/parse.y"
{
- yyval.command = make_select_command (yyvsp[-4].word, add_string_to_list ("$@", (WORD_LIST *)NULL), yyvsp[-1].command);
- ;
+ yyval.command = make_arith_for_command (yyvsp[-3].word_list, yyvsp[-1].command, arith_for_lineno);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 70:
-#line 586 "/usr/homes/chet/src/bash/src/parse.y"
+#line 688 "/Users/chet/src/bash/src/parse.y"
{
- yyval.command = make_select_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command);
+ yyval.command = make_select_command (yyvsp[-4].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
;
break;}
case 71:
-#line 590 "/usr/homes/chet/src/bash/src/parse.y"
+#line 693 "/Users/chet/src/bash/src/parse.y"
{
- yyval.command = make_select_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command);
+ yyval.command = make_select_command (yyvsp[-4].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
;
break;}
case 72:
-#line 594 "/usr/homes/chet/src/bash/src/parse.y"
+#line 698 "/Users/chet/src/bash/src/parse.y"
{
- yyval.command = make_select_command (yyvsp[-8].word, (WORD_LIST *)reverse_list (yyvsp[-5].word_list), yyvsp[-1].command);
+ yyval.command = make_select_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
;
break;}
case 73:
-#line 598 "/usr/homes/chet/src/bash/src/parse.y"
+#line 703 "/Users/chet/src/bash/src/parse.y"
{
- yyval.command = make_select_command (yyvsp[-8].word, (WORD_LIST *)reverse_list (yyvsp[-5].word_list), yyvsp[-1].command);
+ yyval.command = make_select_command (yyvsp[-5].word, add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
;
break;}
case 74:
-#line 604 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_case_command (yyvsp[-4].word, (PATTERN_LIST *)NULL); ;
+#line 708 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_select_command (yyvsp[-8].word, REVERSE_LIST (yyvsp[-5].word_list, WORD_LIST *), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 75:
-#line 606 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_case_command (yyvsp[-5].word, yyvsp[-2].pattern); ;
+#line 713 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_select_command (yyvsp[-8].word, REVERSE_LIST (yyvsp[-5].word_list, WORD_LIST *), yyvsp[-1].command, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 76:
-#line 608 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_case_command (yyvsp[-4].word, yyvsp[-1].pattern); ;
+#line 720 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_case_command (yyvsp[-4].word, (PATTERN_LIST *)NULL, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 77:
-#line 612 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_function_def (yyvsp[-4].word, yyvsp[0].command, function_dstart, function_bstart); ;
+#line 725 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_case_command (yyvsp[-5].word, yyvsp[-2].pattern, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 78:
-#line 615 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_function_def (yyvsp[-4].word, yyvsp[0].command, function_dstart, function_bstart); ;
+#line 730 "/Users/chet/src/bash/src/parse.y"
+{
+ yyval.command = make_case_command (yyvsp[-4].word, yyvsp[-1].pattern, word_lineno[word_top]);
+ if (word_top > 0) word_top--;
+ ;
break;}
case 79:
-#line 618 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = make_function_def (yyvsp[-2].word, yyvsp[0].command, function_dstart, function_bstart); ;
+#line 737 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = make_function_def (yyvsp[-4].word, yyvsp[0].command, function_dstart, function_bstart); ;
break;}
case 80:
-#line 623 "/usr/homes/chet/src/bash/src/parse.y"
-{ yyval.command = yyvsp[0].command; ;
+#line 740 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = make_function_def (yyvsp[-4].word, yyvsp[0].command, function_dstart, function_bstart); ;
break;}
case 81:
-#line 625 "/usr/homes/chet/src/bash/src/parse.y"
+#line 743 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = make_function_def (yyvsp[-2].word, yyvsp[0].command, function_dstart, function_bstart); ;
+ break;}
+case 82:
+#line 748 "/Users/chet/src/bash/src/parse.y"
+{ yyval.command = yyvsp[0].command; ;
+ break;}
+case 83:
+#line 750 "/Users/chet/src/bash/src/parse.y"
{
COMMAND *tc;
yyval.command = yyvsp[-1].command;
;
break;}
-case 82:
-#line 656 "/usr/homes/chet/src/bash/src/parse.y"
+case 84:
+#line 781 "/Users/chet/src/bash/src/parse.y"
{
yyval.command = make_subshell_command (yyvsp[-1].command);
yyval.command->flags |= CMD_WANT_SUBSHELL;
;
break;}
-case 83:
-#line 663 "/usr/homes/chet/src/bash/src/parse.y"
+case 85:
+#line 788 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_if_command (yyvsp[-3].command, yyvsp[-1].command, (COMMAND *)NULL); ;
break;}
-case 84:
-#line 665 "/usr/homes/chet/src/bash/src/parse.y"
+case 86:
+#line 790 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_if_command (yyvsp[-5].command, yyvsp[-3].command, yyvsp[-1].command); ;
break;}
-case 85:
-#line 667 "/usr/homes/chet/src/bash/src/parse.y"
+case 87:
+#line 792 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_if_command (yyvsp[-4].command, yyvsp[-2].command, yyvsp[-1].command); ;
break;}
-case 86:
-#line 672 "/usr/homes/chet/src/bash/src/parse.y"
+case 88:
+#line 797 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_group_command (yyvsp[-1].command); ;
break;}
-case 87:
-#line 676 "/usr/homes/chet/src/bash/src/parse.y"
+case 89:
+#line 801 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_arith_command (yyvsp[0].word_list); ;
break;}
-case 88:
-#line 680 "/usr/homes/chet/src/bash/src/parse.y"
+case 90:
+#line 805 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[-1].command; ;
break;}
-case 89:
-#line 684 "/usr/homes/chet/src/bash/src/parse.y"
+case 91:
+#line 809 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_if_command (yyvsp[-2].command, yyvsp[0].command, (COMMAND *)NULL); ;
break;}
-case 90:
-#line 686 "/usr/homes/chet/src/bash/src/parse.y"
+case 92:
+#line 811 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_if_command (yyvsp[-4].command, yyvsp[-2].command, yyvsp[0].command); ;
break;}
-case 91:
-#line 688 "/usr/homes/chet/src/bash/src/parse.y"
+case 93:
+#line 813 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = make_if_command (yyvsp[-3].command, yyvsp[-1].command, yyvsp[0].command); ;
break;}
-case 93:
-#line 693 "/usr/homes/chet/src/bash/src/parse.y"
+case 95:
+#line 818 "/Users/chet/src/bash/src/parse.y"
{ yyvsp[0].pattern->next = yyvsp[-1].pattern; yyval.pattern = yyvsp[0].pattern; ;
break;}
-case 94:
-#line 697 "/usr/homes/chet/src/bash/src/parse.y"
+case 96:
+#line 822 "/Users/chet/src/bash/src/parse.y"
{ yyval.pattern = make_pattern_list (yyvsp[-2].word_list, yyvsp[0].command); ;
break;}
-case 95:
-#line 699 "/usr/homes/chet/src/bash/src/parse.y"
+case 97:
+#line 824 "/Users/chet/src/bash/src/parse.y"
{ yyval.pattern = make_pattern_list (yyvsp[-2].word_list, (COMMAND *)NULL); ;
break;}
-case 96:
-#line 701 "/usr/homes/chet/src/bash/src/parse.y"
+case 98:
+#line 826 "/Users/chet/src/bash/src/parse.y"
{ yyval.pattern = make_pattern_list (yyvsp[-2].word_list, yyvsp[0].command); ;
break;}
-case 97:
-#line 703 "/usr/homes/chet/src/bash/src/parse.y"
+case 99:
+#line 828 "/Users/chet/src/bash/src/parse.y"
{ yyval.pattern = make_pattern_list (yyvsp[-2].word_list, (COMMAND *)NULL); ;
break;}
-case 99:
-#line 708 "/usr/homes/chet/src/bash/src/parse.y"
+case 101:
+#line 833 "/Users/chet/src/bash/src/parse.y"
{ yyvsp[-1].pattern->next = yyvsp[-2].pattern; yyval.pattern = yyvsp[-1].pattern; ;
break;}
-case 100:
-#line 712 "/usr/homes/chet/src/bash/src/parse.y"
+case 102:
+#line 837 "/Users/chet/src/bash/src/parse.y"
{ yyval.word_list = make_word_list (yyvsp[0].word, (WORD_LIST *)NULL); ;
break;}
-case 101:
-#line 714 "/usr/homes/chet/src/bash/src/parse.y"
+case 103:
+#line 839 "/Users/chet/src/bash/src/parse.y"
{ yyval.word_list = make_word_list (yyvsp[0].word, yyvsp[-2].word_list); ;
break;}
-case 102:
-#line 723 "/usr/homes/chet/src/bash/src/parse.y"
+case 104:
+#line 848 "/Users/chet/src/bash/src/parse.y"
{
yyval.command = yyvsp[0].command;
if (need_here_doc)
gather_here_documents ();
;
break;}
-case 104:
-#line 732 "/usr/homes/chet/src/bash/src/parse.y"
+case 106:
+#line 857 "/Users/chet/src/bash/src/parse.y"
{
yyval.command = yyvsp[0].command;
;
break;}
-case 106:
-#line 739 "/usr/homes/chet/src/bash/src/parse.y"
+case 108:
+#line 864 "/Users/chet/src/bash/src/parse.y"
{
if (yyvsp[-2].command->type == cm_connection)
yyval.command = connect_async_list (yyvsp[-2].command, (COMMAND *)NULL, '&');
yyval.command = command_connect (yyvsp[-2].command, (COMMAND *)NULL, '&');
;
break;}
-case 108:
-#line 750 "/usr/homes/chet/src/bash/src/parse.y"
+case 110:
+#line 875 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, AND_AND); ;
break;}
-case 109:
-#line 752 "/usr/homes/chet/src/bash/src/parse.y"
+case 111:
+#line 877 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, OR_OR); ;
break;}
-case 110:
-#line 754 "/usr/homes/chet/src/bash/src/parse.y"
+case 112:
+#line 879 "/Users/chet/src/bash/src/parse.y"
{
if (yyvsp[-3].command->type == cm_connection)
yyval.command = connect_async_list (yyvsp[-3].command, yyvsp[0].command, '&');
yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, '&');
;
break;}
-case 111:
-#line 761 "/usr/homes/chet/src/bash/src/parse.y"
+case 113:
+#line 886 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, ';'); ;
break;}
-case 112:
-#line 763 "/usr/homes/chet/src/bash/src/parse.y"
+case 114:
+#line 888 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, ';'); ;
break;}
-case 113:
-#line 765 "/usr/homes/chet/src/bash/src/parse.y"
+case 115:
+#line 890 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
+case 118:
+#line 898 "/Users/chet/src/bash/src/parse.y"
+{ yyval.number = '\n'; ;
+ break;}
case 119:
-#line 784 "/usr/homes/chet/src/bash/src/parse.y"
+#line 900 "/Users/chet/src/bash/src/parse.y"
+{ yyval.number = ';'; ;
+ break;}
+case 120:
+#line 902 "/Users/chet/src/bash/src/parse.y"
+{ yyval.number = yacc_EOF; ;
+ break;}
+case 123:
+#line 916 "/Users/chet/src/bash/src/parse.y"
{
yyval.command = yyvsp[0].command;
if (need_here_doc)
gather_here_documents ();
;
break;}
-case 120:
-#line 790 "/usr/homes/chet/src/bash/src/parse.y"
+case 124:
+#line 922 "/Users/chet/src/bash/src/parse.y"
{
if (yyvsp[-1].command->type == cm_connection)
yyval.command = connect_async_list (yyvsp[-1].command, (COMMAND *)NULL, '&');
gather_here_documents ();
;
break;}
-case 121:
-#line 799 "/usr/homes/chet/src/bash/src/parse.y"
+case 125:
+#line 931 "/Users/chet/src/bash/src/parse.y"
{
yyval.command = yyvsp[-1].command;
if (need_here_doc)
gather_here_documents ();
;
break;}
-case 122:
-#line 807 "/usr/homes/chet/src/bash/src/parse.y"
+case 126:
+#line 939 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, AND_AND); ;
break;}
-case 123:
-#line 809 "/usr/homes/chet/src/bash/src/parse.y"
+case 127:
+#line 941 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, OR_OR); ;
break;}
-case 124:
-#line 811 "/usr/homes/chet/src/bash/src/parse.y"
+case 128:
+#line 943 "/Users/chet/src/bash/src/parse.y"
{
if (yyvsp[-2].command->type == cm_connection)
yyval.command = connect_async_list (yyvsp[-2].command, yyvsp[0].command, '&');
yyval.command = command_connect (yyvsp[-2].command, yyvsp[0].command, '&');
;
break;}
-case 125:
-#line 818 "/usr/homes/chet/src/bash/src/parse.y"
+case 129:
+#line 950 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-2].command, yyvsp[0].command, ';'); ;
break;}
-case 126:
-#line 821 "/usr/homes/chet/src/bash/src/parse.y"
+case 130:
+#line 953 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
-case 127:
-#line 825 "/usr/homes/chet/src/bash/src/parse.y"
+case 131:
+#line 957 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
-case 128:
-#line 827 "/usr/homes/chet/src/bash/src/parse.y"
+case 132:
+#line 959 "/Users/chet/src/bash/src/parse.y"
{
- yyvsp[0].command->flags |= CMD_INVERT_RETURN;
+ if (yyvsp[0].command)
+ yyvsp[0].command->flags |= CMD_INVERT_RETURN;
yyval.command = yyvsp[0].command;
;
break;}
-case 129:
-#line 832 "/usr/homes/chet/src/bash/src/parse.y"
+case 133:
+#line 965 "/Users/chet/src/bash/src/parse.y"
{
- yyvsp[0].command->flags |= yyvsp[-1].number;
+ if (yyvsp[0].command)
+ yyvsp[0].command->flags |= yyvsp[-1].number;
yyval.command = yyvsp[0].command;
;
break;}
-case 130:
-#line 837 "/usr/homes/chet/src/bash/src/parse.y"
+case 134:
+#line 971 "/Users/chet/src/bash/src/parse.y"
{
- yyvsp[0].command->flags |= yyvsp[-2].number|CMD_INVERT_RETURN;
+ if (yyvsp[0].command)
+ yyvsp[0].command->flags |= yyvsp[-2].number|CMD_INVERT_RETURN;
yyval.command = yyvsp[0].command;
;
break;}
-case 131:
-#line 842 "/usr/homes/chet/src/bash/src/parse.y"
+case 135:
+#line 977 "/Users/chet/src/bash/src/parse.y"
{
- yyvsp[0].command->flags |= yyvsp[-1].number|CMD_INVERT_RETURN;
+ if (yyvsp[0].command)
+ yyvsp[0].command->flags |= yyvsp[-1].number|CMD_INVERT_RETURN;
yyval.command = yyvsp[0].command;
;
break;}
-case 132:
-#line 850 "/usr/homes/chet/src/bash/src/parse.y"
+case 136:
+#line 983 "/Users/chet/src/bash/src/parse.y"
+{
+ ELEMENT x;
+
+ /* Boy, this is unclean. `time' by itself can
+ time a null command. We cheat and push a
+ newline back if the list_terminator was a newline
+ to avoid the double-newline problem (one to
+ terminate this, one to terminate the command) */
+ x.word = 0;
+ x.redirect = 0;
+ yyval.command = make_simple_command (x, (COMMAND *)NULL);
+ yyval.command->flags |= yyvsp[-1].number;
+ /* XXX - let's cheat and push a newline back */
+ if (yyvsp[0].number == '\n')
+ token_to_read = '\n';
+ ;
+ break;}
+case 137:
+#line 1004 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = command_connect (yyvsp[-3].command, yyvsp[0].command, '|'); ;
break;}
-case 133:
-#line 852 "/usr/homes/chet/src/bash/src/parse.y"
+case 138:
+#line 1006 "/Users/chet/src/bash/src/parse.y"
{ yyval.command = yyvsp[0].command; ;
break;}
-case 134:
-#line 856 "/usr/homes/chet/src/bash/src/parse.y"
+case 139:
+#line 1010 "/Users/chet/src/bash/src/parse.y"
{ yyval.number = CMD_TIME_PIPELINE; ;
break;}
-case 135:
-#line 858 "/usr/homes/chet/src/bash/src/parse.y"
+case 140:
+#line 1012 "/Users/chet/src/bash/src/parse.y"
{ yyval.number = CMD_TIME_PIPELINE|CMD_TIME_POSIX; ;
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/local/share/bison.simple"
+#line 543 "/usr/share/bison.simple"
\f
yyvsp -= yylen;
yyssp -= yylen;
}
return 1;
}
-#line 860 "/usr/homes/chet/src/bash/src/parse.y"
+#line 1014 "/Users/chet/src/bash/src/parse.y"
/* Possible states for the parser that require it to do special things. */
-#define PST_CASEPAT 0x001 /* in a case pattern list */
-#define PST_ALEXPNEXT 0x002 /* expand next word for aliases */
-#define PST_ALLOWOPNBRC 0x004 /* allow open brace for function def */
-#define PST_NEEDCLOSBRC 0x008 /* need close brace */
-#define PST_DBLPAREN 0x010 /* double-paren parsing */
-#define PST_SUBSHELL 0x020 /* ( ... ) subshell */
-#define PST_CMDSUBST 0x040 /* $( ... ) command substitution */
-#define PST_CASESTMT 0x080 /* parsing a case statement */
-#define PST_CONDCMD 0x100 /* parsing a [[...]] command */
-#define PST_CONDEXPR 0x200 /* parsing the guts of [[...]] */
-#define PST_ARITHFOR 0x400 /* parsing an arithmetic for command */
+#define PST_CASEPAT 0x0001 /* in a case pattern list */
+#define PST_ALEXPNEXT 0x0002 /* expand next word for aliases */
+#define PST_ALLOWOPNBRC 0x0004 /* allow open brace for function def */
+#define PST_NEEDCLOSBRC 0x0008 /* need close brace */
+#define PST_DBLPAREN 0x0010 /* double-paren parsing */
+#define PST_SUBSHELL 0x0020 /* ( ... ) subshell */
+#define PST_CMDSUBST 0x0040 /* $( ... ) command substitution */
+#define PST_CASESTMT 0x0080 /* parsing a case statement */
+#define PST_CONDCMD 0x0100 /* parsing a [[...]] command */
+#define PST_CONDEXPR 0x0200 /* parsing the guts of [[...]] */
+#define PST_ARITHFOR 0x0400 /* parsing an arithmetic for command */
+#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. */
#define TOKEN_DEFAULT_INITIAL_SIZE 496
#define TOKEN_DEFAULT_GROW_SIZE 512
+/* Should we call prompt_again? */
+#define SHOULD_PROMPT() \
+ (interactive && (bash_input.type == st_stdin || bash_input.type == st_stream))
+
+#if defined (ALIAS)
+# define expanding_alias() (pushed_string_list && pushed_string_list->expander)
+#else
+# define expanding_alias() 0
+#endif
+
/* The token currently being read. */
static int current_token;
/* The token read prior to token_before_that. */
static int two_tokens_ago;
-/* If non-zero, it is the token that we want read_token to return
- regardless of what text is (or isn't) present to be read. This
- is reset by read_token. If token_to_read == WORD or
- ASSIGNMENT_WORD, yylval.word should be set to word_desc_to_read. */
-static int token_to_read;
-static WORD_DESC *word_desc_to_read;
-
/* The current parser state. */
static int parser_state;
bash_input.ungetter = unget;
}
+char *
+yy_input_name ()
+{
+ return (bash_input.name ? bash_input.name : "stdin");
+}
+
/* Call this to get the next character of input. */
static int
yy_getc ()
old_sigint = (SigHandler *)set_signal_handler (SIGINT, sigint_sighandler);
interrupt_immediately++;
}
+ terminate_immediately = 1;
current_readline_line = readline (current_readline_prompt ?
current_readline_prompt : "");
+ terminate_immediately = 0;
if (signal_is_ignored (SIGINT) == 0 && old_sigint)
{
interrupt_immediately--;
result = EOF;
if (bash_input.location.file)
- result = getc_with_restart (bash_input.location.file);
-
- return (result);
+ {
+ if (interactive)
+ {
+ interrupt_immediately++;
+ terminate_immediately++;
+ }
+ result = getc_with_restart (bash_input.location.file);
+ if (interactive)
+ {
+ interrupt_immediately--;
+ terminate_immediately--;
+ }
+ }
+ return (result);
}
static int
#if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
-#if !defined (ALIAS)
-typedef void *alias_t;
-#endif
-
#define END_OF_ALIAS 0
/*
shell_input_line_size = strlen (s);
shell_input_line_index = 0;
shell_input_line_terminator = '\0';
- parser_state &= ~PST_ALEXPNEXT;
+#if 0
+ parser_state &= ~PST_ALEXPNEXT; /* XXX */
+#endif
+
+ set_line_mbstate ();
}
/*
#endif
free ((char *)t);
+
+ set_line_mbstate ();
}
static void
#endif /* ALIAS || DPAREN_ARITHMETIC */
+void
+free_pushed_string_input ()
+{
+#if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
+ free_string_list ();
+#endif
+}
+
/* Return a line of text, taken from wherever yylex () reads input.
If there is no more input, then we return NULL. If REMOVE_QUOTED_NEWLINE
is non-zero, we remove unquoted \<newline> pairs. This is used by
int indx = 0, c, peekc, pass_next;
#if defined (READLINE)
- if (interactive && bash_input.type != st_string && no_line_editing)
+ if (no_line_editing && SHOULD_PROMPT ())
#else
- if (interactive && bash_input.type != st_string)
+ if (SHOULD_PROMPT ())
#endif
print_prompt ();
pass_next = 0;
while (1)
{
- c = yy_getc ();
-
/* Allow immediate exit if interrupted during input. */
QUIT;
+ c = yy_getc ();
+
/* Ignore null bytes in input. */
if (c == 0)
{
{
peekc = yy_getc ();
if (peekc == '\n')
- continue; /* Make the unquoted \<newline> pair disappear. */
+ {
+ line_number++;
+ continue; /* Make the unquoted \<newline> pair disappear. */
+ }
else
{
yy_ungetc (peekc);
int remove_quoted_newline;
{
prompt_string_pointer = &ps2_prompt;
- prompt_again ();
+ if (SHOULD_PROMPT())
+ prompt_again ();
return (read_a_line (remove_quoted_newline));
}
{ (char *)NULL, 0}
};
-/* XXX - we should also have an alist with strings for other tokens, so we
- can give more descriptive error messages. Look at y.tab.h for the
- other tokens. */
+/* other tokens that can be returned by read_token() */
+STRING_INT_ALIST other_token_alist[] = {
+ /* Multiple-character tokens with special values */
+ { "-p", TIMEOPT },
+ { "&&", AND_AND },
+ { "||", OR_OR },
+ { ">>", GREATER_GREATER },
+ { "<<", LESS_LESS },
+ { "<&", LESS_AND },
+ { ">&", GREATER_AND },
+ { ";;", SEMI_SEMI },
+ { "<<-", LESS_LESS_MINUS },
+ { "<<<", LESS_LESS_LESS },
+ { "&>", AND_GREATER },
+ { "<>", LESS_GREATER },
+ { ">|", GREATER_BAR },
+ { "EOF", yacc_EOF },
+ /* Tokens whose value is the character itself */
+ { ">", '>' },
+ { "<", '<' },
+ { "-", '-' },
+ { "{", '{' },
+ { "}", '}' },
+ { ";", ';' },
+ { "(", '(' },
+ { ")", ')' },
+ { "|", '|' },
+ { "&", '&' },
+ { "newline", '\n' },
+ { (char *)NULL, 0}
+};
+
+/* others not listed here:
+ WORD look at yylval.word
+ ASSIGNMENT_WORD look at yylval.word
+ NUMBER look at yylval.number
+ ARITH_CMD look at yylval.word_list
+ ARITH_FOR_EXPRS look at yylval.word_list
+ COND_CMD look at yylval.command
+*/
/* These are used by read_token_word, but appear up here so that shell_getc
can use them to decide when to add otherwise blank lines to the history. */
register int i;
int c;
unsigned char uc;
- static int mustpop = 0;
QUIT;
+ if (sigwinch_received)
+ {
+ sigwinch_received = 0;
+ get_new_window_size (0, (int *)0, (int *)0);
+ }
+
if (eol_ungetc_lookahead)
{
c = eol_ungetc_lookahead;
i = 0;
shell_input_line_terminator = 0;
+ /* If the shell is interatctive, but not currently printing a prompt
+ (interactive_shell && interactive == 0), we don't want to print
+ notifies or cleanup the jobs -- we want to defer it until we do
+ print the next prompt. */
+ if (interactive_shell == 0 || SHOULD_PROMPT())
+ {
#if defined (JOB_CONTROL)
/* This can cause a problem when reading a command as the result
of a trap, when the trap is called from flush_child. This call
had better not cause jobs to disappear from the job table in
that case, or we will have big trouble. */
- notify_and_cleanup ();
+ notify_and_cleanup ();
#else /* !JOB_CONTROL */
- cleanup_dead_jobs ();
+ cleanup_dead_jobs ();
#endif /* !JOB_CONTROL */
+ }
#if defined (READLINE)
- if (interactive && bash_input.type != st_string && no_line_editing)
+ if (no_line_editing && SHOULD_PROMPT())
#else
- if (interactive && bash_input.type != st_string)
+ if (SHOULD_PROMPT())
#endif
print_prompt ();
shell_input_line_index = 0;
shell_input_line_len = i; /* == strlen (shell_input_line) */
+ set_line_mbstate ();
+
#if defined (HISTORY)
if (remember_on_history && shell_input_line && shell_input_line[0])
{
/* We have to force the xrealloc below because we don't know
the true allocated size of shell_input_line anymore. */
shell_input_line_size = shell_input_line_len;
+
+ set_line_mbstate ();
}
}
/* Try to do something intelligent with blank lines encountered while
{
shell_input_line_size = 0;
prompt_string_pointer = ¤t_prompt_string;
- prompt_again ();
+ if (SHOULD_PROMPT ())
+ prompt_again ();
goto restart_read;
}
shell_input_line[shell_input_line_len] = '\n';
shell_input_line[shell_input_line_len + 1] = '\0';
+
+ set_line_mbstate ();
}
}
if (uc)
shell_input_line_index++;
- if (uc == '\\' && remove_quoted_newline &&
- shell_input_line[shell_input_line_index] == '\n')
- {
- prompt_again ();
- line_number++;
- goto restart_read;
- }
-
#if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
/* If UC is NULL, we have reached the end of the current input string. If
pushed_string_list is non-empty, it's time to pop to the previous string
to. */
if (!uc && (pushed_string_list != (STRING_SAVER *)NULL))
{
- if (mustpop)
- {
- pop_string ();
- uc = shell_input_line[shell_input_line_index];
- if (uc)
- shell_input_line_index++;
- mustpop--;
- }
- else
- {
- mustpop++;
- uc = ' ';
- }
+ pop_string ();
+ uc = shell_input_line[shell_input_line_index];
+ if (uc)
+ shell_input_line_index++;
}
#endif /* ALIAS || DPAREN_ARITHMETIC */
+ if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
+ {
+ if (SHOULD_PROMPT ())
+ prompt_again ();
+ line_number++;
+ goto restart_read;
+ }
+
if (!uc && shell_input_line_terminator == EOF)
return ((shell_input_line_index != 0) ? '\n' : EOF);
return (uc);
}
-/* Put C back into the input for the shell. */
+/* Put C back into the input for the shell. This might need changes for
+ HANDLE_MULTIBYTE around EOLs. Since we (currently) never push back a
+ character different than we read, shell_input_line_property doesn't need
+ to change when manipulating shell_input_line. The define for
+ last_shell_getc_is_singlebyte should take care of it, though. */
static void
shell_ungetc (c)
int c;
}
void
-execute_prompt_command (command)
- char *command;
+execute_variable_command (command, vname)
+ char *command, *vname;
{
- sh_builtin_func_t *temp_last, *temp_this;
char *last_lastarg;
- int temp_exit_value, temp_eof_encountered;
+ sh_parser_state_t ps;
- temp_last = last_shell_builtin;
- temp_this = this_shell_builtin;
- temp_exit_value = last_command_exit_value;
- temp_eof_encountered = eof_encountered;
+ save_parser_state (&ps);
last_lastarg = get_string_value ("_");
if (last_lastarg)
last_lastarg = savestring (last_lastarg);
- parse_and_execute (savestring (command), "PROMPT_COMMAND", SEVAL_NONINT|SEVAL_NOHIST);
+ parse_and_execute (savestring (command), vname, SEVAL_NONINT|SEVAL_NOHIST);
- last_shell_builtin = temp_last;
- this_shell_builtin = temp_this;
- last_command_exit_value = temp_exit_value;
- eof_encountered = temp_eof_encountered;
-
- bind_variable ("_", last_lastarg);
+ restore_parser_state (&ps);
+ bind_variable ("_", last_lastarg, 0);
FREE (last_lastarg);
if (token_to_read == '\n') /* reset_parser was called */
/* Avoid printing a prompt if we're not going to read anything, e.g.
after resetting the parser with read_token (RESET). */
- if (token_to_read == 0 && interactive)
+ if (token_to_read == 0 && SHOULD_PROMPT ())
prompt_again ();
}
(((token) == ASSIGNMENT_WORD) || \
((token) != SEMI_SEMI && reserved_word_acceptable(token)))
-#define assignment_acceptable(token) command_token_position(token) && \
- ((parser_state & PST_CASEPAT) == 0)
+#define assignment_acceptable(token) \
+ (command_token_position(token) && ((parser_state & PST_CASEPAT) == 0))
/* Check to see if TOKEN is a reserved word and return the token
value if it is. */
{ \
if ((parser_state & PST_CASEPAT) && (word_token_alist[i].token != ESAC)) \
break; \
- if (word_token_alist[i].token == TIME) \
+ if (word_token_alist[i].token == TIME && time_command_acceptable () == 0) \
break; \
if (word_token_alist[i].token == ESAC) \
parser_state &= ~(PST_CASEPAT|PST_CASESTMT); \
/* OK, we have a token. Let's try to alias expand it, if (and only if)
it's eligible.
- It is eligible for expansion if the shell is in interactive mode, and
+ It is eligible for expansion if EXPAND_ALIASES is set, and
the token is unquoted and the last token read was a command
separator (or expand_next_token is set), and we are currently
processing an alias (pushed_string_list is non-empty) and this
Special cases that disqualify:
In a pattern list in a case statement (parser_state & PST_CASEPAT). */
+
+static char *
+mk_alexpansion (s)
+ char *s;
+{
+ int l;
+ char *r;
+
+ l = strlen (s);
+ r = xmalloc (l + 2);
+ strcpy (r, s);
+ if (r[l -1] != ' ')
+ r[l++] = ' ';
+ r[l] = '\0';
+ return r;
+}
+
static int
alias_expand_token (tokstr)
char *tokstr;
if (ap && (ap->flags & AL_BEINGEXPANDED))
return (NO_EXPANSION);
- expanded = ap ? savestring (ap->value) : (char *)NULL;
+ /* mk_alexpansion puts an extra space on the end of the alias expansion,
+ so the lookahead by the parser works right. If this gets changed,
+ make sure the code in shell_getc that deals with reaching the end of
+ an expanded alias is changed with it. */
+ expanded = ap ? mk_alexpansion (ap->value) : (char *)NULL;
+
if (expanded)
{
push_string (expanded, ap->flags & AL_EXPANDNEXT, ap);
return (TIMEOPT);
#endif
+#if 0
#if defined (COMMAND_TIMING)
if (STREQ (token, "time") && ((parser_state & PST_CASEPAT) == 0) && time_command_acceptable ())
return (TIME);
#endif /* COMMAND_TIMING */
+#endif
#if defined (COND_COMMAND) /* [[ */
if ((parser_state & PST_CONDEXPR) && tokstr[0] == ']' && tokstr[1] == ']' && tokstr[2] == '\0')
yylval.command = parse_cond_command ();
if (cond_token != COND_END)
{
- if (EOF_Reached && cond_token != COND_ERROR) /* [[ */
- parser_error (cond_lineno, "unexpected EOF while looking for `]]'");
- else if (cond_token != COND_ERROR)
- parser_error (cond_lineno, "syntax error in conditional expression");
+ cond_error ();
return (-1);
}
token_to_read = COND_END;
#endif /* ALIAS */
/* Read a single word from input. Start by skipping blanks. */
- while ((character = shell_getc (1)) != EOF && whitespace (character))
+ while ((character = shell_getc (1)) != EOF && shellblank (character))
;
if (character == EOF)
return (yacc_EOF);
}
- if (character == '#' && (!interactive || interactive_comments))
+ if MBTEST(character == '#' && (!interactive || interactive_comments))
{
/* A comment. Discard until EOL or EOF, and then return a newline. */
discard_until ('\n');
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
+ parser_state &= ~PST_ASSIGNOK;
+
return (character);
}
/* Shell meta-characters. */
- if (shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0))
+ if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0))
{
#if defined (ALIAS)
/* Turn off alias tokenization iff this character sequence would
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
+ parser_state &= ~PST_ASSIGNOK;
+
peek_char = shell_getc (1);
if (character == peek_char)
{
peek_char = shell_getc (1);
if (peek_char == '-')
return (LESS_LESS_MINUS);
+ else if (peek_char == '<')
+ return (LESS_LESS_LESS);
else
{
shell_ungetc (peek_char);
#if defined (ALIAS)
parser_state &= ~PST_ALEXPNEXT;
#endif /* ALIAS */
+
return (SEMI_SEMI);
case '&':
#if defined (DPAREN_ARITHMETIC) || defined (ARITH_FOR_COMMAND)
case '(': /* ) */
-# if defined (ARITH_FOR_COMMAND)
- if (last_read_token == FOR)
- {
- int cmdtyp, len;
- char *wval, *wv2;
- WORD_DESC *wd;
-
- arith_for_lineno = line_number;
- cmdtyp = parse_arith_cmd (&wval);
- if (cmdtyp == 1)
- {
- /* parse_arith_cmd adds quotes at the beginning and end
- of the string it returns; we need to take those out. */
- len = strlen (wval);
- wv2 = (char *)xmalloc (len);
- strncpy (wv2, wval + 1, len - 2);
- wv2[len - 2] = '\0';
- wd = make_word (wv2);
- yylval.word_list = make_word_list (wd, (WORD_LIST *)NULL);
- free (wval);
- free (wv2);
- return (ARITH_FOR_EXPRS);
- }
- else
- return -1; /* ERROR */
- }
-# endif
-# if defined (DPAREN_ARITHMETIC)
- if (reserved_word_acceptable (last_read_token))
- {
- int cmdtyp, sline;
- char *wval;
- WORD_DESC *wd;
-
- sline = line_number;
- cmdtyp = parse_arith_cmd (&wval);
- if (cmdtyp == 1) /* arithmetic command */
- {
- wd = make_word (wval);
- wd->flags = W_QUOTED;
- yylval.word_list = make_word_list (wd, (WORD_LIST *)NULL);
- free (wval); /* make_word copies it */
- return (ARITH_CMD);
- }
- else if (cmdtyp == 0) /* nested subshell */
- {
- push_string (wval, 0, (alias_t *)NULL);
- if ((parser_state & PST_CASEPAT) == 0)
- parser_state |= PST_SUBSHELL;
- return (character);
- }
- else /* ERROR */
- return -1;
- }
- break;
-# endif
+ result = parse_dparen (character);
+ if (result == -2)
+ break;
+ else
+ return result;
#endif
}
}
- else if (character == '<' && peek_char == '&')
+ else if MBTEST(character == '<' && peek_char == '&')
return (LESS_AND);
- else if (character == '>' && peek_char == '&')
+ else if MBTEST(character == '>' && peek_char == '&')
return (GREATER_AND);
- else if (character == '<' && peek_char == '>')
+ else if MBTEST(character == '<' && peek_char == '>')
return (LESS_GREATER);
- else if (character == '>' && peek_char == '|')
+ else if MBTEST(character == '>' && peek_char == '|')
return (GREATER_BAR);
- else if (peek_char == '>' && character == '&')
+ else if MBTEST(peek_char == '>' && character == '&')
return (AND_GREATER);
shell_ungetc (peek_char);
/* If we look like we are reading the start of a function
definition, then let the reader know about it so that
we will do the right thing with `{'. */
- if (character == ')' && last_read_token == '(' && token_before_that == WORD)
+ if MBTEST(character == ')' && last_read_token == '(' && token_before_that == WORD)
{
parser_state |= PST_ALLOWOPNBRC;
#if defined (ALIAS)
/* case pattern lists may be preceded by an optional left paren. If
we're not trying to parse a case pattern list, the left paren
indicates a subshell. */
- if (character == '(' && (parser_state & PST_CASEPAT) == 0) /* ) */
+ if MBTEST(character == '(' && (parser_state & PST_CASEPAT) == 0) /* ) */
parser_state |= PST_SUBSHELL;
/*(*/
- else if ((parser_state & PST_CASEPAT) && character == ')')
+ else if MBTEST((parser_state & PST_CASEPAT) && character == ')')
parser_state &= ~PST_CASEPAT;
/*(*/
- else if ((parser_state & PST_SUBSHELL) && character == ')')
+ else if MBTEST((parser_state & PST_SUBSHELL) && character == ')')
parser_state &= ~PST_SUBSHELL;
#if defined (PROCESS_SUBSTITUTION)
/* Check for the constructs which introduce process substitution.
Shells running in `posix mode' don't do process substitution. */
- if (posixly_correct ||
- ((character != '>' && character != '<') || peek_char != '('))
+ if MBTEST(posixly_correct || ((character != '>' && character != '<') || peek_char != '(')) /*)*/
#endif /* PROCESS_SUBSTITUTION */
return (character);
}
- /* Hack <&- (close stdin) case. */
- if (character == '-' && (last_read_token == LESS_AND || last_read_token == GREATER_AND))
+ /* Hack <&- (close stdin) case. Also <&N- (dup and close). */
+ if MBTEST(character == '-' && (last_read_token == LESS_AND || last_read_token == GREATER_AND))
return (character);
/* Okay, if we got this far, we have to read a word. Read one,
return result;
}
-/* Match a $(...) or other grouping construct. This has to handle embedded
- quoted strings ('', ``, "") and nested constructs. It also must handle
- reprompting the user, if necessary, after reading a newline, and returning
- correct error values if it reads EOF. */
-
+/*
+ * Match a $(...) or other grouping construct. This has to handle embedded
+ * quoted strings ('', ``, "") and nested constructs. It also must handle
+ * reprompting the user, if necessary, after reading a newline, and returning
+ * correct error values if it reads EOF.
+ */
#define P_FIRSTCLOSE 0x01
#define P_ALLOWESC 0x02
+#define P_DQUOTE 0x04
+#define P_COMMAND 0x08 /* parsing a command, so look for comments */
+#define P_BACKQUOTE 0x10 /* parsing a backquoted command substitution */
static char matched_pair_error;
static char *
int open, close;
int *lenp, flags;
{
- int count, ch, was_dollar;
- int pass_next_character, nestlen, ttranslen, start_lineno;
+ int count, ch, was_dollar, in_comment, check_comment;
+ int pass_next_character, backq_backslash, nestlen, ttranslen, start_lineno;
char *ret, *nestret, *ttrans;
- int retind, retsize;
+ int retind, retsize, rflags;
+/* itrace("parse_matched_pair: open = %c close = %c", open, close); */
count = 1;
- pass_next_character = was_dollar = 0;
+ pass_next_character = backq_backslash = was_dollar = in_comment = 0;
+ check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
+
+ /* RFLAGS is the set of flags we want to pass to recursive calls. */
+ rflags = (qc == '"') ? P_DQUOTE : (flags & P_DQUOTE);
ret = (char *)xmalloc (retsize = 64);
retind = 0;
start_lineno = line_number;
while (count)
{
- ch = shell_getc ((qc != '\'' || (flags & P_ALLOWESC)) && pass_next_character == 0);
+ ch = shell_getc (qc != '\'' && pass_next_character == 0 && backq_backslash == 0);
+
if (ch == EOF)
{
free (ret);
- parser_error (start_lineno, "unexpected EOF while looking for matching `%c'", close);
+ parser_error (start_lineno, _("unexpected EOF while looking for matching `%c'"), close);
EOF_Reached = 1; /* XXX */
return (&matched_pair_error);
}
/* Possible reprompting. */
- if (ch == '\n' && interactive &&
- (bash_input.type == st_stdin || bash_input.type == st_stream))
+ if (ch == '\n' && SHOULD_PROMPT ())
prompt_again ();
+ if (in_comment)
+ {
+ /* Add this character. */
+ RESIZE_MALLOCED_BUFFER (ret, retind, 1, retsize, 64);
+ ret[retind++] = ch;
+
+ if (ch == '\n')
+ in_comment = 0;
+
+ continue;
+ }
+ /* Not exactly right yet, should handle shell metacharacters, too. If
+ any changes are made to this test, make analogous changes to subst.c:
+ extract_delimited_string(). */
+ else if MBTEST(check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind - 1])))
+ in_comment = 1;
+
+ /* last char was backslash inside backquoted command substitution */
+ if (backq_backslash)
+ {
+ backq_backslash = 0;
+ /* Placeholder for adding special characters */
+ }
+
if (pass_next_character) /* last char was backslash */
{
pass_next_character = 0;
}
RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64);
- if (ch == CTLESC || ch == CTLNUL)
+ if MBTEST(ch == CTLESC || ch == CTLNUL)
ret[retind++] = CTLESC;
ret[retind++] = ch;
continue;
}
- else if (ch == CTLESC || ch == CTLNUL) /* special shell escapes */
+ else if MBTEST(ch == CTLESC || ch == CTLNUL) /* special shell escapes */
{
RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64);
ret[retind++] = CTLESC;
ret[retind++] = ch;
continue;
}
- else if (ch == close) /* ending delimiter */
+ else if MBTEST(ch == close) /* ending delimiter */
count--;
-#if 1
/* handle nested ${...} specially. */
- else if (open != close && was_dollar && open == '{' && ch == open) /* } */
+ else if MBTEST(open != close && was_dollar && open == '{' && ch == open) /* } */
count++;
-#endif
- else if (((flags & P_FIRSTCLOSE) == 0) && ch == open) /* nested begin */
+ else if MBTEST(((flags & P_FIRSTCLOSE) == 0) && ch == open) /* nested begin */
count++;
/* Add this character. */
if (open == '\'') /* '' inside grouping construct */
{
- if ((flags & P_ALLOWESC) && ch == '\\')
+ if MBTEST((flags & P_ALLOWESC) && ch == '\\')
pass_next_character++;
+#if 0
+ else if MBTEST((flags & P_BACKQUOTE) && ch == '\\')
+ backq_backslash++;
+#endif
continue;
}
- if (ch == '\\') /* backslashes */
+ if MBTEST(ch == '\\') /* backslashes */
pass_next_character++;
if (open != close) /* a grouping construct */
{
- if (shellquote (ch))
+ if MBTEST(shellquote (ch))
{
/* '', ``, or "" inside $(...) or other grouping construct. */
push_delimiter (dstack, ch);
- if (was_dollar && ch == '\'') /* $'...' inside group */
- nestret = parse_matched_pair (ch, ch, ch, &nestlen, P_ALLOWESC);
+ if MBTEST(was_dollar && ch == '\'') /* $'...' inside group */
+ nestret = parse_matched_pair (ch, ch, ch, &nestlen, P_ALLOWESC|rflags);
else
- nestret = parse_matched_pair (ch, ch, ch, &nestlen, 0);
+ nestret = parse_matched_pair (ch, ch, ch, &nestlen, rflags);
pop_delimiter (dstack);
if (nestret == &matched_pair_error)
{
free (ret);
return &matched_pair_error;
}
- if (was_dollar && ch == '\'')
+ if MBTEST(was_dollar && ch == '\'' && (extended_quote || (rflags & P_DQUOTE) == 0))
{
/* Translate $'...' here. */
ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen);
xfree (nestret);
- nestret = sh_single_quote (ttrans);
- free (ttrans);
- nestlen = strlen (nestret);
+
+ if ((rflags & P_DQUOTE) == 0)
+ {
+ nestret = sh_single_quote (ttrans);
+ free (ttrans);
+ nestlen = strlen (nestret);
+ }
+ else
+ {
+ nestret = ttrans;
+ nestlen = ttranslen;
+ }
retind -= 2; /* back up before the $' */
}
- else if (was_dollar && ch == '"')
+ else if MBTEST(was_dollar && ch == '"' && (extended_quote || (rflags & P_DQUOTE) == 0))
{
/* Locale expand $"..." here. */
ttrans = localeexpand (nestret, 0, nestlen - 1, start_lineno, &ttranslen);
xfree (nestret);
- nestret = (char *)xmalloc (ttranslen + 3);
- nestret[0] = '"';
- strcpy (nestret + 1, ttrans);
- nestret[ttranslen + 1] = '"';
- nestret[ttranslen += 2] = '\0';
+
+ nestret = sh_mkdoublequoted (ttrans, ttranslen, 0);
free (ttrans);
- nestlen = ttranslen;
+ nestlen = ttranslen + 2;
retind -= 2; /* back up before the $" */
}
+
if (nestlen)
{
RESIZE_MALLOCED_BUFFER (ret, retind, nestlen, retsize, 64);
/* Parse an old-style command substitution within double quotes as a
single word. */
/* XXX - sh and ksh93 don't do this - XXX */
- else if (open == '"' && ch == '`')
+ else if MBTEST(open == '"' && ch == '`')
{
- nestret = parse_matched_pair (0, '`', '`', &nestlen, 0);
+ nestret = parse_matched_pair (0, '`', '`', &nestlen, rflags);
+add_nestret:
if (nestret == &matched_pair_error)
{
free (ret);
}
FREE (nestret);
}
- else if (was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
+#if 0
+ else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
+ {
+ /* Add P_BACKQUOTE so backslash quotes the next character and
+ shell_getc does the right thing with \<newline>. We do this for
+ a measure of backwards compatibility -- it's not strictly the
+ right POSIX thing. */
+ nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_BACKQUOTE);
+ goto add_nestret;
+ }
+#endif
+ else if MBTEST(open != '`' && was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
/* check for $(), $[], or ${} inside quoted string. */
{
if (open == ch) /* undo previous increment */
count--;
if (ch == '(') /* ) */
- nestret = parse_matched_pair (0, '(', ')', &nestlen, 0);
+ nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE);
else if (ch == '{') /* } */
- nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE);
+ nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags);
else if (ch == '[') /* ] */
- nestret = parse_matched_pair (0, '[', ']', &nestlen, 0);
- if (nestret == &matched_pair_error)
- {
- free (ret);
- return &matched_pair_error;
- }
- if (nestlen)
- {
- RESIZE_MALLOCED_BUFFER (ret, retind, nestlen, retsize, 64);
- strcpy (ret + retind, nestret);
- retind += nestlen;
- }
- FREE (nestret);
+ nestret = parse_matched_pair (0, '[', ']', &nestlen, rflags);
+
+ goto add_nestret;
}
- was_dollar = (ch == '$');
+ was_dollar = MBTEST(ch == '$');
}
ret[retind] = '\0';
}
#if defined (DPAREN_ARITHMETIC) || defined (ARITH_FOR_COMMAND)
+/* Parse a double-paren construct. It can be either an arithmetic
+ command, an arithmetic `for' command, or a nested subshell. Returns
+ the parsed token, -1 on error, or -2 if we didn't do anything and
+ should just go on. */
+static int
+parse_dparen (c)
+ int c;
+{
+ int cmdtyp, sline;
+ char *wval;
+ WORD_DESC *wd;
+
+#if defined (ARITH_FOR_COMMAND)
+ if (last_read_token == FOR)
+ {
+ arith_for_lineno = line_number;
+ cmdtyp = parse_arith_cmd (&wval, 0);
+ if (cmdtyp == 1)
+ {
+ wd = alloc_word_desc ();
+ wd->word = wval;
+ yylval.word_list = make_word_list (wd, (WORD_LIST *)NULL);
+ return (ARITH_FOR_EXPRS);
+ }
+ else
+ return -1; /* ERROR */
+ }
+#endif
+
+#if defined (DPAREN_ARITHMETIC)
+ if (reserved_word_acceptable (last_read_token))
+ {
+ sline = line_number;
+
+ cmdtyp = parse_arith_cmd (&wval, 0);
+ if (cmdtyp == 1) /* arithmetic command */
+ {
+ wd = alloc_word_desc ();
+ wd->word = wval;
+ wd->flags = W_QUOTED|W_NOSPLIT|W_NOGLOB|W_DQUOTE;
+ yylval.word_list = make_word_list (wd, (WORD_LIST *)NULL);
+ return (ARITH_CMD);
+ }
+ else if (cmdtyp == 0) /* nested subshell */
+ {
+ push_string (wval, 0, (alias_t *)NULL);
+ if ((parser_state & PST_CASEPAT) == 0)
+ parser_state |= PST_SUBSHELL;
+ return (c);
+ }
+ else /* ERROR */
+ return -1;
+ }
+#endif
+
+ return -2; /* XXX */
+}
+
/* We've seen a `(('. Look for the matching `))'. If we get it, return 1.
If not, assume it's a nested subshell for backwards compatibility and
return 0. In any case, put the characters we've consumed into a locally-
allocated buffer and make *ep point to that buffer. Return -1 on an
error, for example EOF. */
static int
-parse_arith_cmd (ep)
+parse_arith_cmd (ep, adddq)
char **ep;
+ int adddq;
{
int exp_lineno, rval, c;
char *ttok, *tokstr;
return -1;
/* Check that the next character is the closing right paren. If
not, this is a syntax error. ( */
- if ((c = shell_getc (0)) != ')')
+ c = shell_getc (0);
+ if MBTEST(c != ')')
rval = 0;
tokstr = (char *)xmalloc (ttoklen + 4);
- /* (( ... )) -> "..." */
- tokstr[0] = (rval == 1) ? '"' : '(';
- strncpy (tokstr + 1, ttok, ttoklen - 1); /* don't copy the final `)' */
- if (rval == 1)
+ /* if ADDDQ != 0 then (( ... )) -> "..." */
+ if (rval == 1 && adddq) /* arith cmd, add double quotes */
{
+ tokstr[0] = '"';
+ strncpy (tokstr + 1, ttok, ttoklen - 1);
tokstr[ttoklen] = '"';
tokstr[ttoklen+1] = '\0';
}
- else
+ else if (rval == 1) /* arith cmd, don't add double quotes */
+ {
+ strncpy (tokstr, ttok, ttoklen - 1);
+ tokstr[ttoklen-1] = '\0';
+ }
+ else /* nested subshell */
{
+ tokstr[0] = '(';
+ strncpy (tokstr + 1, ttok, ttoklen - 1);
tokstr[ttoklen] = ')';
tokstr[ttoklen+1] = c;
tokstr[ttoklen+2] = '\0';
}
+
*ep = tokstr;
FREE (ttok);
return rval;
#endif /* DPAREN_ARITHMETIC || ARITH_FOR_COMMAND */
#if defined (COND_COMMAND)
+static void
+cond_error ()
+{
+ char *etext;
+
+ if (EOF_Reached && cond_token != COND_ERROR) /* [[ */
+ parser_error (cond_lineno, _("unexpected EOF while looking for `]]'"));
+ else if (cond_token != COND_ERROR)
+ {
+ if (etext = error_token_from_token (cond_token))
+ {
+ parser_error (cond_lineno, _("syntax error in conditional expression: unexpected token `%s'"), etext);
+ free (etext);
+ }
+ else
+ parser_error (cond_lineno, _("syntax error in conditional expression"));
+ }
+}
+
static COND_COM *
cond_expr ()
{
{
while ((cond_token = read_token (READ)) == '\n')
{
- if (interactive && (bash_input.type == st_stdin || bash_input.type == st_stream))
+ if (SHOULD_PROMPT ())
prompt_again ();
}
return (cond_token);
WORD_DESC *op;
COND_COM *term, *tleft, *tright;
int tok, lineno;
+ char *etext;
/* Read a token. It can be a left paren, a `!', a unary operator, or a
word that should be the first argument of a binary operator. Start by
{
if (term)
dispose_cond_node (term); /* ( */
- parser_error (lineno, "expected `)'");
+ if (etext = error_token_from_token (cond_token))
+ {
+ parser_error (lineno, _("unexpected token `%s', expected `)'"), etext);
+ free (etext);
+ }
+ else
+ parser_error (lineno, _("expected `)'"));
COND_RETURN_ERROR ();
}
term = make_cond_node (COND_EXPR, (WORD_DESC *)NULL, term, (COND_COM *)NULL);
else
{
dispose_word (op);
- parser_error (line_number, "unexpected argument to conditional unary operator");
+ if (etext = error_token_from_token (tok))
+ {
+ parser_error (line_number, _("unexpected argument `%s' to conditional unary operator"), etext);
+ free (etext);
+ }
+ else
+ parser_error (line_number, _("unexpected argument to conditional unary operator"));
COND_RETURN_ERROR ();
}
tok = read_token (READ);
if (tok == WORD && test_binop (yylval.word->word))
op = yylval.word;
+#if defined (COND_REGEXP)
+ else if (tok == WORD && STREQ (yylval.word->word,"=~"))
+ op = yylval.word;
+#endif
else if (tok == '<' || tok == '>')
op = make_word_from_token (tok); /* ( */
/* There should be a check before blindly accepting the `)' that we have
}
else
{
- parser_error (line_number, "conditional binary operator expected");
+ if (etext = error_token_from_token (tok))
+ {
+ parser_error (line_number, _("unexpected token `%s', conditional binary operator expected"), etext);
+ free (etext);
+ }
+ else
+ parser_error (line_number, _("conditional binary operator expected"));
dispose_cond_node (tleft);
COND_RETURN_ERROR ();
}
}
else
{
- parser_error (line_number, "unexpected argument to conditional binary operator");
+ if (etext = error_token_from_token (tok))
+ {
+ parser_error (line_number, _("unexpected argument `%s' to conditional binary operator"), etext);
+ free (etext);
+ }
+ else
+ parser_error (line_number, _("unexpected argument to conditional binary operator"));
dispose_cond_node (tleft);
dispose_word (op);
COND_RETURN_ERROR ();
else
{
if (tok < 256)
- parser_error (line_number, "unexpected token `%c' in conditional command", tok);
+ parser_error (line_number, _("unexpected token `%c' in conditional command"), tok);
+ else if (etext = error_token_from_token (tok))
+ {
+ parser_error (line_number, _("unexpected token `%s' in conditional command"), etext);
+ free (etext);
+ }
else
- parser_error (line_number, "unexpected token %d in conditional command", tok);
+ parser_error (line_number, _("unexpected token %d in conditional command"), tok);
COND_RETURN_ERROR ();
}
return (term);
}
#endif
+#if defined (ARRAY_VARS)
+/* When this is called, it's guaranteed that we don't care about anything
+ in t beyond i. We do save and restore the chars, though. */
+static int
+token_is_assignment (t, i)
+ char *t;
+ int i;
+{
+ unsigned char c, c1;
+ int r;
+
+ c = t[i]; c1 = t[i+1];
+ t[i] = '='; t[i+1] = '\0';
+ r = assignment (t, (parser_state & PST_COMPASSIGN) != 0);
+ t[i] = c; t[i+1] = c1;
+ return r;
+}
+
+/* XXX - possible changes here for `+=' */
+static int
+token_is_ident (t, i)
+ char *t;
+ int i;
+{
+ unsigned char c;
+ int r;
+
+ c = t[i];
+ t[i] = '\0';
+ r = legal_identifier (t);
+ t[i] = c;
+ return r;
+}
+#endif
+
static int
read_token_word (character)
int character;
/* DOLLAR_PRESENT becomes non-zero if we see a `$'. */
int dollar_present;
+ /* COMPOUND_ASSIGNMENT becomes non-zero if we are parsing a compound
+ assignment. */
+ int compound_assignment;
+
/* QUOTED becomes non-zero if we see one of ("), ('), (`), or (\). */
int quoted;
int result, peek_char;
char *ttok, *ttrans;
int ttoklen, ttranslen;
- long lvalue;
+ intmax_t lvalue;
if (token_buffer_size < TOKEN_DEFAULT_INITIAL_SIZE)
token = (char *)xrealloc (token, token_buffer_size = TOKEN_DEFAULT_INITIAL_SIZE);
token_index = 0;
all_digit_token = DIGIT (character);
- dollar_present = quoted = pass_next_character = 0;
+ dollar_present = quoted = pass_next_character = compound_assignment = 0;
for (;;)
{
/* Handle backslashes. Quote lots of things when not inside of
double-quotes, quote some things inside of double-quotes. */
- if (character == '\\')
+ if MBTEST(character == '\\')
{
peek_char = shell_getc (0);
}
/* Parse a matched pair of quote characters. */
- if (shellquote (character))
+ if MBTEST(shellquote (character))
{
push_delimiter (dstack, character);
- ttok = parse_matched_pair (character, character, character, &ttoklen, 0);
+ ttok = parse_matched_pair (character, character, character, &ttoklen, (character == '`') ? P_COMMAND : 0);
pop_delimiter (dstack);
if (ttok == &matched_pair_error)
return -1; /* Bail immediately. */
if (extended_glob && PATTERN_CHAR (character))
{
peek_char = shell_getc (1);
- if (peek_char == '(') /* ) */
+ if MBTEST(peek_char == '(') /* ) */
{
push_delimiter (dstack, peek_char);
ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
{
peek_char = shell_getc (1);
/* $(...), <(...), >(...), $((...)), ${...}, and $[...] constructs */
- if (peek_char == '(' ||
+ if MBTEST(peek_char == '(' || \
((peek_char == '{' || peek_char == '[') && character == '$')) /* ) ] } */
{
if (peek_char == '{') /* } */
history literally rather than causing a possibly-
incorrect `;' to be added. ) */
push_delimiter (dstack, peek_char);
- ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
+ ttok = parse_matched_pair (cd, '(', ')', &ttoklen, P_COMMAND);
pop_delimiter (dstack);
}
else
goto next_character;
}
/* This handles $'...' and $"..." new-style quoted strings. */
- else if (character == '$' && (peek_char == '\'' || peek_char == '"'))
+ else if MBTEST(character == '$' && (peek_char == '\'' || peek_char == '"'))
{
int first_line;
{
ttrans = ansiexpand (ttok, 0, ttoklen - 1, &ttranslen);
free (ttok);
+
/* Insert the single quotes and correctly quote any
embedded single quotes (allowed because P_ALLOWESC was
passed to parse_matched_pair). */
ttok = sh_single_quote (ttrans);
free (ttrans);
+ ttranslen = strlen (ttok);
ttrans = ttok;
- ttranslen = strlen (ttrans);
}
else
{
free (ttok);
/* Add the double quotes back */
- ttok = (char *)xmalloc (ttranslen + 3);
- ttok[0] = '"';
- strcpy (ttok + 1, ttrans);
- ttok[ttranslen + 1] = '"';
- ttok[ttranslen += 2] = '\0';
+ ttok = sh_mkdoublequoted (ttrans, ttranslen, 0);
free (ttrans);
+ ttranslen += 2;
ttrans = ttok;
}
}
/* This could eventually be extended to recognize all of the
shell's single-character parameter expansions, and set flags.*/
- else if (character == '$' && peek_char == '$')
+ else if MBTEST(character == '$' && peek_char == '$')
{
ttok = (char *)xmalloc (3);
ttok[0] = ttok[1] = '$';
}
#if defined (ARRAY_VARS)
+ /* Identify possible array subscript assignment; match [...] */
+ else if MBTEST(character == '[' && token_index > 0 && assignment_acceptable (last_read_token) && token_is_ident (token, token_index)) /* ] */
+ {
+ ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0);
+ if (ttok == &matched_pair_error)
+ return -1; /* Bail immediately. */
+ RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2,
+ token_buffer_size,
+ TOKEN_DEFAULT_GROW_SIZE);
+ token[token_index++] = character;
+ strcpy (token + token_index, ttok);
+ token_index += ttoklen;
+ FREE (ttok);
+ all_digit_token = 0;
+ goto next_character;
+ }
/* Identify possible compound array variable assignment. */
- else if (character == '=' && token_index > 0)
+ 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 (peek_char == '(') /* ) */
+ if MBTEST(peek_char == '(') /* ) */
{
- ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
- if (ttok == &matched_pair_error)
- return -1; /* Bail immediately. */
- if (ttok[0] == '(') /* ) */
- {
- FREE (ttok);
- return -1;
- }
- RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2,
+ ttok = parse_compound_assignment (&ttoklen);
+
+ RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 4,
token_buffer_size,
TOKEN_DEFAULT_GROW_SIZE);
- token[token_index++] = character;
- token[token_index++] = peek_char;
- strcpy (token + token_index, ttok);
- token_index += ttoklen;
+
+ token[token_index++] = '=';
+ token[token_index++] = '(';
+ if (ttok)
+ {
+ strcpy (token + token_index, ttok);
+ token_index += ttoklen;
+ }
+ token[token_index++] = ')';
FREE (ttok);
all_digit_token = 0;
+ compound_assignment = 1;
+#if 1
goto next_character;
+#else
+ goto got_token; /* ksh93 seems to do this */
+#endif
}
else
shell_ungetc (peek_char);
/* When not parsing a multi-character word construct, shell meta-
characters break words. */
- if (shellbreak (character))
+ if MBTEST(shellbreak (character))
{
shell_ungetc (character);
goto got_token;
TOKEN_DEFAULT_GROW_SIZE);
next_character:
- if (character == '\n' && interactive &&
- (bash_input.type == st_stdin || bash_input.type == st_stream))
+ if (character == '\n' && SHOULD_PROMPT ())
prompt_again ();
/* We want to remove quoted newlines (that is, a \<newline> pair)
is a `<', or a `&', or the character which ended this token is
a '>' or '<', then, and ONLY then, is this input token a NUMBER.
Otherwise, it is just a word, and should be returned as such. */
- if (all_digit_token && (character == '<' || character == '>' ||
- last_read_token == LESS_AND ||
+ if MBTEST(all_digit_token && (character == '<' || character == '>' || \
+ last_read_token == LESS_AND || \
last_read_token == GREATER_AND))
{
if (legal_number (token, &lvalue) && (int)lvalue == lvalue)
}
/* Check for special case tokens. */
- result = special_case_tokens (token);
+ result = (last_shell_getc_is_singlebyte) ? special_case_tokens (token) : -1;
if (result >= 0)
return result;
/* Posix.2 does not allow reserved words to be aliased, so check for all
of them, including special cases, before expanding the current token
as an alias. */
- if (posixly_correct)
+ if MBTEST(posixly_correct)
CHECK_FOR_RESERVED_WORD (token);
/* Aliases are expanded iff EXPAND_ALIASES is non-zero, and quoting
/* If not in Posix.2 mode, check for reserved words after alias
expansion. */
- if (posixly_correct == 0)
+ if MBTEST(posixly_correct == 0)
#endif
CHECK_FOR_RESERVED_WORD (token);
if (dollar_present)
the_word->flags |= W_HASDOLLAR;
if (quoted)
- the_word->flags |= W_QUOTED;
+ the_word->flags |= W_QUOTED; /*(*/
+ if (compound_assignment && token[token_index-1] == ')')
+ the_word->flags |= W_COMPASSIGN;
/* A word is an assignment if it appears at the beginning of a
simple command, or after another assignment word. This is
context-dependent, so it cannot be handled in the grammar. */
- if (assignment (token))
+ if (assignment (token, (parser_state & PST_COMPASSIGN) != 0))
{
the_word->flags |= W_ASSIGNMENT;
/* Don't perform word splitting on assignment statements. */
- if (assignment_acceptable (last_read_token))
+ if (assignment_acceptable (last_read_token) || (parser_state & PST_COMPASSIGN) != 0)
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;
+ else if (STREQ (token, "eval") || STREQ (token, "let"))
+ parser_state |= PST_ASSIGNOK;
+ }
+
yylval.word = the_word;
result = ((the_word->flags & (W_ASSIGNMENT|W_NOSPLIT)) == (W_ASSIGNMENT|W_NOSPLIT))
? ASSIGNMENT_WORD : WORD;
- if (last_read_token == FUNCTION)
+ switch (last_read_token)
{
+ case FUNCTION:
parser_state |= PST_ALLOWOPNBRC;
function_dstart = line_number;
+ break;
+ case CASE:
+ case SELECT:
+ case FOR:
+ if (word_top < MAX_CASE_NEST)
+ word_top++;
+ word_lineno[word_top] = line_number;
+ break;
}
return (result);
}
-/* $'...' ANSI-C expand the portion of STRING between START and END and
- return the result. The result cannot be longer than the input string. */
-static char *
-ansiexpand (string, start, end, lenp)
- char *string;
- int start, end, *lenp;
+/* Return 1 if TOKSYM is a token that after being read would allow
+ a reserved word to be seen, else 0. */
+static int
+reserved_word_acceptable (toksym)
+ int toksym;
{
- char *temp, *t;
- int len, tlen;
-
- temp = (char *)xmalloc (end - start + 1);
- for (tlen = 0, len = start; len < end; )
- temp[tlen++] = string[len++];
- temp[tlen] = '\0';
-
- if (*temp)
- {
- t = ansicstr (temp, tlen, 0, (int *)NULL, lenp);
- free (temp);
- return (t);
- }
- else
+ switch (toksym)
{
- if (lenp)
- *lenp = 0;
- return (temp);
+ case '\n':
+ case ';':
+ case '(':
+ case ')':
+ case '|':
+ case '&':
+ case '{':
+ case '}': /* XXX */
+ case AND_AND:
+ case BANG:
+ case DO:
+ case DONE:
+ case ELIF:
+ case ELSE:
+ case ESAC:
+ case FI:
+ case IF:
+ case OR_OR:
+ case SEMI_SEMI:
+ case THEN:
+ case TIME:
+ case TIMEOPT:
+ case UNTIL:
+ case WHILE:
+ case 0:
+ return 1;
+ default:
+ return 0;
}
}
-
-/* Change a bash string into a string suitable for inclusion in a `po' file.
- This backslash-escapes `"' and `\' and changes newlines into \\\n"\n". */
-static char *
-mk_msgstr (string, foundnlp)
- char *string;
- int *foundnlp;
-{
- register int c, len;
- char *result, *r, *s;
-
- for (len = 0, s = string; s && *s; s++)
- {
- len++;
- if (*s == '"' || *s == '\\')
- len++;
- else if (*s == '\n')
- len += 5;
- }
-
- r = result = (char *)xmalloc (len + 3);
- *r++ = '"';
-
- for (s = string; s && (c = *s); s++)
- {
- if (c == '\n') /* <NL> -> \n"<NL>" */
- {
- *r++ = '\\';
- *r++ = 'n';
- *r++ = '"';
- *r++ = '\n';
- *r++ = '"';
- if (foundnlp)
- *foundnlp = 1;
- continue;
- }
- if (c == '"' || c == '\\')
- *r++ = '\\';
- *r++ = c;
- }
-
- *r++ = '"';
- *r++ = '\0';
-
- return result;
-}
-
-/* $"..." -- Translate the portion of STRING between START and END
- according to current locale using gettext (if available) and return
- the result. The caller will take care of leaving the quotes intact.
- The string will be left without the leading `$' by the caller.
- If translation is performed, the translated string will be double-quoted
- by the caller. The length of the translated string is returned in LENP,
- if non-null. */
-static char *
-localeexpand (string, start, end, lineno, lenp)
- char *string;
- int start, end, lineno, *lenp;
-{
- int len, tlen, foundnl;
- char *temp, *t, *t2;
-
- temp = (char *)xmalloc (end - start + 1);
- for (tlen = 0, len = start; len < end; )
- temp[tlen++] = string[len++];
- temp[tlen] = '\0';
-
- /* If we're just dumping translatable strings, don't do anything with the
- string itself, but if we're dumping in `po' file format, convert it into a form more palatable to gettext(3)
- and friends by quoting `"' and `\' with backslashes and converting <NL>
- into `\n"<NL>"'. If we find a newline in TEMP, we first output a
- `msgid ""' line and then the translated string; otherwise we output the
- `msgid' and translated string all on one line. */
- if (dump_translatable_strings)
- {
- if (dump_po_strings)
- {
- foundnl = 0;
- t = mk_msgstr (temp, &foundnl);
- t2 = foundnl ? "\"\"\n" : "";
-
- printf ("#: %s:%d\nmsgid %s%s\nmsgstr \"\"\n",
- (bash_input.name ? bash_input.name : "stdin"), lineno, t2, t);
- free (t);
- }
- else
- printf ("\"%s\"\n", temp);
-
- if (lenp)
- *lenp = tlen;
- return (temp);
- }
- else if (*temp)
- {
- t = localetrans (temp, tlen, &len);
- free (temp);
- if (lenp)
- *lenp = len;
- return (t);
- }
- else
- {
- if (lenp)
- *lenp = 0;
- return (temp);
- }
-}
-
-/* Return 1 if TOKSYM is a token that after being read would allow
- a reserved word to be seen, else 0. */
-static int
-reserved_word_acceptable (toksym)
- int toksym;
-{
- if (toksym == '\n' || toksym == ';' || toksym == '(' || toksym == ')' ||
- toksym == '|' || toksym == '&' || toksym == '{' ||
- toksym == '}' || /* XXX */
- toksym == AND_AND ||
- toksym == BANG ||
- toksym == TIME || toksym == TIMEOPT ||
- toksym == DO ||
- toksym == ELIF ||
- toksym == ELSE ||
- toksym == FI ||
- toksym == IF ||
- toksym == OR_OR ||
- toksym == SEMI_SEMI ||
- toksym == THEN ||
- toksym == UNTIL ||
- toksym == WHILE ||
- toksym == DONE || /* XXX these two are experimental */
- toksym == ESAC ||
- toksym == 0)
- return (1);
- else
- return (0);
-}
-
+
/* Return the index of TOKEN in the alist of reserved words, or -1 if
TOKEN is not a shell reserved word. */
int
return " ";
return ";";
}
+ else if (two_tokens_ago == CASE && token_before_that == WORD && (parser_state & PST_CASESTMT))
+ return " ";
for (i = 0; no_semi_successors[i]; i++)
{
{
char *temp_prompt;
- if (!interactive) /* XXX */
+ if (interactive == 0 || expanding_alias()) /* XXX */
return;
ps1_prompt = get_string_value ("PS1");
may contain special characters which are decoded as follows:
\a bell (ascii 07)
- \e escape (ascii 033)
\d the date in Day Mon Date format
+ \e escape (ascii 033)
\h the hostname up to the first `.'
\H the hostname
\j the number of active jobs
\l the basename of the shell's tty device name
\n CRLF
+ \r CR
\s the name of the shell
\t the time in 24-hour hh:mm:ss format
\T the time in 12-hour hh:mm:ss format
- \@ the time in 12-hour am/pm format
+ \@ the time in 12-hour hh:mm am/pm format
+ \A the time in 24-hour hh:mm format
+ \D{fmt} the result of passing FMT to strftime(3)
+ \u your username
\v the version of bash (e.g., 2.00)
\V the release of bash, version + patchlevel (e.g., 2.00.0)
\w the current working directory
\W the last element of $PWD
- \u your username
- \# the command number of this command
\! the history number of this command
+ \# the command number of this command
\$ a $ or a # if you are root
\nnn character code nnn in octal
\\ a backslash
int last_exit_value;
#if defined (PROMPT_STRING_DECODE)
int result_size, result_index;
- int c, n;
+ int c, n, i;
char *temp, octal_string[4];
+ struct tm *tm;
time_t the_time;
+ char timebuf[128];
+ char *timefmt;
result = (char *)xmalloc (result_size = PROMPT_GROWTH);
result[result_index = 0] = 0;
for (c = 0; n != -1 && c < 3 && ISOCTAL (*string); c++)
string++;
- c = 0;
+ c = 0; /* tested at add_string: */
goto add_string;
- case 't':
case 'd':
+ case 't':
case 'T':
case '@':
case 'A':
/* Make the current time/date into a string. */
- the_time = time (0);
- temp = ctime (&the_time);
+ (void) time (&the_time);
+ tm = localtime (&the_time);
+
+ if (c == 'd')
+ n = strftime (timebuf, sizeof (timebuf), "%a %b %d", tm);
+ else if (c == 't')
+ n = strftime (timebuf, sizeof (timebuf), "%H:%M:%S", tm);
+ else if (c == 'T')
+ n = strftime (timebuf, sizeof (timebuf), "%I:%M:%S", tm);
+ else if (c == '@')
+ n = strftime (timebuf, sizeof (timebuf), "%I:%M %p", tm);
+ else if (c == 'A')
+ n = strftime (timebuf, sizeof (timebuf), "%H:%M", tm);
+
+ if (n == 0)
+ timebuf[0] = '\0';
+ else
+ timebuf[sizeof(timebuf) - 1] = '\0';
- temp = (c != 'd') ? savestring (temp + 11) : savestring (temp);
- temp[(c != 'd') ? 8 : 10] = '\0';
- temp[(c != 'A') ? 10 : 5] = '\0';
+ temp = savestring (timebuf);
+ goto add_string;
+
+ case 'D': /* strftime format */
+ if (string[1] != '{') /* } */
+ goto not_escape;
- /* quick and dirty conversion to 12-hour time */
- if (c == 'T' || c == '@')
+ (void) time (&the_time);
+ tm = localtime (&the_time);
+ string += 2; /* skip { */
+ timefmt = xmalloc (strlen (string) + 3);
+ for (t = timefmt; *string && *string != '}'; )
+ *t++ = *string++;
+ *t = '\0';
+ c = *string; /* tested at add_string */
+ if (timefmt[0] == '\0')
{
- if (c == '@')
- {
- temp[5] = 'a'; /* am/pm format */
- temp[6] = 'm';
- temp[7] = '\0';
- }
- c = temp[2];
- temp[2] = '\0';
- n = atoi (temp);
- temp[2] = c;
- n -= 12;
- if (n > 0)
- {
- temp[0] = (n / 10) + '0';
- temp[1] = (n % 10) + '0';
- }
- if (n >= 0 && temp[5] == 'a')
- temp[5] = 'p';
+ timefmt[0] = '%';
+ timefmt[1] = 'X'; /* locale-specific current time */
+ timefmt[2] = '\0';
}
- goto add_string;
+ n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
+ free (timefmt);
- case 'r':
- temp = (char *)xmalloc (2);
- temp[0] = '\r';
- temp[1] = '\0';
- goto add_string;
+ if (n == 0)
+ timebuf[0] = '\0';
+ else
+ timebuf[sizeof(timebuf) - 1] = '\0';
+ if (promptvars || posixly_correct)
+ /* Make sure that expand_prompt_string is called with a
+ second argument of Q_DOUBLE_QUOTES if we use this
+ function here. */
+ temp = sh_backslash_quote_for_double_quotes (timebuf);
+ else
+ temp = savestring (timebuf);
+ goto add_string;
+
case 'n':
temp = (char *)xmalloc (3);
temp[0] = no_line_editing ? '\n' : '\r';
case 'v':
case 'V':
- temp = (char *)xmalloc (8);
+ temp = (char *)xmalloc (16);
if (c == 'v')
strcpy (temp, dist_version);
else
#define ROOT_PATH(x) ((x)[0] == '/' && (x)[1] == 0)
#define DOUBLE_SLASH_ROOT(x) ((x)[0] == '/' && (x)[1] == '/' && (x)[2] == 0)
- if (c == 'W')
+ /* Abbreviate \W as ~ if $PWD == $HOME */
+ if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, t_string) == 0))
{
if (ROOT_PATH (t_string) == 0 && DOUBLE_SLASH_ROOT (t_string) == 0)
{
quote the directory name. */
if (promptvars || posixly_correct)
/* Make sure that expand_prompt_string is called with a
- second argument of Q_DOUBLE_QUOTE if we use this
+ second argument of Q_DOUBLE_QUOTES if we use this
function here. */
temp = sh_backslash_quote_for_double_quotes (t_string);
else
#if defined (READLINE)
case '[':
case ']':
+ if (no_line_editing)
+ {
+ string++;
+ break;
+ }
temp = (char *)xmalloc (3);
- temp[0] = '\001';
- temp[1] = (c == '[') ? RL_PROMPT_START_IGNORE : RL_PROMPT_END_IGNORE;
- temp[2] = '\0';
+ n = (c == '[') ? RL_PROMPT_START_IGNORE : RL_PROMPT_END_IGNORE;
+ i = 0;
+ if (n == CTLESC || n == CTLNUL)
+ temp[i++] = CTLESC;
+ temp[i++] = n;
+ temp[i] = '\0';
goto add_string;
#endif /* READLINE */
case '\\':
- temp = (char *)xmalloc (2);
- temp[0] = c;
- temp[1] = '\0';
- goto add_string;
-
case 'a':
case 'e':
+ case 'r':
temp = (char *)xmalloc (2);
- temp[0] = (c == 'a') ? '\07' : '\033';
+ if (c == 'a')
+ temp[0] = '\07';
+ else if (c == 'e')
+ temp[0] = '\033';
+ else if (c == 'r')
+ temp[0] = '\r';
+ else /* (c == '\\') */
+ temp[0] = c;
temp[1] = '\0';
goto add_string;
default:
+not_escape:
temp = (char *)xmalloc (3);
temp[0] = '\\';
temp[1] = c;
return (result);
}
+/************************************************
+ * *
+ * ERROR HANDLING *
+ * *
+ ************************************************/
+
/* Report a syntax error, and restart the parser. Call here for fatal
errors. */
int
return (0);
}
+static char *
+error_token_from_token (tok)
+ int tok;
+{
+ char *t;
+
+ if (t = find_token_in_alist (tok, word_token_alist, 0))
+ return t;
+
+ if (t = find_token_in_alist (tok, other_token_alist, 0))
+ return t;
+
+ t = (char *)NULL;
+ /* This stuff is dicy and needs closer inspection */
+ switch (current_token)
+ {
+ case WORD:
+ case ASSIGNMENT_WORD:
+ if (yylval.word)
+ t = savestring (yylval.word->word);
+ break;
+ case NUMBER:
+ t = itos (yylval.number);
+ break;
+ case ARITH_CMD:
+ if (yylval.word_list)
+ t = string_list (yylval.word_list);
+ break;
+ case ARITH_FOR_EXPRS:
+ if (yylval.word_list)
+ t = string_list_internal (yylval.word_list, " ; ");
+ break;
+ case COND_CMD:
+ t = (char *)NULL; /* punt */
+ break;
+ }
+
+ return t;
+}
+
+static char *
+error_token_from_text ()
+{
+ char *msg, *t;
+ int token_end, i;
+
+ t = shell_input_line;
+ i = shell_input_line_index;
+ token_end = 0;
+ msg = (char *)NULL;
+
+ if (i && t[i] == '\0')
+ i--;
+
+ while (i && (whitespace (t[i]) || t[i] == '\n'))
+ i--;
+
+ if (i)
+ token_end = i + 1;
+
+ while (i && (member (t[i], " \n\t;|&") == 0))
+ i--;
+
+ while (i != token_end && (whitespace (t[i]) || t[i] == '\n'))
+ i++;
+
+ /* Return our idea of the offending token. */
+ if (token_end || (i == 0 && token_end == 0))
+ {
+ if (token_end)
+ msg = substring (t, i, token_end);
+ else /* one-character token */
+ {
+ msg = (char *)xmalloc (2);
+ msg[0] = t[i];
+ msg[1] = '\0';
+ }
+ }
+
+ return (msg);
+}
+
+static void
+print_offending_line ()
+{
+ char *msg;
+ int token_end;
+
+ msg = savestring (shell_input_line);
+ token_end = strlen (msg);
+ while (token_end && msg[token_end - 1] == '\n')
+ msg[--token_end] = '\0';
+
+ parser_error (line_number, "`%s'", msg);
+ free (msg);
+}
+
/* Report a syntax error with line numbers, etc.
Call here for recoverable errors. If you have a message to print,
then place it in MESSAGE, otherwise pass NULL and this will figure
report_syntax_error (message)
char *message;
{
- char *msg, *t;
- int token_end, i;
- char msg2[2];
+ char *msg;
if (message)
{
}
/* If the line of input we're reading is not null, try to find the
- objectionable token. */
- if (shell_input_line && *shell_input_line)
+ objectionable token. First, try to figure out what token the
+ parser's complaining about by looking at current_token. */
+ if (current_token != 0 && EOF_Reached == 0 && (msg = error_token_from_token (current_token)))
{
- t = shell_input_line;
- i = shell_input_line_index;
- token_end = 0;
-
- if (i && t[i] == '\0')
- i--;
-
- while (i && (whitespace (t[i]) || t[i] == '\n'))
- i--;
-
- if (i)
- token_end = i + 1;
+ parser_error (line_number, _("syntax error near unexpected token `%s'"), msg);
+ free (msg);
- while (i && (member (t[i], " \n\t;|&") == 0))
- i--;
+ if (interactive == 0)
+ print_offending_line ();
- while (i != token_end && (whitespace (t[i]) || t[i] == '\n'))
- i++;
+ last_command_exit_value = EX_USAGE;
+ return;
+ }
- /* Print the offending token. */
- if (token_end || (i == 0 && token_end == 0))
+ /* If looking at the current token doesn't prove fruitful, try to find the
+ offending token by analyzing the text of the input line near the current
+ input line index and report what we find. */
+ if (shell_input_line && *shell_input_line)
+ {
+ msg = error_token_from_text ();
+ if (msg)
{
- if (token_end)
- msg = substring (t, i, token_end);
- else /* one-character token */
- {
- msg2[0] = t[i];
- msg2[1] = '\0';
- msg = msg2;
- }
-
- parser_error (line_number, "syntax error near unexpected token `%s'", msg);
-
- if (msg != msg2)
- free (msg);
+ parser_error (line_number, _("syntax error near `%s'"), msg);
+ free (msg);
}
/* If not interactive, print the line containing the error. */
if (interactive == 0)
- {
- msg = savestring (shell_input_line);
- token_end = strlen (msg);
- while (token_end && msg[token_end - 1] == '\n')
- msg[--token_end] = '\0';
-
- parser_error (line_number, "`%s'", msg);
- free (msg);
- }
+ print_offending_line ();
}
else
{
- msg = EOF_Reached ? "syntax error: unexpected end of file" : "syntax error";
+ msg = EOF_Reached ? _("syntax error: unexpected end of file") : _("syntax error");
parser_error (line_number, "%s", msg);
/* When the shell is interactive, this file uses EOF_Reached
only for error reporting. Other mechanisms are used to
if (interactive && EOF_Reached)
EOF_Reached = 0;
}
+
last_command_exit_value = EX_USAGE;
}
created during parsing. In the case of error, we want to return
allocated objects to the memory pool. In the case of no error, we want
to throw away the information about where the allocated objects live.
- (dispose_command () will actually free the command. */
+ (dispose_command () will actually free the command.) */
static void
discard_parser_constructs (error_p)
int error_p;
{
}
+/************************************************
+ * *
+ * EOF HANDLING *
+ * *
+ ************************************************/
+
/* Do that silly `type "bye" to exit' stuff. You know, "ignoreeof". */
/* A flag denoting whether or not ignoreeof is set. */
{
if (eof_encountered < eof_encountered_limit)
{
- fprintf (stderr, "Use \"%s\" to leave the shell.\n",
+ fprintf (stderr, _("Use \"%s\" to leave the shell.\n"),
login_shell ? "logout" : "exit");
eof_encountered++;
+ /* Reset the parsing state. */
+ last_read_token = current_token = '\n';
/* Reset the prompt string to be $PS1. */
prompt_string_pointer = (char **)NULL;
prompt_again ();
- last_read_token = current_token = '\n';
return;
}
}
}
}
+/************************************************
+ * *
+ * STRING PARSING FUNCTIONS *
+ * *
+ ************************************************/
+
+/* It's very important that these two functions treat the characters
+ between ( and ) identically. */
+
static WORD_LIST parse_string_error;
/* Take a string and run it through the shell parser, returning the
resultant word list. Used by compound array assignment. */
WORD_LIST *
-parse_string_to_word_list (s, whom)
+parse_string_to_word_list (s, flags, whom)
char *s;
+ int flags;
const char *whom;
{
WORD_LIST *wl;
- int tok, orig_line_number, orig_input_terminator;
+ int tok, orig_current_token, orig_line_number, orig_input_terminator;
int orig_line_count;
+ int old_echo_input, old_expand_aliases;
#if defined (HISTORY)
int old_remember_on_history, old_history_expansion_inhibited;
#endif
orig_line_number = line_number;
orig_line_count = current_command_line_count;
orig_input_terminator = shell_input_line_terminator;
+ old_echo_input = echo_input_at_read;
+ old_expand_aliases = expand_aliases;
push_stream (1);
- last_read_token = '\n';
+ last_read_token = WORD; /* WORD to allow reserved words here */
current_command_line_count = 0;
+ echo_input_at_read = expand_aliases = 0;
with_input_from_string (s, whom);
wl = (WORD_LIST *)NULL;
+
+ if (flags & 1)
+ parser_state |= PST_COMPASSIGN;
+
while ((tok = read_token (READ)) != yacc_EOF)
{
if (tok == '\n' && *bash_input.location.string == '\0')
if (tok != WORD && tok != ASSIGNMENT_WORD)
{
line_number = orig_line_number + line_number - 1;
- yyerror ((char *)NULL); /* does the right thing */
+ orig_current_token = current_token;
+ current_token = tok;
+ yyerror (NULL); /* does the right thing */
+ current_token = orig_current_token;
if (wl)
dispose_words (wl);
wl = &parse_string_error;
# endif /* BANG_HISTORY */
#endif /* HISTORY */
+ echo_input_at_read = old_echo_input;
+ expand_aliases = old_expand_aliases;
+
current_command_line_count = orig_line_count;
shell_input_line_terminator = orig_input_terminator;
+ if (flags & 1)
+ parser_state &= ~PST_COMPASSIGN;
+
if (wl == &parse_string_error)
{
last_command_exit_value = EXECUTION_FAILURE;
return (REVERSE_LIST (wl, WORD_LIST *));
}
+
+static char *
+parse_compound_assignment (retlenp)
+ int *retlenp;
+{
+ WORD_LIST *wl, *rl;
+ int tok, orig_line_number, orig_token_size, orig_last_token, assignok;
+ char *saved_token, *ret;
+
+ saved_token = token;
+ orig_token_size = token_buffer_size;
+ orig_line_number = line_number;
+ orig_last_token = last_read_token;
+
+ last_read_token = WORD; /* WORD to allow reserved words here */
+
+ token = (char *)NULL;
+ token_buffer_size = 0;
+
+ assignok = parser_state&PST_ASSIGNOK; /* XXX */
+
+ wl = (WORD_LIST *)NULL; /* ( */
+ parser_state |= PST_COMPASSIGN;
+
+ while ((tok = read_token (READ)) != ')')
+ {
+ if (tok == '\n') /* Allow newlines in compound assignments */
+ {
+ if (SHOULD_PROMPT ())
+ prompt_again ();
+ continue;
+ }
+ if (tok != WORD && tok != ASSIGNMENT_WORD)
+ {
+ current_token = tok; /* for error reporting */
+ if (tok == yacc_EOF) /* ( */
+ parser_error (orig_line_number, _("unexpected EOF while looking for matching `)'"));
+ else
+ yyerror(NULL); /* does the right thing */
+ if (wl)
+ dispose_words (wl);
+ wl = &parse_string_error;
+ break;
+ }
+ wl = make_word_list (yylval.word, wl);
+ }
+
+ FREE (token);
+ token = saved_token;
+ token_buffer_size = orig_token_size;
+
+ parser_state &= ~PST_COMPASSIGN;
+
+ if (wl == &parse_string_error)
+ {
+ last_command_exit_value = EXECUTION_FAILURE;
+ last_read_token = '\n'; /* XXX */
+ if (interactive_shell == 0 && posixly_correct)
+ jump_to_top_level (FORCE_EOF);
+ else
+ jump_to_top_level (DISCARD);
+ }
+
+ last_read_token = orig_last_token; /* XXX - was WORD? */
+
+ if (wl)
+ {
+ rl = REVERSE_LIST (wl, WORD_LIST *);
+ ret = string_list (rl);
+ dispose_words (rl);
+ }
+ else
+ ret = (char *)NULL;
+
+ if (retlenp)
+ *retlenp = (ret && *ret) ? strlen (ret) : 0;
+
+ if (assignok)
+ parser_state |= PST_ASSIGNOK;
+
+ return ret;
+}
+
+/************************************************
+ * *
+ * SAVING AND RESTORING PARTIAL PARSE STATE *
+ * *
+ ************************************************/
+
+sh_parser_state_t *
+save_parser_state (ps)
+ sh_parser_state_t *ps;
+{
+#if defined (ARRAY_VARS)
+ SHELL_VAR *v;
+#endif
+
+ if (ps == 0)
+ ps = (sh_parser_state_t *)xmalloc (sizeof (sh_parser_state_t));
+ if (ps == 0)
+ return ((sh_parser_state_t *)NULL);
+
+ ps->parser_state = parser_state;
+ ps->token_state = save_token_state ();
+
+ ps->input_line_terminator = shell_input_line_terminator;
+ ps->eof_encountered = eof_encountered;
+
+ ps->current_command_line_count = current_command_line_count;
+
+#if defined (HISTORY)
+ ps->remember_on_history = remember_on_history;
+# if defined (BANG_HISTORY)
+ ps->history_expansion_inhibited = history_expansion_inhibited;
+# endif
+#endif
+
+ ps->last_command_exit_value = last_command_exit_value;
+#if defined (ARRAY_VARS)
+ v = find_variable ("PIPESTATUS");
+ if (v && array_p (v) && array_cell (v))
+ ps->pipestatus = array_copy (array_cell (v));
+ else
+ ps->pipestatus = (ARRAY *)NULL;
+#endif
+
+ ps->last_shell_builtin = last_shell_builtin;
+ ps->this_shell_builtin = this_shell_builtin;
+
+ ps->expand_aliases = expand_aliases;
+ ps->echo_input_at_read = echo_input_at_read;
+
+ return (ps);
+}
+
+void
+restore_parser_state (ps)
+ sh_parser_state_t *ps;
+{
+#if defined (ARRAY_VARS)
+ SHELL_VAR *v;
+#endif
+
+ if (ps == 0)
+ return;
+
+ parser_state = ps->parser_state;
+ if (ps->token_state)
+ {
+ restore_token_state (ps->token_state);
+ free (ps->token_state);
+ }
+
+ shell_input_line_terminator = ps->input_line_terminator;
+ eof_encountered = ps->eof_encountered;
+
+ current_command_line_count = ps->current_command_line_count;
+
+#if defined (HISTORY)
+ remember_on_history = ps->remember_on_history;
+# if defined (BANG_HISTORY)
+ history_expansion_inhibited = ps->history_expansion_inhibited;
+# endif
+#endif
+
+ last_command_exit_value = ps->last_command_exit_value;
+#if defined (ARRAY_VARS)
+ v = find_variable ("PIPESTATUS");
+ if (v && array_p (v) && array_cell (v))
+ {
+ array_dispose (array_cell (v));
+ var_setarray (v, ps->pipestatus);
+ }
+#endif
+
+ last_shell_builtin = ps->last_shell_builtin;
+ this_shell_builtin = ps->this_shell_builtin;
+
+ expand_aliases = ps->expand_aliases;
+ echo_input_at_read = ps->echo_input_at_read;
+}
+
+/************************************************
+ * *
+ * MULTIBYTE CHARACTER HANDLING *
+ * *
+ ************************************************/
+
+#if defined (HANDLE_MULTIBYTE)
+static void
+set_line_mbstate ()
+{
+ int i, previ, len, c;
+ mbstate_t mbs, prevs;
+ size_t mbclen;
+
+ if (shell_input_line == NULL)
+ return;
+ len = strlen (shell_input_line); /* XXX - shell_input_line_len ? */
+ FREE (shell_input_line_property);
+ shell_input_line_property = (char *)xmalloc (len + 1);
+
+ memset (&prevs, '\0', sizeof (mbstate_t));
+ for (i = previ = 0; i < len; i++)
+ {
+ mbs = prevs;
+
+ c = shell_input_line[i];
+ if (c == EOF)
+ {
+ int j;
+ for (j = i; j < len; j++)
+ shell_input_line_property[j] = 1;
+ break;
+ }
+
+ mbclen = mbrlen (shell_input_line + previ, i - previ + 1, &mbs);
+ if (mbclen == 1 || mbclen == (size_t)-1)
+ {
+ mbclen = 1;
+ previ = i + 1;
+ }
+ else if (mbclen == (size_t)-2)
+ mbclen = 0;
+ else if (mbclen > 1)
+ {
+ mbclen = 0;
+ previ = i + 1;
+ prevs = mbs;
+ }
+ else
+ {
+ /* XXX - what to do if mbrlen returns 0? (null wide character) */
+ int j;
+ for (j = i; j < len; j++)
+ shell_input_line_property[j] = 1;
+ break;
+ }
+
+ shell_input_line_property[i] = mbclen;
+ }
+}
+#endif /* HANDLE_MULTIBYTE */
projects / platform / upstream / bash.git / blobdiff