From 773a93b08d27aca3c9f9469c087a9352f434bf6c Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Thu, 21 Mar 2019 23:29:52 -0500 Subject: [PATCH] Add def foo(@@arg): ...; co-expression syntax --- src/compile.c | 9 + src/compile.h | 1 + src/lexer.c | 1107 ++++++++++++++---------- src/lexer.h | 497 +++++++++-- src/lexer.l | 1 + src/opcode_list.h | 1 + src/parser.c | 2100 +++++++++++++++++++++++---------------------- src/parser.h | 32 +- src/parser.y | 6 + 9 files changed, 2190 insertions(+), 1564 deletions(-) diff --git a/src/compile.c b/src/compile.c index 8ca9e687e7..d68018a58e 100644 --- a/src/compile.c +++ b/src/compile.c @@ -568,6 +568,11 @@ block gen_function(const char* name, block formals, block body) { if (i->op == CLOSURE_PARAM_REGULAR) { i->op = CLOSURE_PARAM; body = gen_var_binding(gen_call(i->symbol, gen_noop()), i->symbol, body); + } else if (i->op == CLOSURE_PARAM_COEXPR) { + i->op = CLOSURE_PARAM; + block coexp = gen_function(i->symbol, gen_noop(), BLOCK(gen_op_unbound(LOADV,i->symbol), gen_call("fhread", gen_noop()))); + block_bind_subblock(coexp, body, OP_IS_CALL_PSEUDO | OP_HAS_BINDING, 0); + body = gen_var_binding(gen_call("coexp", gen_lambda(gen_call(i->symbol, gen_noop()))), i->symbol, BLOCK(coexp, body)); } block_bind_subblock(inst_block(i), body, OP_IS_CALL_PSEUDO | OP_HAS_BINDING, 0); } @@ -581,6 +586,10 @@ block gen_function(const char* name, block formals, block body) { return b; } +block gen_param_coexpr(const char* name) { + return gen_op_unbound(CLOSURE_PARAM_COEXPR, name); +} + block gen_param_regular(const char* name) { return gen_op_unbound(CLOSURE_PARAM_REGULAR, name); } diff --git a/src/compile.h b/src/compile.h index c02afb3e2a..184331c611 100644 --- a/src/compile.h +++ b/src/compile.h @@ -37,6 +37,7 @@ block gen_import(const char* name, const char *as, int is_data); block gen_import_meta(block import, block metadata); block gen_function(const char* name, block formals, block body); block gen_param_regular(const char* name); +block gen_param_coexpr(const char* name); block gen_param(const char* name); block gen_lambda(block body); block gen_call(const char* name, block body); diff --git a/src/lexer.c b/src/lexer.c index b9baf3abb3..46a6620172 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -9,11 +9,245 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 0 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define jq_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer jq_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define jq_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer jq_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define jq_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer jq_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define jq_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string jq_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define jq_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes jq_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define jq_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer jq_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define jq_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer jq_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define jq_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state jq_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define jq_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer jq_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define jq_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state jq_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define jq_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state jq_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define jq_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack jq_yyensure_buffer_stack +#endif + +#ifdef yylex +#define jq_yylex_ALREADY_DEFINED +#else +#define yylex jq_yylex +#endif + +#ifdef yyrestart +#define jq_yyrestart_ALREADY_DEFINED +#else +#define yyrestart jq_yyrestart +#endif + +#ifdef yylex_init +#define jq_yylex_init_ALREADY_DEFINED +#else +#define yylex_init jq_yylex_init +#endif + +#ifdef yylex_init_extra +#define jq_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra jq_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define jq_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy jq_yylex_destroy +#endif + +#ifdef yyget_debug +#define jq_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug jq_yyget_debug +#endif + +#ifdef yyset_debug +#define jq_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug jq_yyset_debug +#endif + +#ifdef yyget_extra +#define jq_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra jq_yyget_extra +#endif + +#ifdef yyset_extra +#define jq_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra jq_yyset_extra +#endif + +#ifdef yyget_in +#define jq_yyget_in_ALREADY_DEFINED +#else +#define yyget_in jq_yyget_in +#endif + +#ifdef yyset_in +#define jq_yyset_in_ALREADY_DEFINED +#else +#define yyset_in jq_yyset_in +#endif + +#ifdef yyget_out +#define jq_yyget_out_ALREADY_DEFINED +#else +#define yyget_out jq_yyget_out +#endif + +#ifdef yyset_out +#define jq_yyset_out_ALREADY_DEFINED +#else +#define yyset_out jq_yyset_out +#endif + +#ifdef yyget_leng +#define jq_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng jq_yyget_leng +#endif + +#ifdef yyget_text +#define jq_yyget_text_ALREADY_DEFINED +#else +#define yyget_text jq_yyget_text +#endif + +#ifdef yyget_lineno +#define jq_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno jq_yyget_lineno +#endif + +#ifdef yyset_lineno +#define jq_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno jq_yyset_lineno +#endif + +#ifdef yyget_column +#define jq_yyget_column_ALREADY_DEFINED +#else +#define yyget_column jq_yyget_column +#endif + +#ifdef yyset_column +#define jq_yyset_column_ALREADY_DEFINED +#else +#define yyset_column jq_yyset_column +#endif + +#ifdef yywrap +#define jq_yywrap_ALREADY_DEFINED +#else +#define yywrap jq_yywrap +#endif + +#ifdef yyget_lval +#define jq_yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval jq_yyget_lval +#endif + +#ifdef yyset_lval +#define jq_yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval jq_yyset_lval +#endif + +#ifdef yyget_lloc +#define jq_yyget_lloc_ALREADY_DEFINED +#else +#define yyget_lloc jq_yyget_lloc +#endif + +#ifdef yyset_lloc +#define jq_yyset_lloc_ALREADY_DEFINED +#else +#define yyset_lloc jq_yyset_lloc +#endif + +#ifdef yyalloc +#define jq_yyalloc_ALREADY_DEFINED +#else +#define yyalloc jq_yyalloc +#endif + +#ifdef yyrealloc +#define jq_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc jq_yyrealloc +#endif + +#ifdef yyfree +#define jq_yyfree_ALREADY_DEFINED +#else +#define yyfree jq_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -84,40 +318,32 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST +/* begin standard C++ headers. */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* An opaque pointer. */ #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -141,20 +367,16 @@ typedef void* yyscan_t; * definition of BEGIN. */ #define BEGIN yyg->yy_start = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START ((yyg->yy_start - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE jq_yyrestart(yyin ,yyscanner ) - +#define YY_NEW_FILE yyrestart( yyin , yyscanner ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -187,7 +409,7 @@ typedef size_t yy_size_t; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -204,7 +426,6 @@ typedef size_t yy_size_t; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -219,7 +440,7 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. @@ -247,7 +468,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -264,7 +485,7 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via jq_yyrestart()), so that the user can continue scanning by + * (via yyrestart()), so that the user can continue scanning by * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -281,89 +502,79 @@ struct yy_buffer_state #define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] -void jq_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void jq_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void jq_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void jq_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void jq_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void jq_yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -static void jq_yyensure_buffer_stack (yyscan_t yyscanner ); -static void jq_yy_load_buffer_state (yyscan_t yyscanner ); -static void jq_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); +static void yyensure_buffer_stack ( yyscan_t yyscanner ); +static void yy_load_buffer_state ( yyscan_t yyscanner ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) -#define YY_FLUSH_BUFFER jq_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); - -void *jq_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *jq_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void jq_yyfree (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer jq_yy_create_buffer +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ - jq_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - jq_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ - jq_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - jq_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ #define jq_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; typedef int yy_state_type; #define yytext_ptr yytext_r -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -#if defined(__GNUC__) && __GNUC__ >= 3 -__attribute__((__noreturn__)) -#endif -static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); +static yy_state_type yy_get_previous_state ( yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state , yyscan_t yyscanner); +static int yy_get_next_buffer ( yyscan_t yyscanner ); +static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 50 -#define YY_END_OF_BUFFER 51 +#define YY_NUM_RULES 51 +#define YY_END_OF_BUFFER 52 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -371,28 +582,28 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[157] = +static const flex_int16_t yy_accept[158] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 51, 49, 48, 48, 49, 40, 1, 35, - 35, 36, 37, 35, 35, 35, 35, 35, 39, 35, - 35, 35, 35, 49, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 35, 44, - 44, 42, 45, 48, 2, 1, 29, 27, 25, 26, - 33, 39, 47, 47, 18, 28, 0, 31, 3, 32, - 0, 38, 46, 0, 46, 46, 4, 46, 46, 46, - 46, 46, 46, 9, 46, 46, 46, 46, 14, 46, - 46, 46, 24, 44, 43, 41, 43, 47, 0, 39, - - 30, 39, 34, 0, 46, 13, 46, 46, 8, 46, - 46, 15, 46, 46, 46, 46, 46, 46, 46, 19, - 0, 43, 46, 46, 46, 46, 12, 11, 46, 46, - 46, 46, 46, 46, 10, 43, 46, 22, 20, 46, - 46, 46, 21, 46, 46, 43, 46, 46, 5, 46, - 7, 16, 23, 17, 6, 0 + 0, 0, 52, 50, 49, 49, 50, 41, 1, 36, + 36, 37, 38, 36, 36, 36, 36, 36, 40, 36, + 36, 36, 36, 50, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 36, 45, + 45, 43, 46, 49, 2, 1, 29, 27, 25, 26, + 33, 40, 48, 48, 18, 28, 0, 31, 3, 32, + 0, 39, 35, 47, 0, 47, 47, 4, 47, 47, + 47, 47, 47, 47, 9, 47, 47, 47, 47, 14, + 47, 47, 47, 24, 45, 44, 42, 44, 48, 0, + + 40, 30, 40, 34, 0, 47, 13, 47, 47, 8, + 47, 47, 15, 47, 47, 47, 47, 47, 47, 47, + 19, 0, 44, 47, 47, 47, 47, 12, 11, 47, + 47, 47, 47, 47, 47, 10, 44, 47, 22, 20, + 47, 47, 47, 21, 47, 47, 44, 47, 47, 5, + 47, 7, 16, 23, 17, 6, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -424,106 +635,107 @@ static yyconst YY_CHAR yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst YY_CHAR yy_meta[54] = +static const YY_CHAR yy_meta[54] = { 0, 1, 1, 2, 2, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 5, 6, 1, - 1, 1, 1, 1, 1, 7, 7, 1, 8, 1, - 9, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 1, 1, 1, 1, 7, 8, 8, 1, 9, 1, + 10, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[170] = +static const flex_int16_t yy_base[171] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 51, 52, 320, 321, 57, 59, 297, 321, 0, 321, - 296, 321, 321, 295, 294, 293, 47, 47, 50, 292, - 291, 290, 294, 0, 291, 48, 51, 53, 52, 37, - 59, 57, 66, 56, 63, 68, 70, 72, 287, 0, - 0, 321, 80, 90, 321, 0, 321, 321, 321, 321, - 95, 99, 0, 106, 286, 321, 110, 321, 321, 321, - 290, 0, 285, 281, 86, 77, 277, 97, 101, 111, - 113, 115, 117, 274, 119, 120, 118, 121, 270, 122, - 123, 124, 321, 0, 257, 321, 255, 0, 254, 249, - - 321, 245, 321, 0, 125, 239, 126, 127, 237, 128, - 134, 234, 136, 143, 147, 148, 149, 152, 154, 232, - 165, 212, 210, 157, 159, 158, 209, 208, 160, 161, - 162, 163, 164, 166, 207, 196, 171, 205, 204, 174, - 167, 175, 201, 170, 176, 190, 190, 184, 199, 194, - 198, 197, 85, 78, 76, 321, 230, 239, 245, 250, - 255, 264, 273, 278, 283, 285, 290, 294, 298 + 51, 52, 327, 328, 57, 59, 304, 328, 0, 328, + 303, 328, 328, 302, 301, 300, 47, 47, 50, 299, + 298, 297, 299, 290, 292, 48, 51, 53, 52, 37, + 59, 57, 66, 56, 63, 68, 70, 72, 288, 0, + 0, 328, 80, 90, 328, 0, 328, 328, 328, 328, + 95, 99, 0, 106, 284, 328, 110, 328, 328, 328, + 288, 277, 328, 279, 278, 86, 77, 275, 97, 101, + 111, 113, 115, 117, 273, 119, 120, 118, 121, 272, + 122, 123, 124, 328, 0, 249, 328, 243, 0, 250, + + 248, 328, 244, 328, 0, 125, 240, 126, 127, 237, + 128, 134, 235, 136, 143, 147, 148, 149, 152, 154, + 234, 165, 213, 210, 157, 159, 158, 209, 208, 160, + 161, 162, 163, 164, 166, 207, 196, 171, 205, 204, + 174, 167, 175, 201, 170, 176, 190, 190, 184, 199, + 194, 198, 197, 85, 78, 76, 328, 230, 240, 247, + 253, 259, 269, 279, 285, 291, 293, 299, 304, 309 } ; -static yyconst flex_int16_t yy_def[170] = +static const flex_int16_t yy_def[171] = { 0, - 156, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 157, 157, 156, 156, 156, 156, 156, 156, 158, 156, - 156, 156, 156, 156, 156, 156, 159, 156, 156, 156, - 156, 156, 156, 160, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 156, 162, - 162, 156, 163, 156, 156, 158, 156, 156, 156, 156, - 156, 156, 164, 164, 156, 156, 156, 156, 156, 156, - 156, 160, 161, 156, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 156, 162, 156, 156, 165, 164, 156, 164, - - 156, 156, 156, 166, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 163, 167, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 168, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 169, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 0, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156 + 157, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 158, 158, 157, 157, 157, 157, 157, 157, 159, 157, + 157, 157, 157, 157, 157, 157, 160, 157, 157, 157, + 157, 157, 157, 161, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 157, 163, + 163, 157, 164, 157, 157, 159, 157, 157, 157, 157, + 157, 157, 165, 165, 157, 157, 157, 157, 157, 157, + 157, 161, 157, 162, 157, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 157, 163, 157, 157, 166, 165, 157, + + 165, 157, 157, 157, 167, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 164, 168, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 169, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 170, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 0, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157 } ; -static yyconst flex_uint16_t yy_nxt[375] = +static const flex_int16_t yy_nxt[382] = { 0, 14, 15, 16, 14, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 26, 27, 28, 29, 20, 20, 30, 31, 32, 33, 34, 35, 35, 22, 14, 23, 36, 37, 38, 39, 40, 41, 42, 35, 43, 35, 44, 45, 35, 46, 35, 47, 35, 48, 35, 35, - 22, 49, 23, 51, 51, 74, 52, 52, 54, 54, - 54, 54, 61, 65, 62, 62, 74, 62, 66, 74, - 74, 74, 80, 64, 74, 74, 67, 74, 75, 53, - 53, 74, 64, 79, 74, 67, 74, 87, 74, 96, - 74, 54, 54, 76, 74, 74, 74, 77, 78, 81, - - 83, 82, 84, 74, 74, 90, 88, 85, 86, 91, - 62, 106, 62, 89, 62, 74, 62, 92, 99, 74, - 99, 67, 99, 100, 99, 67, 105, 102, 97, 74, - 67, 74, 107, 74, 67, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 109, 108, 112, - 116, 110, 74, 115, 74, 117, 118, 125, 119, 111, - 126, 74, 113, 114, 127, 74, 74, 74, 124, 128, - 74, 129, 74, 120, 156, 74, 74, 74, 74, 74, - 74, 74, 74, 132, 74, 74, 130, 131, 74, 74, - 137, 140, 74, 74, 74, 139, 135, 133, 138, 145, - - 134, 147, 74, 143, 144, 151, 141, 148, 74, 150, - 142, 152, 74, 97, 149, 74, 74, 74, 121, 74, - 153, 154, 74, 74, 121, 74, 74, 74, 74, 155, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 56, - 121, 56, 56, 56, 56, 56, 56, 56, 63, 63, - 74, 63, 74, 63, 72, 74, 72, 74, 72, 73, - 73, 73, 102, 73, 94, 94, 100, 94, 94, 94, - 94, 102, 94, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 98, 121, 98, 121, 98, 122, 74, 122, - 122, 123, 74, 123, 136, 74, 136, 136, 146, 104, - - 146, 146, 95, 74, 95, 95, 103, 101, 93, 74, - 71, 70, 69, 68, 60, 59, 58, 57, 55, 156, - 13, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156 + 22, 49, 23, 51, 51, 75, 52, 52, 54, 54, + 54, 54, 61, 65, 62, 62, 75, 62, 66, 75, + 75, 75, 81, 64, 75, 75, 67, 75, 76, 53, + 53, 75, 64, 80, 75, 67, 75, 88, 75, 97, + 75, 54, 54, 77, 75, 75, 75, 78, 79, 82, + + 84, 83, 85, 75, 75, 91, 89, 86, 87, 92, + 62, 107, 62, 90, 62, 75, 62, 93, 100, 75, + 100, 67, 100, 101, 100, 67, 106, 103, 98, 75, + 67, 75, 108, 75, 67, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 110, 109, 113, + 117, 111, 75, 116, 75, 118, 119, 126, 120, 112, + 127, 75, 114, 115, 128, 75, 75, 75, 125, 129, + 75, 130, 75, 121, 157, 75, 75, 75, 75, 75, + 75, 75, 75, 133, 75, 75, 131, 132, 75, 75, + 138, 141, 75, 75, 75, 140, 136, 134, 139, 146, + + 135, 148, 75, 144, 145, 152, 142, 149, 75, 151, + 143, 153, 75, 98, 150, 75, 75, 75, 122, 75, + 154, 155, 75, 75, 122, 75, 75, 75, 75, 156, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 56, 122, 56, 56, 56, 56, 56, 56, 56, 56, + 63, 63, 75, 75, 63, 75, 63, 72, 75, 72, + 72, 103, 72, 74, 74, 101, 74, 103, 74, 95, + 95, 122, 95, 95, 95, 95, 95, 122, 95, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 99, + 75, 75, 99, 75, 99, 123, 105, 75, 123, 123, + + 124, 157, 124, 137, 104, 102, 137, 137, 147, 94, + 75, 147, 147, 96, 73, 71, 96, 96, 70, 69, + 68, 60, 59, 58, 57, 55, 157, 13, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157 } ; -static yyconst flex_int16_t yy_chk[375] = +static const flex_int16_t yy_chk[382] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -534,38 +746,39 @@ static yyconst flex_int16_t yy_chk[375] = 16, 16, 27, 28, 27, 29, 36, 29, 28, 37, 39, 38, 40, 27, 44, 42, 29, 41, 36, 11, 12, 45, 27, 39, 43, 29, 46, 44, 47, 53, - 48, 54, 54, 37, 155, 76, 154, 37, 38, 41, - - 42, 41, 43, 153, 75, 47, 45, 43, 43, 48, - 61, 76, 61, 46, 62, 78, 62, 48, 64, 79, - 64, 61, 67, 64, 67, 62, 75, 67, 53, 80, - 61, 81, 78, 82, 62, 83, 87, 85, 86, 88, - 90, 91, 92, 105, 107, 108, 110, 80, 79, 82, - 87, 81, 111, 86, 113, 88, 90, 107, 91, 81, - 108, 114, 83, 85, 110, 115, 116, 117, 105, 111, - 118, 113, 119, 92, 121, 124, 126, 125, 129, 130, - 131, 132, 133, 116, 134, 141, 114, 115, 144, 137, - 124, 129, 140, 142, 145, 126, 119, 117, 125, 134, - - 118, 137, 148, 132, 133, 144, 130, 140, 147, 142, - 131, 145, 150, 121, 141, 152, 151, 149, 146, 143, - 147, 148, 139, 138, 136, 135, 128, 127, 123, 150, - 157, 157, 157, 157, 157, 157, 157, 157, 157, 158, - 122, 158, 158, 158, 158, 158, 158, 158, 159, 159, - 120, 159, 112, 159, 160, 109, 160, 106, 160, 161, - 161, 161, 102, 161, 162, 162, 100, 162, 162, 162, - 162, 99, 162, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 164, 97, 164, 95, 164, 165, 89, 165, - 165, 166, 84, 166, 167, 77, 167, 167, 168, 74, - - 168, 168, 169, 73, 169, 169, 71, 65, 49, 35, - 33, 32, 31, 30, 26, 25, 24, 21, 17, 13, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156 + 48, 54, 54, 37, 156, 77, 155, 37, 38, 41, + + 42, 41, 43, 154, 76, 47, 45, 43, 43, 48, + 61, 77, 61, 46, 62, 79, 62, 48, 64, 80, + 64, 61, 67, 64, 67, 62, 76, 67, 53, 81, + 61, 82, 79, 83, 62, 84, 88, 86, 87, 89, + 91, 92, 93, 106, 108, 109, 111, 81, 80, 83, + 88, 82, 112, 87, 114, 89, 91, 108, 92, 82, + 109, 115, 84, 86, 111, 116, 117, 118, 106, 112, + 119, 114, 120, 93, 122, 125, 127, 126, 130, 131, + 132, 133, 134, 117, 135, 142, 115, 116, 145, 138, + 125, 130, 141, 143, 146, 127, 120, 118, 126, 135, + + 119, 138, 149, 133, 134, 145, 131, 141, 148, 143, + 132, 146, 151, 122, 142, 153, 152, 150, 147, 144, + 148, 149, 140, 139, 137, 136, 129, 128, 124, 151, + 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 159, 123, 159, 159, 159, 159, 159, 159, 159, 159, + 160, 160, 121, 113, 160, 110, 160, 161, 107, 161, + 161, 103, 161, 162, 162, 101, 162, 100, 162, 163, + 163, 98, 163, 163, 163, 163, 163, 96, 163, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 165, + 90, 85, 165, 78, 165, 166, 75, 74, 166, 166, + + 167, 72, 167, 168, 71, 65, 168, 168, 169, 49, + 35, 169, 169, 170, 34, 33, 170, 170, 32, 31, + 30, 26, 25, 24, 21, 17, 13, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157 } ; /* The intent behind this definition is that it'll catch @@ -587,21 +800,19 @@ struct lexer_param; #define YY_USER_ACTION \ do { \ - yylloc->start = jq_yyget_extra(yyscanner); \ + yylloc->start = yyget_extra(yyscanner); \ yylloc->end = yylloc->start + yyleng; \ - jq_yyset_extra(yylloc->end,yyscanner); \ + yyset_extra(yylloc->end, yyscanner); \ } while (0); - - - - +#line 809 "src/lexer.c" #line 25 "src/lexer.l" static int enter(int opening, int state, yyscan_t yyscanner); static int try_exit(int closing, int state, yyscan_t yyscanner); +#line 814 "src/lexer.c" #define YY_NO_INPUT 1 -#line 605 "src/lexer.c" +#line 816 "src/lexer.c" #define INITIAL 0 #define IN_PAREN 1 @@ -634,7 +845,7 @@ struct yyguts_t YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; int yy_n_chars; - yy_size_t yyleng_r; + int yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -658,7 +869,7 @@ struct yyguts_t }; /* end struct yyguts_t */ -static int yy_init_globals (yyscan_t yyscanner ); +static int yy_init_globals ( yyscan_t yyscanner ); /* This must go here because YYSTYPE and YYLTYPE are included * from bison output in section 1.*/ @@ -666,50 +877,50 @@ static int yy_init_globals (yyscan_t yyscanner ); # define yylloc yyg->yylloc_r -int jq_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int jq_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int jq_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int jq_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void jq_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE jq_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void jq_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *jq_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void jq_yyset_in (FILE * _in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *jq_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void jq_yyset_out (FILE * _out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t jq_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *jq_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int jq_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void jq_yyset_lineno (int _line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int jq_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void jq_yyset_column (int _column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * jq_yyget_lval (yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - YYLTYPE *jq_yyget_lloc (yyscan_t yyscanner ); + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - void jq_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -717,9 +928,9 @@ void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int jq_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int jq_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif @@ -728,28 +939,27 @@ extern int jq_yywrap (yyscan_t yyscanner ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); +static int yyinput ( yyscan_t yyscanner ); #else -static int input (yyscan_t yyscanner ); +static int input ( yyscan_t yyscanner ); #endif #endif - static void yy_push_state (int _new_state ,yyscan_t yyscanner); + static void yy_push_state ( int _new_state , yyscan_t yyscanner); - static void yy_pop_state (yyscan_t yyscanner ); + static void yy_pop_state ( yyscan_t yyscanner ); - static int yy_top_state (yyscan_t yyscanner ); + static int yy_top_state ( yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE @@ -766,7 +976,7 @@ static int input (yyscan_t yyscanner ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -777,7 +987,7 @@ static int input (yyscan_t yyscanner ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -790,7 +1000,7 @@ static int input (yyscan_t yyscanner ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -831,10 +1041,10 @@ static int input (yyscan_t yyscanner ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int jq_yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); +extern int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); -#define YY_DECL int jq_yylex \ +#define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) #endif /* !YY_DECL */ @@ -884,19 +1094,19 @@ YY_DECL yyout = stdout; if ( ! YY_CURRENT_BUFFER ) { - jq_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - jq_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - jq_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } { #line 38 "src/lexer.l" -#line 900 "src/lexer.c" +#line 1110 "src/lexer.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -923,13 +1133,13 @@ YY_DECL while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 157 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 158 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 321 ); + while ( yy_base[yy_current_state] != 328 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1126,64 +1336,69 @@ YY_RULE_SETUP case 35: YY_RULE_SETUP #line 75 "src/lexer.l" -{ return yytext[0];} +{ return COEXPR; } YY_BREAK case 36: YY_RULE_SETUP -#line 77 "src/lexer.l" +#line 76 "src/lexer.l" +{ return yytext[0];} + YY_BREAK +case 37: +YY_RULE_SETUP +#line 78 "src/lexer.l" { return enter(yytext[0], YY_START, yyscanner); } YY_BREAK -case 37: +case 38: YY_RULE_SETUP -#line 81 "src/lexer.l" +#line 82 "src/lexer.l" { return try_exit(yytext[0], YY_START, yyscanner); } YY_BREAK -case 38: +case 39: YY_RULE_SETUP -#line 85 "src/lexer.l" +#line 86 "src/lexer.l" { yylval->literal = jv_string_sized(yytext + 1, yyleng - 1); return FORMAT; } YY_BREAK -case 39: +case 40: YY_RULE_SETUP -#line 89 "src/lexer.l" +#line 90 "src/lexer.l" { yylval->literal = jv_parse_sized(yytext, yyleng); return LITERAL; } YY_BREAK -case 40: +case 41: YY_RULE_SETUP -#line 93 "src/lexer.l" +#line 94 "src/lexer.l" { yy_push_state(IN_QQSTRING, yyscanner); return QQSTRING_START; } YY_BREAK -case 41: +case 42: YY_RULE_SETUP -#line 99 "src/lexer.l" +#line 100 "src/lexer.l" { return enter(QQSTRING_INTERP_START, YY_START, yyscanner); } YY_BREAK -case 42: +case 43: YY_RULE_SETUP -#line 102 "src/lexer.l" +#line 103 "src/lexer.l" { yy_pop_state(yyscanner); return QQSTRING_END; } YY_BREAK -case 43: -/* rule 43 can match eol */ +case 44: +/* rule 44 can match eol */ YY_RULE_SETUP -#line 106 "src/lexer.l" +#line 107 "src/lexer.l" { /* pass escapes to the json parser */ jv escapes = jv_string_fmt("\"%.*s\"", (int)yyleng, yytext); @@ -1192,50 +1407,50 @@ YY_RULE_SETUP return QQSTRING_TEXT; } YY_BREAK -case 44: -/* rule 44 can match eol */ +case 45: +/* rule 45 can match eol */ YY_RULE_SETUP -#line 113 "src/lexer.l" +#line 114 "src/lexer.l" { yylval->literal = jv_string_sized(yytext, yyleng); return QQSTRING_TEXT; } YY_BREAK -case 45: +case 46: YY_RULE_SETUP -#line 117 "src/lexer.l" +#line 118 "src/lexer.l" { return INVALID_CHARACTER; } YY_BREAK -case 46: +case 47: YY_RULE_SETUP -#line 123 "src/lexer.l" +#line 124 "src/lexer.l" { yylval->literal = jv_string(yytext); return IDENT;} YY_BREAK -case 47: +case 48: YY_RULE_SETUP -#line 124 "src/lexer.l" +#line 125 "src/lexer.l" { yylval->literal = jv_string(yytext+1); return FIELD;} YY_BREAK -case 48: -/* rule 48 can match eol */ +case 49: +/* rule 49 can match eol */ YY_RULE_SETUP -#line 126 "src/lexer.l" +#line 127 "src/lexer.l" {} YY_BREAK -case 49: +case 50: YY_RULE_SETUP -#line 128 "src/lexer.l" +#line 129 "src/lexer.l" { return INVALID_CHARACTER; } YY_BREAK -case 50: +case 51: YY_RULE_SETUP -#line 130 "src/lexer.l" +#line 131 "src/lexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1239 "src/lexer.c" +#line 1454 "src/lexer.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(IN_PAREN): case YY_STATE_EOF(IN_BRACKET): @@ -1258,7 +1473,7 @@ case YY_STATE_EOF(IN_QQSTRING): /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called - * jq_yylex(). If so, then we have to assure + * yylex(). If so, then we have to assure * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a @@ -1318,7 +1533,7 @@ case YY_STATE_EOF(IN_QQSTRING): { yyg->yy_did_buffer_switch_on_eof = 0; - if ( jq_yywrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1372,7 +1587,7 @@ case YY_STATE_EOF(IN_QQSTRING): } /* end of action switch */ } /* end of scanning one token */ } /* end of user's declarations */ -} /* end of jq_yylex */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1386,7 +1601,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = yyg->yytext_ptr; - yy_size_t number_to_move, i; + int number_to_move, i; int ret_val; if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) @@ -1415,7 +1630,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1428,7 +1643,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1442,7 +1657,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1451,11 +1666,12 @@ static int yy_get_next_buffer (yyscan_t yyscanner) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - jq_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1483,7 +1699,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - jq_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); } else @@ -1497,12 +1713,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((int) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) jq_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } yyg->yy_n_chars += number_to_move; @@ -1535,10 +1754,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 157 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 158 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -1564,11 +1783,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 157 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 158 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 156); + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_is_jam = (yy_current_state == 157); (void)yyg; return yy_is_jam ? 0 : yy_current_state; @@ -1603,7 +1822,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1620,14 +1839,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ /* Reset buffer status. */ - jq_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( jq_yywrap(yyscanner ) ) - return EOF; + if ( yywrap( yyscanner ) ) + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -1658,34 +1877,34 @@ static int yy_get_next_buffer (yyscan_t yyscanner) * @param yyscanner The scanner object. * @note This function does not reset the start condition to @c INITIAL . */ - void jq_yyrestart (FILE * input_file , yyscan_t yyscanner) + void yyrestart (FILE * input_file , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! YY_CURRENT_BUFFER ){ - jq_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - jq_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - jq_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - jq_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @param yyscanner The scanner object. */ - void jq_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* TODO. We should be able to replace this entire function body * with - * jq_yypop_buffer_state(); - * jq_yypush_buffer_state(new_buffer); + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - jq_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); if ( YY_CURRENT_BUFFER == new_buffer ) return; @@ -1698,17 +1917,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - jq_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); /* We don't actually know whether we did this switch during - * EOF (jq_yywrap()) processing, but the only time this flag - * is looked at is after jq_yywrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ yyg->yy_did_buffer_switch_on_eof = 1; } -static void jq_yy_load_buffer_state (yyscan_t yyscanner) +static void yy_load_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; @@ -1723,35 +1942,35 @@ static void jq_yy_load_buffer_state (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the allocated buffer state. */ - YY_BUFFER_STATE jq_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) jq_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in jq_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = (yy_size_t)size; + b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) jq_yyalloc(b->yy_buf_size + 2 ,yyscanner ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in jq_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - jq_yy_init_buffer(b,file ,yyscanner); + yy_init_buffer( b, file , yyscanner); return b; } /** Destroy the buffer. - * @param b a buffer created with jq_yy_create_buffer() + * @param b a buffer created with yy_create_buffer() * @param yyscanner The scanner object. */ - void jq_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -1762,28 +1981,28 @@ static void jq_yy_load_buffer_state (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - jq_yyfree((void *) b->yy_ch_buf ,yyscanner ); + yyfree( (void *) b->yy_ch_buf , yyscanner ); - jq_yyfree((void *) b ,yyscanner ); + yyfree( (void *) b , yyscanner ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a jq_yyrestart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void jq_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) { int oerrno = errno; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - jq_yy_flush_buffer(b ,yyscanner); + yy_flush_buffer( b , yyscanner); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then jq_yy_init_buffer was _probably_ - * called from jq_yyrestart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -1800,7 +2019,7 @@ static void jq_yy_load_buffer_state (yyscan_t yyscanner) * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * @param yyscanner The scanner object. */ - void jq_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! b ) @@ -1821,7 +2040,7 @@ static void jq_yy_load_buffer_state (yyscan_t yyscanner) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - jq_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } /** Pushes the new state onto the stack. The new state becomes @@ -1830,15 +2049,15 @@ static void jq_yy_load_buffer_state (yyscan_t yyscanner) * @param new_buffer The new state. * @param yyscanner The scanner object. */ -void jq_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (new_buffer == NULL) return; - jq_yyensure_buffer_stack(yyscanner); + yyensure_buffer_stack(yyscanner); - /* This block is copied from jq_yy_switch_to_buffer. */ + /* This block is copied from yy_switch_to_buffer. */ if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ @@ -1852,8 +2071,8 @@ void jq_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) yyg->yy_buffer_stack_top++; YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from jq_yy_switch_to_buffer. */ - jq_yy_load_buffer_state(yyscanner ); + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } @@ -1861,19 +2080,19 @@ void jq_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) * The next element becomes the new top. * @param yyscanner The scanner object. */ -void jq_yypop_buffer_state (yyscan_t yyscanner) +void yypop_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!YY_CURRENT_BUFFER) return; - jq_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); YY_CURRENT_BUFFER_LVALUE = NULL; if (yyg->yy_buffer_stack_top > 0) --yyg->yy_buffer_stack_top; if (YY_CURRENT_BUFFER) { - jq_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } } @@ -1881,7 +2100,7 @@ void jq_yypop_buffer_state (yyscan_t yyscanner) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void jq_yyensure_buffer_stack (yyscan_t yyscanner) +static void yyensure_buffer_stack (yyscan_t yyscanner) { yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -1892,15 +2111,15 @@ static void jq_yyensure_buffer_stack (yyscan_t yyscanner) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - yyg->yy_buffer_stack = (struct yy_buffer_state**)jq_yyalloc + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in jq_yyensure_buffer_stack()" ); - + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; @@ -1912,12 +2131,12 @@ static void jq_yyensure_buffer_stack (yyscan_t yyscanner) yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)jq_yyrealloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc (yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in jq_yyensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -1929,9 +2148,9 @@ static void jq_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE jq_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; @@ -1939,69 +2158,69 @@ YY_BUFFER_STATE jq_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yysc base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) jq_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in jq_yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - jq_yy_switch_to_buffer(b ,yyscanner ); + yy_switch_to_buffer( b , yyscanner ); return b; } -/** Setup the input buffer state to scan a string. The next call to jq_yylex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * jq_yy_scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE jq_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) { - return jq_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); + return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); } -/** Setup the input buffer state to scan the given bytes. The next call to jq_yylex() will +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) jq_yyalloc(n ,yyscanner ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n , yyscanner ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in jq_yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); for ( i = 0; i < _yybytes_len; ++i ) buf[i] = yybytes[i]; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = jq_yy_scan_buffer(buf,n ,yyscanner); + b = yy_scan_buffer( buf, n , yyscanner); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in jq_yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -2019,13 +2238,14 @@ YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l yy_size_t new_size; yyg->yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yyg->yy_start_stack_depth * sizeof( int ); + new_size = (yy_size_t) yyg->yy_start_stack_depth * sizeof( int ); if ( ! yyg->yy_start_stack ) - yyg->yy_start_stack = (int *) jq_yyalloc(new_size ,yyscanner ); + yyg->yy_start_stack = (int *) yyalloc( new_size , yyscanner ); else - yyg->yy_start_stack = (int *) jq_yyrealloc((void *) yyg->yy_start_stack,new_size ,yyscanner ); + yyg->yy_start_stack = (int *) yyrealloc( + (void *) yyg->yy_start_stack, new_size , yyscanner ); if ( ! yyg->yy_start_stack ) YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); @@ -2055,11 +2275,11 @@ YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_l #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2085,7 +2305,7 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) /** Get the user-defined data for this scanner. * @param yyscanner The scanner object. */ -YY_EXTRA_TYPE jq_yyget_extra (yyscan_t yyscanner) +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyextra; @@ -2094,10 +2314,10 @@ YY_EXTRA_TYPE jq_yyget_extra (yyscan_t yyscanner) /** Get the current line number. * @param yyscanner The scanner object. */ -int jq_yyget_lineno (yyscan_t yyscanner) +int yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2107,10 +2327,10 @@ int jq_yyget_lineno (yyscan_t yyscanner) /** Get the current column number. * @param yyscanner The scanner object. */ -int jq_yyget_column (yyscan_t yyscanner) +int yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2120,7 +2340,7 @@ int jq_yyget_column (yyscan_t yyscanner) /** Get the input stream. * @param yyscanner The scanner object. */ -FILE *jq_yyget_in (yyscan_t yyscanner) +FILE *yyget_in (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyin; @@ -2129,7 +2349,7 @@ FILE *jq_yyget_in (yyscan_t yyscanner) /** Get the output stream. * @param yyscanner The scanner object. */ -FILE *jq_yyget_out (yyscan_t yyscanner) +FILE *yyget_out (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyout; @@ -2138,7 +2358,7 @@ FILE *jq_yyget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -yy_size_t jq_yyget_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -2148,7 +2368,7 @@ yy_size_t jq_yyget_leng (yyscan_t yyscanner) * @param yyscanner The scanner object. */ -char *jq_yyget_text (yyscan_t yyscanner) +char *yyget_text (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yytext; @@ -2158,7 +2378,7 @@ char *jq_yyget_text (yyscan_t yyscanner) * @param user_defined The data to be associated with this scanner. * @param yyscanner The scanner object. */ -void jq_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyextra = user_defined ; @@ -2168,13 +2388,13 @@ void jq_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) * @param _line_number line number * @param yyscanner The scanner object. */ -void jq_yyset_lineno (int _line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "jq_yyset_lineno called with no buffer" ); + YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); yylineno = _line_number; } @@ -2183,13 +2403,13 @@ void jq_yyset_lineno (int _line_number , yyscan_t yyscanner) * @param _column_no column number * @param yyscanner The scanner object. */ -void jq_yyset_column (int _column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "jq_yyset_column called with no buffer" ); + YY_FATAL_ERROR( "yyset_column called with no buffer" ); yycolumn = _column_no; } @@ -2198,27 +2418,27 @@ void jq_yyset_column (int _column_no , yyscan_t yyscanner) * input buffer. * @param _in_str A readable stream. * @param yyscanner The scanner object. - * @see jq_yy_switch_to_buffer + * @see yy_switch_to_buffer */ -void jq_yyset_in (FILE * _in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyin = _in_str ; } -void jq_yyset_out (FILE * _out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyout = _out_str ; } -int jq_yyget_debug (yyscan_t yyscanner) +int yyget_debug (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yy_flex_debug; } -void jq_yyset_debug (int _bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_flex_debug = _bdebug ; @@ -2226,25 +2446,25 @@ void jq_yyset_debug (int _bdebug , yyscan_t yyscanner) /* Accessor methods for yylval and yylloc */ -YYSTYPE * jq_yyget_lval (yyscan_t yyscanner) +YYSTYPE * yyget_lval (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yylval; } -void jq_yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) +void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yylval = yylval_param; } -YYLTYPE *jq_yyget_lloc (yyscan_t yyscanner) +YYLTYPE *yyget_lloc (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yylloc; } -void jq_yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) +void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yylloc = yylloc_param; @@ -2252,20 +2472,18 @@ void jq_yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) /* User-visible API */ -/* jq_yylex_init is special because it creates the scanner itself, so it is +/* yylex_init is special because it creates the scanner itself, so it is * the ONLY reentrant function that doesn't take the scanner as the last argument. * That's why we explicitly handle the declaration, instead of using our macros. */ - -int jq_yylex_init(yyscan_t* ptr_yy_globals) - +int yylex_init(yyscan_t* ptr_yy_globals) { if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) jq_yyalloc ( sizeof( struct yyguts_t ), NULL ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -2278,39 +2496,37 @@ int jq_yylex_init(yyscan_t* ptr_yy_globals) return yy_init_globals ( *ptr_yy_globals ); } -/* jq_yylex_init_extra has the same functionality as jq_yylex_init, but follows the +/* yylex_init_extra has the same functionality as yylex_init, but follows the * convention of taking the scanner as the last argument. Note however, that * this is a *pointer* to a scanner, as it will be allocated by this call (and * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to jq_yyalloc in + * The user defined value in the first argument will be available to yyalloc in * the yyextra field. */ - -int jq_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - +int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) { struct yyguts_t dummy_yyguts; - jq_yyset_extra (yy_user_defined, &dummy_yyguts); + yyset_extra (yy_user_defined, &dummy_yyguts); if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - - *ptr_yy_globals = (yyscan_t) jq_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - jq_yyset_extra (yy_user_defined, *ptr_yy_globals); - + + yyset_extra (yy_user_defined, *ptr_yy_globals); + return yy_init_globals ( *ptr_yy_globals ); } @@ -2318,13 +2534,13 @@ static int yy_init_globals (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Initialization is the same as for the non-reentrant scanner. - * This function is called from jq_yylex_destroy(), so don't allocate here. + * This function is called from yylex_destroy(), so don't allocate here. */ - yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack = NULL; yyg->yy_buffer_stack_top = 0; yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; + yyg->yy_c_buf_p = NULL; yyg->yy_init = 0; yyg->yy_start = 0; @@ -2337,42 +2553,42 @@ static int yy_init_globals (yyscan_t yyscanner) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by - * jq_yylex_init() + * yylex_init() */ return 0; } -/* jq_yylex_destroy is for both reentrant and non-reentrant scanners. */ -int jq_yylex_destroy (yyscan_t yyscanner) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - jq_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); YY_CURRENT_BUFFER_LVALUE = NULL; - jq_yypop_buffer_state(yyscanner); + yypop_buffer_state(yyscanner); } /* Destroy the stack itself. */ - jq_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyfree(yyg->yy_buffer_stack , yyscanner); yyg->yy_buffer_stack = NULL; /* Destroy the start condition stack. */ - jq_yyfree(yyg->yy_start_stack ,yyscanner ); + yyfree( yyg->yy_start_stack , yyscanner ); yyg->yy_start_stack = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * jq_yylex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( yyscanner); /* Destroy the main struct (reentrant only). */ - jq_yyfree ( yyscanner , yyscanner ); + yyfree ( yyscanner , yyscanner ); yyscanner = NULL; return 0; } @@ -2382,7 +2598,7 @@ int jq_yylex_destroy (yyscan_t yyscanner) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; @@ -2394,7 +2610,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +static int yy_flex_strlen (const char * s , yyscan_t yyscanner) { int n; for ( n = 0; s[n]; ++n ) @@ -2406,8 +2622,7 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 130 "src/lexer.l" - +#line 131 "src/lexer.l" /* perhaps these should be calls... */ /* @@ -2455,13 +2670,13 @@ static int enter(int c, int currstate, yyscan_t yyscanner) { return c; } -void* jq_yyalloc(size_t sz,void* extra) { +void* yyalloc(size_t sz, void* extra) { return jv_mem_alloc(sz); } -void* jq_yyrealloc(void* p,size_t sz,void* extra) { +void* yyrealloc(void* p, size_t sz, void* extra) { return jv_mem_realloc(p, sz); } -void jq_yyfree(void* p,void* extra) { +void yyfree(void* p, void* extra) { jv_mem_free(p); } diff --git a/src/lexer.h b/src/lexer.h index e095b106df..7c04a3dcf4 100644 --- a/src/lexer.h +++ b/src/lexer.h @@ -13,11 +13,245 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 0 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define jq_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer jq_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define jq_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer jq_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define jq_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer jq_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define jq_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string jq_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define jq_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes jq_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define jq_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer jq_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define jq_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer jq_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define jq_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state jq_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define jq_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer jq_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define jq_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state jq_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define jq_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state jq_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define jq_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack jq_yyensure_buffer_stack +#endif + +#ifdef yylex +#define jq_yylex_ALREADY_DEFINED +#else +#define yylex jq_yylex +#endif + +#ifdef yyrestart +#define jq_yyrestart_ALREADY_DEFINED +#else +#define yyrestart jq_yyrestart +#endif + +#ifdef yylex_init +#define jq_yylex_init_ALREADY_DEFINED +#else +#define yylex_init jq_yylex_init +#endif + +#ifdef yylex_init_extra +#define jq_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra jq_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define jq_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy jq_yylex_destroy +#endif + +#ifdef yyget_debug +#define jq_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug jq_yyget_debug +#endif + +#ifdef yyset_debug +#define jq_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug jq_yyset_debug +#endif + +#ifdef yyget_extra +#define jq_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra jq_yyget_extra +#endif + +#ifdef yyset_extra +#define jq_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra jq_yyset_extra +#endif + +#ifdef yyget_in +#define jq_yyget_in_ALREADY_DEFINED +#else +#define yyget_in jq_yyget_in +#endif + +#ifdef yyset_in +#define jq_yyset_in_ALREADY_DEFINED +#else +#define yyset_in jq_yyset_in +#endif + +#ifdef yyget_out +#define jq_yyget_out_ALREADY_DEFINED +#else +#define yyget_out jq_yyget_out +#endif + +#ifdef yyset_out +#define jq_yyset_out_ALREADY_DEFINED +#else +#define yyset_out jq_yyset_out +#endif + +#ifdef yyget_leng +#define jq_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng jq_yyget_leng +#endif + +#ifdef yyget_text +#define jq_yyget_text_ALREADY_DEFINED +#else +#define yyget_text jq_yyget_text +#endif + +#ifdef yyget_lineno +#define jq_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno jq_yyget_lineno +#endif + +#ifdef yyset_lineno +#define jq_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno jq_yyset_lineno +#endif + +#ifdef yyget_column +#define jq_yyget_column_ALREADY_DEFINED +#else +#define yyget_column jq_yyget_column +#endif + +#ifdef yyset_column +#define jq_yyset_column_ALREADY_DEFINED +#else +#define yyset_column jq_yyset_column +#endif + +#ifdef yywrap +#define jq_yywrap_ALREADY_DEFINED +#else +#define yywrap jq_yywrap +#endif + +#ifdef yyget_lval +#define jq_yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval jq_yyget_lval +#endif + +#ifdef yyset_lval +#define jq_yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval jq_yyset_lval +#endif + +#ifdef yyget_lloc +#define jq_yyget_lloc_ALREADY_DEFINED +#else +#define yyget_lloc jq_yyget_lloc +#endif + +#ifdef yyset_lloc +#define jq_yyset_lloc_ALREADY_DEFINED +#else +#define yyset_lloc jq_yyset_lloc +#endif + +#ifdef yyalloc +#define jq_yyalloc_ALREADY_DEFINED +#else +#define yyalloc jq_yyalloc +#endif + +#ifdef yyrealloc +#define jq_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc jq_yyrealloc +#endif + +#ifdef yyfree +#define jq_yyfree_ALREADY_DEFINED +#else +#define yyfree jq_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -88,29 +322,23 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +/* begin standard C++ headers. */ -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* An opaque pointer. */ @@ -165,7 +393,7 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. @@ -193,7 +421,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -204,21 +432,21 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void jq_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void jq_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void jq_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void jq_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void jq_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void jq_yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE jq_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *jq_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *jq_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void jq_yyfree (void * ,yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); /* Begin user sect3 */ @@ -247,50 +475,50 @@ void jq_yyfree (void * ,yyscan_t yyscanner ); #define YY_EXTRA_TYPE int -int jq_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int jq_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int jq_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int jq_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void jq_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE jq_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void jq_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *jq_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void jq_yyset_in (FILE * _in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *jq_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void jq_yyset_out (FILE * _out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t jq_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *jq_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int jq_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void jq_yyset_lineno (int _line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int jq_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void jq_yyset_column (int _column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * jq_yyget_lval (yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - YYLTYPE *jq_yyget_lloc (yyscan_t yyscanner ); + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - void jq_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -298,18 +526,18 @@ void jq_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int jq_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int jq_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -337,10 +565,10 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int jq_yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); +extern int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); -#define YY_DECL int jq_yylex \ +#define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) #endif /* !YY_DECL */ @@ -358,9 +586,154 @@ extern int jq_yylex \ #undef YY_DECL #endif -#line 130 "src/lexer.l" +#ifndef jq_yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef jq_yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef jq_yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef jq_yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef jq_yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef jq_yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef jq_yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef jq_yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef jq_yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef jq_yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef jq_yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef jq_yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef jq_yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef jq_yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef jq_yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef jq_yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef jq_yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef jq_yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef jq_yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef jq_yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef jq_yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef jq_yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef jq_yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef jq_yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef jq_yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef jq_yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef jq_yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef jq_yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef jq_yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef jq_yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef jq_yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef jq_yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef jq_yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef jq_yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef jq_yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef jq_yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef jq_yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef jq_yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef jq_yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef jq_yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef jq_yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef jq_yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef jq_yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef jq_yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef jq_yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef jq_yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef jq_yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef jq_yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 131 "src/lexer.l" -#line 365 "src/lexer.h" +#line 738 "src/lexer.h" #undef jq_yyIN_HEADER #endif /* jq_yyHEADER_H */ diff --git a/src/lexer.l b/src/lexer.l index 6b9164bf28..03c1508912 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -72,6 +72,7 @@ struct lexer_param; ">=" { return GREATEREQ; } ".." { return REC; } "?//" { return ALTERNATION; } +"@@" { return COEXPR; } "."|"?"|"="|";"|","|":"|"|"|"+"|"-"|"*"|"/"|"%"|"\$"|"<"|">" { return yytext[0];} "["|"{"|"(" { diff --git a/src/opcode_list.h b/src/opcode_list.h index c9b0d0ccce..9e30565104 100644 --- a/src/opcode_list.h +++ b/src/opcode_list.h @@ -40,6 +40,7 @@ OP(CLOSURE_CREATE_C, DEFINITION, 0, 0) OP(TOP, NONE, 0, 0) OP(CLOSURE_PARAM_REGULAR, DEFINITION, 0, 0) +OP(CLOSURE_PARAM_COEXPR, DEFINITION, 0, 0) OP(DEPS, CONSTANT, 0, 0) OP(MODULEMETA, CONSTANT, 0, 0) OP(GENLABEL, NONE, 0, 1) diff --git a/src/parser.c b/src/parser.c index 3389ee359e..fdb7a059c9 100644 --- a/src/parser.c +++ b/src/parser.c @@ -165,13 +165,14 @@ struct lexer_param; LESSEQ = 293, GREATEREQ = 294, ALTERNATION = 295, - QQSTRING_START = 296, - QQSTRING_TEXT = 297, - QQSTRING_INTERP_START = 298, - QQSTRING_INTERP_END = 299, - QQSTRING_END = 300, - FUNCDEF = 301, - NONOPT = 302 + COEXPR = 296, + QQSTRING_START = 297, + QQSTRING_TEXT = 298, + QQSTRING_INTERP_START = 299, + QQSTRING_INTERP_END = 300, + QQSTRING_END = 301, + FUNCDEF = 302, + NONOPT = 303 }; #endif /* Tokens. */ @@ -213,13 +214,14 @@ struct lexer_param; #define LESSEQ 293 #define GREATEREQ 294 #define ALTERNATION 295 -#define QQSTRING_START 296 -#define QQSTRING_TEXT 297 -#define QQSTRING_INTERP_START 298 -#define QQSTRING_INTERP_END 299 -#define QQSTRING_END 300 -#define FUNCDEF 301 -#define NONOPT 302 +#define COEXPR 296 +#define QQSTRING_START 297 +#define QQSTRING_TEXT 298 +#define QQSTRING_INTERP_START 299 +#define QQSTRING_INTERP_END 300 +#define QQSTRING_END 301 +#define FUNCDEF 302 +#define NONOPT 303 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -231,7 +233,7 @@ union YYSTYPE jv literal; block blk; -#line 235 "src/parser.c" /* yacc.c:355 */ +#line 237 "src/parser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -260,7 +262,7 @@ int yyparse (block* answer, int* errors, struct locfile* locations, struct lexer #endif /* !YY_YY_SRC_PARSER_H_INCLUDED */ /* Copy the second part of user declarations. */ -#line 124 "src/parser.y" /* yacc.c:358 */ +#line 125 "src/parser.y" /* yacc.c:358 */ #include "lexer.h" struct lexer_param { @@ -434,7 +436,7 @@ static block gen_update(block object, block val, int optype) { } -#line 438 "src/parser.c" /* yacc.c:358 */ +#line 440 "src/parser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -678,21 +680,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 27 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2069 +#define YYLAST 2084 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 69 +#define YYNTOKENS 70 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 30 /* YYNRULES -- Number of rules. */ -#define YYNRULES 166 +#define YYNRULES 167 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 320 +#define YYNSTATES 322 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 302 +#define YYMAXUTOK 303 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -704,16 +706,16 @@ static const yytype_uint8 yytranslate[] = 0, 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, 62, 56, 2, 2, - 60, 61, 54, 52, 48, 53, 64, 55, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 63, 59, - 50, 49, 51, 58, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 63, 57, 2, 2, + 61, 62, 55, 53, 49, 54, 65, 56, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 64, 60, + 51, 50, 52, 59, 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, 65, 2, 66, 2, 2, 2, 2, 2, 2, + 2, 66, 2, 67, 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, 67, 47, 68, 2, 2, 2, 2, + 2, 2, 2, 68, 48, 69, 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, @@ -731,30 +733,30 @@ static const yytype_uint8 yytranslate[] = 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, 41, 42, 43, 44, - 45, 46, 57 + 45, 46, 47, 58 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 300, 300, 303, 308, 311, 322, 325, 330, 333, - 338, 342, 345, 349, 353, 357, 360, 363, 368, 372, - 376, 381, 388, 392, 396, 400, 404, 408, 412, 416, - 420, 424, 428, 432, 436, 440, 444, 448, 452, 458, - 464, 468, 472, 476, 480, 484, 488, 492, 496, 501, - 504, 521, 530, 537, 545, 556, 561, 567, 570, 575, - 580, 587, 587, 591, 591, 598, 601, 604, 610, 613, - 618, 621, 624, 630, 633, 636, 644, 648, 651, 654, - 657, 660, 663, 666, 669, 672, 676, 682, 685, 688, - 691, 694, 697, 700, 703, 706, 709, 712, 715, 718, - 721, 724, 727, 730, 733, 736, 743, 747, 751, 763, - 768, 769, 770, 771, 774, 777, 782, 787, 790, 795, - 798, 803, 807, 810, 815, 818, 823, 826, 831, 834, - 837, 840, 843, 846, 854, 860, 863, 866, 869, 872, - 875, 878, 881, 884, 887, 890, 893, 896, 899, 902, - 905, 908, 911, 914, 919, 922, 923, 924, 927, 930, - 933, 936, 940, 944, 948, 952, 960 + 0, 301, 301, 304, 309, 312, 323, 326, 331, 334, + 339, 343, 346, 350, 354, 358, 361, 364, 369, 373, + 377, 382, 389, 393, 397, 401, 405, 409, 413, 417, + 421, 425, 429, 433, 437, 441, 445, 449, 453, 459, + 465, 469, 473, 477, 481, 485, 489, 493, 497, 502, + 505, 522, 531, 538, 546, 557, 562, 568, 571, 576, + 581, 586, 593, 593, 597, 597, 604, 607, 610, 616, + 619, 624, 627, 630, 636, 639, 642, 650, 654, 657, + 660, 663, 666, 669, 672, 675, 678, 682, 688, 691, + 694, 697, 700, 703, 706, 709, 712, 715, 718, 721, + 724, 727, 730, 733, 736, 739, 742, 749, 753, 757, + 769, 774, 775, 776, 777, 780, 783, 788, 793, 796, + 801, 804, 809, 813, 816, 821, 824, 829, 832, 837, + 840, 843, 846, 849, 852, 860, 866, 869, 872, 875, + 878, 881, 884, 887, 890, 893, 896, 899, 902, 905, + 908, 911, 914, 917, 920, 925, 928, 929, 930, 933, + 936, 939, 942, 946, 950, 954, 958, 966 }; #endif @@ -769,16 +771,16 @@ static const char *const yytname[] = "\"then\"", "\"else\"", "\"elif\"", "\"reduce\"", "\"foreach\"", "\"end\"", "\"and\"", "\"or\"", "\"try\"", "\"catch\"", "\"label\"", "\"break\"", "\"__loc__\"", "\"|=\"", "\"+=\"", "\"-=\"", "\"*=\"", - "\"/=\"", "\"//=\"", "\"<=\"", "\">=\"", "\"?//\"", "QQSTRING_START", - "QQSTRING_TEXT", "QQSTRING_INTERP_START", "QQSTRING_INTERP_END", - "QQSTRING_END", "FUNCDEF", "'|'", "','", "'='", "'<'", "'>'", "'+'", - "'-'", "'*'", "'/'", "'%'", "NONOPT", "'?'", "';'", "'('", "')'", "'$'", - "':'", "'.'", "'['", "']'", "'{'", "'}'", "$accept", "TopLevel", - "Module", "Imports", "FuncDefs", "Exp", "Import", "ImportWhat", - "ImportFrom", "FuncDef", "Params", "Param", "String", "@1", "@2", - "QQString", "ElseBody", "ExpD", "Term", "Args", "Arg", "RepPatterns", - "Patterns", "Pattern", "ArrayPats", "ObjPats", "ObjPat", "Keyword", - "MkDict", "MkDictPair", YY_NULLPTR + "\"/=\"", "\"//=\"", "\"<=\"", "\">=\"", "\"?//\"", "\"@@\"", + "QQSTRING_START", "QQSTRING_TEXT", "QQSTRING_INTERP_START", + "QQSTRING_INTERP_END", "QQSTRING_END", "FUNCDEF", "'|'", "','", "'='", + "'<'", "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", "NONOPT", "'?'", "';'", + "'('", "')'", "'$'", "':'", "'.'", "'['", "']'", "'{'", "'}'", "$accept", + "TopLevel", "Module", "Imports", "FuncDefs", "Exp", "Import", + "ImportWhat", "ImportFrom", "FuncDef", "Params", "Param", "String", "@1", + "@2", "QQString", "ElseBody", "ExpD", "Term", "Args", "Arg", + "RepPatterns", "Patterns", "Pattern", "ArrayPats", "ObjPats", "ObjPat", + "Keyword", "MkDict", "MkDictPair", YY_NULLPTR }; #endif @@ -791,9 +793,9 @@ static const yytype_uint16 yytoknum[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 124, 44, 61, - 60, 62, 43, 45, 42, 47, 37, 302, 63, 59, - 40, 41, 36, 58, 46, 91, 93, 123, 125 + 295, 296, 297, 298, 299, 300, 301, 302, 124, 44, + 61, 60, 62, 43, 45, 42, 47, 37, 303, 63, + 59, 40, 41, 36, 58, 46, 91, 93, 123, 125 }; # endif @@ -802,47 +804,48 @@ static const yytype_uint16 yytoknum[] = #define yypact_value_is_default(Yystate) \ (!!((Yystate) == (-163))) -#define YYTABLE_NINF -155 +#define YYTABLE_NINF -156 #define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-155))) + (!!((Yytable_value) == (-156))) /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const yytype_int16 yypact[] = { - 9, 769, 36, 63, -20, -2, -163, 18, -163, 47, - 769, 115, 115, 769, 50, 0, -163, 769, 519, 10, - 286, 452, 352, 1337, 769, -163, 2, -163, 1, 1, - 769, 63, 677, 769, -163, -163, -15, 1743, 8, 17, - 86, 57, -163, 60, -163, 95, 56, 1167, -163, -163, - -163, 125, 18, 72, 65, -163, 914, -25, 70, -163, + 38, 716, 19, 25, -46, 3, -163, 29, -163, 53, + 716, 755, 755, 716, 2, 0, -163, 716, 497, 4, + 288, 429, 149, 1336, 716, -163, 1, -163, -2, -2, + 716, 25, 622, 716, -163, -163, 15, 1750, 8, 55, + 54, 108, -163, 111, -163, 78, 57, 1161, -163, -163, + -163, 125, 29, 68, 63, -163, 903, -25, 67, -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, - -163, -163, -163, -163, -163, -163, -163, -163, 769, 130, - 81, 84, 67, 104, 769, 769, 769, 769, 769, 769, - 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, - 769, 769, 769, 769, 769, 769, 769, 769, -163, -163, - 1911, 100, -7, 3, 195, 146, -163, -163, -163, 1911, - 769, -163, -163, 1388, 1911, -12, -163, -163, 48, 769, - 584, -7, -7, 649, 113, -163, 33, -163, -163, -163, - -163, -163, -163, 409, 437, -163, 437, 1201, 98, 437, - 437, -163, 409, 1979, 347, 347, 1945, 500, 2011, 1979, - 1979, 1979, 1979, 1979, 1979, 347, 347, 1911, 1945, 1979, - 347, 347, 95, 95, 105, 105, 105, -163, 158, -7, - 831, 124, 118, 126, 769, 109, 103, 769, 112, 864, - 49, -163, -163, 769, -163, 82, -163, 167, 4, -163, - 1439, -163, 1643, 114, 116, -163, -163, 769, -163, 769, - -163, -13, -163, 437, 131, 6, 131, 110, 437, 131, - 131, -163, -163, -163, -9, 121, 127, 769, 168, 128, - -22, -163, 132, -7, 769, 964, -163, -163, 1014, -163, - 741, 129, -163, 184, -163, -163, -163, 48, 134, -163, - 769, 769, -163, -163, 769, 769, 1911, 1777, -163, 437, - 437, 131, -7, -163, -7, -7, 1235, 135, -7, 831, - -163, -7, 149, 1911, 136, 153, 154, 1064, -163, -163, - -163, 769, 1827, 1877, 1490, 1541, -163, 131, 131, -163, - -163, -163, 141, -7, -163, -163, -163, -163, -163, -163, - 156, 1592, -163, 769, 769, 769, -7, -163, -163, -163, - 1693, 1269, 1114, -163, -163, -163, 769, -163, 1303, -163 + -163, -163, -163, -163, -163, -163, -163, -163, 716, 136, + 80, 82, 89, 98, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, 716, 716, + 716, 716, 716, 716, 716, 716, 716, 716, -163, -163, + 1922, 90, -14, -5, 399, 138, -163, -163, -163, 1922, + 716, -163, -163, 1388, 1922, -17, -163, -163, 18, 716, + 527, -14, -14, 593, 112, -163, 12, -163, -163, -163, + -163, -163, -163, 355, 196, -163, 196, 1196, 95, 196, + 196, -163, 355, 1992, 754, 754, 1957, 816, 2025, 1992, + 1992, 1992, 1992, 1992, 1992, 754, 754, 1922, 1957, 1992, + 754, 754, 78, 78, 102, 102, 102, -163, 177, -14, + 818, 142, 139, 144, 716, 129, 122, 716, 131, 852, + 44, -163, -163, 716, -163, 26, -163, 189, 190, 83, + -163, 1440, -163, 1648, 134, 135, -163, -163, 716, -163, + 716, -163, -13, -163, 196, 150, 59, 150, 133, 196, + 150, 150, -163, -163, -163, -21, 141, 151, 716, 195, + 152, -19, -163, 153, -14, 716, 954, -163, -163, 1005, + -163, 687, 154, -163, 204, -163, -163, -163, -163, 18, + 155, -163, 716, 716, -163, -163, 716, 716, 1922, 1785, + -163, 196, 196, 150, -14, -163, -14, -14, 1231, 156, + -14, 818, -163, -14, 174, 1922, 162, 163, 164, 1056, + -163, -163, -163, 716, 1836, 1887, 1492, 1544, -163, 150, + 150, -163, -163, -163, 160, -14, -163, -163, -163, -163, + -163, -163, 166, 1596, -163, 716, 716, 716, -14, -163, + -163, -163, 1699, 1266, 1107, -163, -163, -163, 716, -163, + 1301, -163 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -850,54 +853,55 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 4, 0, 0, 6, 108, 82, 99, 101, 74, 0, - 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, - 0, 0, 0, 0, 0, 100, 48, 1, 0, 0, - 8, 6, 0, 0, 78, 63, 0, 0, 0, 0, - 19, 0, 76, 0, 65, 33, 0, 0, 107, 106, - 85, 0, 0, 84, 0, 104, 0, 0, 164, 135, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 153, 0, 0, - 161, 0, 0, 155, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 6, 109, 83, 100, 102, 75, 0, + 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, + 0, 0, 0, 0, 0, 101, 48, 1, 0, 0, + 8, 6, 0, 0, 79, 64, 0, 0, 0, 0, + 19, 0, 77, 0, 66, 33, 0, 0, 108, 107, + 86, 0, 0, 85, 0, 105, 0, 0, 165, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 154, 0, 0, + 162, 0, 0, 156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 5, - 10, 81, 0, 0, 0, 0, 54, 53, 3, 2, - 8, 7, 49, 0, 116, 0, 114, 65, 0, 0, - 0, 0, 0, 0, 0, 75, 0, 110, 102, 86, - 80, 111, 103, 0, 0, 113, 0, 0, 163, 0, - 0, 105, 0, 41, 42, 43, 26, 25, 24, 28, + 10, 82, 0, 0, 0, 0, 54, 53, 3, 2, + 8, 7, 49, 0, 117, 0, 115, 66, 0, 0, + 0, 0, 0, 0, 0, 76, 0, 111, 103, 87, + 81, 112, 104, 0, 0, 114, 0, 0, 164, 0, + 0, 106, 0, 41, 42, 43, 26, 25, 24, 28, 32, 35, 37, 40, 27, 46, 47, 29, 30, 23, - 44, 45, 31, 34, 36, 38, 39, 77, 0, 0, - 0, 0, 0, 120, 0, 83, 0, 0, 92, 0, - 0, 9, 50, 0, 109, 0, 60, 0, 0, 57, - 0, 17, 0, 0, 0, 20, 18, 0, 66, 0, - 62, 0, 157, 0, 166, 72, 158, 0, 0, 160, - 159, 156, 121, 124, 0, 0, 0, 0, 0, 0, - 0, 126, 0, 0, 0, 0, 79, 112, 0, 91, - 0, 88, 52, 0, 115, 64, 59, 0, 0, 55, - 0, 0, 16, 15, 0, 0, 21, 0, 71, 0, - 0, 162, 0, 122, 0, 0, 0, 128, 0, 0, - 123, 0, 119, 11, 90, 98, 97, 0, 87, 51, - 58, 0, 0, 0, 0, 0, 67, 70, 165, 125, - 134, 130, 0, 0, 132, 127, 131, 89, 95, 94, - 96, 0, 69, 0, 0, 0, 0, 129, 93, 56, - 0, 0, 0, 133, 68, 12, 0, 14, 0, 13 + 44, 45, 31, 34, 36, 38, 39, 78, 0, 0, + 0, 0, 0, 121, 0, 84, 0, 0, 93, 0, + 0, 9, 50, 0, 110, 0, 61, 0, 0, 0, + 57, 0, 17, 0, 0, 0, 20, 18, 0, 67, + 0, 63, 0, 158, 0, 167, 73, 159, 0, 0, + 161, 160, 157, 122, 125, 0, 0, 0, 0, 0, + 0, 0, 127, 0, 0, 0, 0, 80, 113, 0, + 92, 0, 89, 52, 0, 116, 65, 60, 59, 0, + 0, 55, 0, 0, 16, 15, 0, 0, 21, 0, + 72, 0, 0, 163, 0, 123, 0, 0, 0, 129, + 0, 0, 124, 0, 120, 11, 91, 99, 98, 0, + 88, 51, 58, 0, 0, 0, 0, 0, 68, 71, + 166, 126, 135, 131, 0, 0, 133, 128, 132, 90, + 96, 95, 97, 0, 70, 0, 0, 0, 0, 130, + 94, 56, 0, 0, 0, 134, 69, 12, 0, 14, + 0, 13 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -163, -163, -163, 162, 87, -1, -163, -163, 186, -11, - -163, -31, 5, -163, -163, 92, -90, -144, -8, -163, - 28, -163, 23, -125, -163, -163, -46, -162, -115, -163 + -163, -163, -163, 197, 109, -1, -163, -163, 201, -4, + -163, -18, 5, -163, -163, 105, -79, -139, -8, -163, + 42, -163, 23, -156, -163, -163, -35, -162, -105, -163 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 2, 3, 30, 118, 110, 31, 32, 115, 24, - 198, 199, 25, 44, 127, 136, 253, 214, 26, 125, - 126, 181, 182, 183, 224, 230, 231, 81, 82, 83 + 199, 200, 25, 44, 127, 136, 255, 215, 26, 125, + 126, 181, 182, 183, 225, 231, 232, 81, 82, 83 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -905,484 +909,489 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 23, 42, 216, 38, 39, 219, 220, 111, 52, 37, - 52, 111, 40, 111, 48, 112, 45, 47, 232, 120, - 56, 131, 111, 143, 1, 53, 269, 80, 212, 119, - 132, 123, 124, 116, 116, 143, 27, 221, 144, 262, - 33, 49, 16, 145, 16, 128, 270, 193, 129, 194, - 144, 36, 196, 242, 223, 178, 34, 263, 179, 35, - 180, 134, 43, 247, 135, 248, 113, 114, 184, 258, - 113, 114, 113, 114, 261, 208, 209, 147, 210, 28, - 29, 113, 114, 153, 154, 155, 156, 157, 158, 159, + 23, 42, 52, 38, 39, 52, 111, 217, 48, 37, + 220, 221, 40, 111, 112, 33, 45, 47, 233, 27, + 56, 131, 196, 224, 143, 53, 120, 80, 264, 119, + 271, 123, 124, 116, 116, 49, 143, 16, 213, 144, + 16, 28, 29, 193, 145, 194, 265, 222, 243, 178, + 272, 144, 179, 1, 180, 209, 210, 36, 211, 197, + 111, 184, 34, 43, 111, 41, 113, 114, 132, 209, + 210, 35, 246, 113, 114, 260, 128, 147, 274, 129, + 263, 198, 133, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 232, 272, 120, - 197, 243, 41, 189, 133, 287, 288, 137, 185, 4, - 5, 6, 7, 8, 208, 209, 139, 245, 200, 202, - 140, 141, 206, 146, 148, 151, 215, 289, 215, 290, - 291, 215, 215, 294, 149, 15, 296, 150, 80, 105, - 106, 107, 152, 108, 203, 204, 16, 80, 177, 190, - 207, 218, 222, 108, 233, 234, -118, 236, 307, 237, - 239, 246, 267, 260, 254, 18, 255, 19, 259, 20, - 21, 313, 22, 235, 264, 229, 238, 278, 279, -117, - 265, 268, 124, 121, 297, 271, 186, 281, 293, 4, - 5, 6, 7, 8, 306, 215, 256, 191, 257, 9, - 215, 298, 299, 10, 308, 117, 280, 11, 12, 195, - 314, 244, 13, 295, 14, 15, 266, 0, 0, 0, - 0, 0, 0, 273, 0, 0, 16, 0, 0, 277, - 0, 0, 0, 0, 0, 0, 0, 0, 17, 282, - 283, 215, 215, 284, 285, 18, 0, 19, 187, 20, - 21, 188, 22, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 229, 0, 0, 0, 0, 0, - 301, 0, 0, 0, 0, 0, -73, 50, 0, 0, - 51, -73, 0, 52, 0, -73, -73, -73, -73, -73, - 0, 0, 310, 311, 312, -73, -73, -73, 0, 0, - -73, -73, -73, 0, -73, 318, 0, 0, -73, -73, - -73, -73, -73, -73, -73, -73, 0, 16, 0, 0, - -73, 0, 0, -73, -73, -73, -73, -73, -73, -73, - -73, -73, -73, 0, -73, -73, 0, -73, 0, -73, - -73, -73, -73, 57, -73, 0, 58, -155, -155, 52, - 0, 0, 0, 0, 0, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 0, -155, -155, 0, 0, 0, - 0, 0, 0, 16, 0, 0, 0, -155, -155, 103, - 104, 105, 106, 107, 0, 108, 0, 0, 0, 0, - 211, 0, 78, 58, 79, 0, 52, 0, 0, 0, - -154, 0, 59, 60, 61, 62, 63, 64, 65, 66, + 170, 171, 172, 173, 174, 175, 176, 244, 291, 233, + 292, 293, 134, 189, 296, 135, 120, 298, 185, 137, + 113, 114, 289, 290, 113, 114, 139, 140, 201, 203, + 141, 146, 207, 105, 106, 107, 216, 108, 216, 309, + 148, 216, 216, 249, 149, 250, 150, 152, 80, 177, + 57, 190, 315, 58, 204, 205, 52, 80, 151, 219, + 208, 108, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 4, 5, 6, 7, 8, 0, 0, 0, 0, - 16, 0, 0, 54, 0, 0, 4, 5, 6, 7, - 8, 0, 0, 0, 0, 0, 9, 15, 0, 78, - 10, 79, 0, 0, 11, 12, 0, -154, 16, 13, - 0, 14, 15, 0, 0, 0, 0, 0, 0, 0, - 213, 0, 0, 16, 0, 0, 0, 18, 0, 19, - 0, 20, 21, 0, 22, 17, 0, 0, 0, 0, - 85, 86, 18, 0, 19, 0, 20, 21, 55, 22, - 46, 0, 0, 4, 5, 6, 7, 8, 0, 0, - 0, 0, 0, 9, 0, 0, 0, 10, 96, 97, - 0, 11, 12, 0, 0, 0, 13, 0, 14, 15, - 101, 102, 103, 104, 105, 106, 107, 0, 108, 0, - 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, 0, 0, 0, 18, - 0, 19, 0, 20, 21, 201, 22, 0, 4, 5, - 6, 7, 8, 0, 0, 0, 0, 0, 9, 0, - 0, 0, 10, 0, 0, 0, 11, 12, 0, 0, - 0, 13, 0, 14, 15, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, - 0, 0, 0, 0, 18, 0, 19, 0, 20, 21, - 205, 22, 0, 4, 5, 6, 7, 8, 0, 0, - 0, 0, 0, 9, 0, 0, 0, 10, 0, 0, - 0, 11, 12, 0, 0, 0, 13, 0, 14, 15, + 77, 223, 234, 236, -119, 230, 239, 235, 237, 238, + 240, 16, 124, 247, 248, 256, 257, 262, 261, 269, + 4, 5, 6, 7, 8, 266, 216, 258, 281, 259, + 78, 216, 79, 280, -118, 267, 270, 273, -155, 283, + 295, 299, 300, 301, 308, 310, 15, 268, 121, 191, + 117, 282, 195, 316, 275, 245, 297, 0, 16, 0, + 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 214, 284, 285, 216, 216, 286, 287, 18, 0, 19, + 0, 20, 21, 0, 22, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 230, 0, 0, 0, + 0, 0, 303, 0, 0, 0, 0, 0, -74, 50, + 0, 0, 51, -74, 0, 52, 0, -74, -74, -74, + -74, -74, 0, 0, 312, 313, 314, -74, -74, -74, + 0, 0, -74, -74, -74, 0, -74, 320, 0, 0, + -74, -74, -74, -74, -74, -74, -74, -74, 0, 0, + 16, 0, 0, -74, 0, 0, -74, -74, -74, -74, + -74, -74, -74, -74, -74, -74, 0, -74, -74, 0, + -74, 0, -74, -74, -74, -74, 212, -74, 0, 58, + 0, 0, 52, 0, 0, 0, 0, 0, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, + 186, 0, 0, 4, 5, 6, 7, 8, 0, 0, + 0, 0, 0, 9, 0, 0, 78, 10, 79, 0, + 0, 11, 12, 0, -155, 0, 13, 0, 14, 15, + 54, 0, 0, 4, 5, 6, 7, 8, 0, 0, + 0, 16, 0, 9, 0, 0, 0, 10, 0, 0, + 0, 11, 12, 17, 0, 0, 13, 0, 14, 15, + 18, 0, 19, 187, 20, 21, 188, 22, 0, 0, + 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, + 18, 0, 19, 0, 20, 21, 55, 22, 46, 0, 0, 4, 5, 6, 7, 8, 0, 0, 0, 0, - 16, 9, 0, 0, 0, 10, 0, 0, 0, 11, - 12, 0, 17, 0, 13, 0, 14, 15, 0, 18, - 0, 19, 0, 20, 21, 0, 22, 0, 16, 0, + 0, 9, 0, 0, 0, 10, 0, 0, 0, 11, + 12, 0, 0, 0, 13, 0, 14, 15, 202, 0, + 0, 4, 5, 6, 7, 8, 0, 0, 0, 16, + 0, 9, 0, 0, 0, 10, 0, 0, 0, 11, + 12, 17, 0, 0, 13, 0, 14, 15, 18, 0, + 19, 0, 20, 21, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 0, 0, 122, 18, 0, 19, - 0, 20, 21, 0, 22, 4, 5, 6, 7, 8, - 0, 0, 0, 0, 0, 9, 0, 0, 0, 10, - 0, 0, 0, 11, 12, 0, 0, 0, 13, 0, - 14, 15, 0, 4, 5, 6, 7, 8, 0, 0, - 0, 0, 16, 9, 0, 0, 0, 10, 0, 0, - 0, 11, 12, 0, 17, 0, 13, 0, 14, 15, - 0, 18, 0, 19, 0, 20, 21, 276, 22, 0, - 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, 0, 0, 0, 18, - 0, 19, 225, 20, 21, 226, 22, 0, 52, 0, - 0, 0, 0, 0, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 16, 84, 85, 86, 87, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 89, 227, 0, 228, 0, 0, 90, 91, 92, 93, - 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, - 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 0, 108, 84, 85, 86, 87, 240, 0, 0, - 241, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, - 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, + 0, 17, 0, 0, 0, 0, 0, 0, 18, 0, + 19, 0, 20, 21, 206, 22, 0, 4, 5, 6, + 7, 8, 0, 0, 0, 0, 0, 9, 0, 0, + 0, 10, 0, 0, 0, 11, 12, 0, 0, 0, + 13, 0, 14, 15, 0, 0, 4, 5, 6, 7, + 8, 0, 0, 0, 0, 16, 9, 0, 0, 0, + 10, 0, 0, 0, 11, 12, 0, 17, 0, 13, + 0, 14, 15, 0, 18, 0, 19, 0, 20, 21, + 0, 22, 0, 0, 16, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, + 0, 0, 122, 18, 0, 19, 0, 20, 21, 0, + 22, 4, 5, 6, 7, 8, 0, 0, 0, 0, + 0, 9, 0, 0, 0, 10, 0, 0, 0, 11, + 12, 0, 0, 0, 13, 0, 14, 15, 0, 0, + 4, 5, 6, 7, 8, 0, 0, 0, 0, 16, + 9, 0, 0, 0, 10, 0, 0, 0, 11, 12, + 0, 17, 0, 13, 0, 14, 15, 0, 18, 0, + 19, 0, 20, 21, 278, 22, 0, 0, 16, 4, + 5, 6, 7, 8, -156, -156, 0, 0, 0, 0, + 17, 0, 0, 0, 0, 0, 0, 18, 0, 19, + 0, 20, 21, 0, 22, 15, 0, 0, 0, 0, + 0, 0, -156, -156, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 0, 0, -156, -156, 103, 104, 105, + 106, 107, 0, 108, 0, 0, 18, 0, 19, 226, + 20, 21, 227, 22, 0, 52, 85, 86, 0, 0, + 0, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 0, 0, 0, 0, 96, 97, 0, 0, 0, 0, + 16, 84, 85, 86, 87, 0, 0, 101, 102, 103, + 104, 105, 106, 107, 0, 108, 0, 88, 89, 228, + 0, 229, 0, 0, 90, 91, 92, 93, 94, 95, + 96, 97, 0, 0, 0, 0, 0, 0, 0, 0, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, + 0, 108, 84, 85, 86, 87, 241, 0, 0, 242, + 0, 0, 0, 0, 0, 0, 0, 0, 88, 89, + 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, + 95, 96, 97, 0, 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, 84, 85, 86, 87, 0, 0, 0, 142, 0, 0, 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, - 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 0, 108, 84, 85, 86, 87, 0, 0, 0, - 274, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, - 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, - 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 0, 108, 84, 85, 86, 87, 0, 0, 0, - 275, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, - 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, - 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 0, 108, 84, 85, 86, 87, 0, 0, 0, - 300, 0, 0, 0, 0, 0, 0, 0, 0, 88, - 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, - 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, - 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 0, 108, 316, 0, 317, 84, 85, 86, 87, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 0, 108, 84, 85, 86, 87, 0, 0, + 0, 276, 0, 0, 0, 0, 0, 0, 0, 0, + 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, + 93, 94, 95, 96, 97, 0, 0, 0, 0, 0, + 0, 0, 0, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 0, 108, 84, 85, 86, 87, 0, + 0, 0, 277, 0, 0, 0, 0, 0, 0, 0, + 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, + 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, + 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 0, 108, 84, 85, 86, 87, + 0, 0, 0, 302, 0, 0, 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, + 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 0, 108, 318, 0, 319, + 84, 85, 86, 87, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, + 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, + 97, 0, 0, 0, 0, 84, 85, 86, 87, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, + 108, 88, 89, 138, 0, 0, 0, 0, 90, 91, + 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, 84, 85, 86, 87, 98, 99, 100, 101, 102, 103, - 104, 105, 106, 107, 0, 108, 88, 89, 138, 0, + 104, 105, 106, 107, 0, 108, 88, 89, 218, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, - 97, 0, 0, 0, 84, 85, 86, 87, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, - 88, 89, 217, 0, 0, 0, 0, 90, 91, 92, - 93, 94, 95, 96, 97, 0, 0, 0, 84, 85, - 86, 87, 98, 99, 100, 101, 102, 103, 104, 105, - 106, 107, 0, 108, 88, 89, 292, 0, 0, 0, - 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, - 0, 0, 84, 85, 86, 87, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 0, 108, 88, 89, - 315, 0, 0, 0, 0, 90, 91, 92, 93, 94, - 95, 96, 97, 0, 0, 0, 84, 85, 86, 87, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 0, 108, 88, 89, 319, 0, 0, 0, 0, 90, - 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, + 97, 0, 0, 0, 0, 84, 85, 86, 87, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, + 108, 88, 89, 294, 0, 0, 0, 0, 90, 91, + 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, + 84, 85, 86, 87, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 0, 108, 88, 89, 317, 0, + 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, + 97, 0, 0, 0, 0, 84, 85, 86, 87, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, + 108, 88, 89, 321, 0, 0, 0, 0, 90, 91, + 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, 109, 84, 85, 86, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, 0, - 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 0, 108, 192, 84, 85, - 86, 87, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, - 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 0, 108, 249, 84, + 102, 103, 104, 105, 106, 107, 0, 108, 192, 84, 85, 86, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, - 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 0, 108, 304, - 84, 85, 86, 87, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, - 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, - 97, 0, 0, 0, 0, 0, 0, 0, 98, 99, + 0, 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, - 305, 84, 85, 86, 87, 0, 0, 0, 0, 0, + 251, 84, 85, 86, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, - 96, 97, 0, 0, 0, 0, 0, 0, 0, 98, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, - 108, 309, 84, 85, 86, 87, 0, 0, 0, 0, - 0, 0, 0, 250, 251, 0, 0, 252, 88, 89, - 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, - 95, 96, 97, 0, 0, 0, 0, 0, 0, 0, + 96, 97, 0, 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 0, 108, 84, 85, 86, 87, 0, 0, 0, 0, - 0, 0, 0, 250, 251, 0, 0, 0, 88, 89, - 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, - 95, 96, 97, 0, 0, 0, 0, 0, 0, 0, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 0, 108, 84, 85, 86, 87, 0, 0, 0, 0, - 0, 0, 130, 0, 0, 0, 0, 0, 88, 89, - 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, - 95, 96, 97, 0, 0, 0, 84, 85, 86, 87, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 0, 108, 88, 89, 0, 0, 0, 0, 0, 90, - 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, - 0, 286, 0, 0, 98, 99, 100, 101, 102, 103, - 104, 105, 106, 107, 0, 108, 84, 85, 86, 87, + 0, 108, 306, 84, 85, 86, 87, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, + 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, + 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, + 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 0, 108, 307, 84, 85, 86, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 302, 88, 89, 0, 0, 0, 0, 0, 90, - 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, + 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, + 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, + 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 0, 108, 311, 84, 85, 86, + 87, 0, 0, 0, 0, 0, 0, 0, 252, 253, + 0, 0, 254, 88, 89, 0, 0, 0, 0, 0, + 90, 91, 92, 93, 94, 95, 96, 97, 0, 0, + 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 0, 108, 84, 85, + 86, 87, 0, 0, 0, 0, 0, 0, 0, 252, + 253, 0, 0, 0, 88, 89, 0, 0, 0, 0, + 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, + 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 0, 108, 84, + 85, 86, 87, 0, 0, 0, 0, 0, 0, 130, + 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, + 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, + 0, 0, 0, 0, 84, 85, 86, 87, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, + 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, + 93, 94, 95, 96, 97, 0, 0, 0, 0, 0, + 288, 0, 0, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 0, 108, 84, 85, 86, 87, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 304, 88, 89, 0, 0, 0, 0, 0, 90, 91, + 92, 93, 94, 95, 96, 97, 0, 0, 0, 0, 0, 0, 0, 0, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, 84, 85, 86, 87, - 0, 0, 0, 0, 0, 0, 303, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 305, 0, 0, 0, 0, 0, 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, - 84, 85, 86, 87, 98, 99, 100, 101, 102, 103, - 104, 105, 106, 107, 0, 108, 88, 89, 0, 0, - 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, - 97, 0, 0, 0, 84, 85, 86, 87, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 0, 108, - 88, 89, 0, 0, 0, 0, 0, 90, 91, 92, - 93, 94, 95, 96, 97, 0, 0, 0, -155, 85, - 86, 0, 0, 0, 100, 101, 102, 103, 104, 105, - 106, 107, 0, 108, 88, 89, 0, 0, 0, 0, - 0, -155, -155, -155, -155, -155, -155, 96, 97, 0, - 0, 85, 86, 0, 0, 0, 0, 0, -155, 101, - 102, 103, 104, 105, 106, 107, 88, 108, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, - 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 101, 102, 103, 104, 105, 106, 107, 0, 108 + 0, 84, 85, 86, 87, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 0, 108, 88, 89, 0, + 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, + 96, 97, 0, 0, 0, 0, 84, 85, 86, 87, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, + 0, 108, 88, 89, 0, 0, 0, 0, 0, 90, + 91, 92, 93, 94, 95, 96, 97, 0, 0, 0, + 0, -156, 85, 86, 0, 0, 0, 100, 101, 102, + 103, 104, 105, 106, 107, 0, 108, 88, 89, 0, + 0, 0, 0, 0, -156, -156, -156, -156, -156, -156, + 96, 97, 0, 0, 0, 85, 86, 0, 0, 0, + 0, 0, -156, 101, 102, 103, 104, 105, 106, 107, + 88, 108, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 96, 97, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 101, 102, 103, 104, + 105, 106, 107, 0, 108 }; static const yytype_int16 yycheck[] = { - 1, 1, 146, 11, 12, 149, 150, 5, 7, 10, - 7, 5, 13, 5, 4, 13, 17, 18, 180, 30, - 21, 13, 5, 48, 15, 20, 48, 22, 143, 30, - 13, 32, 33, 28, 29, 48, 0, 152, 63, 48, - 60, 31, 41, 68, 41, 60, 68, 59, 63, 61, - 63, 4, 4, 4, 179, 62, 58, 66, 65, 41, - 67, 4, 62, 59, 4, 61, 64, 65, 65, 213, - 64, 65, 64, 65, 218, 42, 43, 78, 45, 16, - 17, 64, 65, 84, 85, 86, 87, 88, 89, 90, + 1, 1, 7, 11, 12, 7, 5, 146, 4, 10, + 149, 150, 13, 5, 13, 61, 17, 18, 180, 0, + 21, 13, 4, 179, 49, 20, 30, 22, 49, 30, + 49, 32, 33, 28, 29, 31, 49, 42, 143, 64, + 42, 16, 17, 60, 69, 62, 67, 152, 4, 63, + 69, 64, 66, 15, 68, 43, 44, 4, 46, 41, + 5, 66, 59, 63, 5, 63, 65, 66, 13, 43, + 44, 42, 46, 65, 66, 214, 61, 78, 234, 64, + 219, 63, 28, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 269, 233, 120, - 62, 62, 62, 114, 28, 259, 260, 61, 113, 4, - 5, 6, 7, 8, 42, 43, 1, 45, 129, 130, - 58, 66, 133, 63, 4, 68, 144, 262, 146, 264, - 265, 149, 150, 268, 63, 30, 271, 63, 143, 54, - 55, 56, 48, 58, 131, 132, 41, 152, 58, 13, - 47, 63, 4, 58, 40, 47, 40, 58, 293, 66, - 58, 4, 4, 63, 60, 60, 60, 62, 47, 64, - 65, 306, 67, 184, 63, 180, 187, 58, 4, 40, - 63, 63, 193, 31, 58, 63, 1, 63, 63, 4, - 5, 6, 7, 8, 63, 213, 207, 120, 209, 14, - 218, 58, 58, 18, 58, 29, 247, 22, 23, 127, - 310, 193, 27, 269, 29, 30, 227, -1, -1, -1, - -1, -1, -1, 234, -1, -1, 41, -1, -1, 240, - -1, -1, -1, -1, -1, -1, -1, -1, 53, 250, - 251, 259, 260, 254, 255, 60, -1, 62, 63, 64, - 65, 66, 67, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 269, -1, -1, -1, -1, -1, - 281, -1, -1, -1, -1, -1, 0, 1, -1, -1, - 4, 5, -1, 7, -1, 9, 10, 11, 12, 13, - -1, -1, 303, 304, 305, 19, 20, 21, -1, -1, - 24, 25, 26, -1, 28, 316, -1, -1, 32, 33, - 34, 35, 36, 37, 38, 39, -1, 41, -1, -1, - 44, -1, -1, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, -1, 58, 59, -1, 61, -1, 63, - 64, 65, 66, 1, 68, -1, 4, 10, 11, 7, - -1, -1, -1, -1, -1, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, -1, 38, 39, -1, -1, -1, - -1, -1, -1, 41, -1, -1, -1, 50, 51, 52, - 53, 54, 55, 56, -1, 58, -1, -1, -1, -1, - 1, -1, 60, 4, 62, -1, 7, -1, -1, -1, - 68, -1, 13, 14, 15, 16, 17, 18, 19, 20, + 101, 102, 103, 104, 105, 106, 107, 63, 264, 271, + 266, 267, 4, 114, 270, 4, 120, 273, 113, 62, + 65, 66, 261, 262, 65, 66, 1, 59, 129, 130, + 67, 64, 133, 55, 56, 57, 144, 59, 146, 295, + 4, 149, 150, 60, 64, 62, 64, 49, 143, 59, + 1, 13, 308, 4, 131, 132, 7, 152, 69, 64, + 48, 59, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 4, 5, 6, 7, 8, -1, -1, -1, -1, - 41, -1, -1, 1, -1, -1, 4, 5, 6, 7, - 8, -1, -1, -1, -1, -1, 14, 30, -1, 60, - 18, 62, -1, -1, 22, 23, -1, 68, 41, 27, - -1, 29, 30, -1, -1, -1, -1, -1, -1, -1, - 53, -1, -1, 41, -1, -1, -1, 60, -1, 62, - -1, 64, 65, -1, 67, 53, -1, -1, -1, -1, - 10, 11, 60, -1, 62, -1, 64, 65, 66, 67, + 31, 4, 40, 184, 40, 180, 187, 48, 59, 67, + 59, 42, 193, 4, 4, 61, 61, 64, 48, 4, + 4, 5, 6, 7, 8, 64, 214, 208, 4, 210, + 61, 219, 63, 59, 40, 64, 64, 64, 69, 64, + 64, 59, 59, 59, 64, 59, 30, 228, 31, 120, + 29, 249, 127, 312, 235, 193, 271, -1, 42, -1, + 241, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 54, 252, 253, 261, 262, 256, 257, 61, -1, 63, + -1, 65, 66, -1, 68, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 271, -1, -1, -1, + -1, -1, 283, -1, -1, -1, -1, -1, 0, 1, + -1, -1, 4, 5, -1, 7, -1, 9, 10, 11, + 12, 13, -1, -1, 305, 306, 307, 19, 20, 21, + -1, -1, 24, 25, 26, -1, 28, 318, -1, -1, + 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, + 42, -1, -1, 45, -1, -1, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, -1, 59, 60, -1, + 62, -1, 64, 65, 66, 67, 1, 69, -1, 4, + -1, -1, 7, -1, -1, -1, -1, -1, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 1, -1, -1, 4, 5, 6, 7, 8, -1, -1, + -1, -1, -1, 14, -1, -1, 61, 18, 63, -1, + -1, 22, 23, -1, 69, -1, 27, -1, 29, 30, 1, -1, -1, 4, 5, 6, 7, 8, -1, -1, - -1, -1, -1, 14, -1, -1, -1, 18, 38, 39, - -1, 22, 23, -1, -1, -1, 27, -1, 29, 30, - 50, 51, 52, 53, 54, 55, 56, -1, 58, -1, - 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 53, -1, -1, -1, -1, -1, -1, 60, - -1, 62, -1, 64, 65, 1, 67, -1, 4, 5, - 6, 7, 8, -1, -1, -1, -1, -1, 14, -1, - -1, -1, 18, -1, -1, -1, 22, 23, -1, -1, - -1, 27, -1, 29, 30, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 53, -1, -1, - -1, -1, -1, -1, 60, -1, 62, -1, 64, 65, - 1, 67, -1, 4, 5, 6, 7, 8, -1, -1, - -1, -1, -1, 14, -1, -1, -1, 18, -1, -1, - -1, 22, 23, -1, -1, -1, 27, -1, 29, 30, + -1, 42, -1, 14, -1, -1, -1, 18, -1, -1, + -1, 22, 23, 54, -1, -1, 27, -1, 29, 30, + 61, -1, 63, 64, 65, 66, 67, 68, -1, -1, + -1, 42, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, + 61, -1, 63, -1, 65, 66, 67, 68, 1, -1, -1, 4, 5, 6, 7, 8, -1, -1, -1, -1, - 41, 14, -1, -1, -1, 18, -1, -1, -1, 22, - 23, -1, 53, -1, 27, -1, 29, 30, -1, 60, - -1, 62, -1, 64, 65, -1, 67, -1, 41, -1, + -1, 14, -1, -1, -1, 18, -1, -1, -1, 22, + 23, -1, -1, -1, 27, -1, 29, 30, 1, -1, + -1, 4, 5, 6, 7, 8, -1, -1, -1, 42, + -1, 14, -1, -1, -1, 18, -1, -1, -1, 22, + 23, 54, -1, -1, 27, -1, 29, 30, 61, -1, + 63, -1, 65, 66, -1, 68, -1, -1, -1, 42, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 53, -1, -1, -1, -1, -1, 59, 60, -1, 62, - -1, 64, 65, -1, 67, 4, 5, 6, 7, 8, - -1, -1, -1, -1, -1, 14, -1, -1, -1, 18, - -1, -1, -1, 22, 23, -1, -1, -1, 27, -1, - 29, 30, -1, 4, 5, 6, 7, 8, -1, -1, - -1, -1, 41, 14, -1, -1, -1, 18, -1, -1, - -1, 22, 23, -1, 53, -1, 27, -1, 29, 30, - -1, 60, -1, 62, -1, 64, 65, 66, 67, -1, - 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 53, -1, -1, -1, -1, -1, -1, 60, - -1, 62, 1, 64, 65, 4, 67, -1, 7, -1, - -1, -1, -1, -1, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 41, 9, 10, 11, 12, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, - 26, 60, -1, 62, -1, -1, 32, 33, 34, 35, - 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, - -1, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, -1, 58, 9, 10, 11, 12, 63, -1, -1, - 66, -1, -1, -1, -1, -1, -1, -1, -1, 25, - 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, - 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, - -1, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, -1, 58, 9, 10, 11, 12, -1, -1, -1, - 66, -1, -1, -1, -1, -1, -1, -1, -1, 25, - 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, - 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, - -1, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, -1, 58, 9, 10, 11, 12, -1, -1, -1, - 66, -1, -1, -1, -1, -1, -1, -1, -1, 25, - 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, - 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, - -1, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, -1, 58, 9, 10, 11, 12, -1, -1, -1, - 66, -1, -1, -1, -1, -1, -1, -1, -1, 25, - 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, - 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, - -1, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, -1, 58, 9, 10, 11, 12, -1, -1, -1, - 66, -1, -1, -1, -1, -1, -1, -1, -1, 25, + -1, 54, -1, -1, -1, -1, -1, -1, 61, -1, + 63, -1, 65, 66, 1, 68, -1, 4, 5, 6, + 7, 8, -1, -1, -1, -1, -1, 14, -1, -1, + -1, 18, -1, -1, -1, 22, 23, -1, -1, -1, + 27, -1, 29, 30, -1, -1, 4, 5, 6, 7, + 8, -1, -1, -1, -1, 42, 14, -1, -1, -1, + 18, -1, -1, -1, 22, 23, -1, 54, -1, 27, + -1, 29, 30, -1, 61, -1, 63, -1, 65, 66, + -1, 68, -1, -1, 42, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, + -1, -1, 60, 61, -1, 63, -1, 65, 66, -1, + 68, 4, 5, 6, 7, 8, -1, -1, -1, -1, + -1, 14, -1, -1, -1, 18, -1, -1, -1, 22, + 23, -1, -1, -1, 27, -1, 29, 30, -1, -1, + 4, 5, 6, 7, 8, -1, -1, -1, -1, 42, + 14, -1, -1, -1, 18, -1, -1, -1, 22, 23, + -1, 54, -1, 27, -1, 29, 30, -1, 61, -1, + 63, -1, 65, 66, 67, 68, -1, -1, 42, 4, + 5, 6, 7, 8, 10, 11, -1, -1, -1, -1, + 54, -1, -1, -1, -1, -1, -1, 61, -1, 63, + -1, 65, 66, -1, 68, 30, -1, -1, -1, -1, + -1, -1, 38, 39, -1, -1, -1, 42, -1, -1, + -1, -1, -1, -1, -1, 51, 52, 53, 54, 55, + 56, 57, -1, 59, -1, -1, 61, -1, 63, 1, + 65, 66, 4, 68, -1, 7, 10, 11, -1, -1, + -1, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + -1, -1, -1, -1, 38, 39, -1, -1, -1, -1, + 42, 9, 10, 11, 12, -1, -1, 51, 52, 53, + 54, 55, 56, 57, -1, 59, -1, 25, 26, 61, + -1, 63, -1, -1, 32, 33, 34, 35, 36, 37, + 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + -1, 59, 9, 10, 11, 12, 64, -1, -1, 67, + -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, + -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, + 37, 38, 39, -1, -1, -1, -1, -1, -1, -1, + -1, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, -1, 59, 9, 10, 11, 12, -1, -1, -1, + 67, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, - -1, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, -1, 58, 59, -1, 61, 9, 10, 11, 12, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, -1, 59, 9, 10, 11, 12, -1, -1, + -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, + 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, + 35, 36, 37, 38, 39, -1, -1, -1, -1, -1, + -1, -1, -1, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, -1, 59, 9, 10, 11, 12, -1, + -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, + -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, + 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, + -1, -1, -1, -1, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, -1, 59, 9, 10, 11, 12, + -1, -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, - 9, 10, 11, 12, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, -1, 58, 25, 26, 61, -1, + -1, -1, -1, -1, -1, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, -1, 59, 60, -1, 62, + 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, - 39, -1, -1, -1, 9, 10, 11, 12, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, -1, 58, - 25, 26, 61, -1, -1, -1, -1, 32, 33, 34, - 35, 36, 37, 38, 39, -1, -1, -1, 9, 10, - 11, 12, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, -1, 58, 25, 26, 61, -1, -1, -1, - -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, - -1, -1, 9, 10, 11, 12, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, -1, 58, 25, 26, - 61, -1, -1, -1, -1, 32, 33, 34, 35, 36, - 37, 38, 39, -1, -1, -1, 9, 10, 11, 12, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - -1, 58, 25, 26, 61, -1, -1, -1, -1, 32, - 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, - -1, -1, -1, -1, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, -1, 58, 59, 9, 10, 11, + 39, -1, -1, -1, -1, 9, 10, 11, 12, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, + 59, 25, 26, 62, -1, -1, -1, -1, 32, 33, + 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, + 9, 10, 11, 12, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, -1, 59, 25, 26, 62, -1, + -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, + 39, -1, -1, -1, -1, 9, 10, 11, 12, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, + 59, 25, 26, 62, -1, -1, -1, -1, 32, 33, + 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, + 9, 10, 11, 12, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, -1, 59, 25, 26, 62, -1, + -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, + 39, -1, -1, -1, -1, 9, 10, 11, 12, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, + 59, 25, 26, 62, -1, -1, -1, -1, 32, 33, + 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, + -1, -1, -1, -1, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, -1, 59, 60, 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, - -1, -1, -1, -1, -1, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, -1, 58, 59, 9, 10, - 11, 12, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, - -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, - -1, -1, -1, -1, -1, -1, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, -1, 58, 59, 9, + -1, -1, -1, -1, -1, -1, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, -1, 59, 60, 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, - -1, -1, -1, -1, -1, -1, -1, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, -1, 58, 59, - 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, - -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, - 39, -1, -1, -1, -1, -1, -1, -1, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, -1, 58, - 59, 9, 10, 11, 12, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, -1, 59, + 60, 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, - 38, 39, -1, -1, -1, -1, -1, -1, -1, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, -1, - 58, 59, 9, 10, 11, 12, -1, -1, -1, -1, - -1, -1, -1, 20, 21, -1, -1, 24, 25, 26, - -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, - 37, 38, 39, -1, -1, -1, -1, -1, -1, -1, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - -1, 58, 9, 10, 11, 12, -1, -1, -1, -1, - -1, -1, -1, 20, 21, -1, -1, -1, 25, 26, - -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, - 37, 38, 39, -1, -1, -1, -1, -1, -1, -1, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - -1, 58, 9, 10, 11, 12, -1, -1, -1, -1, - -1, -1, 19, -1, -1, -1, -1, -1, 25, 26, - -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, - 37, 38, 39, -1, -1, -1, 9, 10, 11, 12, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - -1, 58, 25, 26, -1, -1, -1, -1, -1, 32, - 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, - -1, 44, -1, -1, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, -1, 58, 9, 10, 11, 12, + 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + -1, 59, 60, 9, 10, 11, 12, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, + 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, + 36, 37, 38, 39, -1, -1, -1, -1, -1, -1, + -1, -1, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, -1, 59, 60, 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 24, 25, 26, -1, -1, -1, -1, -1, 32, - 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, - -1, -1, -1, -1, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, -1, 58, 9, 10, 11, 12, + -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, + 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, + -1, -1, -1, -1, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, -1, 59, 60, 9, 10, 11, + 12, -1, -1, -1, -1, -1, -1, -1, 20, 21, + -1, -1, 24, 25, 26, -1, -1, -1, -1, -1, + 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, + -1, -1, -1, -1, -1, -1, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, -1, 59, 9, 10, + 11, 12, -1, -1, -1, -1, -1, -1, -1, 20, + 21, -1, -1, -1, 25, 26, -1, -1, -1, -1, + -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, + -1, -1, -1, -1, -1, -1, -1, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, -1, 59, 9, + 10, 11, 12, -1, -1, -1, -1, -1, -1, 19, + -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, + -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, + -1, -1, -1, -1, 9, 10, 11, 12, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, -1, 59, + 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, + 35, 36, 37, 38, 39, -1, -1, -1, -1, -1, + 45, -1, -1, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, -1, 59, 9, 10, 11, 12, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 24, 25, 26, -1, -1, -1, -1, -1, 32, 33, + 34, 35, 36, 37, 38, 39, -1, -1, -1, -1, + -1, -1, -1, -1, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, -1, 59, 9, 10, 11, 12, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, - 9, 10, 11, 12, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, -1, 58, 25, 26, -1, -1, - -1, -1, -1, 32, 33, 34, 35, 36, 37, 38, - 39, -1, -1, -1, 9, 10, 11, 12, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, -1, 58, - 25, 26, -1, -1, -1, -1, -1, 32, 33, 34, - 35, 36, 37, 38, 39, -1, -1, -1, 9, 10, - 11, -1, -1, -1, 49, 50, 51, 52, 53, 54, - 55, 56, -1, 58, 25, 26, -1, -1, -1, -1, - -1, 32, 33, 34, 35, 36, 37, 38, 39, -1, - -1, 10, 11, -1, -1, -1, -1, -1, 49, 50, - 51, 52, 53, 54, 55, 56, 25, 58, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 38, - 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 50, 51, 52, 53, 54, 55, 56, -1, 58 + -1, 9, 10, 11, 12, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, -1, 59, 25, 26, -1, + -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, + 38, 39, -1, -1, -1, -1, 9, 10, 11, 12, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + -1, 59, 25, 26, -1, -1, -1, -1, -1, 32, + 33, 34, 35, 36, 37, 38, 39, -1, -1, -1, + -1, 9, 10, 11, -1, -1, -1, 50, 51, 52, + 53, 54, 55, 56, 57, -1, 59, 25, 26, -1, + -1, -1, -1, -1, 32, 33, 34, 35, 36, 37, + 38, 39, -1, -1, -1, 10, 11, -1, -1, -1, + -1, -1, 50, 51, 52, 53, 54, 55, 56, 57, + 25, 59, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 38, 39, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 51, 52, 53, 54, + 55, 56, 57, -1, 59 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 15, 70, 71, 4, 5, 6, 7, 8, 14, - 18, 22, 23, 27, 29, 30, 41, 53, 60, 62, - 64, 65, 67, 74, 78, 81, 87, 0, 16, 17, - 72, 75, 76, 60, 58, 41, 4, 74, 87, 87, - 74, 62, 1, 62, 82, 74, 1, 74, 4, 31, - 1, 4, 7, 81, 1, 66, 74, 1, 4, 13, + 0, 15, 71, 72, 4, 5, 6, 7, 8, 14, + 18, 22, 23, 27, 29, 30, 42, 54, 61, 63, + 65, 66, 68, 75, 79, 82, 88, 0, 16, 17, + 73, 76, 77, 61, 59, 42, 4, 75, 88, 88, + 75, 63, 1, 63, 83, 75, 1, 75, 4, 31, + 1, 4, 7, 82, 1, 67, 75, 1, 4, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 60, 62, - 81, 96, 97, 98, 9, 10, 11, 12, 25, 26, - 32, 33, 34, 35, 36, 37, 38, 39, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 58, 59, - 74, 5, 13, 64, 65, 77, 81, 77, 73, 74, - 78, 72, 59, 74, 74, 88, 89, 83, 60, 63, - 19, 13, 13, 28, 4, 4, 84, 61, 61, 1, - 58, 66, 66, 48, 63, 68, 63, 74, 4, 63, - 63, 68, 48, 74, 74, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 58, 62, 65, - 67, 90, 91, 92, 65, 81, 1, 63, 66, 74, - 13, 73, 59, 59, 61, 84, 4, 62, 79, 80, - 74, 1, 74, 91, 91, 1, 74, 47, 42, 43, - 45, 1, 97, 53, 86, 87, 86, 61, 63, 86, - 86, 97, 4, 92, 93, 1, 4, 60, 62, 81, - 94, 95, 96, 40, 47, 74, 58, 66, 74, 58, - 63, 66, 4, 62, 89, 45, 4, 59, 61, 59, - 20, 21, 24, 85, 60, 60, 74, 74, 86, 47, - 63, 86, 48, 66, 63, 63, 74, 4, 63, 48, - 68, 63, 92, 74, 66, 66, 66, 74, 58, 4, - 80, 63, 74, 74, 74, 74, 44, 86, 86, 92, - 92, 92, 61, 63, 92, 95, 92, 58, 58, 58, - 66, 74, 24, 19, 59, 59, 63, 92, 58, 59, - 74, 74, 74, 92, 85, 61, 59, 61, 74, 61 + 24, 25, 26, 27, 28, 29, 30, 31, 61, 63, + 82, 97, 98, 99, 9, 10, 11, 12, 25, 26, + 32, 33, 34, 35, 36, 37, 38, 39, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, + 75, 5, 13, 65, 66, 78, 82, 78, 74, 75, + 79, 73, 60, 75, 75, 89, 90, 84, 61, 64, + 19, 13, 13, 28, 4, 4, 85, 62, 62, 1, + 59, 67, 67, 49, 64, 69, 64, 75, 4, 64, + 64, 69, 49, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 59, 63, 66, + 68, 91, 92, 93, 66, 82, 1, 64, 67, 75, + 13, 74, 60, 60, 62, 85, 4, 41, 63, 80, + 81, 75, 1, 75, 92, 92, 1, 75, 48, 43, + 44, 46, 1, 98, 54, 87, 88, 87, 62, 64, + 87, 87, 98, 4, 93, 94, 1, 4, 61, 63, + 82, 95, 96, 97, 40, 48, 75, 59, 67, 75, + 59, 64, 67, 4, 63, 90, 46, 4, 4, 60, + 62, 60, 20, 21, 24, 86, 61, 61, 75, 75, + 87, 48, 64, 87, 49, 67, 64, 64, 75, 4, + 64, 49, 69, 64, 93, 75, 67, 67, 67, 75, + 59, 4, 81, 64, 75, 75, 75, 75, 45, 87, + 87, 93, 93, 93, 62, 64, 93, 96, 93, 59, + 59, 59, 67, 75, 24, 19, 60, 60, 64, 93, + 59, 60, 75, 75, 75, 93, 86, 62, 60, 62, + 75, 62 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 69, 70, 70, 71, 71, 72, 72, 73, 73, - 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 74, 74, 75, - 75, 76, 76, 76, 77, 78, 78, 79, 79, 80, - 80, 82, 81, 83, 81, 84, 84, 84, 85, 85, - 86, 86, 86, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 88, 88, 89, 90, 90, 91, - 91, 92, 92, 92, 93, 93, 94, 94, 95, 95, - 95, 95, 95, 95, 95, 96, 96, 96, 96, 96, - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 96, 96, 96, 97, 97, 97, 97, 98, 98, - 98, 98, 98, 98, 98, 98, 98 + 0, 70, 71, 71, 72, 72, 73, 73, 74, 74, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 75, 75, 75, 75, 75, 76, + 76, 77, 77, 77, 78, 79, 79, 80, 80, 81, + 81, 81, 83, 82, 84, 82, 85, 85, 85, 86, + 86, 87, 87, 87, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 89, 89, 90, 91, 91, + 92, 92, 93, 93, 93, 94, 94, 95, 95, 96, + 96, 96, 96, 96, 96, 96, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 98, 98, 98, 98, 99, + 99, 99, 99, 99, 99, 99, 99, 99 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1394,17 +1403,17 @@ static const yytype_uint8 yyr2[] = 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 2, 3, 5, 4, 2, 1, 5, 8, 1, 3, 2, - 1, 0, 4, 0, 5, 0, 2, 4, 5, 3, - 3, 2, 1, 1, 1, 3, 2, 3, 2, 4, - 3, 2, 1, 3, 2, 2, 3, 5, 4, 6, - 5, 4, 3, 7, 6, 6, 6, 5, 5, 1, - 1, 1, 3, 3, 2, 3, 2, 2, 1, 4, - 3, 3, 4, 3, 1, 3, 1, 3, 1, 3, - 1, 2, 3, 3, 1, 3, 1, 3, 2, 4, - 3, 3, 3, 5, 3, 1, 1, 1, 1, 1, + 2, 1, 0, 4, 0, 5, 0, 2, 4, 5, + 3, 3, 2, 1, 1, 1, 3, 2, 3, 2, + 4, 3, 2, 1, 3, 2, 2, 3, 5, 4, + 6, 5, 4, 3, 7, 6, 6, 6, 5, 5, + 1, 1, 1, 3, 3, 2, 3, 2, 2, 1, + 4, 3, 3, 4, 3, 1, 3, 1, 3, 1, + 3, 1, 2, 3, 3, 1, 3, 1, 3, 2, + 4, 3, 3, 3, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 3, 3, 3, 3, - 3, 1, 4, 2, 1, 5, 3 + 1, 1, 1, 1, 1, 0, 1, 3, 3, 3, + 3, 3, 1, 4, 2, 1, 5, 3 }; @@ -1907,187 +1916,187 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio case 4: /* IDENT */ #line 36 "src/parser.y" /* yacc.c:1257 */ { jv_free(((*yyvaluep).literal)); } -#line 1911 "src/parser.c" /* yacc.c:1257 */ +#line 1920 "src/parser.c" /* yacc.c:1257 */ break; case 5: /* FIELD */ #line 36 "src/parser.y" /* yacc.c:1257 */ { jv_free(((*yyvaluep).literal)); } -#line 1917 "src/parser.c" /* yacc.c:1257 */ +#line 1926 "src/parser.c" /* yacc.c:1257 */ break; case 6: /* LITERAL */ #line 36 "src/parser.y" /* yacc.c:1257 */ { jv_free(((*yyvaluep).literal)); } -#line 1923 "src/parser.c" /* yacc.c:1257 */ +#line 1932 "src/parser.c" /* yacc.c:1257 */ break; case 7: /* FORMAT */ #line 36 "src/parser.y" /* yacc.c:1257 */ { jv_free(((*yyvaluep).literal)); } -#line 1929 "src/parser.c" /* yacc.c:1257 */ +#line 1938 "src/parser.c" /* yacc.c:1257 */ break; - case 42: /* QQSTRING_TEXT */ + case 43: /* QQSTRING_TEXT */ #line 36 "src/parser.y" /* yacc.c:1257 */ { jv_free(((*yyvaluep).literal)); } -#line 1935 "src/parser.c" /* yacc.c:1257 */ +#line 1944 "src/parser.c" /* yacc.c:1257 */ break; - case 71: /* Module */ + case 72: /* Module */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1941 "src/parser.c" /* yacc.c:1257 */ +#line 1950 "src/parser.c" /* yacc.c:1257 */ break; - case 72: /* Imports */ + case 73: /* Imports */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1947 "src/parser.c" /* yacc.c:1257 */ +#line 1956 "src/parser.c" /* yacc.c:1257 */ break; - case 73: /* FuncDefs */ + case 74: /* FuncDefs */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1953 "src/parser.c" /* yacc.c:1257 */ +#line 1962 "src/parser.c" /* yacc.c:1257 */ break; - case 74: /* Exp */ + case 75: /* Exp */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1959 "src/parser.c" /* yacc.c:1257 */ +#line 1968 "src/parser.c" /* yacc.c:1257 */ break; - case 75: /* Import */ + case 76: /* Import */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1965 "src/parser.c" /* yacc.c:1257 */ +#line 1974 "src/parser.c" /* yacc.c:1257 */ break; - case 76: /* ImportWhat */ + case 77: /* ImportWhat */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1971 "src/parser.c" /* yacc.c:1257 */ +#line 1980 "src/parser.c" /* yacc.c:1257 */ break; - case 77: /* ImportFrom */ + case 78: /* ImportFrom */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1977 "src/parser.c" /* yacc.c:1257 */ +#line 1986 "src/parser.c" /* yacc.c:1257 */ break; - case 78: /* FuncDef */ + case 79: /* FuncDef */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1983 "src/parser.c" /* yacc.c:1257 */ +#line 1992 "src/parser.c" /* yacc.c:1257 */ break; - case 79: /* Params */ + case 80: /* Params */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1989 "src/parser.c" /* yacc.c:1257 */ +#line 1998 "src/parser.c" /* yacc.c:1257 */ break; - case 80: /* Param */ + case 81: /* Param */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 1995 "src/parser.c" /* yacc.c:1257 */ +#line 2004 "src/parser.c" /* yacc.c:1257 */ break; - case 81: /* String */ + case 82: /* String */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2001 "src/parser.c" /* yacc.c:1257 */ +#line 2010 "src/parser.c" /* yacc.c:1257 */ break; - case 84: /* QQString */ + case 85: /* QQString */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2007 "src/parser.c" /* yacc.c:1257 */ +#line 2016 "src/parser.c" /* yacc.c:1257 */ break; - case 85: /* ElseBody */ + case 86: /* ElseBody */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2013 "src/parser.c" /* yacc.c:1257 */ +#line 2022 "src/parser.c" /* yacc.c:1257 */ break; - case 86: /* ExpD */ + case 87: /* ExpD */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2019 "src/parser.c" /* yacc.c:1257 */ +#line 2028 "src/parser.c" /* yacc.c:1257 */ break; - case 87: /* Term */ + case 88: /* Term */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2025 "src/parser.c" /* yacc.c:1257 */ +#line 2034 "src/parser.c" /* yacc.c:1257 */ break; - case 88: /* Args */ + case 89: /* Args */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2031 "src/parser.c" /* yacc.c:1257 */ +#line 2040 "src/parser.c" /* yacc.c:1257 */ break; - case 89: /* Arg */ + case 90: /* Arg */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2037 "src/parser.c" /* yacc.c:1257 */ +#line 2046 "src/parser.c" /* yacc.c:1257 */ break; - case 90: /* RepPatterns */ + case 91: /* RepPatterns */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2043 "src/parser.c" /* yacc.c:1257 */ +#line 2052 "src/parser.c" /* yacc.c:1257 */ break; - case 91: /* Patterns */ + case 92: /* Patterns */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2049 "src/parser.c" /* yacc.c:1257 */ +#line 2058 "src/parser.c" /* yacc.c:1257 */ break; - case 92: /* Pattern */ + case 93: /* Pattern */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2055 "src/parser.c" /* yacc.c:1257 */ +#line 2064 "src/parser.c" /* yacc.c:1257 */ break; - case 93: /* ArrayPats */ + case 94: /* ArrayPats */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2061 "src/parser.c" /* yacc.c:1257 */ +#line 2070 "src/parser.c" /* yacc.c:1257 */ break; - case 94: /* ObjPats */ + case 95: /* ObjPats */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2067 "src/parser.c" /* yacc.c:1257 */ +#line 2076 "src/parser.c" /* yacc.c:1257 */ break; - case 95: /* ObjPat */ + case 96: /* ObjPat */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2073 "src/parser.c" /* yacc.c:1257 */ +#line 2082 "src/parser.c" /* yacc.c:1257 */ break; - case 96: /* Keyword */ + case 97: /* Keyword */ #line 36 "src/parser.y" /* yacc.c:1257 */ { jv_free(((*yyvaluep).literal)); } -#line 2079 "src/parser.c" /* yacc.c:1257 */ +#line 2088 "src/parser.c" /* yacc.c:1257 */ break; - case 97: /* MkDict */ + case 98: /* MkDict */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2085 "src/parser.c" /* yacc.c:1257 */ +#line 2094 "src/parser.c" /* yacc.c:1257 */ break; - case 98: /* MkDictPair */ + case 99: /* MkDictPair */ #line 37 "src/parser.y" /* yacc.c:1257 */ { block_free(((*yyvaluep).blk)); } -#line 2091 "src/parser.c" /* yacc.c:1257 */ +#line 2100 "src/parser.c" /* yacc.c:1257 */ break; @@ -2379,31 +2388,31 @@ YYLTYPE yylloc = yyloc_default; switch (yyn) { case 2: -#line 300 "src/parser.y" /* yacc.c:1646 */ +#line 301 "src/parser.y" /* yacc.c:1646 */ { *answer = BLOCK((yyvsp[-2].blk), (yyvsp[-1].blk), gen_op_simple(TOP), (yyvsp[0].blk)); } -#line 2387 "src/parser.c" /* yacc.c:1646 */ +#line 2396 "src/parser.c" /* yacc.c:1646 */ break; case 3: -#line 303 "src/parser.y" /* yacc.c:1646 */ +#line 304 "src/parser.y" /* yacc.c:1646 */ { *answer = BLOCK((yyvsp[-2].blk), (yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2395 "src/parser.c" /* yacc.c:1646 */ +#line 2404 "src/parser.c" /* yacc.c:1646 */ break; case 4: -#line 308 "src/parser.y" /* yacc.c:1646 */ +#line 309 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 2403 "src/parser.c" /* yacc.c:1646 */ +#line 2412 "src/parser.c" /* yacc.c:1646 */ break; case 5: -#line 311 "src/parser.y" /* yacc.c:1646 */ +#line 312 "src/parser.y" /* yacc.c:1646 */ { if (!block_is_const((yyvsp[-1].blk))) { FAIL((yyloc), "Module metadata must be constant"); @@ -2413,374 +2422,374 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = gen_module((yyvsp[-1].blk)); } } -#line 2417 "src/parser.c" /* yacc.c:1646 */ +#line 2426 "src/parser.c" /* yacc.c:1646 */ break; case 6: -#line 322 "src/parser.y" /* yacc.c:1646 */ +#line 323 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 2425 "src/parser.c" /* yacc.c:1646 */ +#line 2434 "src/parser.c" /* yacc.c:1646 */ break; case 7: -#line 325 "src/parser.y" /* yacc.c:1646 */ +#line 326 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2433 "src/parser.c" /* yacc.c:1646 */ +#line 2442 "src/parser.c" /* yacc.c:1646 */ break; case 8: -#line 330 "src/parser.y" /* yacc.c:1646 */ +#line 331 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 2441 "src/parser.c" /* yacc.c:1646 */ +#line 2450 "src/parser.c" /* yacc.c:1646 */ break; case 9: -#line 333 "src/parser.y" /* yacc.c:1646 */ +#line 334 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = block_join((yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2449 "src/parser.c" /* yacc.c:1646 */ +#line 2458 "src/parser.c" /* yacc.c:1646 */ break; case 10: -#line 338 "src/parser.y" /* yacc.c:1646 */ +#line 339 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = block_bind_referenced((yyvsp[-1].blk), (yyvsp[0].blk), OP_IS_CALL_PSEUDO); } -#line 2457 "src/parser.c" /* yacc.c:1646 */ +#line 2466 "src/parser.c" /* yacc.c:1646 */ break; case 11: -#line 342 "src/parser.y" /* yacc.c:1646 */ +#line 343 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_destructure((yyvsp[-4].blk), (yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2465 "src/parser.c" /* yacc.c:1646 */ +#line 2474 "src/parser.c" /* yacc.c:1646 */ break; case 12: -#line 345 "src/parser.y" /* yacc.c:1646 */ +#line 346 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_reduce((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 2473 "src/parser.c" /* yacc.c:1646 */ +#line 2482 "src/parser.c" /* yacc.c:1646 */ break; case 13: -#line 349 "src/parser.y" /* yacc.c:1646 */ +#line 350 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_foreach((yyvsp[-9].blk), (yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 2481 "src/parser.c" /* yacc.c:1646 */ +#line 2490 "src/parser.c" /* yacc.c:1646 */ break; case 14: -#line 353 "src/parser.y" /* yacc.c:1646 */ +#line 354 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_foreach((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop()); } -#line 2489 "src/parser.c" /* yacc.c:1646 */ +#line 2498 "src/parser.c" /* yacc.c:1646 */ break; case 15: -#line 357 "src/parser.y" /* yacc.c:1646 */ +#line 358 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2497 "src/parser.c" /* yacc.c:1646 */ +#line 2506 "src/parser.c" /* yacc.c:1646 */ break; case 16: -#line 360 "src/parser.y" /* yacc.c:1646 */ +#line 361 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop()); } -#line 2505 "src/parser.c" /* yacc.c:1646 */ +#line 2514 "src/parser.c" /* yacc.c:1646 */ break; case 17: -#line 363 "src/parser.y" /* yacc.c:1646 */ +#line 364 "src/parser.y" /* yacc.c:1646 */ { FAIL((yyloc), "Possibly unterminated 'if' statement"); (yyval.blk) = (yyvsp[-2].blk); } -#line 2514 "src/parser.c" /* yacc.c:1646 */ +#line 2523 "src/parser.c" /* yacc.c:1646 */ break; case 18: -#line 368 "src/parser.y" /* yacc.c:1646 */ +#line 369 "src/parser.y" /* yacc.c:1646 */ { //$$ = BLOCK(gen_op_target(FORK_OPT, $2), $2, $4); (yyval.blk) = gen_try((yyvsp[-2].blk), gen_try_handler((yyvsp[0].blk))); } -#line 2523 "src/parser.c" /* yacc.c:1646 */ +#line 2532 "src/parser.c" /* yacc.c:1646 */ break; case 19: -#line 372 "src/parser.y" /* yacc.c:1646 */ +#line 373 "src/parser.y" /* yacc.c:1646 */ { //$$ = BLOCK(gen_op_target(FORK_OPT, $2), $2, gen_op_simple(BACKTRACK)); (yyval.blk) = gen_try((yyvsp[0].blk), gen_op_simple(BACKTRACK)); } -#line 2532 "src/parser.c" /* yacc.c:1646 */ +#line 2541 "src/parser.c" /* yacc.c:1646 */ break; case 20: -#line 376 "src/parser.y" /* yacc.c:1646 */ +#line 377 "src/parser.y" /* yacc.c:1646 */ { FAIL((yyloc), "Possibly unterminated 'try' statement"); (yyval.blk) = (yyvsp[-2].blk); } -#line 2541 "src/parser.c" /* yacc.c:1646 */ +#line 2550 "src/parser.c" /* yacc.c:1646 */ break; case 21: -#line 381 "src/parser.y" /* yacc.c:1646 */ +#line 382 "src/parser.y" /* yacc.c:1646 */ { jv v = jv_string_fmt("*label-%s", jv_string_value((yyvsp[-2].literal))); (yyval.blk) = gen_location((yyloc), locations, gen_label(jv_string_value(v), (yyvsp[0].blk))); jv_free((yyvsp[-2].literal)); jv_free(v); } -#line 2552 "src/parser.c" /* yacc.c:1646 */ +#line 2561 "src/parser.c" /* yacc.c:1646 */ break; case 22: -#line 388 "src/parser.y" /* yacc.c:1646 */ +#line 389 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_try((yyvsp[-1].blk), gen_op_simple(BACKTRACK)); } -#line 2560 "src/parser.c" /* yacc.c:1646 */ +#line 2569 "src/parser.c" /* yacc.c:1646 */ break; case 23: -#line 392 "src/parser.y" /* yacc.c:1646 */ +#line 393 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_call("_assign", BLOCK(gen_lambda((yyvsp[-2].blk)), gen_lambda((yyvsp[0].blk)))); } -#line 2568 "src/parser.c" /* yacc.c:1646 */ +#line 2577 "src/parser.c" /* yacc.c:1646 */ break; case 24: -#line 396 "src/parser.y" /* yacc.c:1646 */ +#line 397 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_or((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2576 "src/parser.c" /* yacc.c:1646 */ +#line 2585 "src/parser.c" /* yacc.c:1646 */ break; case 25: -#line 400 "src/parser.y" /* yacc.c:1646 */ +#line 401 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_and((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2584 "src/parser.c" /* yacc.c:1646 */ +#line 2593 "src/parser.c" /* yacc.c:1646 */ break; case 26: -#line 404 "src/parser.y" /* yacc.c:1646 */ +#line 405 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_definedor((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2592 "src/parser.c" /* yacc.c:1646 */ +#line 2601 "src/parser.c" /* yacc.c:1646 */ break; case 27: -#line 408 "src/parser.y" /* yacc.c:1646 */ +#line 409 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_definedor_assign((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2600 "src/parser.c" /* yacc.c:1646 */ +#line 2609 "src/parser.c" /* yacc.c:1646 */ break; case 28: -#line 412 "src/parser.y" /* yacc.c:1646 */ +#line 413 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_call("_modify", BLOCK(gen_lambda((yyvsp[-2].blk)), gen_lambda((yyvsp[0].blk)))); } -#line 2608 "src/parser.c" /* yacc.c:1646 */ +#line 2617 "src/parser.c" /* yacc.c:1646 */ break; case 29: -#line 416 "src/parser.y" /* yacc.c:1646 */ +#line 417 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2616 "src/parser.c" /* yacc.c:1646 */ +#line 2625 "src/parser.c" /* yacc.c:1646 */ break; case 30: -#line 420 "src/parser.y" /* yacc.c:1646 */ +#line 421 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_both((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2624 "src/parser.c" /* yacc.c:1646 */ +#line 2633 "src/parser.c" /* yacc.c:1646 */ break; case 31: -#line 424 "src/parser.y" /* yacc.c:1646 */ +#line 425 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '+'); } -#line 2632 "src/parser.c" /* yacc.c:1646 */ +#line 2641 "src/parser.c" /* yacc.c:1646 */ break; case 32: -#line 428 "src/parser.y" /* yacc.c:1646 */ +#line 429 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '+'); } -#line 2640 "src/parser.c" /* yacc.c:1646 */ +#line 2649 "src/parser.c" /* yacc.c:1646 */ break; case 33: -#line 432 "src/parser.y" /* yacc.c:1646 */ +#line 433 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop())); } -#line 2648 "src/parser.c" /* yacc.c:1646 */ +#line 2657 "src/parser.c" /* yacc.c:1646 */ break; case 34: -#line 436 "src/parser.y" /* yacc.c:1646 */ +#line 437 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '-'); } -#line 2656 "src/parser.c" /* yacc.c:1646 */ +#line 2665 "src/parser.c" /* yacc.c:1646 */ break; case 35: -#line 440 "src/parser.y" /* yacc.c:1646 */ +#line 441 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '-'); } -#line 2664 "src/parser.c" /* yacc.c:1646 */ +#line 2673 "src/parser.c" /* yacc.c:1646 */ break; case 36: -#line 444 "src/parser.y" /* yacc.c:1646 */ +#line 445 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '*'); } -#line 2672 "src/parser.c" /* yacc.c:1646 */ +#line 2681 "src/parser.c" /* yacc.c:1646 */ break; case 37: -#line 448 "src/parser.y" /* yacc.c:1646 */ +#line 449 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '*'); } -#line 2680 "src/parser.c" /* yacc.c:1646 */ +#line 2689 "src/parser.c" /* yacc.c:1646 */ break; case 38: -#line 452 "src/parser.y" /* yacc.c:1646 */ +#line 453 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '/'); if (block_is_const_inf((yyval.blk))) FAIL((yyloc), "Division by zero?"); } -#line 2690 "src/parser.c" /* yacc.c:1646 */ +#line 2699 "src/parser.c" /* yacc.c:1646 */ break; case 39: -#line 458 "src/parser.y" /* yacc.c:1646 */ +#line 459 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '%'); if (block_is_const_inf((yyval.blk))) FAIL((yyloc), "Remainder by zero?"); } -#line 2700 "src/parser.c" /* yacc.c:1646 */ +#line 2709 "src/parser.c" /* yacc.c:1646 */ break; case 40: -#line 464 "src/parser.y" /* yacc.c:1646 */ +#line 465 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '/'); } -#line 2708 "src/parser.c" /* yacc.c:1646 */ +#line 2717 "src/parser.c" /* yacc.c:1646 */ break; case 41: -#line 468 "src/parser.y" /* yacc.c:1646 */ +#line 469 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '%'); } -#line 2716 "src/parser.c" /* yacc.c:1646 */ +#line 2725 "src/parser.c" /* yacc.c:1646 */ break; case 42: -#line 472 "src/parser.y" /* yacc.c:1646 */ +#line 473 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), EQ); } -#line 2724 "src/parser.c" /* yacc.c:1646 */ +#line 2733 "src/parser.c" /* yacc.c:1646 */ break; case 43: -#line 476 "src/parser.y" /* yacc.c:1646 */ +#line 477 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), NEQ); } -#line 2732 "src/parser.c" /* yacc.c:1646 */ +#line 2741 "src/parser.c" /* yacc.c:1646 */ break; case 44: -#line 480 "src/parser.y" /* yacc.c:1646 */ +#line 481 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '<'); } -#line 2740 "src/parser.c" /* yacc.c:1646 */ +#line 2749 "src/parser.c" /* yacc.c:1646 */ break; case 45: -#line 484 "src/parser.y" /* yacc.c:1646 */ +#line 485 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '>'); } -#line 2748 "src/parser.c" /* yacc.c:1646 */ +#line 2757 "src/parser.c" /* yacc.c:1646 */ break; case 46: -#line 488 "src/parser.y" /* yacc.c:1646 */ +#line 489 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), LESSEQ); } -#line 2756 "src/parser.c" /* yacc.c:1646 */ +#line 2765 "src/parser.c" /* yacc.c:1646 */ break; case 47: -#line 492 "src/parser.y" /* yacc.c:1646 */ +#line 493 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), GREATEREQ); } -#line 2764 "src/parser.c" /* yacc.c:1646 */ +#line 2773 "src/parser.c" /* yacc.c:1646 */ break; case 48: -#line 496 "src/parser.y" /* yacc.c:1646 */ +#line 497 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 2772 "src/parser.c" /* yacc.c:1646 */ +#line 2781 "src/parser.c" /* yacc.c:1646 */ break; case 49: -#line 501 "src/parser.y" /* yacc.c:1646 */ +#line 502 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[-1].blk); } -#line 2780 "src/parser.c" /* yacc.c:1646 */ +#line 2789 "src/parser.c" /* yacc.c:1646 */ break; case 50: -#line 504 "src/parser.y" /* yacc.c:1646 */ +#line 505 "src/parser.y" /* yacc.c:1646 */ { if (!block_is_const((yyvsp[-1].blk))) { FAIL((yyloc), "Module metadata must be constant"); @@ -2796,11 +2805,11 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = gen_import_meta((yyvsp[-2].blk), (yyvsp[-1].blk)); } } -#line 2800 "src/parser.c" /* yacc.c:1646 */ +#line 2809 "src/parser.c" /* yacc.c:1646 */ break; case 51: -#line 521 "src/parser.y" /* yacc.c:1646 */ +#line 522 "src/parser.y" /* yacc.c:1646 */ { jv v = block_const((yyvsp[-3].blk)); // XXX Make gen_import take only blocks and the int is_data so we @@ -2810,11 +2819,11 @@ YYLTYPE yylloc = yyloc_default; jv_free((yyvsp[0].literal)); jv_free(v); } -#line 2814 "src/parser.c" /* yacc.c:1646 */ +#line 2823 "src/parser.c" /* yacc.c:1646 */ break; case 52: -#line 530 "src/parser.y" /* yacc.c:1646 */ +#line 531 "src/parser.y" /* yacc.c:1646 */ { jv v = block_const((yyvsp[-2].blk)); (yyval.blk) = gen_import(jv_string_value(v), jv_string_value((yyvsp[0].literal)), 0); @@ -2822,22 +2831,22 @@ YYLTYPE yylloc = yyloc_default; jv_free((yyvsp[0].literal)); jv_free(v); } -#line 2826 "src/parser.c" /* yacc.c:1646 */ +#line 2835 "src/parser.c" /* yacc.c:1646 */ break; case 53: -#line 537 "src/parser.y" /* yacc.c:1646 */ +#line 538 "src/parser.y" /* yacc.c:1646 */ { jv v = block_const((yyvsp[0].blk)); (yyval.blk) = gen_import(jv_string_value(v), NULL, 0); block_free((yyvsp[0].blk)); jv_free(v); } -#line 2837 "src/parser.c" /* yacc.c:1646 */ +#line 2846 "src/parser.c" /* yacc.c:1646 */ break; case 54: -#line 545 "src/parser.y" /* yacc.c:1646 */ +#line 546 "src/parser.y" /* yacc.c:1646 */ { if (!block_is_const((yyvsp[0].blk))) { FAIL((yyloc), "Import path must be constant"); @@ -2847,173 +2856,182 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = (yyvsp[0].blk); } } -#line 2851 "src/parser.c" /* yacc.c:1646 */ +#line 2860 "src/parser.c" /* yacc.c:1646 */ break; case 55: -#line 556 "src/parser.y" /* yacc.c:1646 */ +#line 557 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_function(jv_string_value((yyvsp[-3].literal)), gen_noop(), (yyvsp[-1].blk)); jv_free((yyvsp[-3].literal)); } -#line 2860 "src/parser.c" /* yacc.c:1646 */ +#line 2869 "src/parser.c" /* yacc.c:1646 */ break; case 56: -#line 561 "src/parser.y" /* yacc.c:1646 */ +#line 562 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_function(jv_string_value((yyvsp[-6].literal)), (yyvsp[-4].blk), (yyvsp[-1].blk)); jv_free((yyvsp[-6].literal)); } -#line 2869 "src/parser.c" /* yacc.c:1646 */ +#line 2878 "src/parser.c" /* yacc.c:1646 */ break; case 57: -#line 567 "src/parser.y" /* yacc.c:1646 */ +#line 568 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 2877 "src/parser.c" /* yacc.c:1646 */ +#line 2886 "src/parser.c" /* yacc.c:1646 */ break; case 58: -#line 570 "src/parser.y" /* yacc.c:1646 */ +#line 571 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2885 "src/parser.c" /* yacc.c:1646 */ +#line 2894 "src/parser.c" /* yacc.c:1646 */ break; case 59: -#line 575 "src/parser.y" /* yacc.c:1646 */ +#line 576 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_param_regular(jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 2894 "src/parser.c" /* yacc.c:1646 */ +#line 2903 "src/parser.c" /* yacc.c:1646 */ break; case 60: -#line 580 "src/parser.y" /* yacc.c:1646 */ +#line 581 "src/parser.y" /* yacc.c:1646 */ { - (yyval.blk) = gen_param(jv_string_value((yyvsp[0].literal))); + (yyval.blk) = gen_param_coexpr(jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 2903 "src/parser.c" /* yacc.c:1646 */ +#line 2912 "src/parser.c" /* yacc.c:1646 */ break; case 61: -#line 587 "src/parser.y" /* yacc.c:1646 */ - { (yyval.literal) = jv_string("text"); } -#line 2909 "src/parser.c" /* yacc.c:1646 */ +#line 586 "src/parser.y" /* yacc.c:1646 */ + { + (yyval.blk) = gen_param(jv_string_value((yyvsp[0].literal))); + jv_free((yyvsp[0].literal)); +} +#line 2921 "src/parser.c" /* yacc.c:1646 */ break; case 62: -#line 587 "src/parser.y" /* yacc.c:1646 */ +#line 593 "src/parser.y" /* yacc.c:1646 */ + { (yyval.literal) = jv_string("text"); } +#line 2927 "src/parser.c" /* yacc.c:1646 */ + break; + + case 63: +#line 593 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[-1].blk); jv_free((yyvsp[-2].literal)); } -#line 2918 "src/parser.c" /* yacc.c:1646 */ +#line 2936 "src/parser.c" /* yacc.c:1646 */ break; - case 63: -#line 591 "src/parser.y" /* yacc.c:1646 */ + case 64: +#line 597 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = (yyvsp[-1].literal); } -#line 2924 "src/parser.c" /* yacc.c:1646 */ +#line 2942 "src/parser.c" /* yacc.c:1646 */ break; - case 64: -#line 591 "src/parser.y" /* yacc.c:1646 */ + case 65: +#line 597 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[-1].blk); jv_free((yyvsp[-2].literal)); } -#line 2933 "src/parser.c" /* yacc.c:1646 */ +#line 2951 "src/parser.c" /* yacc.c:1646 */ break; - case 65: -#line 598 "src/parser.y" /* yacc.c:1646 */ + case 66: +#line 604 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_const(jv_string("")); } -#line 2941 "src/parser.c" /* yacc.c:1646 */ +#line 2959 "src/parser.c" /* yacc.c:1646 */ break; - case 66: -#line 601 "src/parser.y" /* yacc.c:1646 */ + case 67: +#line 607 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-1].blk), gen_const((yyvsp[0].literal)), '+'); } -#line 2949 "src/parser.c" /* yacc.c:1646 */ +#line 2967 "src/parser.c" /* yacc.c:1646 */ break; - case 67: -#line 604 "src/parser.y" /* yacc.c:1646 */ + case 68: +#line 610 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_binop((yyvsp[-3].blk), gen_format((yyvsp[-1].blk), jv_copy((yyvsp[-4].literal))), '+'); } -#line 2957 "src/parser.c" /* yacc.c:1646 */ +#line 2975 "src/parser.c" /* yacc.c:1646 */ break; - case 68: -#line 610 "src/parser.y" /* yacc.c:1646 */ + case 69: +#line 616 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2965 "src/parser.c" /* yacc.c:1646 */ +#line 2983 "src/parser.c" /* yacc.c:1646 */ break; - case 69: -#line 613 "src/parser.y" /* yacc.c:1646 */ + case 70: +#line 619 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[-1].blk); } -#line 2973 "src/parser.c" /* yacc.c:1646 */ +#line 2991 "src/parser.c" /* yacc.c:1646 */ break; - case 70: -#line 618 "src/parser.y" /* yacc.c:1646 */ + case 71: +#line 624 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2981 "src/parser.c" /* yacc.c:1646 */ +#line 2999 "src/parser.c" /* yacc.c:1646 */ break; - case 71: -#line 621 "src/parser.y" /* yacc.c:1646 */ + case 72: +#line 627 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop())); } -#line 2989 "src/parser.c" /* yacc.c:1646 */ +#line 3007 "src/parser.c" /* yacc.c:1646 */ break; - case 72: -#line 624 "src/parser.y" /* yacc.c:1646 */ + case 73: +#line 630 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 2997 "src/parser.c" /* yacc.c:1646 */ +#line 3015 "src/parser.c" /* yacc.c:1646 */ break; - case 73: -#line 630 "src/parser.y" /* yacc.c:1646 */ + case 74: +#line 636 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 3005 "src/parser.c" /* yacc.c:1646 */ +#line 3023 "src/parser.c" /* yacc.c:1646 */ break; - case 74: -#line 633 "src/parser.y" /* yacc.c:1646 */ + case 75: +#line 639 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_call("recurse", gen_noop()); } -#line 3013 "src/parser.c" /* yacc.c:1646 */ +#line 3031 "src/parser.c" /* yacc.c:1646 */ break; - case 75: -#line 636 "src/parser.y" /* yacc.c:1646 */ + case 76: +#line 642 "src/parser.y" /* yacc.c:1646 */ { jv v = jv_string_fmt("*label-%s", jv_string_value((yyvsp[0].literal))); // impossible symbol (yyval.blk) = gen_location((yyloc), locations, @@ -3022,247 +3040,247 @@ YYLTYPE yylloc = yyloc_default; jv_free(v); jv_free((yyvsp[0].literal)); } -#line 3026 "src/parser.c" /* yacc.c:1646 */ +#line 3044 "src/parser.c" /* yacc.c:1646 */ break; - case 76: -#line 644 "src/parser.y" /* yacc.c:1646 */ + case 77: +#line 650 "src/parser.y" /* yacc.c:1646 */ { FAIL((yyloc), "break requires a label to break to"); (yyval.blk) = gen_noop(); } -#line 3035 "src/parser.c" /* yacc.c:1646 */ +#line 3053 "src/parser.c" /* yacc.c:1646 */ break; - case 77: -#line 648 "src/parser.y" /* yacc.c:1646 */ + case 78: +#line 654 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index_opt((yyvsp[-2].blk), gen_const((yyvsp[-1].literal))); } -#line 3043 "src/parser.c" /* yacc.c:1646 */ +#line 3061 "src/parser.c" /* yacc.c:1646 */ break; - case 78: -#line 651 "src/parser.y" /* yacc.c:1646 */ + case 79: +#line 657 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index_opt(gen_noop(), gen_const((yyvsp[-1].literal))); } -#line 3051 "src/parser.c" /* yacc.c:1646 */ +#line 3069 "src/parser.c" /* yacc.c:1646 */ break; - case 79: -#line 654 "src/parser.y" /* yacc.c:1646 */ + case 80: +#line 660 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index_opt((yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 3059 "src/parser.c" /* yacc.c:1646 */ +#line 3077 "src/parser.c" /* yacc.c:1646 */ break; - case 80: -#line 657 "src/parser.y" /* yacc.c:1646 */ + case 81: +#line 663 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index_opt(gen_noop(), (yyvsp[-1].blk)); } -#line 3067 "src/parser.c" /* yacc.c:1646 */ +#line 3085 "src/parser.c" /* yacc.c:1646 */ break; - case 81: -#line 660 "src/parser.y" /* yacc.c:1646 */ + case 82: +#line 666 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index((yyvsp[-1].blk), gen_const((yyvsp[0].literal))); } -#line 3075 "src/parser.c" /* yacc.c:1646 */ +#line 3093 "src/parser.c" /* yacc.c:1646 */ break; - case 82: -#line 663 "src/parser.y" /* yacc.c:1646 */ + case 83: +#line 669 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index(gen_noop(), gen_const((yyvsp[0].literal))); } -#line 3083 "src/parser.c" /* yacc.c:1646 */ +#line 3101 "src/parser.c" /* yacc.c:1646 */ break; - case 83: -#line 666 "src/parser.y" /* yacc.c:1646 */ + case 84: +#line 672 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3091 "src/parser.c" /* yacc.c:1646 */ +#line 3109 "src/parser.c" /* yacc.c:1646 */ break; - case 84: -#line 669 "src/parser.y" /* yacc.c:1646 */ + case 85: +#line 675 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index(gen_noop(), (yyvsp[0].blk)); } -#line 3099 "src/parser.c" /* yacc.c:1646 */ +#line 3117 "src/parser.c" /* yacc.c:1646 */ break; - case 85: -#line 672 "src/parser.y" /* yacc.c:1646 */ + case 86: +#line 678 "src/parser.y" /* yacc.c:1646 */ { FAIL((yyloc), "try .[\"field\"] instead of .field for unusually named fields"); (yyval.blk) = gen_noop(); } -#line 3108 "src/parser.c" /* yacc.c:1646 */ +#line 3126 "src/parser.c" /* yacc.c:1646 */ break; - case 86: -#line 676 "src/parser.y" /* yacc.c:1646 */ + case 87: +#line 682 "src/parser.y" /* yacc.c:1646 */ { jv_free((yyvsp[-1].literal)); FAIL((yyloc), "try .[\"field\"] instead of .field for unusually named fields"); (yyval.blk) = gen_noop(); } -#line 3118 "src/parser.c" /* yacc.c:1646 */ +#line 3136 "src/parser.c" /* yacc.c:1646 */ break; - case 87: -#line 682 "src/parser.y" /* yacc.c:1646 */ + case 88: +#line 688 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index_opt((yyvsp[-4].blk), (yyvsp[-2].blk)); } -#line 3126 "src/parser.c" /* yacc.c:1646 */ +#line 3144 "src/parser.c" /* yacc.c:1646 */ break; - case 88: -#line 685 "src/parser.y" /* yacc.c:1646 */ + case 89: +#line 691 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index((yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 3134 "src/parser.c" /* yacc.c:1646 */ +#line 3152 "src/parser.c" /* yacc.c:1646 */ break; - case 89: -#line 688 "src/parser.y" /* yacc.c:1646 */ + case 90: +#line 694 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index_opt((yyvsp[-5].blk), (yyvsp[-2].blk)); } -#line 3142 "src/parser.c" /* yacc.c:1646 */ +#line 3160 "src/parser.c" /* yacc.c:1646 */ break; - case 90: -#line 691 "src/parser.y" /* yacc.c:1646 */ + case 91: +#line 697 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_index((yyvsp[-4].blk), (yyvsp[-1].blk)); } -#line 3150 "src/parser.c" /* yacc.c:1646 */ +#line 3168 "src/parser.c" /* yacc.c:1646 */ break; - case 91: -#line 694 "src/parser.y" /* yacc.c:1646 */ + case 92: +#line 700 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = block_join((yyvsp[-3].blk), gen_op_simple(EACH_OPT)); } -#line 3158 "src/parser.c" /* yacc.c:1646 */ +#line 3176 "src/parser.c" /* yacc.c:1646 */ break; - case 92: -#line 697 "src/parser.y" /* yacc.c:1646 */ + case 93: +#line 703 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = block_join((yyvsp[-2].blk), gen_op_simple(EACH)); } -#line 3166 "src/parser.c" /* yacc.c:1646 */ +#line 3184 "src/parser.c" /* yacc.c:1646 */ break; - case 93: -#line 700 "src/parser.y" /* yacc.c:1646 */ + case 94: +#line 706 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_slice_index((yyvsp[-6].blk), (yyvsp[-4].blk), (yyvsp[-2].blk), INDEX_OPT); } -#line 3174 "src/parser.c" /* yacc.c:1646 */ +#line 3192 "src/parser.c" /* yacc.c:1646 */ break; - case 94: -#line 703 "src/parser.y" /* yacc.c:1646 */ + case 95: +#line 709 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_slice_index((yyvsp[-5].blk), (yyvsp[-3].blk), gen_const(jv_null()), INDEX_OPT); } -#line 3182 "src/parser.c" /* yacc.c:1646 */ +#line 3200 "src/parser.c" /* yacc.c:1646 */ break; - case 95: -#line 706 "src/parser.y" /* yacc.c:1646 */ + case 96: +#line 712 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_slice_index((yyvsp[-5].blk), gen_const(jv_null()), (yyvsp[-2].blk), INDEX_OPT); } -#line 3190 "src/parser.c" /* yacc.c:1646 */ +#line 3208 "src/parser.c" /* yacc.c:1646 */ break; - case 96: -#line 709 "src/parser.y" /* yacc.c:1646 */ + case 97: +#line 715 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_slice_index((yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), INDEX); } -#line 3198 "src/parser.c" /* yacc.c:1646 */ +#line 3216 "src/parser.c" /* yacc.c:1646 */ break; - case 97: -#line 712 "src/parser.y" /* yacc.c:1646 */ + case 98: +#line 718 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_slice_index((yyvsp[-4].blk), (yyvsp[-2].blk), gen_const(jv_null()), INDEX); } -#line 3206 "src/parser.c" /* yacc.c:1646 */ +#line 3224 "src/parser.c" /* yacc.c:1646 */ break; - case 98: -#line 715 "src/parser.y" /* yacc.c:1646 */ + case 99: +#line 721 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_slice_index((yyvsp[-4].blk), gen_const(jv_null()), (yyvsp[-1].blk), INDEX); } -#line 3214 "src/parser.c" /* yacc.c:1646 */ +#line 3232 "src/parser.c" /* yacc.c:1646 */ break; - case 99: -#line 718 "src/parser.y" /* yacc.c:1646 */ + case 100: +#line 724 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_const((yyvsp[0].literal)); } -#line 3222 "src/parser.c" /* yacc.c:1646 */ +#line 3240 "src/parser.c" /* yacc.c:1646 */ break; - case 100: -#line 721 "src/parser.y" /* yacc.c:1646 */ + case 101: +#line 727 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 3230 "src/parser.c" /* yacc.c:1646 */ +#line 3248 "src/parser.c" /* yacc.c:1646 */ break; - case 101: -#line 724 "src/parser.y" /* yacc.c:1646 */ + case 102: +#line 730 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_format(gen_noop(), (yyvsp[0].literal)); } -#line 3238 "src/parser.c" /* yacc.c:1646 */ +#line 3256 "src/parser.c" /* yacc.c:1646 */ break; - case 102: -#line 727 "src/parser.y" /* yacc.c:1646 */ + case 103: +#line 733 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[-1].blk); } -#line 3246 "src/parser.c" /* yacc.c:1646 */ +#line 3264 "src/parser.c" /* yacc.c:1646 */ break; - case 103: -#line 730 "src/parser.y" /* yacc.c:1646 */ + case 104: +#line 736 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_collect((yyvsp[-1].blk)); } -#line 3254 "src/parser.c" /* yacc.c:1646 */ +#line 3272 "src/parser.c" /* yacc.c:1646 */ break; - case 104: -#line 733 "src/parser.y" /* yacc.c:1646 */ + case 105: +#line 739 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_const(jv_array()); } -#line 3262 "src/parser.c" /* yacc.c:1646 */ +#line 3280 "src/parser.c" /* yacc.c:1646 */ break; - case 105: -#line 736 "src/parser.y" /* yacc.c:1646 */ + case 106: +#line 742 "src/parser.y" /* yacc.c:1646 */ { block o = gen_const_object((yyvsp[-1].blk)); if (o.first != NULL) @@ -3270,29 +3288,29 @@ YYLTYPE yylloc = yyloc_default; else (yyval.blk) = BLOCK(gen_subexp(gen_const(jv_object())), (yyvsp[-1].blk), gen_op_simple(POP)); } -#line 3274 "src/parser.c" /* yacc.c:1646 */ +#line 3292 "src/parser.c" /* yacc.c:1646 */ break; - case 106: -#line 743 "src/parser.y" /* yacc.c:1646 */ + case 107: +#line 749 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_const(JV_OBJECT(jv_string("file"), jv_copy(locations->fname), jv_string("line"), jv_number(locfile_get_line(locations, (yyloc).start) + 1))); } -#line 3283 "src/parser.c" /* yacc.c:1646 */ +#line 3301 "src/parser.c" /* yacc.c:1646 */ break; - case 107: -#line 747 "src/parser.y" /* yacc.c:1646 */ + case 108: +#line 753 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal)))); jv_free((yyvsp[0].literal)); } -#line 3292 "src/parser.c" /* yacc.c:1646 */ +#line 3310 "src/parser.c" /* yacc.c:1646 */ break; - case 108: -#line 751 "src/parser.y" /* yacc.c:1646 */ + case 109: +#line 757 "src/parser.y" /* yacc.c:1646 */ { const char *s = jv_string_value((yyvsp[0].literal)); if (strcmp(s, "false") == 0) @@ -3305,198 +3323,198 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = gen_location((yyloc), locations, gen_call(s, gen_noop())); jv_free((yyvsp[0].literal)); } -#line 3309 "src/parser.c" /* yacc.c:1646 */ +#line 3327 "src/parser.c" /* yacc.c:1646 */ break; - case 109: -#line 763 "src/parser.y" /* yacc.c:1646 */ + case 110: +#line 769 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_call(jv_string_value((yyvsp[-3].literal)), (yyvsp[-1].blk)); (yyval.blk) = gen_location((yylsp[-3]), locations, (yyval.blk)); jv_free((yyvsp[-3].literal)); } -#line 3319 "src/parser.c" /* yacc.c:1646 */ +#line 3337 "src/parser.c" /* yacc.c:1646 */ break; - case 110: -#line 768 "src/parser.y" /* yacc.c:1646 */ + case 111: +#line 774 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 3325 "src/parser.c" /* yacc.c:1646 */ +#line 3343 "src/parser.c" /* yacc.c:1646 */ break; - case 111: -#line 769 "src/parser.y" /* yacc.c:1646 */ + case 112: +#line 775 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 3331 "src/parser.c" /* yacc.c:1646 */ +#line 3349 "src/parser.c" /* yacc.c:1646 */ break; - case 112: -#line 770 "src/parser.y" /* yacc.c:1646 */ + case 113: +#line 776 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[-3].blk); } -#line 3337 "src/parser.c" /* yacc.c:1646 */ +#line 3355 "src/parser.c" /* yacc.c:1646 */ break; - case 113: -#line 771 "src/parser.y" /* yacc.c:1646 */ + case 114: +#line 777 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_noop(); } -#line 3343 "src/parser.c" /* yacc.c:1646 */ +#line 3361 "src/parser.c" /* yacc.c:1646 */ break; - case 114: -#line 774 "src/parser.y" /* yacc.c:1646 */ + case 115: +#line 780 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 3351 "src/parser.c" /* yacc.c:1646 */ +#line 3369 "src/parser.c" /* yacc.c:1646 */ break; - case 115: -#line 777 "src/parser.y" /* yacc.c:1646 */ + case 116: +#line 783 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3359 "src/parser.c" /* yacc.c:1646 */ +#line 3377 "src/parser.c" /* yacc.c:1646 */ break; - case 116: -#line 782 "src/parser.y" /* yacc.c:1646 */ + case 117: +#line 788 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_lambda((yyvsp[0].blk)); } -#line 3367 "src/parser.c" /* yacc.c:1646 */ +#line 3385 "src/parser.c" /* yacc.c:1646 */ break; - case 117: -#line 787 "src/parser.y" /* yacc.c:1646 */ + case 118: +#line 793 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-2].blk), gen_destructure_alt((yyvsp[0].blk))); } -#line 3375 "src/parser.c" /* yacc.c:1646 */ +#line 3393 "src/parser.c" /* yacc.c:1646 */ break; - case 118: -#line 790 "src/parser.y" /* yacc.c:1646 */ + case 119: +#line 796 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_destructure_alt((yyvsp[0].blk)); } -#line 3383 "src/parser.c" /* yacc.c:1646 */ +#line 3401 "src/parser.c" /* yacc.c:1646 */ break; - case 119: -#line 795 "src/parser.y" /* yacc.c:1646 */ + case 120: +#line 801 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3391 "src/parser.c" /* yacc.c:1646 */ +#line 3409 "src/parser.c" /* yacc.c:1646 */ break; - case 120: -#line 798 "src/parser.y" /* yacc.c:1646 */ + case 121: +#line 804 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 3399 "src/parser.c" /* yacc.c:1646 */ +#line 3417 "src/parser.c" /* yacc.c:1646 */ break; - case 121: -#line 803 "src/parser.y" /* yacc.c:1646 */ + case 122: +#line 809 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_op_unbound(STOREV, jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 3408 "src/parser.c" /* yacc.c:1646 */ +#line 3426 "src/parser.c" /* yacc.c:1646 */ break; - case 122: -#line 807 "src/parser.y" /* yacc.c:1646 */ + case 123: +#line 813 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-1].blk), gen_op_simple(POP)); } -#line 3416 "src/parser.c" /* yacc.c:1646 */ +#line 3434 "src/parser.c" /* yacc.c:1646 */ break; - case 123: -#line 810 "src/parser.y" /* yacc.c:1646 */ + case 124: +#line 816 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-1].blk), gen_op_simple(POP)); } -#line 3424 "src/parser.c" /* yacc.c:1646 */ +#line 3442 "src/parser.c" /* yacc.c:1646 */ break; - case 124: -#line 815 "src/parser.y" /* yacc.c:1646 */ + case 125: +#line 821 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_array_matcher(gen_noop(), (yyvsp[0].blk)); } -#line 3432 "src/parser.c" /* yacc.c:1646 */ +#line 3450 "src/parser.c" /* yacc.c:1646 */ break; - case 125: -#line 818 "src/parser.y" /* yacc.c:1646 */ + case 126: +#line 824 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_array_matcher((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3440 "src/parser.c" /* yacc.c:1646 */ +#line 3458 "src/parser.c" /* yacc.c:1646 */ break; - case 126: -#line 823 "src/parser.y" /* yacc.c:1646 */ + case 127: +#line 829 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 3448 "src/parser.c" /* yacc.c:1646 */ +#line 3466 "src/parser.c" /* yacc.c:1646 */ break; - case 127: -#line 826 "src/parser.y" /* yacc.c:1646 */ + case 128: +#line 832 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3456 "src/parser.c" /* yacc.c:1646 */ +#line 3474 "src/parser.c" /* yacc.c:1646 */ break; - case 128: -#line 831 "src/parser.y" /* yacc.c:1646 */ + case 129: +#line 837 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[0].literal)), gen_op_unbound(STOREV, jv_string_value((yyvsp[0].literal)))); } -#line 3464 "src/parser.c" /* yacc.c:1646 */ +#line 3482 "src/parser.c" /* yacc.c:1646 */ break; - case 129: -#line 834 "src/parser.y" /* yacc.c:1646 */ + case 130: +#line 840 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), BLOCK(gen_op_simple(DUP), gen_op_unbound(STOREV, jv_string_value((yyvsp[-2].literal))), (yyvsp[0].blk))); } -#line 3472 "src/parser.c" /* yacc.c:1646 */ +#line 3490 "src/parser.c" /* yacc.c:1646 */ break; - case 130: -#line 837 "src/parser.y" /* yacc.c:1646 */ + case 131: +#line 843 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3480 "src/parser.c" /* yacc.c:1646 */ +#line 3498 "src/parser.c" /* yacc.c:1646 */ break; - case 131: -#line 840 "src/parser.y" /* yacc.c:1646 */ + case 132: +#line 846 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3488 "src/parser.c" /* yacc.c:1646 */ +#line 3506 "src/parser.c" /* yacc.c:1646 */ break; - case 132: -#line 843 "src/parser.y" /* yacc.c:1646 */ + case 133: +#line 849 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_object_matcher((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3496 "src/parser.c" /* yacc.c:1646 */ +#line 3514 "src/parser.c" /* yacc.c:1646 */ break; - case 133: -#line 846 "src/parser.y" /* yacc.c:1646 */ + case 134: +#line 852 "src/parser.y" /* yacc.c:1646 */ { jv msg = check_object_key((yyvsp[-3].blk)); if (jv_is_valid(msg)) { @@ -3505,258 +3523,258 @@ YYLTYPE yylloc = yyloc_default; jv_free(msg); (yyval.blk) = gen_object_matcher((yyvsp[-3].blk), (yyvsp[0].blk)); } -#line 3509 "src/parser.c" /* yacc.c:1646 */ +#line 3527 "src/parser.c" /* yacc.c:1646 */ break; - case 134: -#line 854 "src/parser.y" /* yacc.c:1646 */ + case 135: +#line 860 "src/parser.y" /* yacc.c:1646 */ { FAIL((yyloc), "May need parentheses around object key expression"); (yyval.blk) = (yyvsp[0].blk); } -#line 3518 "src/parser.c" /* yacc.c:1646 */ +#line 3536 "src/parser.c" /* yacc.c:1646 */ break; - case 135: -#line 860 "src/parser.y" /* yacc.c:1646 */ + case 136: +#line 866 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("as"); } -#line 3526 "src/parser.c" /* yacc.c:1646 */ +#line 3544 "src/parser.c" /* yacc.c:1646 */ break; - case 136: -#line 863 "src/parser.y" /* yacc.c:1646 */ + case 137: +#line 869 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("def"); } -#line 3534 "src/parser.c" /* yacc.c:1646 */ +#line 3552 "src/parser.c" /* yacc.c:1646 */ break; - case 137: -#line 866 "src/parser.y" /* yacc.c:1646 */ + case 138: +#line 872 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("module"); } -#line 3542 "src/parser.c" /* yacc.c:1646 */ +#line 3560 "src/parser.c" /* yacc.c:1646 */ break; - case 138: -#line 869 "src/parser.y" /* yacc.c:1646 */ + case 139: +#line 875 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("import"); } -#line 3550 "src/parser.c" /* yacc.c:1646 */ +#line 3568 "src/parser.c" /* yacc.c:1646 */ break; - case 139: -#line 872 "src/parser.y" /* yacc.c:1646 */ + case 140: +#line 878 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("include"); } -#line 3558 "src/parser.c" /* yacc.c:1646 */ +#line 3576 "src/parser.c" /* yacc.c:1646 */ break; - case 140: -#line 875 "src/parser.y" /* yacc.c:1646 */ + case 141: +#line 881 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("if"); } -#line 3566 "src/parser.c" /* yacc.c:1646 */ +#line 3584 "src/parser.c" /* yacc.c:1646 */ break; - case 141: -#line 878 "src/parser.y" /* yacc.c:1646 */ + case 142: +#line 884 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("then"); } -#line 3574 "src/parser.c" /* yacc.c:1646 */ +#line 3592 "src/parser.c" /* yacc.c:1646 */ break; - case 142: -#line 881 "src/parser.y" /* yacc.c:1646 */ + case 143: +#line 887 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("else"); } -#line 3582 "src/parser.c" /* yacc.c:1646 */ +#line 3600 "src/parser.c" /* yacc.c:1646 */ break; - case 143: -#line 884 "src/parser.y" /* yacc.c:1646 */ + case 144: +#line 890 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("elif"); } -#line 3590 "src/parser.c" /* yacc.c:1646 */ +#line 3608 "src/parser.c" /* yacc.c:1646 */ break; - case 144: -#line 887 "src/parser.y" /* yacc.c:1646 */ + case 145: +#line 893 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("reduce"); } -#line 3598 "src/parser.c" /* yacc.c:1646 */ +#line 3616 "src/parser.c" /* yacc.c:1646 */ break; - case 145: -#line 890 "src/parser.y" /* yacc.c:1646 */ + case 146: +#line 896 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("foreach"); } -#line 3606 "src/parser.c" /* yacc.c:1646 */ +#line 3624 "src/parser.c" /* yacc.c:1646 */ break; - case 146: -#line 893 "src/parser.y" /* yacc.c:1646 */ + case 147: +#line 899 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("end"); } -#line 3614 "src/parser.c" /* yacc.c:1646 */ +#line 3632 "src/parser.c" /* yacc.c:1646 */ break; - case 147: -#line 896 "src/parser.y" /* yacc.c:1646 */ + case 148: +#line 902 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("and"); } -#line 3622 "src/parser.c" /* yacc.c:1646 */ +#line 3640 "src/parser.c" /* yacc.c:1646 */ break; - case 148: -#line 899 "src/parser.y" /* yacc.c:1646 */ + case 149: +#line 905 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("or"); } -#line 3630 "src/parser.c" /* yacc.c:1646 */ +#line 3648 "src/parser.c" /* yacc.c:1646 */ break; - case 149: -#line 902 "src/parser.y" /* yacc.c:1646 */ + case 150: +#line 908 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("try"); } -#line 3638 "src/parser.c" /* yacc.c:1646 */ +#line 3656 "src/parser.c" /* yacc.c:1646 */ break; - case 150: -#line 905 "src/parser.y" /* yacc.c:1646 */ + case 151: +#line 911 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("catch"); } -#line 3646 "src/parser.c" /* yacc.c:1646 */ +#line 3664 "src/parser.c" /* yacc.c:1646 */ break; - case 151: -#line 908 "src/parser.y" /* yacc.c:1646 */ + case 152: +#line 914 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("label"); } -#line 3654 "src/parser.c" /* yacc.c:1646 */ +#line 3672 "src/parser.c" /* yacc.c:1646 */ break; - case 152: -#line 911 "src/parser.y" /* yacc.c:1646 */ + case 153: +#line 917 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("break"); } -#line 3662 "src/parser.c" /* yacc.c:1646 */ +#line 3680 "src/parser.c" /* yacc.c:1646 */ break; - case 153: -#line 914 "src/parser.y" /* yacc.c:1646 */ + case 154: +#line 920 "src/parser.y" /* yacc.c:1646 */ { (yyval.literal) = jv_string("__loc__"); } -#line 3670 "src/parser.c" /* yacc.c:1646 */ +#line 3688 "src/parser.c" /* yacc.c:1646 */ break; - case 154: -#line 919 "src/parser.y" /* yacc.c:1646 */ + case 155: +#line 925 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk)=gen_noop(); } -#line 3678 "src/parser.c" /* yacc.c:1646 */ +#line 3696 "src/parser.c" /* yacc.c:1646 */ break; - case 155: -#line 922 "src/parser.y" /* yacc.c:1646 */ + case 156: +#line 928 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 3684 "src/parser.c" /* yacc.c:1646 */ +#line 3702 "src/parser.c" /* yacc.c:1646 */ break; - case 156: -#line 923 "src/parser.y" /* yacc.c:1646 */ + case 157: +#line 929 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk)=block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3690 "src/parser.c" /* yacc.c:1646 */ +#line 3708 "src/parser.c" /* yacc.c:1646 */ break; - case 157: -#line 924 "src/parser.y" /* yacc.c:1646 */ + case 158: +#line 930 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = (yyvsp[0].blk); } -#line 3696 "src/parser.c" /* yacc.c:1646 */ +#line 3714 "src/parser.c" /* yacc.c:1646 */ break; - case 158: -#line 927 "src/parser.y" /* yacc.c:1646 */ + case 159: +#line 933 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3704 "src/parser.c" /* yacc.c:1646 */ +#line 3722 "src/parser.c" /* yacc.c:1646 */ break; - case 159: -#line 930 "src/parser.y" /* yacc.c:1646 */ + case 160: +#line 936 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3712 "src/parser.c" /* yacc.c:1646 */ +#line 3730 "src/parser.c" /* yacc.c:1646 */ break; - case 160: -#line 933 "src/parser.y" /* yacc.c:1646 */ + case 161: +#line 939 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3720 "src/parser.c" /* yacc.c:1646 */ +#line 3738 "src/parser.c" /* yacc.c:1646 */ break; - case 161: -#line 936 "src/parser.y" /* yacc.c:1646 */ + case 162: +#line 942 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair((yyvsp[0].blk), BLOCK(gen_op_simple(POP), gen_op_simple(DUP2), gen_op_simple(DUP2), gen_op_simple(INDEX))); } -#line 3729 "src/parser.c" /* yacc.c:1646 */ +#line 3747 "src/parser.c" /* yacc.c:1646 */ break; - case 162: -#line 940 "src/parser.y" /* yacc.c:1646 */ + case 163: +#line 946 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair(gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[-2].literal)))), (yyvsp[0].blk)); } -#line 3738 "src/parser.c" /* yacc.c:1646 */ +#line 3756 "src/parser.c" /* yacc.c:1646 */ break; - case 163: -#line 944 "src/parser.y" /* yacc.c:1646 */ + case 164: +#line 950 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair(gen_const((yyvsp[0].literal)), gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal))))); } -#line 3747 "src/parser.c" /* yacc.c:1646 */ +#line 3765 "src/parser.c" /* yacc.c:1646 */ break; - case 164: -#line 948 "src/parser.y" /* yacc.c:1646 */ + case 165: +#line 954 "src/parser.y" /* yacc.c:1646 */ { (yyval.blk) = gen_dictpair(gen_const(jv_copy((yyvsp[0].literal))), gen_index(gen_noop(), gen_const((yyvsp[0].literal)))); } -#line 3756 "src/parser.c" /* yacc.c:1646 */ +#line 3774 "src/parser.c" /* yacc.c:1646 */ break; - case 165: -#line 952 "src/parser.y" /* yacc.c:1646 */ + case 166: +#line 958 "src/parser.y" /* yacc.c:1646 */ { jv msg = check_object_key((yyvsp[-3].blk)); if (jv_is_valid(msg)) { @@ -3765,20 +3783,20 @@ YYLTYPE yylloc = yyloc_default; jv_free(msg); (yyval.blk) = gen_dictpair((yyvsp[-3].blk), (yyvsp[0].blk)); } -#line 3769 "src/parser.c" /* yacc.c:1646 */ +#line 3787 "src/parser.c" /* yacc.c:1646 */ break; - case 166: -#line 960 "src/parser.y" /* yacc.c:1646 */ + case 167: +#line 966 "src/parser.y" /* yacc.c:1646 */ { FAIL((yyloc), "May need parentheses around object key expression"); (yyval.blk) = (yyvsp[0].blk); } -#line 3778 "src/parser.c" /* yacc.c:1646 */ +#line 3796 "src/parser.c" /* yacc.c:1646 */ break; -#line 3782 "src/parser.c" /* yacc.c:1646 */ +#line 3800 "src/parser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4013,7 +4031,7 @@ YYLTYPE yylloc = yyloc_default; #endif return yyresult; } -#line 964 "src/parser.y" /* yacc.c:1906 */ +#line 970 "src/parser.y" /* yacc.c:1906 */ int jq_parse(struct locfile* locations, block* answer) { diff --git a/src/parser.h b/src/parser.h index b15c53aad4..954ffff57c 100644 --- a/src/parser.h +++ b/src/parser.h @@ -102,13 +102,14 @@ struct lexer_param; LESSEQ = 293, GREATEREQ = 294, ALTERNATION = 295, - QQSTRING_START = 296, - QQSTRING_TEXT = 297, - QQSTRING_INTERP_START = 298, - QQSTRING_INTERP_END = 299, - QQSTRING_END = 300, - FUNCDEF = 301, - NONOPT = 302 + COEXPR = 296, + QQSTRING_START = 297, + QQSTRING_TEXT = 298, + QQSTRING_INTERP_START = 299, + QQSTRING_INTERP_END = 300, + QQSTRING_END = 301, + FUNCDEF = 302, + NONOPT = 303 }; #endif /* Tokens. */ @@ -150,13 +151,14 @@ struct lexer_param; #define LESSEQ 293 #define GREATEREQ 294 #define ALTERNATION 295 -#define QQSTRING_START 296 -#define QQSTRING_TEXT 297 -#define QQSTRING_INTERP_START 298 -#define QQSTRING_INTERP_END 299 -#define QQSTRING_END 300 -#define FUNCDEF 301 -#define NONOPT 302 +#define COEXPR 296 +#define QQSTRING_START 297 +#define QQSTRING_TEXT 298 +#define QQSTRING_INTERP_START 299 +#define QQSTRING_INTERP_END 300 +#define QQSTRING_END 301 +#define FUNCDEF 302 +#define NONOPT 303 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -168,7 +170,7 @@ union YYSTYPE jv literal; block blk; -#line 172 "src/parser.h" /* yacc.c:1909 */ +#line 174 "src/parser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/src/parser.y b/src/parser.y index 39c78366e6..f753ae71a5 100644 --- a/src/parser.y +++ b/src/parser.y @@ -84,6 +84,7 @@ struct lexer_param; %token LESSEQ "<=" %token GREATEREQ ">=" %token ALTERNATION "?//" +%token COEXPR "@@" %token QQSTRING_START %token QQSTRING_TEXT @@ -577,6 +578,11 @@ Param: jv_free($2); } | +"@@" IDENT { + $$ = gen_param_coexpr(jv_string_value($2)); + jv_free($2); +} | + IDENT { $$ = gen_param(jv_string_value($1)); jv_free($1);