diff --git a/docs/content/manual/manual.yml b/docs/content/manual/manual.yml index a81cf75819..2c0835a131 100644 --- a/docs/content/manual/manual.yml +++ b/docs/content/manual/manual.yml @@ -2122,7 +2122,7 @@ sections: `if A then B end` is the same as `if A then B else . end`. That is, the `else` branch is optional, and if absent is the - same as `.`. + same as `.`. This also applies to `elif` with absent ending `else` branch. Checking for false or null is a simpler notion of "truthiness" than is found in Javascript or Python, but it diff --git a/src/parser.c b/src/parser.c index 82bf21d68a..8117a551dc 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -40,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30802 -/* Bison version. */ -#define YYBISON_VERSION "3.0.4" +/* Bison version string. */ +#define YYBISON_VERSION "3.8.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -61,8 +66,8 @@ -/* Copy the first part of user declarations. */ -#line 1 "src/parser.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 1 "src/parser.y" #include #include @@ -73,26 +78,31 @@ #define YYMALLOC jv_mem_alloc #define YYFREE jv_mem_free -#line 77 "src/parser.c" /* yacc.c:339 */ +#line 82 "src/parser.c" +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 1 -#endif - -/* In a future release of Bison, this section will be replaced - by #include "y.tab.h". */ +/* Use api.header.include to #include this header + instead of duplicating it here. */ #ifndef YY_YY_SRC_PARSER_H_INCLUDED # define YY_YY_SRC_PARSER_H_INCLUDED /* Debug traces. */ @@ -103,7 +113,7 @@ extern int yydebug; #endif /* "%code requires" blocks. */ -#line 11 "src/parser.y" /* yacc.c:355 */ +#line 11 "src/parser.y" #include "locfile.h" struct lexer_param; @@ -120,61 +130,70 @@ struct lexer_param; } \ } while (0) -#line 124 "src/parser.c" /* yacc.c:355 */ +#line 134 "src/parser.c" -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - INVALID_CHARACTER = 258, - IDENT = 259, - FIELD = 260, - LITERAL = 261, - FORMAT = 262, - REC = 263, - SETMOD = 264, - EQ = 265, - NEQ = 266, - DEFINEDOR = 267, - AS = 268, - DEF = 269, - MODULE = 270, - IMPORT = 271, - INCLUDE = 272, - IF = 273, - THEN = 274, - ELSE = 275, - ELSE_IF = 276, - REDUCE = 277, - FOREACH = 278, - END = 279, - AND = 280, - OR = 281, - TRY = 282, - CATCH = 283, - LABEL = 284, - BREAK = 285, - LOC = 286, - SETPIPE = 287, - SETPLUS = 288, - SETMINUS = 289, - SETMULT = 290, - SETDIV = 291, - SETDEFINEDOR = 292, - 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 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + INVALID_CHARACTER = 258, /* INVALID_CHARACTER */ + IDENT = 259, /* IDENT */ + FIELD = 260, /* FIELD */ + LITERAL = 261, /* LITERAL */ + FORMAT = 262, /* FORMAT */ + REC = 263, /* ".." */ + SETMOD = 264, /* "%=" */ + EQ = 265, /* "==" */ + NEQ = 266, /* "!=" */ + DEFINEDOR = 267, /* "//" */ + AS = 268, /* "as" */ + DEF = 269, /* "def" */ + MODULE = 270, /* "module" */ + IMPORT = 271, /* "import" */ + INCLUDE = 272, /* "include" */ + IF = 273, /* "if" */ + THEN = 274, /* "then" */ + ELSE = 275, /* "else" */ + ELSE_IF = 276, /* "elif" */ + REDUCE = 277, /* "reduce" */ + FOREACH = 278, /* "foreach" */ + END = 279, /* "end" */ + AND = 280, /* "and" */ + OR = 281, /* "or" */ + TRY = 282, /* "try" */ + CATCH = 283, /* "catch" */ + LABEL = 284, /* "label" */ + BREAK = 285, /* "break" */ + LOC = 286, /* "__loc__" */ + SETPIPE = 287, /* "|=" */ + SETPLUS = 288, /* "+=" */ + SETMINUS = 289, /* "-=" */ + SETMULT = 290, /* "*=" */ + SETDIV = 291, /* "/=" */ + SETDEFINEDOR = 292, /* "//=" */ + LESSEQ = 293, /* "<=" */ + GREATEREQ = 294, /* ">=" */ + ALTERNATION = 295, /* "?//" */ + QQSTRING_START = 296, /* QQSTRING_START */ + QQSTRING_TEXT = 297, /* QQSTRING_TEXT */ + QQSTRING_INTERP_START = 298, /* QQSTRING_INTERP_START */ + QQSTRING_INTERP_END = 299, /* QQSTRING_INTERP_END */ + QQSTRING_END = 300, /* QQSTRING_END */ + FUNCDEF = 301, /* FUNCDEF */ + NONOPT = 302 /* NONOPT */ }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define INVALID_CHARACTER 258 #define IDENT 259 #define FIELD 260 @@ -223,17 +242,16 @@ struct lexer_param; /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 31 "src/parser.y" /* yacc.c:355 */ +#line 31 "src/parser.y" jv literal; block blk; -#line 235 "src/parser.c" /* yacc.c:355 */ -}; +#line 253 "src/parser.c" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -255,12 +273,120 @@ struct YYLTYPE + int yyparse (block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr); + #endif /* !YY_YY_SRC_PARSER_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_INVALID_CHARACTER = 3, /* INVALID_CHARACTER */ + YYSYMBOL_IDENT = 4, /* IDENT */ + YYSYMBOL_FIELD = 5, /* FIELD */ + YYSYMBOL_LITERAL = 6, /* LITERAL */ + YYSYMBOL_FORMAT = 7, /* FORMAT */ + YYSYMBOL_REC = 8, /* ".." */ + YYSYMBOL_SETMOD = 9, /* "%=" */ + YYSYMBOL_EQ = 10, /* "==" */ + YYSYMBOL_NEQ = 11, /* "!=" */ + YYSYMBOL_DEFINEDOR = 12, /* "//" */ + YYSYMBOL_AS = 13, /* "as" */ + YYSYMBOL_DEF = 14, /* "def" */ + YYSYMBOL_MODULE = 15, /* "module" */ + YYSYMBOL_IMPORT = 16, /* "import" */ + YYSYMBOL_INCLUDE = 17, /* "include" */ + YYSYMBOL_IF = 18, /* "if" */ + YYSYMBOL_THEN = 19, /* "then" */ + YYSYMBOL_ELSE = 20, /* "else" */ + YYSYMBOL_ELSE_IF = 21, /* "elif" */ + YYSYMBOL_REDUCE = 22, /* "reduce" */ + YYSYMBOL_FOREACH = 23, /* "foreach" */ + YYSYMBOL_END = 24, /* "end" */ + YYSYMBOL_AND = 25, /* "and" */ + YYSYMBOL_OR = 26, /* "or" */ + YYSYMBOL_TRY = 27, /* "try" */ + YYSYMBOL_CATCH = 28, /* "catch" */ + YYSYMBOL_LABEL = 29, /* "label" */ + YYSYMBOL_BREAK = 30, /* "break" */ + YYSYMBOL_LOC = 31, /* "__loc__" */ + YYSYMBOL_SETPIPE = 32, /* "|=" */ + YYSYMBOL_SETPLUS = 33, /* "+=" */ + YYSYMBOL_SETMINUS = 34, /* "-=" */ + YYSYMBOL_SETMULT = 35, /* "*=" */ + YYSYMBOL_SETDIV = 36, /* "/=" */ + YYSYMBOL_SETDEFINEDOR = 37, /* "//=" */ + YYSYMBOL_LESSEQ = 38, /* "<=" */ + YYSYMBOL_GREATEREQ = 39, /* ">=" */ + YYSYMBOL_ALTERNATION = 40, /* "?//" */ + YYSYMBOL_QQSTRING_START = 41, /* QQSTRING_START */ + YYSYMBOL_QQSTRING_TEXT = 42, /* QQSTRING_TEXT */ + YYSYMBOL_QQSTRING_INTERP_START = 43, /* QQSTRING_INTERP_START */ + YYSYMBOL_QQSTRING_INTERP_END = 44, /* QQSTRING_INTERP_END */ + YYSYMBOL_QQSTRING_END = 45, /* QQSTRING_END */ + YYSYMBOL_FUNCDEF = 46, /* FUNCDEF */ + YYSYMBOL_47_ = 47, /* '|' */ + YYSYMBOL_48_ = 48, /* ',' */ + YYSYMBOL_49_ = 49, /* '=' */ + YYSYMBOL_50_ = 50, /* '<' */ + YYSYMBOL_51_ = 51, /* '>' */ + YYSYMBOL_52_ = 52, /* '+' */ + YYSYMBOL_53_ = 53, /* '-' */ + YYSYMBOL_54_ = 54, /* '*' */ + YYSYMBOL_55_ = 55, /* '/' */ + YYSYMBOL_56_ = 56, /* '%' */ + YYSYMBOL_NONOPT = 57, /* NONOPT */ + YYSYMBOL_58_ = 58, /* '?' */ + YYSYMBOL_59_ = 59, /* ';' */ + YYSYMBOL_60_ = 60, /* '(' */ + YYSYMBOL_61_ = 61, /* ')' */ + YYSYMBOL_62_ = 62, /* '$' */ + YYSYMBOL_63_ = 63, /* ':' */ + YYSYMBOL_64_ = 64, /* '.' */ + YYSYMBOL_65_ = 65, /* '[' */ + YYSYMBOL_66_ = 66, /* ']' */ + YYSYMBOL_67_ = 67, /* '{' */ + YYSYMBOL_68_ = 68, /* '}' */ + YYSYMBOL_YYACCEPT = 69, /* $accept */ + YYSYMBOL_TopLevel = 70, /* TopLevel */ + YYSYMBOL_Module = 71, /* Module */ + YYSYMBOL_Imports = 72, /* Imports */ + YYSYMBOL_FuncDefs = 73, /* FuncDefs */ + YYSYMBOL_Exp = 74, /* Exp */ + YYSYMBOL_Import = 75, /* Import */ + YYSYMBOL_ImportWhat = 76, /* ImportWhat */ + YYSYMBOL_ImportFrom = 77, /* ImportFrom */ + YYSYMBOL_FuncDef = 78, /* FuncDef */ + YYSYMBOL_Params = 79, /* Params */ + YYSYMBOL_Param = 80, /* Param */ + YYSYMBOL_String = 81, /* String */ + YYSYMBOL_82_1 = 82, /* @1 */ + YYSYMBOL_83_2 = 83, /* @2 */ + YYSYMBOL_QQString = 84, /* QQString */ + YYSYMBOL_ElseBody = 85, /* ElseBody */ + YYSYMBOL_ExpD = 86, /* ExpD */ + YYSYMBOL_Term = 87, /* Term */ + YYSYMBOL_Args = 88, /* Args */ + YYSYMBOL_Arg = 89, /* Arg */ + YYSYMBOL_RepPatterns = 90, /* RepPatterns */ + YYSYMBOL_Patterns = 91, /* Patterns */ + YYSYMBOL_Pattern = 92, /* Pattern */ + YYSYMBOL_ArrayPats = 93, /* ArrayPats */ + YYSYMBOL_ObjPats = 94, /* ObjPats */ + YYSYMBOL_ObjPat = 95, /* ObjPat */ + YYSYMBOL_Keyword = 96, /* Keyword */ + YYSYMBOL_MkDict = 97, /* MkDict */ + YYSYMBOL_MkDictPair = 98 /* MkDictPair */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; -/* Copy the second part of user declarations. */ -#line 124 "src/parser.y" /* yacc.c:358 */ + +/* Second part of user prologue. */ +#line 124 "src/parser.y" #include "lexer.h" struct lexer_param { @@ -440,34 +566,94 @@ static block gen_update(block object, block val, int optype) { } -#line 444 "src/parser.c" /* yacc.c:358 */ +#line 570 "src/parser.c" + #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + and (if available) are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; #else typedef signed char yytype_int8; #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef unsigned short int yytype_uint16; +typedef short yytype_int16; +#endif + +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + . */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef short int yytype_int16; +typedef short yytype_uint8; +#endif + +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; +#else +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -475,15 +661,28 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int16 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS @@ -497,47 +696,43 @@ typedef short int yytype_int16; # endif #endif -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif #ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif #endif #ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) -#endif - -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) # else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(E) /* empty */ +# define YY_USE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +# endif +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else # define YY_INITIAL_VALUE(Value) Value @@ -550,8 +745,22 @@ typedef short int yytype_int16; # define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END +#endif -#if ! defined yyoverflow || YYERROR_VERBOSE + +#define YY_ASSERT(E) ((void) (0 && (E))) + +#if 1 /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -616,8 +825,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* 1 */ #if (! defined yyoverflow \ && (! defined __cplusplus \ @@ -627,18 +835,19 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; + yy_state_t yyss_alloc; YYSTYPE yyvs_alloc; YYLTYPE yyls_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE) \ + + YYSIZEOF (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM) # define YYCOPY_NEEDED 1 @@ -651,11 +860,11 @@ union yyalloc # define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ - YYSIZE_T yynewbytes; \ + YYPTRDIFF_T yynewbytes; \ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ } \ while (0) @@ -667,12 +876,12 @@ union yyalloc # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) # else # define YYCOPY(Dst, Src, Count) \ do \ { \ - YYSIZE_T yyi; \ + YYPTRDIFF_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ @@ -691,21 +900,24 @@ union yyalloc /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 30 /* YYNRULES -- Number of rules. */ -#define YYNRULES 170 +#define YYNRULES 171 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 326 +#define YYNSTATES 327 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 302 -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ -static const yytype_uint8 yytranslate[] = + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -741,8 +953,8 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +static const yytype_int16 yyrline[] = { 0, 306, 306, 309, 314, 317, 328, 331, 336, 339, 344, 348, 351, 355, 359, 363, 366, 369, 374, 378, @@ -751,71 +963,69 @@ static const yytype_uint16 yyrline[] = 470, 474, 478, 482, 486, 490, 494, 498, 502, 507, 510, 527, 536, 543, 551, 562, 567, 573, 576, 581, 585, 589, 596, 596, 600, 600, 607, 610, 613, 619, - 622, 627, 630, 633, 639, 642, 645, 653, 657, 660, - 663, 666, 669, 672, 675, 678, 681, 685, 691, 694, + 622, 625, 630, 633, 636, 642, 645, 648, 656, 660, + 663, 666, 669, 672, 675, 678, 681, 684, 688, 694, 697, 700, 703, 706, 709, 712, 715, 718, 721, 724, - 727, 730, 733, 736, 739, 742, 745, 767, 771, 775, - 784, 796, 801, 802, 803, 804, 807, 810, 815, 820, - 823, 828, 831, 836, 840, 843, 848, 851, 856, 859, - 864, 867, 870, 873, 876, 879, 887, 893, 896, 899, + 727, 730, 733, 736, 739, 742, 745, 748, 770, 774, + 778, 787, 799, 804, 805, 806, 807, 810, 813, 818, + 823, 826, 831, 834, 839, 843, 846, 851, 854, 859, + 862, 867, 870, 873, 876, 879, 882, 890, 896, 899, 902, 905, 908, 911, 914, 917, 920, 923, 926, 929, - 932, 935, 938, 941, 944, 947, 952, 955, 956, 957, - 960, 963, 966, 969, 973, 977, 981, 985, 989, 993, - 1001 + 932, 935, 938, 941, 944, 947, 950, 955, 958, 959, + 960, 963, 966, 969, 972, 976, 980, 984, 988, 992, + 996, 1004 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 1 +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if 1 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "INVALID_CHARACTER", "IDENT", "FIELD", - "LITERAL", "FORMAT", "\"..\"", "\"%=\"", "\"==\"", "\"!=\"", "\"//\"", - "\"as\"", "\"def\"", "\"module\"", "\"import\"", "\"include\"", "\"if\"", - "\"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 + "\"end of file\"", "error", "\"invalid token\"", "INVALID_CHARACTER", + "IDENT", "FIELD", "LITERAL", "FORMAT", "\"..\"", "\"%=\"", "\"==\"", + "\"!=\"", "\"//\"", "\"as\"", "\"def\"", "\"module\"", "\"import\"", + "\"include\"", "\"if\"", "\"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 }; -#endif -# ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ -static const yytype_uint16 yytoknum[] = +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) { - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 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 -}; -# endif + return yytname[yysymbol]; +} +#endif -#define YYPACT_NINF -120 +#define YYPACT_NINF (-120) -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-120))) +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF -157 +#define YYTABLE_NINF (-158) -#define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-157))) +#define yytable_value_is_error(Yyn) \ + ((Yyn) == YYTABLE_NINF) - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { 13, 775, 14, 49, -55, 11, -120, 7, -120, 32, @@ -850,50 +1060,50 @@ static const yytype_int16 yypact[] = 1544, 1595, -120, 119, 119, -120, -120, -120, 140, -20, -120, -120, -120, -120, -120, -120, 143, 1646, -120, 775, 775, 775, -20, -120, -120, -120, 1747, 1323, 1168, -120, - -120, -120, 775, -120, 1357, -120 + -120, -120, -120, 775, -120, 1357, -120 }; - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { - 4, 0, 0, 6, 110, 83, 100, 102, 75, 0, + 4, 0, 0, 6, 111, 84, 101, 103, 76, 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, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 0, 109, - 86, 0, 0, 85, 0, 105, 0, 0, 167, 0, - 0, 163, 168, 0, 157, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 102, 48, 1, 0, 0, + 8, 6, 0, 0, 80, 64, 0, 0, 0, 0, + 19, 0, 78, 0, 66, 33, 0, 0, 109, 138, + 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 0, 110, + 87, 0, 0, 86, 0, 106, 0, 0, 168, 0, + 0, 164, 169, 0, 158, 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, 82, 0, 0, 0, 0, 54, 53, 3, - 2, 8, 7, 49, 0, 118, 0, 116, 66, 0, - 0, 0, 0, 0, 0, 0, 76, 0, 112, 103, - 0, 87, 81, 113, 104, 0, 0, 115, 0, 0, - 165, 166, 0, 0, 106, 0, 41, 42, 43, 26, + 5, 10, 83, 0, 0, 0, 0, 54, 53, 3, + 2, 8, 7, 49, 0, 119, 0, 117, 66, 0, + 0, 0, 0, 0, 0, 0, 77, 0, 113, 104, + 0, 88, 82, 114, 105, 0, 0, 116, 0, 0, + 166, 167, 0, 0, 107, 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, - 78, 0, 0, 0, 0, 0, 122, 0, 84, 0, - 0, 93, 0, 0, 9, 50, 0, 111, 0, 61, + 79, 0, 0, 0, 0, 0, 123, 0, 85, 0, + 0, 94, 0, 0, 9, 50, 0, 112, 0, 61, 0, 0, 57, 0, 17, 0, 0, 0, 20, 18, - 0, 67, 0, 63, 0, 0, 159, 0, 170, 73, - 160, 0, 0, 162, 161, 158, 123, 126, 0, 0, - 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, - 80, 114, 0, 92, 0, 89, 52, 0, 117, 65, + 0, 67, 0, 63, 0, 0, 160, 0, 171, 74, + 161, 0, 0, 163, 162, 159, 124, 127, 0, 0, + 0, 0, 0, 0, 0, 129, 0, 0, 0, 0, + 81, 115, 0, 93, 0, 90, 52, 0, 118, 65, 59, 60, 0, 0, 55, 0, 0, 16, 15, 0, - 0, 21, 0, 107, 72, 0, 0, 164, 0, 124, - 0, 0, 0, 130, 0, 0, 125, 0, 121, 11, - 91, 99, 98, 0, 88, 51, 58, 0, 0, 0, - 0, 0, 68, 71, 169, 127, 136, 132, 0, 0, - 134, 129, 133, 90, 96, 95, 97, 0, 70, 0, - 0, 0, 0, 131, 94, 56, 0, 0, 0, 135, - 69, 12, 0, 14, 0, 13 + 0, 21, 0, 108, 73, 0, 0, 165, 0, 125, + 0, 0, 0, 131, 0, 0, 126, 0, 122, 11, + 92, 100, 99, 0, 89, 51, 58, 0, 0, 0, + 0, 0, 68, 72, 170, 128, 137, 133, 0, 0, + 135, 130, 134, 91, 97, 96, 98, 0, 71, 0, + 0, 0, 0, 132, 95, 56, 0, 0, 0, 136, + 70, 69, 12, 0, 14, 0, 13 }; - /* YYPGOTO[NTERM-NUM]. */ +/* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -120, -120, -120, 171, 83, -1, -120, -120, 176, -12, @@ -901,17 +1111,17 @@ static const yytype_int16 yypgoto[] = 22, -120, -16, -119, -120, -120, -68, -18, -105, -120 }; - /* YYDEFGOTO[NTERM-NUM]. */ +/* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 2, 3, 30, 119, 111, 31, 32, 116, 24, + 0, 2, 3, 30, 119, 111, 31, 32, 116, 24, 201, 202, 25, 44, 128, 137, 258, 218, 26, 126, 127, 184, 185, 186, 228, 234, 235, 82, 83, 84 }; - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 23, 69, 199, 42, 72, 33, 38, 39, 112, 37, @@ -929,13 +1139,13 @@ static const yytype_int16 yytable[] = 106, 107, 108, 140, 109, 141, 142, 148, 143, 203, 205, 154, 152, 209, 153, 155, 180, 210, 193, 214, 109, 219, 226, 219, 222, 237, 238, 219, 219, 295, - 81, 296, 297, -120, 240, 300, 293, 294, 302, 241, + 81, 296, 297, -121, 240, 300, 293, 294, 302, 241, 81, 243, 259, 263, 260, 236, 265, 273, 284, 285, 189, 266, 270, 4, 5, 6, 7, 8, 271, 274, 313, 277, 251, 9, 287, 299, 239, 10, 233, 242, - -119, 11, 12, 319, 303, 125, 13, 304, 14, 15, + -120, 11, 12, 319, 303, 125, 13, 304, 14, 15, 305, 314, 122, 312, 194, 118, 286, 301, 198, 261, - 16, 262, 219, 320, 0, 0, 0, 219, 248, 0, + 16, 262, 219, 321, 0, 0, 0, 219, 248, 0, 0, 0, 17, 85, 86, 87, 88, 0, 0, 18, 272, 19, 190, 20, 21, 191, 22, 279, 0, 89, 90, 0, 0, 283, 0, 0, 91, 92, 93, 94, @@ -943,26 +1153,26 @@ static const yytype_int16 yytable[] = 219, 219, 0, 101, 102, 103, 104, 105, 106, 107, 108, 0, 109, 0, 0, 0, 0, 0, 0, 0, 233, 0, 0, 0, 0, 0, 307, 0, 0, 0, - 0, 0, -74, 70, 0, 0, 71, -74, 0, 72, - 0, -74, -74, -74, -74, -74, 0, 0, 316, 317, - 318, -74, -74, -74, 0, 0, -74, -74, -74, 0, - -74, 324, 0, 0, -74, -74, -74, -74, -74, -74, - -74, -74, 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, 77, - -74, 0, 78, -157, -157, 72, 0, 0, 0, 0, + 0, 0, -75, 70, 0, 0, 71, -75, 0, 72, + 0, -75, -75, -75, -75, -75, 0, 0, 316, 317, + 318, -75, -75, -75, 0, 0, -75, -75, -75, 0, + -75, 0, 325, 0, -75, -75, -75, -75, -75, -75, + -75, -75, 0, 16, 0, 0, -75, 0, 0, -75, + -75, -75, -75, -75, -75, -75, -75, -75, -75, 0, + -75, -75, 0, -75, 0, -75, -75, -75, -75, 77, + -75, 0, 78, -158, -158, 72, 0, 0, 0, 0, 0, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 0, -157, -157, 0, 0, 0, 0, 0, 0, 16, - 0, 0, 0, -157, -157, 104, 105, 106, 107, 108, + 0, -158, -158, 0, 0, 0, 0, 0, 0, 16, + 0, 0, 0, -158, -158, 104, 105, 106, 107, 108, 0, 109, 0, 0, 0, 0, 215, 0, 79, 78, - 80, 0, 72, 0, 0, 0, -156, 0, 49, 50, + 80, 0, 72, 0, 0, 0, -157, 0, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 4, 5, 6, 7, 8, 0, 0, 0, 0, 16, 0, 0, 74, 0, 0, 4, 5, 6, 7, 8, 0, 0, 0, 0, 0, 9, 15, 0, 79, 10, 80, 0, 0, - 11, 12, 0, -156, 16, 13, 0, 14, 15, 0, + 11, 12, 0, -157, 16, 13, 0, 14, 15, 0, 0, 0, 0, 0, 0, 0, 217, 0, 0, 16, 0, 0, 0, 18, 0, 19, 0, 20, 21, 0, 22, 17, 4, 5, 6, 7, 8, 0, 18, 0, @@ -1036,7 +1246,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 89, 90, 0, 0, 0, 0, 0, 91, 92, 93, 94, 95, 96, 97, 98, 0, 0, 0, 0, 0, 0, 0, 99, 100, 101, 102, 103, - 104, 105, 106, 107, 108, 0, 109, 322, 0, 323, + 104, 105, 106, 107, 108, 0, 109, 323, 0, 324, 85, 86, 87, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 90, 0, 0, 0, 0, 0, 91, 92, 93, 94, 95, 96, 97, @@ -1052,10 +1262,10 @@ static const yytype_int16 yytable[] = 298, 0, 0, 0, 0, 91, 92, 93, 94, 95, 96, 97, 98, 0, 0, 0, 85, 86, 87, 88, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 0, 109, 89, 90, 321, 0, 0, 0, 0, 91, + 0, 109, 89, 90, 322, 0, 0, 0, 0, 91, 92, 93, 94, 95, 96, 97, 98, 0, 0, 0, 85, 86, 87, 88, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 0, 109, 89, 90, 325, 0, + 105, 106, 107, 108, 0, 109, 89, 90, 326, 0, 0, 0, 0, 91, 92, 93, 94, 95, 96, 97, 98, 0, 0, 0, 0, 0, 0, 0, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 0, 109, @@ -1091,7 +1301,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 0, 109, 85, 86, 87, 88, 0, 0, 0, 0, 0, 0, 0, 255, 256, 0, - 0, 0, 89, 90, 0, 0, 0, 0, 0, 91, + 0, 320, 89, 90, 0, 0, 0, 0, 0, 91, 92, 93, 94, 95, 96, 97, 98, 0, 0, 0, 0, 0, 0, 0, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 0, 109, 85, 86, 87, 88, @@ -1114,11 +1324,11 @@ static const yytype_int16 yytable[] = 98, 0, 0, 0, 85, 86, 87, 88, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 0, 109, 89, 90, 0, 0, 0, 0, 0, 91, 92, 93, - 94, 95, 96, 97, 98, 0, 0, 0, -157, 86, + 94, 95, 96, 97, 98, 0, 0, 0, -158, 86, 87, 0, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 0, 109, 89, 90, 0, 0, 0, 0, - 0, -157, -157, -157, -157, -157, -157, 97, 98, 0, - 0, 86, 87, 0, 0, 0, 0, 0, -157, 102, + 0, -158, -158, -158, -158, -158, -158, 97, 98, 0, + 0, 86, 87, 0, 0, 0, 0, 0, -158, 102, 103, 104, 105, 106, 107, 108, 89, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1165,7 +1375,7 @@ static const yytype_int16 yycheck[] = -1, -1, 0, 1, -1, -1, 4, 5, -1, 7, -1, 9, 10, 11, 12, 13, -1, -1, 309, 310, 311, 19, 20, 21, -1, -1, 24, 25, 26, -1, - 28, 322, -1, -1, 32, 33, 34, 35, 36, 37, + 28, -1, 323, -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, @@ -1310,7 +1520,7 @@ static const yytype_int16 yycheck[] = -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, + -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, @@ -1350,9 +1560,9 @@ static const yytype_int16 yycheck[] = 28, 29, 30, 31 }; - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ +static const yytype_int8 yystos[] = { 0, 15, 70, 71, 4, 5, 6, 7, 8, 14, 18, 22, 23, 27, 29, 30, 41, 53, 60, 62, @@ -1386,11 +1596,11 @@ static const yytype_uint8 yystos[] = 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, 85, 61, 59, 61, 74, 61 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr1[] = { 0, 69, 70, 70, 71, 71, 72, 72, 73, 73, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, @@ -1399,21 +1609,21 @@ static const yytype_uint8 yyr1[] = 74, 74, 74, 74, 74, 74, 74, 74, 74, 75, 75, 76, 76, 76, 77, 78, 78, 79, 79, 80, 80, 80, 82, 81, 83, 81, 84, 84, 84, 85, - 85, 86, 86, 86, 87, 87, 87, 87, 87, 87, + 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, + 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, 97, 97, 97, 97, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98 + 96, 96, 96, 96, 96, 96, 96, 97, 97, 97, + 97, 98, 98, 98, 98, 98, 98, 98, 98, 98, + 98, 98 }; - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr2[] = { 0, 2, 3, 3, 0, 3, 0, 2, 0, 2, 2, 5, 9, 11, 9, 5, 5, 4, 4, 2, @@ -1422,53 +1632,53 @@ static const yytype_uint8 yyr2[] = 3, 3, 3, 3, 3, 3, 3, 3, 1, 2, 3, 5, 4, 2, 1, 5, 8, 1, 3, 2, 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, 5, 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, + 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, 5, 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, 2, 1, 1, 5, - 3 + 1, 1, 1, 1, 1, 1, 1, 0, 1, 3, + 3, 3, 3, 3, 1, 4, 2, 2, 1, 1, + 5, 3 }; +enum { YYENOMEM = -2 }; + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (&yylloc, answer, errors, locations, lexer_param_ptr, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) - -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (&yylloc, answer, errors, locations, lexer_param_ptr, YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends @@ -1512,20 +1722,27 @@ do { \ } while (0) -/* YY_LOCATION_PRINT -- Print the location on the stream. +/* YYLOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know we won't break user code: when these are the locations we know. */ -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# ifndef YYLOCATION_PRINT + +# if defined YY_LOCATION_PRINT + + /* Temporary convenience wrapper in case some people defined the + undocumented and private YY_LOCATION_PRINT macros. */ +# define YYLOCATION_PRINT(File, Loc) YY_LOCATION_PRINT(File, *(Loc)) + +# elif defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL /* Print *YYLOCP on YYO. Private, do not rely on its existence. */ YY_ATTRIBUTE_UNUSED -static unsigned +static int yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) { - unsigned res = 0; + int res = 0; int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; if (0 <= yylocp->first_line) { @@ -1545,67 +1762,75 @@ yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) res += YYFPRINTF (yyo, "-%d", end_col); } return res; - } +} -# define YY_LOCATION_PRINT(File, Loc) \ - yy_location_print_ (File, &(Loc)) +# define YYLOCATION_PRINT yy_location_print_ -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif + /* Temporary convenience wrapper in case some people defined the + undocumented and private YY_LOCATION_PRINT macros. */ +# define YY_LOCATION_PRINT(File, Loc) YYLOCATION_PRINT(File, &(Loc)) + +# else + +# define YYLOCATION_PRINT(File, Loc) ((void) 0) + /* Temporary convenience wrapper in case some people defined the + undocumented and private YY_LOCATION_PRINT macros. */ +# define YY_LOCATION_PRINT YYLOCATION_PRINT + +# endif +# endif /* !defined YYLOCATION_PRINT */ -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Type, Value, Location, answer, errors, locations, lexer_param_ptr); \ + Kind, Value, Location, answer, errors, locations, lexer_param_ptr); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) { - FILE *yyo = yyoutput; - YYUSE (yyo); - YYUSE (yylocationp); - YYUSE (answer); - YYUSE (errors); - YYUSE (locations); - YYUSE (lexer_param_ptr); + FILE *yyoutput = yyo; + YY_USE (yyoutput); + YY_USE (yylocationp); + YY_USE (answer); + YY_USE (errors); + YY_USE (locations); + YY_USE (lexer_param_ptr); if (!yyvaluep) return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) { - YYFPRINTF (yyoutput, "%s %s (", - yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, answer, errors, locations, lexer_param_ptr); - YYFPRINTF (yyoutput, ")"); + YYLOCATION_PRINT (yyo, yylocationp); + YYFPRINTF (yyo, ": "); + yy_symbol_value_print (yyo, yykind, yyvaluep, yylocationp, answer, errors, locations, lexer_param_ptr); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -1614,7 +1839,7 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYL `------------------------------------------------------------------*/ static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1637,21 +1862,22 @@ do { \ `------------------------------------------------*/ static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, + int yyrule, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) { - unsigned long int yylno = yyrline[yyrule]; + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , &(yylsp[(yyi + 1) - (yynrhs)]) , answer, errors, locations, lexer_param_ptr); + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)], + &(yylsp[(yyi + 1) - (yynrhs)]), answer, errors, locations, lexer_param_ptr); YYFPRINTF (stderr, "\n"); } } @@ -1666,8 +1892,8 @@ do { \ multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -1690,28 +1916,77 @@ int yydebug; #endif -#if YYERROR_VERBOSE +/* Context of a parse error. */ +typedef struct +{ + yy_state_t *yyssp; + yysymbol_kind_t yytoken; + YYLTYPE *yylloc; +} yypcontext_t; + +/* Put in YYARG at most YYARGN of the expected tokens given the + current YYCTX, and return the number of tokens stored in YYARG. If + YYARG is null, return the number of expected tokens (guaranteed to + be less than YYNTOKENS). Return YYENOMEM on memory exhaustion. + Return 0 if there are more than YYARGN expected tokens, yet fill + YYARG up to YYARGN. */ +static int +yypcontext_expected_tokens (const yypcontext_t *yyctx, + yysymbol_kind_t yyarg[], int yyargn) +{ + /* Actual size of YYARG. */ + int yycount = 0; + int yyn = yypact[+*yyctx->yyssp]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYSYMBOL_YYerror + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (!yyarg) + ++yycount; + else if (yycount == yyargn) + return 0; + else + yyarg[yycount++] = YY_CAST (yysymbol_kind_t, yyx); + } + } + if (yyarg && yycount == 0 && 0 < yyargn) + yyarg[0] = YYSYMBOL_YYEMPTY; + return yycount; +} + + -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else + +#ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) +# else /* Return the length of YYSTR. */ -static YYSIZE_T +static YYPTRDIFF_T yystrlen (const char *yystr) { - YYSIZE_T yylen; + YYPTRDIFF_T yylen; for (yylen = 0; yystr[yylen]; yylen++) continue; return yylen; } -# endif # endif +#endif -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else +#ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ static char * @@ -1725,10 +2000,10 @@ yystpcpy (char *yydest, const char *yysrc) return yyd - 1; } -# endif # endif +#endif -# ifndef yytnamerr +#ifndef yytnamerr /* Copy to YYRES the contents of YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string @@ -1736,14 +2011,13 @@ yystpcpy (char *yydest, const char *yysrc) backslash-backslash). YYSTR is taken from yytname. If YYRES is null, do not copy; instead, return the length of what the result would have been. */ -static YYSIZE_T +static YYPTRDIFF_T yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { - YYSIZE_T yyn = 0; + YYPTRDIFF_T yyn = 0; char const *yyp = yystr; - for (;;) switch (*++yyp) { @@ -1754,7 +2028,10 @@ yytnamerr (char *yyres, const char *yystr) case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + else + goto append; + + append: default: if (yyres) yyres[yyn] = *yyp; @@ -1769,36 +2046,20 @@ yytnamerr (char *yyres, const char *yystr) do_not_strip_quotes: ; } - if (! yyres) + if (yyres) + return yystpcpy (yyres, yystr) - yyres; + else return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; } -# endif +#endif -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) +yy_syntax_error_arguments (const yypcontext_t *yyctx, + yysymbol_kind_t yyarg[], int yyargn) { - YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ + /* Actual size of YYARG. */ int yycount = 0; - /* There are many possibilities here to consider: - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action @@ -1822,63 +2083,78 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, one exception: it will still contain any token that will not be accepted due to an error action in a later state. */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } + if (yyctx->yytoken != YYSYMBOL_YYEMPTY) + { + int yyn; + if (yyarg) + yyarg[yycount] = yyctx->yytoken; + ++yycount; + yyn = yypcontext_expected_tokens (yyctx, + yyarg ? yyarg + 1 : yyarg, yyargn - 1); + if (yyn == YYENOMEM) + return YYENOMEM; + else + yycount += yyn; } + return yycount; +} + +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return -1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return YYENOMEM if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, + const yypcontext_t *yyctx) +{ + enum { YYARGS_MAX = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat: reported tokens (one for the "unexpected", + one per "expected"). */ + yysymbol_kind_t yyarg[YYARGS_MAX]; + /* Cumulated lengths of YYARG. */ + YYPTRDIFF_T yysize = 0; + + /* Actual size of YYARG. */ + int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX); + if (yycount == YYENOMEM) + return YYENOMEM; switch (yycount) { -# define YYCASE_(N, S) \ +#define YYCASE_(N, S) \ case N: \ yyformat = S; \ - break + break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ +#undef YYCASE_ } + /* Compute error message size. Don't count the "%s"s, but reserve + room for the terminator. */ + yysize = yystrlen (yyformat) - 2 * yycount + 1; { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + int yyi; + for (yyi = 0; yyi < yycount; ++yyi) + { + YYPTRDIFF_T yysize1 + = yysize + yytnamerr (YY_NULLPTR, yytname[yyarg[yyi]]); + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else + return YYENOMEM; + } } if (*yymsg_alloc < yysize) @@ -1887,7 +2163,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, if (! (yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; + return -1; } /* Avoid sprintf, as that infringes on the user's name space. @@ -1899,226 +2175,226 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, while ((*yyp = *yyformat) != '\0') if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) { - yyp += yytnamerr (yyp, yyarg[yyi++]); + yyp += yytnamerr (yyp, yytname[yyarg[yyi++]]); yyformat += 2; } else { - yyp++; - yyformat++; + ++yyp; + ++yyformat; } } return 0; } -#endif /* YYERROR_VERBOSE */ + /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) { - YYUSE (yyvaluep); - YYUSE (yylocationp); - YYUSE (answer); - YYUSE (errors); - YYUSE (locations); - YYUSE (lexer_param_ptr); + YY_USE (yyvaluep); + YY_USE (yylocationp); + YY_USE (answer); + YY_USE (errors); + YY_USE (locations); + YY_USE (lexer_param_ptr); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - switch (yytype) + switch (yykind) { - case 4: /* IDENT */ -#line 36 "src/parser.y" /* yacc.c:1257 */ - { jv_free(((*yyvaluep).literal)); } -#line 1939 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_IDENT: /* IDENT */ +#line 36 "src/parser.y" + { jv_free(((*yyvaluep).literal)); } +#line 2216 "src/parser.c" break; - case 5: /* FIELD */ -#line 36 "src/parser.y" /* yacc.c:1257 */ - { jv_free(((*yyvaluep).literal)); } -#line 1945 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_FIELD: /* FIELD */ +#line 36 "src/parser.y" + { jv_free(((*yyvaluep).literal)); } +#line 2222 "src/parser.c" break; - case 6: /* LITERAL */ -#line 36 "src/parser.y" /* yacc.c:1257 */ - { jv_free(((*yyvaluep).literal)); } -#line 1951 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_LITERAL: /* LITERAL */ +#line 36 "src/parser.y" + { jv_free(((*yyvaluep).literal)); } +#line 2228 "src/parser.c" break; - case 7: /* FORMAT */ -#line 36 "src/parser.y" /* yacc.c:1257 */ - { jv_free(((*yyvaluep).literal)); } -#line 1957 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_FORMAT: /* FORMAT */ +#line 36 "src/parser.y" + { jv_free(((*yyvaluep).literal)); } +#line 2234 "src/parser.c" break; - case 42: /* QQSTRING_TEXT */ -#line 36 "src/parser.y" /* yacc.c:1257 */ - { jv_free(((*yyvaluep).literal)); } -#line 1963 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_QQSTRING_TEXT: /* QQSTRING_TEXT */ +#line 36 "src/parser.y" + { jv_free(((*yyvaluep).literal)); } +#line 2240 "src/parser.c" break; - case 71: /* Module */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 1969 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Module: /* Module */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2246 "src/parser.c" break; - case 72: /* Imports */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 1975 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Imports: /* Imports */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2252 "src/parser.c" break; - case 73: /* FuncDefs */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 1981 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_FuncDefs: /* FuncDefs */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2258 "src/parser.c" break; - case 74: /* Exp */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 1987 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Exp: /* Exp */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2264 "src/parser.c" break; - case 75: /* Import */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 1993 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Import: /* Import */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2270 "src/parser.c" break; - case 76: /* ImportWhat */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 1999 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ImportWhat: /* ImportWhat */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2276 "src/parser.c" break; - case 77: /* ImportFrom */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2005 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ImportFrom: /* ImportFrom */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2282 "src/parser.c" break; - case 78: /* FuncDef */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2011 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_FuncDef: /* FuncDef */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2288 "src/parser.c" break; - case 79: /* Params */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2017 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Params: /* Params */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2294 "src/parser.c" break; - case 80: /* Param */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2023 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Param: /* Param */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2300 "src/parser.c" break; - case 81: /* String */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2029 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_String: /* String */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2306 "src/parser.c" break; - case 84: /* QQString */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2035 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_QQString: /* QQString */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2312 "src/parser.c" break; - case 85: /* ElseBody */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2041 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ElseBody: /* ElseBody */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2318 "src/parser.c" break; - case 86: /* ExpD */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2047 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ExpD: /* ExpD */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2324 "src/parser.c" break; - case 87: /* Term */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2053 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Term: /* Term */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2330 "src/parser.c" break; - case 88: /* Args */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2059 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Args: /* Args */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2336 "src/parser.c" break; - case 89: /* Arg */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2065 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Arg: /* Arg */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2342 "src/parser.c" break; - case 90: /* RepPatterns */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2071 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_RepPatterns: /* RepPatterns */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2348 "src/parser.c" break; - case 91: /* Patterns */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2077 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Patterns: /* Patterns */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2354 "src/parser.c" break; - case 92: /* Pattern */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2083 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Pattern: /* Pattern */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2360 "src/parser.c" break; - case 93: /* ArrayPats */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2089 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ArrayPats: /* ArrayPats */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2366 "src/parser.c" break; - case 94: /* ObjPats */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2095 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ObjPats: /* ObjPats */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2372 "src/parser.c" break; - case 95: /* ObjPat */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2101 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_ObjPat: /* ObjPat */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2378 "src/parser.c" break; - case 96: /* Keyword */ -#line 36 "src/parser.y" /* yacc.c:1257 */ - { jv_free(((*yyvaluep).literal)); } -#line 2107 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_Keyword: /* Keyword */ +#line 36 "src/parser.y" + { jv_free(((*yyvaluep).literal)); } +#line 2384 "src/parser.c" break; - case 97: /* MkDict */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2113 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_MkDict: /* MkDict */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2390 "src/parser.c" break; - case 98: /* MkDictPair */ -#line 37 "src/parser.y" /* yacc.c:1257 */ - { block_free(((*yyvaluep).blk)); } -#line 2119 "src/parser.c" /* yacc.c:1257 */ + case YYSYMBOL_MkDictPair: /* MkDictPair */ +#line 37 "src/parser.y" + { block_free(((*yyvaluep).blk)); } +#line 2396 "src/parser.c" break; - default: break; } @@ -2128,6 +2404,8 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio + + /*----------. | yyparse. | `----------*/ @@ -2135,7 +2413,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio int yyparse (block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr) { -/* The lookahead symbol. */ +/* Lookahead token kind. */ int yychar; @@ -2154,55 +2432,50 @@ static YYLTYPE yyloc_default YYLTYPE yylloc = yyloc_default; /* Number of syntax errors so far. */ - int yynerrs; + int yynerrs = 0; - int yystate; + yy_state_fast_t yystate = 0; /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; + int yyerrstatus = 0; - /* The stacks and their tools: - 'yyss': related to states. - 'yyvs': related to semantic values. - 'yyls': related to locations. - - Refer to the stacks through separate pointers, to allow yyoverflow + /* Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; + + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; - /* The semantic value stack. */ + /* The semantic value stack: array, bottom, top. */ YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; - /* The location stack. */ + /* The location stack: array, bottom, top. */ YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls; - YYLTYPE *yylsp; - - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[3]; - - YYSIZE_T yystacksize; + YYLTYPE *yyls = yylsa; + YYLTYPE *yylsp = yyls; int yyn; + /* The return value of yyparse. */ int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; YYLTYPE yyloc; -#if YYERROR_VERBOSE + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[3]; + /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf; #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) @@ -2210,43 +2483,49 @@ YYLTYPE yylloc = yyloc_default; Keep to zero when no symbol should be popped. */ int yylen = 0; - yyssp = yyss = yyssa; - yyvsp = yyvs = yyvsa; - yylsp = yyls = yylsa; - yystacksize = YYINITDEPTH; - YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ + yylsp[0] = yylloc; goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + YYNOMEM; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ + yy_state_t *yyss1 = yyss; YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; YYLTYPE *yyls1 = yyls; /* Each stack pointer address is followed by the size of the @@ -2254,32 +2533,29 @@ YYLTYPE yylloc = yyloc_default; conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), + &yyls1, yysize * YYSIZEOF (*yylsp), &yystacksize); - - yyls = yyls1; yyss = yyss1; yyvs = yyvs1; + yyls = yyls1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; + yy_state_t *yyss1 = yyss; union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) - goto yyexhaustedlab; + YYNOMEM; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); YYSTACK_RELOCATE (yyls_alloc, yyls); @@ -2288,31 +2564,32 @@ YYLTYPE yylloc = yyloc_default; YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; yylsp = yyls + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); if (yystate == YYFINAL) YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -2323,18 +2600,30 @@ YYLTYPE yylloc = yyloc_default; /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); + YYDPRINTF ((stderr, "Reading a token\n")); yychar = yylex (&yylval, &yylloc, answer, errors, locations, lexer_param_ptr); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + yyerror_range[1] = yylloc; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -2362,15 +2651,14 @@ YYLTYPE yylloc = yyloc_default; /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - yystate = yyn; YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; + + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -2385,7 +2673,7 @@ YYLTYPE yylloc = yyloc_default; /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -2401,38 +2689,39 @@ YYLTYPE yylloc = yyloc_default; GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; - /* Default location. */ + /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); + yyerror_range[1] = yyloc; YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: -#line 306 "src/parser.y" /* yacc.c:1646 */ - { + case 2: /* TopLevel: Module Imports Exp */ +#line 306 "src/parser.y" + { *answer = BLOCK((yyvsp[-2].blk), (yyvsp[-1].blk), gen_op_simple(TOP), (yyvsp[0].blk)); } -#line 2415 "src/parser.c" /* yacc.c:1646 */ +#line 2704 "src/parser.c" break; - case 3: -#line 309 "src/parser.y" /* yacc.c:1646 */ - { + case 3: /* TopLevel: Module Imports FuncDefs */ +#line 309 "src/parser.y" + { *answer = BLOCK((yyvsp[-2].blk), (yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2423 "src/parser.c" /* yacc.c:1646 */ +#line 2712 "src/parser.c" break; - case 4: -#line 314 "src/parser.y" /* yacc.c:1646 */ - { + case 4: /* Module: %empty */ +#line 314 "src/parser.y" + { (yyval.blk) = gen_noop(); } -#line 2431 "src/parser.c" /* yacc.c:1646 */ +#line 2720 "src/parser.c" break; - case 5: -#line 317 "src/parser.y" /* yacc.c:1646 */ - { + case 5: /* Module: "module" Exp ';' */ +#line 317 "src/parser.y" + { if (!block_is_const((yyvsp[-1].blk))) { FAIL((yyloc), "Module metadata must be constant"); (yyval.blk) = gen_noop(); @@ -2441,375 +2730,375 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = gen_module((yyvsp[-1].blk)); } } -#line 2445 "src/parser.c" /* yacc.c:1646 */ +#line 2734 "src/parser.c" break; - case 6: -#line 328 "src/parser.y" /* yacc.c:1646 */ - { + case 6: /* Imports: %empty */ +#line 328 "src/parser.y" + { (yyval.blk) = gen_noop(); } -#line 2453 "src/parser.c" /* yacc.c:1646 */ +#line 2742 "src/parser.c" break; - case 7: -#line 331 "src/parser.y" /* yacc.c:1646 */ - { + case 7: /* Imports: Import Imports */ +#line 331 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2461 "src/parser.c" /* yacc.c:1646 */ +#line 2750 "src/parser.c" break; - case 8: -#line 336 "src/parser.y" /* yacc.c:1646 */ - { + case 8: /* FuncDefs: %empty */ +#line 336 "src/parser.y" + { (yyval.blk) = gen_noop(); } -#line 2469 "src/parser.c" /* yacc.c:1646 */ +#line 2758 "src/parser.c" break; - case 9: -#line 339 "src/parser.y" /* yacc.c:1646 */ - { + case 9: /* FuncDefs: FuncDef FuncDefs */ +#line 339 "src/parser.y" + { (yyval.blk) = block_join((yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2477 "src/parser.c" /* yacc.c:1646 */ +#line 2766 "src/parser.c" break; - case 10: -#line 344 "src/parser.y" /* yacc.c:1646 */ - { + case 10: /* Exp: FuncDef Exp */ +#line 344 "src/parser.y" + { (yyval.blk) = block_bind_referenced((yyvsp[-1].blk), (yyvsp[0].blk), OP_IS_CALL_PSEUDO); } -#line 2485 "src/parser.c" /* yacc.c:1646 */ +#line 2774 "src/parser.c" break; - case 11: -#line 348 "src/parser.y" /* yacc.c:1646 */ - { + case 11: /* Exp: Term "as" Patterns '|' Exp */ +#line 348 "src/parser.y" + { (yyval.blk) = gen_destructure((yyvsp[-4].blk), (yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2493 "src/parser.c" /* yacc.c:1646 */ +#line 2782 "src/parser.c" break; - case 12: -#line 351 "src/parser.y" /* yacc.c:1646 */ - { + case 12: /* Exp: "reduce" Term "as" Patterns '(' Exp ';' Exp ')' */ +#line 351 "src/parser.y" + { (yyval.blk) = gen_reduce((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 2501 "src/parser.c" /* yacc.c:1646 */ +#line 2790 "src/parser.c" break; - case 13: -#line 355 "src/parser.y" /* yacc.c:1646 */ - { + case 13: /* Exp: "foreach" Term "as" Patterns '(' Exp ';' Exp ';' Exp ')' */ +#line 355 "src/parser.y" + { (yyval.blk) = gen_foreach((yyvsp[-9].blk), (yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 2509 "src/parser.c" /* yacc.c:1646 */ +#line 2798 "src/parser.c" break; - case 14: -#line 359 "src/parser.y" /* yacc.c:1646 */ - { + case 14: /* Exp: "foreach" Term "as" Patterns '(' Exp ';' Exp ')' */ +#line 359 "src/parser.y" + { (yyval.blk) = gen_foreach((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop()); } -#line 2517 "src/parser.c" /* yacc.c:1646 */ +#line 2806 "src/parser.c" break; - case 15: -#line 363 "src/parser.y" /* yacc.c:1646 */ - { + case 15: /* Exp: "if" Exp "then" Exp ElseBody */ +#line 363 "src/parser.y" + { (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 2525 "src/parser.c" /* yacc.c:1646 */ +#line 2814 "src/parser.c" break; - case 16: -#line 366 "src/parser.y" /* yacc.c:1646 */ - { + case 16: /* Exp: "if" Exp "then" Exp "end" */ +#line 366 "src/parser.y" + { (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop()); } -#line 2533 "src/parser.c" /* yacc.c:1646 */ +#line 2822 "src/parser.c" break; - case 17: -#line 369 "src/parser.y" /* yacc.c:1646 */ - { + case 17: /* Exp: "if" Exp "then" error */ +#line 369 "src/parser.y" + { FAIL((yyloc), "Possibly unterminated 'if' statement"); (yyval.blk) = (yyvsp[-2].blk); } -#line 2542 "src/parser.c" /* yacc.c:1646 */ +#line 2831 "src/parser.c" break; - case 18: -#line 374 "src/parser.y" /* yacc.c:1646 */ - { + case 18: /* Exp: "try" Exp "catch" Exp */ +#line 374 "src/parser.y" + { //$$ = BLOCK(gen_op_target(FORK_OPT, $2), $2, $4); (yyval.blk) = gen_try((yyvsp[-2].blk), gen_try_handler((yyvsp[0].blk))); } -#line 2551 "src/parser.c" /* yacc.c:1646 */ +#line 2840 "src/parser.c" break; - case 19: -#line 378 "src/parser.y" /* yacc.c:1646 */ - { + case 19: /* Exp: "try" Exp */ +#line 378 "src/parser.y" + { //$$ = BLOCK(gen_op_target(FORK_OPT, $2), $2, gen_op_simple(BACKTRACK)); (yyval.blk) = gen_try((yyvsp[0].blk), gen_op_simple(BACKTRACK)); } -#line 2560 "src/parser.c" /* yacc.c:1646 */ +#line 2849 "src/parser.c" break; - case 20: -#line 382 "src/parser.y" /* yacc.c:1646 */ - { + case 20: /* Exp: "try" Exp "catch" error */ +#line 382 "src/parser.y" + { FAIL((yyloc), "Possibly unterminated 'try' statement"); (yyval.blk) = (yyvsp[-2].blk); } -#line 2569 "src/parser.c" /* yacc.c:1646 */ +#line 2858 "src/parser.c" break; - case 21: -#line 387 "src/parser.y" /* yacc.c:1646 */ - { + case 21: /* Exp: "label" '$' IDENT '|' Exp */ +#line 387 "src/parser.y" + { 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 2580 "src/parser.c" /* yacc.c:1646 */ +#line 2869 "src/parser.c" break; - case 22: -#line 394 "src/parser.y" /* yacc.c:1646 */ - { + case 22: /* Exp: Exp '?' */ +#line 394 "src/parser.y" + { (yyval.blk) = gen_try((yyvsp[-1].blk), gen_op_simple(BACKTRACK)); } -#line 2588 "src/parser.c" /* yacc.c:1646 */ +#line 2877 "src/parser.c" break; - case 23: -#line 398 "src/parser.y" /* yacc.c:1646 */ - { + case 23: /* Exp: Exp '=' Exp */ +#line 398 "src/parser.y" + { (yyval.blk) = gen_call("_assign", BLOCK(gen_lambda((yyvsp[-2].blk)), gen_lambda((yyvsp[0].blk)))); } -#line 2596 "src/parser.c" /* yacc.c:1646 */ +#line 2885 "src/parser.c" break; - case 24: -#line 402 "src/parser.y" /* yacc.c:1646 */ - { + case 24: /* Exp: Exp "or" Exp */ +#line 402 "src/parser.y" + { (yyval.blk) = gen_or((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2604 "src/parser.c" /* yacc.c:1646 */ +#line 2893 "src/parser.c" break; - case 25: -#line 406 "src/parser.y" /* yacc.c:1646 */ - { + case 25: /* Exp: Exp "and" Exp */ +#line 406 "src/parser.y" + { (yyval.blk) = gen_and((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2612 "src/parser.c" /* yacc.c:1646 */ +#line 2901 "src/parser.c" break; - case 26: -#line 410 "src/parser.y" /* yacc.c:1646 */ - { + case 26: /* Exp: Exp "//" Exp */ +#line 410 "src/parser.y" + { (yyval.blk) = gen_definedor((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2620 "src/parser.c" /* yacc.c:1646 */ +#line 2909 "src/parser.c" break; - case 27: -#line 414 "src/parser.y" /* yacc.c:1646 */ - { + case 27: /* Exp: Exp "//=" Exp */ +#line 414 "src/parser.y" + { (yyval.blk) = gen_definedor_assign((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2628 "src/parser.c" /* yacc.c:1646 */ +#line 2917 "src/parser.c" break; - case 28: -#line 418 "src/parser.y" /* yacc.c:1646 */ - { + case 28: /* Exp: Exp "|=" Exp */ +#line 418 "src/parser.y" + { (yyval.blk) = gen_call("_modify", BLOCK(gen_lambda((yyvsp[-2].blk)), gen_lambda((yyvsp[0].blk)))); } -#line 2636 "src/parser.c" /* yacc.c:1646 */ +#line 2925 "src/parser.c" break; - case 29: -#line 422 "src/parser.y" /* yacc.c:1646 */ - { + case 29: /* Exp: Exp '|' Exp */ +#line 422 "src/parser.y" + { (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2644 "src/parser.c" /* yacc.c:1646 */ +#line 2933 "src/parser.c" break; - case 30: -#line 426 "src/parser.y" /* yacc.c:1646 */ - { + case 30: /* Exp: Exp ',' Exp */ +#line 426 "src/parser.y" + { (yyval.blk) = gen_both((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2652 "src/parser.c" /* yacc.c:1646 */ +#line 2941 "src/parser.c" break; - case 31: -#line 430 "src/parser.y" /* yacc.c:1646 */ - { + case 31: /* Exp: Exp '+' Exp */ +#line 430 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '+'); } -#line 2660 "src/parser.c" /* yacc.c:1646 */ +#line 2949 "src/parser.c" break; - case 32: -#line 434 "src/parser.y" /* yacc.c:1646 */ - { + case 32: /* Exp: Exp "+=" Exp */ +#line 434 "src/parser.y" + { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '+'); } -#line 2668 "src/parser.c" /* yacc.c:1646 */ +#line 2957 "src/parser.c" break; - case 33: -#line 438 "src/parser.y" /* yacc.c:1646 */ - { + case 33: /* Exp: '-' Exp */ +#line 438 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop())); } -#line 2676 "src/parser.c" /* yacc.c:1646 */ +#line 2965 "src/parser.c" break; - case 34: -#line 442 "src/parser.y" /* yacc.c:1646 */ - { + case 34: /* Exp: Exp '-' Exp */ +#line 442 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '-'); } -#line 2684 "src/parser.c" /* yacc.c:1646 */ +#line 2973 "src/parser.c" break; - case 35: -#line 446 "src/parser.y" /* yacc.c:1646 */ - { + case 35: /* Exp: Exp "-=" Exp */ +#line 446 "src/parser.y" + { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '-'); } -#line 2692 "src/parser.c" /* yacc.c:1646 */ +#line 2981 "src/parser.c" break; - case 36: -#line 450 "src/parser.y" /* yacc.c:1646 */ - { + case 36: /* Exp: Exp '*' Exp */ +#line 450 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '*'); } -#line 2700 "src/parser.c" /* yacc.c:1646 */ +#line 2989 "src/parser.c" break; - case 37: -#line 454 "src/parser.y" /* yacc.c:1646 */ - { + case 37: /* Exp: Exp "*=" Exp */ +#line 454 "src/parser.y" + { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '*'); } -#line 2708 "src/parser.c" /* yacc.c:1646 */ +#line 2997 "src/parser.c" break; - case 38: -#line 458 "src/parser.y" /* yacc.c:1646 */ - { + case 38: /* Exp: Exp '/' Exp */ +#line 458 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '/'); if (block_is_const_inf((yyval.blk))) FAIL((yyloc), "Division by zero?"); } -#line 2718 "src/parser.c" /* yacc.c:1646 */ +#line 3007 "src/parser.c" break; - case 39: -#line 464 "src/parser.y" /* yacc.c:1646 */ - { + case 39: /* Exp: Exp '%' Exp */ +#line 464 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '%'); if (block_is_const_inf((yyval.blk))) FAIL((yyloc), "Remainder by zero?"); } -#line 2728 "src/parser.c" /* yacc.c:1646 */ +#line 3017 "src/parser.c" break; - case 40: -#line 470 "src/parser.y" /* yacc.c:1646 */ - { + case 40: /* Exp: Exp "/=" Exp */ +#line 470 "src/parser.y" + { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '/'); } -#line 2736 "src/parser.c" /* yacc.c:1646 */ +#line 3025 "src/parser.c" break; - case 41: -#line 474 "src/parser.y" /* yacc.c:1646 */ - { + case 41: /* Exp: Exp "%=" Exp */ +#line 474 "src/parser.y" + { (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '%'); } -#line 2744 "src/parser.c" /* yacc.c:1646 */ +#line 3033 "src/parser.c" break; - case 42: -#line 478 "src/parser.y" /* yacc.c:1646 */ - { + case 42: /* Exp: Exp "==" Exp */ +#line 478 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), EQ); } -#line 2752 "src/parser.c" /* yacc.c:1646 */ +#line 3041 "src/parser.c" break; - case 43: -#line 482 "src/parser.y" /* yacc.c:1646 */ - { + case 43: /* Exp: Exp "!=" Exp */ +#line 482 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), NEQ); } -#line 2760 "src/parser.c" /* yacc.c:1646 */ +#line 3049 "src/parser.c" break; - case 44: -#line 486 "src/parser.y" /* yacc.c:1646 */ - { + case 44: /* Exp: Exp '<' Exp */ +#line 486 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '<'); } -#line 2768 "src/parser.c" /* yacc.c:1646 */ +#line 3057 "src/parser.c" break; - case 45: -#line 490 "src/parser.y" /* yacc.c:1646 */ - { + case 45: /* Exp: Exp '>' Exp */ +#line 490 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '>'); } -#line 2776 "src/parser.c" /* yacc.c:1646 */ +#line 3065 "src/parser.c" break; - case 46: -#line 494 "src/parser.y" /* yacc.c:1646 */ - { + case 46: /* Exp: Exp "<=" Exp */ +#line 494 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), LESSEQ); } -#line 2784 "src/parser.c" /* yacc.c:1646 */ +#line 3073 "src/parser.c" break; - case 47: -#line 498 "src/parser.y" /* yacc.c:1646 */ - { + case 47: /* Exp: Exp ">=" Exp */ +#line 498 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), GREATEREQ); } -#line 2792 "src/parser.c" /* yacc.c:1646 */ +#line 3081 "src/parser.c" break; - case 48: -#line 502 "src/parser.y" /* yacc.c:1646 */ - { + case 48: /* Exp: Term */ +#line 502 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } -#line 2800 "src/parser.c" /* yacc.c:1646 */ +#line 3089 "src/parser.c" break; - case 49: -#line 507 "src/parser.y" /* yacc.c:1646 */ - { + case 49: /* Import: ImportWhat ';' */ +#line 507 "src/parser.y" + { (yyval.blk) = (yyvsp[-1].blk); } -#line 2808 "src/parser.c" /* yacc.c:1646 */ +#line 3097 "src/parser.c" break; - case 50: -#line 510 "src/parser.y" /* yacc.c:1646 */ - { + case 50: /* Import: ImportWhat Exp ';' */ +#line 510 "src/parser.y" + { if (!block_is_const((yyvsp[-1].blk))) { FAIL((yyloc), "Module metadata must be constant"); (yyval.blk) = gen_noop(); @@ -2824,12 +3113,12 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = gen_import_meta((yyvsp[-2].blk), (yyvsp[-1].blk)); } } -#line 2828 "src/parser.c" /* yacc.c:1646 */ +#line 3117 "src/parser.c" break; - case 51: -#line 527 "src/parser.y" /* yacc.c:1646 */ - { + case 51: /* ImportWhat: "import" ImportFrom "as" '$' IDENT */ +#line 527 "src/parser.y" + { jv v = block_const((yyvsp[-3].blk)); // XXX Make gen_import take only blocks and the int is_data so we // don't have to free so much stuff here @@ -2838,35 +3127,35 @@ YYLTYPE yylloc = yyloc_default; jv_free((yyvsp[0].literal)); jv_free(v); } -#line 2842 "src/parser.c" /* yacc.c:1646 */ +#line 3131 "src/parser.c" break; - case 52: -#line 536 "src/parser.y" /* yacc.c:1646 */ - { + case 52: /* ImportWhat: "import" ImportFrom "as" IDENT */ +#line 536 "src/parser.y" + { jv v = block_const((yyvsp[-2].blk)); (yyval.blk) = gen_import(jv_string_value(v), jv_string_value((yyvsp[0].literal)), 0); block_free((yyvsp[-2].blk)); jv_free((yyvsp[0].literal)); jv_free(v); } -#line 2854 "src/parser.c" /* yacc.c:1646 */ +#line 3143 "src/parser.c" break; - case 53: -#line 543 "src/parser.y" /* yacc.c:1646 */ - { + case 53: /* ImportWhat: "include" ImportFrom */ +#line 543 "src/parser.y" + { 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 2865 "src/parser.c" /* yacc.c:1646 */ +#line 3154 "src/parser.c" break; - case 54: -#line 551 "src/parser.y" /* yacc.c:1646 */ - { + case 54: /* ImportFrom: String */ +#line 551 "src/parser.y" + { if (!block_is_const((yyvsp[0].blk))) { FAIL((yyloc), "Import path must be constant"); (yyval.blk) = gen_const(jv_string("")); @@ -2875,183 +3164,191 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = (yyvsp[0].blk); } } -#line 2879 "src/parser.c" /* yacc.c:1646 */ +#line 3168 "src/parser.c" break; - case 55: -#line 562 "src/parser.y" /* yacc.c:1646 */ - { + case 55: /* FuncDef: "def" IDENT ':' Exp ';' */ +#line 562 "src/parser.y" + { (yyval.blk) = gen_function(jv_string_value((yyvsp[-3].literal)), gen_noop(), (yyvsp[-1].blk)); jv_free((yyvsp[-3].literal)); } -#line 2888 "src/parser.c" /* yacc.c:1646 */ +#line 3177 "src/parser.c" break; - case 56: -#line 567 "src/parser.y" /* yacc.c:1646 */ - { + case 56: /* FuncDef: "def" IDENT '(' Params ')' ':' Exp ';' */ +#line 567 "src/parser.y" + { (yyval.blk) = gen_function(jv_string_value((yyvsp[-6].literal)), (yyvsp[-4].blk), (yyvsp[-1].blk)); jv_free((yyvsp[-6].literal)); } -#line 2897 "src/parser.c" /* yacc.c:1646 */ +#line 3186 "src/parser.c" break; - case 57: -#line 573 "src/parser.y" /* yacc.c:1646 */ - { + case 57: /* Params: Param */ +#line 573 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } -#line 2905 "src/parser.c" /* yacc.c:1646 */ +#line 3194 "src/parser.c" break; - case 58: -#line 576 "src/parser.y" /* yacc.c:1646 */ - { + case 58: /* Params: Params ';' Param */ +#line 576 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 2913 "src/parser.c" /* yacc.c:1646 */ +#line 3202 "src/parser.c" break; - case 59: -#line 581 "src/parser.y" /* yacc.c:1646 */ - { + case 59: /* Param: '$' IDENT */ +#line 581 "src/parser.y" + { (yyval.blk) = gen_param_regular(jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 2922 "src/parser.c" /* yacc.c:1646 */ +#line 3211 "src/parser.c" break; - case 60: -#line 585 "src/parser.y" /* yacc.c:1646 */ - { + case 60: /* Param: '$' Keyword */ +#line 585 "src/parser.y" + { (yyval.blk) = gen_param_regular(jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 2931 "src/parser.c" /* yacc.c:1646 */ +#line 3220 "src/parser.c" break; - case 61: -#line 589 "src/parser.y" /* yacc.c:1646 */ - { + case 61: /* Param: IDENT */ +#line 589 "src/parser.y" + { (yyval.blk) = gen_param(jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 2940 "src/parser.c" /* yacc.c:1646 */ +#line 3229 "src/parser.c" break; - case 62: -#line 596 "src/parser.y" /* yacc.c:1646 */ - { (yyval.literal) = jv_string("text"); } -#line 2946 "src/parser.c" /* yacc.c:1646 */ + case 62: /* @1: %empty */ +#line 596 "src/parser.y" + { (yyval.literal) = jv_string("text"); } +#line 3235 "src/parser.c" break; - case 63: -#line 596 "src/parser.y" /* yacc.c:1646 */ - { + case 63: /* String: QQSTRING_START @1 QQString QQSTRING_END */ +#line 596 "src/parser.y" + { (yyval.blk) = (yyvsp[-1].blk); jv_free((yyvsp[-2].literal)); } -#line 2955 "src/parser.c" /* yacc.c:1646 */ +#line 3244 "src/parser.c" break; - case 64: -#line 600 "src/parser.y" /* yacc.c:1646 */ - { (yyval.literal) = (yyvsp[-1].literal); } -#line 2961 "src/parser.c" /* yacc.c:1646 */ + case 64: /* @2: %empty */ +#line 600 "src/parser.y" + { (yyval.literal) = (yyvsp[-1].literal); } +#line 3250 "src/parser.c" break; - case 65: -#line 600 "src/parser.y" /* yacc.c:1646 */ - { + case 65: /* String: FORMAT QQSTRING_START @2 QQString QQSTRING_END */ +#line 600 "src/parser.y" + { (yyval.blk) = (yyvsp[-1].blk); jv_free((yyvsp[-2].literal)); } -#line 2970 "src/parser.c" /* yacc.c:1646 */ +#line 3259 "src/parser.c" break; - case 66: -#line 607 "src/parser.y" /* yacc.c:1646 */ - { + case 66: /* QQString: %empty */ +#line 607 "src/parser.y" + { (yyval.blk) = gen_const(jv_string("")); } -#line 2978 "src/parser.c" /* yacc.c:1646 */ +#line 3267 "src/parser.c" break; - case 67: -#line 610 "src/parser.y" /* yacc.c:1646 */ - { + case 67: /* QQString: QQString QQSTRING_TEXT */ +#line 610 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-1].blk), gen_const((yyvsp[0].literal)), '+'); } -#line 2986 "src/parser.c" /* yacc.c:1646 */ +#line 3275 "src/parser.c" break; - case 68: -#line 613 "src/parser.y" /* yacc.c:1646 */ - { + case 68: /* QQString: QQString QQSTRING_INTERP_START Exp QQSTRING_INTERP_END */ +#line 613 "src/parser.y" + { (yyval.blk) = gen_binop((yyvsp[-3].blk), gen_format((yyvsp[-1].blk), jv_copy((yyvsp[-4].literal))), '+'); } -#line 2994 "src/parser.c" /* yacc.c:1646 */ +#line 3283 "src/parser.c" break; - case 69: -#line 619 "src/parser.y" /* yacc.c:1646 */ - { + case 69: /* ElseBody: "elif" Exp "then" Exp ElseBody */ +#line 619 "src/parser.y" + { (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk)); } -#line 3002 "src/parser.c" /* yacc.c:1646 */ +#line 3291 "src/parser.c" break; - case 70: -#line 622 "src/parser.y" /* yacc.c:1646 */ - { + case 70: /* ElseBody: "elif" Exp "then" Exp "end" */ +#line 622 "src/parser.y" + { + (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop()); +} +#line 3299 "src/parser.c" + break; + + case 71: /* ElseBody: "else" Exp "end" */ +#line 625 "src/parser.y" + { (yyval.blk) = (yyvsp[-1].blk); } -#line 3010 "src/parser.c" /* yacc.c:1646 */ +#line 3307 "src/parser.c" break; - case 71: -#line 627 "src/parser.y" /* yacc.c:1646 */ - { + case 72: /* ExpD: ExpD '|' ExpD */ +#line 630 "src/parser.y" + { (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3018 "src/parser.c" /* yacc.c:1646 */ +#line 3315 "src/parser.c" break; - case 72: -#line 630 "src/parser.y" /* yacc.c:1646 */ - { + case 73: /* ExpD: '-' ExpD */ +#line 633 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop())); } -#line 3026 "src/parser.c" /* yacc.c:1646 */ +#line 3323 "src/parser.c" break; - case 73: -#line 633 "src/parser.y" /* yacc.c:1646 */ - { + case 74: /* ExpD: Term */ +#line 636 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } -#line 3034 "src/parser.c" /* yacc.c:1646 */ +#line 3331 "src/parser.c" break; - case 74: -#line 639 "src/parser.y" /* yacc.c:1646 */ + case 75: /* Term: '.' */ +#line 642 "src/parser.y" { (yyval.blk) = gen_noop(); } -#line 3042 "src/parser.c" /* yacc.c:1646 */ +#line 3339 "src/parser.c" break; - case 75: -#line 642 "src/parser.y" /* yacc.c:1646 */ + case 76: /* Term: ".." */ +#line 645 "src/parser.y" { (yyval.blk) = gen_call("recurse", gen_noop()); } -#line 3050 "src/parser.c" /* yacc.c:1646 */ +#line 3347 "src/parser.c" break; - case 76: -#line 645 "src/parser.y" /* yacc.c:1646 */ - { + case 77: /* Term: "break" '$' IDENT */ +#line 648 "src/parser.y" + { jv v = jv_string_fmt("*label-%s", jv_string_value((yyvsp[0].literal))); // impossible symbol (yyval.blk) = gen_location((yyloc), locations, BLOCK(gen_op_unbound(LOADV, jv_string_value(v)), @@ -3059,278 +3356,278 @@ YYLTYPE yylloc = yyloc_default; jv_free(v); jv_free((yyvsp[0].literal)); } -#line 3063 "src/parser.c" /* yacc.c:1646 */ +#line 3360 "src/parser.c" break; - case 77: -#line 653 "src/parser.y" /* yacc.c:1646 */ - { + case 78: /* Term: "break" error */ +#line 656 "src/parser.y" + { FAIL((yyloc), "break requires a label to break to"); (yyval.blk) = gen_noop(); } -#line 3072 "src/parser.c" /* yacc.c:1646 */ +#line 3369 "src/parser.c" break; - case 78: -#line 657 "src/parser.y" /* yacc.c:1646 */ - { + case 79: /* Term: Term FIELD '?' */ +#line 660 "src/parser.y" + { (yyval.blk) = gen_index_opt((yyvsp[-2].blk), gen_const((yyvsp[-1].literal))); } -#line 3080 "src/parser.c" /* yacc.c:1646 */ +#line 3377 "src/parser.c" break; - case 79: -#line 660 "src/parser.y" /* yacc.c:1646 */ - { + case 80: /* Term: FIELD '?' */ +#line 663 "src/parser.y" + { (yyval.blk) = gen_index_opt(gen_noop(), gen_const((yyvsp[-1].literal))); } -#line 3088 "src/parser.c" /* yacc.c:1646 */ +#line 3385 "src/parser.c" break; - case 80: -#line 663 "src/parser.y" /* yacc.c:1646 */ - { + case 81: /* Term: Term '.' String '?' */ +#line 666 "src/parser.y" + { (yyval.blk) = gen_index_opt((yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 3096 "src/parser.c" /* yacc.c:1646 */ +#line 3393 "src/parser.c" break; - case 81: -#line 666 "src/parser.y" /* yacc.c:1646 */ - { + case 82: /* Term: '.' String '?' */ +#line 669 "src/parser.y" + { (yyval.blk) = gen_index_opt(gen_noop(), (yyvsp[-1].blk)); } -#line 3104 "src/parser.c" /* yacc.c:1646 */ +#line 3401 "src/parser.c" break; - case 82: -#line 669 "src/parser.y" /* yacc.c:1646 */ - { + case 83: /* Term: Term FIELD */ +#line 672 "src/parser.y" + { (yyval.blk) = gen_index((yyvsp[-1].blk), gen_const((yyvsp[0].literal))); } -#line 3112 "src/parser.c" /* yacc.c:1646 */ +#line 3409 "src/parser.c" break; - case 83: -#line 672 "src/parser.y" /* yacc.c:1646 */ - { + case 84: /* Term: FIELD */ +#line 675 "src/parser.y" + { (yyval.blk) = gen_index(gen_noop(), gen_const((yyvsp[0].literal))); } -#line 3120 "src/parser.c" /* yacc.c:1646 */ +#line 3417 "src/parser.c" break; - case 84: -#line 675 "src/parser.y" /* yacc.c:1646 */ - { + case 85: /* Term: Term '.' String */ +#line 678 "src/parser.y" + { (yyval.blk) = gen_index((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3128 "src/parser.c" /* yacc.c:1646 */ +#line 3425 "src/parser.c" break; - case 85: -#line 678 "src/parser.y" /* yacc.c:1646 */ - { + case 86: /* Term: '.' String */ +#line 681 "src/parser.y" + { (yyval.blk) = gen_index(gen_noop(), (yyvsp[0].blk)); } -#line 3136 "src/parser.c" /* yacc.c:1646 */ +#line 3433 "src/parser.c" break; - case 86: -#line 681 "src/parser.y" /* yacc.c:1646 */ - { + case 87: /* Term: '.' error */ +#line 684 "src/parser.y" + { FAIL((yyloc), "try .[\"field\"] instead of .field for unusually named fields"); (yyval.blk) = gen_noop(); } -#line 3145 "src/parser.c" /* yacc.c:1646 */ +#line 3442 "src/parser.c" break; - case 87: -#line 685 "src/parser.y" /* yacc.c:1646 */ - { + case 88: /* Term: '.' IDENT error */ +#line 688 "src/parser.y" + { jv_free((yyvsp[-1].literal)); FAIL((yyloc), "try .[\"field\"] instead of .field for unusually named fields"); (yyval.blk) = gen_noop(); } -#line 3155 "src/parser.c" /* yacc.c:1646 */ +#line 3452 "src/parser.c" break; - case 88: -#line 691 "src/parser.y" /* yacc.c:1646 */ - { + case 89: /* Term: Term '[' Exp ']' '?' */ +#line 694 "src/parser.y" + { (yyval.blk) = gen_index_opt((yyvsp[-4].blk), (yyvsp[-2].blk)); } -#line 3163 "src/parser.c" /* yacc.c:1646 */ +#line 3460 "src/parser.c" break; - case 89: -#line 694 "src/parser.y" /* yacc.c:1646 */ - { + case 90: /* Term: Term '[' Exp ']' */ +#line 697 "src/parser.y" + { (yyval.blk) = gen_index((yyvsp[-3].blk), (yyvsp[-1].blk)); } -#line 3171 "src/parser.c" /* yacc.c:1646 */ +#line 3468 "src/parser.c" break; - case 90: -#line 697 "src/parser.y" /* yacc.c:1646 */ - { + case 91: /* Term: Term '.' '[' Exp ']' '?' */ +#line 700 "src/parser.y" + { (yyval.blk) = gen_index_opt((yyvsp[-5].blk), (yyvsp[-2].blk)); } -#line 3179 "src/parser.c" /* yacc.c:1646 */ +#line 3476 "src/parser.c" break; - case 91: -#line 700 "src/parser.y" /* yacc.c:1646 */ - { + case 92: /* Term: Term '.' '[' Exp ']' */ +#line 703 "src/parser.y" + { (yyval.blk) = gen_index((yyvsp[-4].blk), (yyvsp[-1].blk)); } -#line 3187 "src/parser.c" /* yacc.c:1646 */ +#line 3484 "src/parser.c" break; - case 92: -#line 703 "src/parser.y" /* yacc.c:1646 */ - { + case 93: /* Term: Term '[' ']' '?' */ +#line 706 "src/parser.y" + { (yyval.blk) = block_join((yyvsp[-3].blk), gen_op_simple(EACH_OPT)); } -#line 3195 "src/parser.c" /* yacc.c:1646 */ +#line 3492 "src/parser.c" break; - case 93: -#line 706 "src/parser.y" /* yacc.c:1646 */ - { + case 94: /* Term: Term '[' ']' */ +#line 709 "src/parser.y" + { (yyval.blk) = block_join((yyvsp[-2].blk), gen_op_simple(EACH)); } -#line 3203 "src/parser.c" /* yacc.c:1646 */ +#line 3500 "src/parser.c" break; - case 94: -#line 709 "src/parser.y" /* yacc.c:1646 */ - { + case 95: /* Term: Term '[' Exp ':' Exp ']' '?' */ +#line 712 "src/parser.y" + { (yyval.blk) = gen_slice_index((yyvsp[-6].blk), (yyvsp[-4].blk), (yyvsp[-2].blk), INDEX_OPT); } -#line 3211 "src/parser.c" /* yacc.c:1646 */ +#line 3508 "src/parser.c" break; - case 95: -#line 712 "src/parser.y" /* yacc.c:1646 */ - { + case 96: /* Term: Term '[' Exp ':' ']' '?' */ +#line 715 "src/parser.y" + { (yyval.blk) = gen_slice_index((yyvsp[-5].blk), (yyvsp[-3].blk), gen_const(jv_null()), INDEX_OPT); } -#line 3219 "src/parser.c" /* yacc.c:1646 */ +#line 3516 "src/parser.c" break; - case 96: -#line 715 "src/parser.y" /* yacc.c:1646 */ - { + case 97: /* Term: Term '[' ':' Exp ']' '?' */ +#line 718 "src/parser.y" + { (yyval.blk) = gen_slice_index((yyvsp[-5].blk), gen_const(jv_null()), (yyvsp[-2].blk), INDEX_OPT); } -#line 3227 "src/parser.c" /* yacc.c:1646 */ +#line 3524 "src/parser.c" break; - case 97: -#line 718 "src/parser.y" /* yacc.c:1646 */ - { + case 98: /* Term: Term '[' Exp ':' Exp ']' */ +#line 721 "src/parser.y" + { (yyval.blk) = gen_slice_index((yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), INDEX); } -#line 3235 "src/parser.c" /* yacc.c:1646 */ +#line 3532 "src/parser.c" break; - case 98: -#line 721 "src/parser.y" /* yacc.c:1646 */ - { + case 99: /* Term: Term '[' Exp ':' ']' */ +#line 724 "src/parser.y" + { (yyval.blk) = gen_slice_index((yyvsp[-4].blk), (yyvsp[-2].blk), gen_const(jv_null()), INDEX); } -#line 3243 "src/parser.c" /* yacc.c:1646 */ +#line 3540 "src/parser.c" break; - case 99: -#line 724 "src/parser.y" /* yacc.c:1646 */ - { + case 100: /* Term: Term '[' ':' Exp ']' */ +#line 727 "src/parser.y" + { (yyval.blk) = gen_slice_index((yyvsp[-4].blk), gen_const(jv_null()), (yyvsp[-1].blk), INDEX); } -#line 3251 "src/parser.c" /* yacc.c:1646 */ +#line 3548 "src/parser.c" break; - case 100: -#line 727 "src/parser.y" /* yacc.c:1646 */ - { + case 101: /* Term: LITERAL */ +#line 730 "src/parser.y" + { (yyval.blk) = gen_const((yyvsp[0].literal)); } -#line 3259 "src/parser.c" /* yacc.c:1646 */ +#line 3556 "src/parser.c" break; - case 101: -#line 730 "src/parser.y" /* yacc.c:1646 */ - { + case 102: /* Term: String */ +#line 733 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } -#line 3267 "src/parser.c" /* yacc.c:1646 */ +#line 3564 "src/parser.c" break; - case 102: -#line 733 "src/parser.y" /* yacc.c:1646 */ - { + case 103: /* Term: FORMAT */ +#line 736 "src/parser.y" + { (yyval.blk) = gen_format(gen_noop(), (yyvsp[0].literal)); } -#line 3275 "src/parser.c" /* yacc.c:1646 */ +#line 3572 "src/parser.c" break; - case 103: -#line 736 "src/parser.y" /* yacc.c:1646 */ - { + case 104: /* Term: '(' Exp ')' */ +#line 739 "src/parser.y" + { (yyval.blk) = (yyvsp[-1].blk); } -#line 3283 "src/parser.c" /* yacc.c:1646 */ +#line 3580 "src/parser.c" break; - case 104: -#line 739 "src/parser.y" /* yacc.c:1646 */ - { + case 105: /* Term: '[' Exp ']' */ +#line 742 "src/parser.y" + { (yyval.blk) = gen_collect((yyvsp[-1].blk)); } -#line 3291 "src/parser.c" /* yacc.c:1646 */ +#line 3588 "src/parser.c" break; - case 105: -#line 742 "src/parser.y" /* yacc.c:1646 */ - { + case 106: /* Term: '[' ']' */ +#line 745 "src/parser.y" + { (yyval.blk) = gen_const(jv_array()); } -#line 3299 "src/parser.c" /* yacc.c:1646 */ +#line 3596 "src/parser.c" break; - case 106: -#line 745 "src/parser.y" /* yacc.c:1646 */ - { + case 107: /* Term: '{' MkDict '}' */ +#line 748 "src/parser.y" + { block o = gen_const_object((yyvsp[-1].blk)); if (o.first != NULL) (yyval.blk) = o; else (yyval.blk) = BLOCK(gen_subexp(gen_const(jv_object())), (yyvsp[-1].blk), gen_op_simple(POP)); } -#line 3311 "src/parser.c" /* yacc.c:1646 */ +#line 3608 "src/parser.c" break; - case 107: -#line 767 "src/parser.y" /* yacc.c:1646 */ - { + case 108: /* Term: '$' '$' '$' '$' IDENT */ +#line 770 "src/parser.y" + { (yyval.blk) = gen_location((yyloc), locations, gen_op_unbound(LOADVN, jv_string_value((yyvsp[0].literal)))); jv_free((yyvsp[0].literal)); } -#line 3320 "src/parser.c" /* yacc.c:1646 */ +#line 3617 "src/parser.c" break; - case 108: -#line 771 "src/parser.y" /* yacc.c:1646 */ - { + case 109: /* Term: '$' IDENT */ +#line 774 "src/parser.y" + { (yyval.blk) = gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal)))); jv_free((yyvsp[0].literal)); } -#line 3329 "src/parser.c" /* yacc.c:1646 */ +#line 3626 "src/parser.c" break; - case 109: -#line 775 "src/parser.y" /* yacc.c:1646 */ - { + case 110: /* Term: '$' Keyword */ +#line 778 "src/parser.y" + { if (strcmp(jv_string_value((yyvsp[0].literal)), "__loc__") == 0) { (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))); @@ -3339,12 +3636,12 @@ YYLTYPE yylloc = yyloc_default; } jv_free((yyvsp[0].literal)); } -#line 3343 "src/parser.c" /* yacc.c:1646 */ +#line 3640 "src/parser.c" break; - case 110: -#line 784 "src/parser.y" /* yacc.c:1646 */ - { + case 111: /* Term: IDENT */ +#line 787 "src/parser.y" + { const char *s = jv_string_value((yyvsp[0].literal)); if (strcmp(s, "false") == 0) (yyval.blk) = gen_const(jv_false()); @@ -3356,199 +3653,199 @@ YYLTYPE yylloc = yyloc_default; (yyval.blk) = gen_location((yyloc), locations, gen_call(s, gen_noop())); jv_free((yyvsp[0].literal)); } -#line 3360 "src/parser.c" /* yacc.c:1646 */ +#line 3657 "src/parser.c" break; - case 111: -#line 796 "src/parser.y" /* yacc.c:1646 */ - { + case 112: /* Term: IDENT '(' Args ')' */ +#line 799 "src/parser.y" + { (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 3370 "src/parser.c" /* yacc.c:1646 */ +#line 3667 "src/parser.c" break; - case 112: -#line 801 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk) = gen_noop(); } -#line 3376 "src/parser.c" /* yacc.c:1646 */ + case 113: /* Term: '(' error ')' */ +#line 804 "src/parser.y" + { (yyval.blk) = gen_noop(); } +#line 3673 "src/parser.c" break; - case 113: -#line 802 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk) = gen_noop(); } -#line 3382 "src/parser.c" /* yacc.c:1646 */ + case 114: /* Term: '[' error ']' */ +#line 805 "src/parser.y" + { (yyval.blk) = gen_noop(); } +#line 3679 "src/parser.c" break; - case 114: -#line 803 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk) = (yyvsp[-3].blk); } -#line 3388 "src/parser.c" /* yacc.c:1646 */ + case 115: /* Term: Term '[' error ']' */ +#line 806 "src/parser.y" + { (yyval.blk) = (yyvsp[-3].blk); } +#line 3685 "src/parser.c" break; - case 115: -#line 804 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk) = gen_noop(); } -#line 3394 "src/parser.c" /* yacc.c:1646 */ + case 116: /* Term: '{' error '}' */ +#line 807 "src/parser.y" + { (yyval.blk) = gen_noop(); } +#line 3691 "src/parser.c" break; - case 116: -#line 807 "src/parser.y" /* yacc.c:1646 */ + case 117: /* Args: Arg */ +#line 810 "src/parser.y" { (yyval.blk) = (yyvsp[0].blk); } -#line 3402 "src/parser.c" /* yacc.c:1646 */ +#line 3699 "src/parser.c" break; - case 117: -#line 810 "src/parser.y" /* yacc.c:1646 */ - { + case 118: /* Args: Args ';' Arg */ +#line 813 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3410 "src/parser.c" /* yacc.c:1646 */ +#line 3707 "src/parser.c" break; - case 118: -#line 815 "src/parser.y" /* yacc.c:1646 */ + case 119: /* Arg: Exp */ +#line 818 "src/parser.y" { (yyval.blk) = gen_lambda((yyvsp[0].blk)); } -#line 3418 "src/parser.c" /* yacc.c:1646 */ +#line 3715 "src/parser.c" break; - case 119: -#line 820 "src/parser.y" /* yacc.c:1646 */ - { + case 120: /* RepPatterns: RepPatterns "?//" Pattern */ +#line 823 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-2].blk), gen_destructure_alt((yyvsp[0].blk))); } -#line 3426 "src/parser.c" /* yacc.c:1646 */ +#line 3723 "src/parser.c" break; - case 120: -#line 823 "src/parser.y" /* yacc.c:1646 */ - { + case 121: /* RepPatterns: Pattern */ +#line 826 "src/parser.y" + { (yyval.blk) = gen_destructure_alt((yyvsp[0].blk)); } -#line 3434 "src/parser.c" /* yacc.c:1646 */ +#line 3731 "src/parser.c" break; - case 121: -#line 828 "src/parser.y" /* yacc.c:1646 */ - { + case 122: /* Patterns: RepPatterns "?//" Pattern */ +#line 831 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3442 "src/parser.c" /* yacc.c:1646 */ +#line 3739 "src/parser.c" break; - case 122: -#line 831 "src/parser.y" /* yacc.c:1646 */ - { + case 123: /* Patterns: Pattern */ +#line 834 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } -#line 3450 "src/parser.c" /* yacc.c:1646 */ +#line 3747 "src/parser.c" break; - case 123: -#line 836 "src/parser.y" /* yacc.c:1646 */ - { + case 124: /* Pattern: '$' IDENT */ +#line 839 "src/parser.y" + { (yyval.blk) = gen_op_unbound(STOREV, jv_string_value((yyvsp[0].literal))); jv_free((yyvsp[0].literal)); } -#line 3459 "src/parser.c" /* yacc.c:1646 */ +#line 3756 "src/parser.c" break; - case 124: -#line 840 "src/parser.y" /* yacc.c:1646 */ - { + case 125: /* Pattern: '[' ArrayPats ']' */ +#line 843 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-1].blk), gen_op_simple(POP)); } -#line 3467 "src/parser.c" /* yacc.c:1646 */ +#line 3764 "src/parser.c" break; - case 125: -#line 843 "src/parser.y" /* yacc.c:1646 */ - { + case 126: /* Pattern: '{' ObjPats '}' */ +#line 846 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-1].blk), gen_op_simple(POP)); } -#line 3475 "src/parser.c" /* yacc.c:1646 */ +#line 3772 "src/parser.c" break; - case 126: -#line 848 "src/parser.y" /* yacc.c:1646 */ - { + case 127: /* ArrayPats: Pattern */ +#line 851 "src/parser.y" + { (yyval.blk) = gen_array_matcher(gen_noop(), (yyvsp[0].blk)); } -#line 3483 "src/parser.c" /* yacc.c:1646 */ +#line 3780 "src/parser.c" break; - case 127: -#line 851 "src/parser.y" /* yacc.c:1646 */ - { + case 128: /* ArrayPats: ArrayPats ',' Pattern */ +#line 854 "src/parser.y" + { (yyval.blk) = gen_array_matcher((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3491 "src/parser.c" /* yacc.c:1646 */ +#line 3788 "src/parser.c" break; - case 128: -#line 856 "src/parser.y" /* yacc.c:1646 */ - { + case 129: /* ObjPats: ObjPat */ +#line 859 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } -#line 3499 "src/parser.c" /* yacc.c:1646 */ +#line 3796 "src/parser.c" break; - case 129: -#line 859 "src/parser.y" /* yacc.c:1646 */ - { + case 130: /* ObjPats: ObjPats ',' ObjPat */ +#line 862 "src/parser.y" + { (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3507 "src/parser.c" /* yacc.c:1646 */ +#line 3804 "src/parser.c" break; - case 130: -#line 864 "src/parser.y" /* yacc.c:1646 */ - { + case 131: /* ObjPat: '$' IDENT */ +#line 867 "src/parser.y" + { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[0].literal)), gen_op_unbound(STOREV, jv_string_value((yyvsp[0].literal)))); } -#line 3515 "src/parser.c" /* yacc.c:1646 */ +#line 3812 "src/parser.c" break; - case 131: -#line 867 "src/parser.y" /* yacc.c:1646 */ - { + case 132: /* ObjPat: '$' IDENT ':' Pattern */ +#line 870 "src/parser.y" + { (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 3523 "src/parser.c" /* yacc.c:1646 */ +#line 3820 "src/parser.c" break; - case 132: -#line 870 "src/parser.y" /* yacc.c:1646 */ - { + case 133: /* ObjPat: IDENT ':' Pattern */ +#line 873 "src/parser.y" + { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3531 "src/parser.c" /* yacc.c:1646 */ +#line 3828 "src/parser.c" break; - case 133: -#line 873 "src/parser.y" /* yacc.c:1646 */ - { + case 134: /* ObjPat: Keyword ':' Pattern */ +#line 876 "src/parser.y" + { (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3539 "src/parser.c" /* yacc.c:1646 */ +#line 3836 "src/parser.c" break; - case 134: -#line 876 "src/parser.y" /* yacc.c:1646 */ - { + case 135: /* ObjPat: String ':' Pattern */ +#line 879 "src/parser.y" + { (yyval.blk) = gen_object_matcher((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3547 "src/parser.c" /* yacc.c:1646 */ +#line 3844 "src/parser.c" break; - case 135: -#line 879 "src/parser.y" /* yacc.c:1646 */ - { + case 136: /* ObjPat: '(' Exp ')' ':' Pattern */ +#line 882 "src/parser.y" + { jv msg = check_object_key((yyvsp[-3].blk)); if (jv_is_valid(msg)) { FAIL((yyloc), jv_string_value(msg)); @@ -3556,277 +3853,277 @@ YYLTYPE yylloc = yyloc_default; jv_free(msg); (yyval.blk) = gen_object_matcher((yyvsp[-3].blk), (yyvsp[0].blk)); } -#line 3560 "src/parser.c" /* yacc.c:1646 */ +#line 3857 "src/parser.c" break; - case 136: -#line 887 "src/parser.y" /* yacc.c:1646 */ - { + case 137: /* ObjPat: error ':' Pattern */ +#line 890 "src/parser.y" + { FAIL((yyloc), "May need parentheses around object key expression"); (yyval.blk) = (yyvsp[0].blk); } -#line 3569 "src/parser.c" /* yacc.c:1646 */ +#line 3866 "src/parser.c" break; - case 137: -#line 893 "src/parser.y" /* yacc.c:1646 */ - { + case 138: /* Keyword: "as" */ +#line 896 "src/parser.y" + { (yyval.literal) = jv_string("as"); } -#line 3577 "src/parser.c" /* yacc.c:1646 */ +#line 3874 "src/parser.c" break; - case 138: -#line 896 "src/parser.y" /* yacc.c:1646 */ - { + case 139: /* Keyword: "def" */ +#line 899 "src/parser.y" + { (yyval.literal) = jv_string("def"); } -#line 3585 "src/parser.c" /* yacc.c:1646 */ +#line 3882 "src/parser.c" break; - case 139: -#line 899 "src/parser.y" /* yacc.c:1646 */ - { + case 140: /* Keyword: "module" */ +#line 902 "src/parser.y" + { (yyval.literal) = jv_string("module"); } -#line 3593 "src/parser.c" /* yacc.c:1646 */ +#line 3890 "src/parser.c" break; - case 140: -#line 902 "src/parser.y" /* yacc.c:1646 */ - { + case 141: /* Keyword: "import" */ +#line 905 "src/parser.y" + { (yyval.literal) = jv_string("import"); } -#line 3601 "src/parser.c" /* yacc.c:1646 */ +#line 3898 "src/parser.c" break; - case 141: -#line 905 "src/parser.y" /* yacc.c:1646 */ - { + case 142: /* Keyword: "include" */ +#line 908 "src/parser.y" + { (yyval.literal) = jv_string("include"); } -#line 3609 "src/parser.c" /* yacc.c:1646 */ +#line 3906 "src/parser.c" break; - case 142: -#line 908 "src/parser.y" /* yacc.c:1646 */ - { + case 143: /* Keyword: "if" */ +#line 911 "src/parser.y" + { (yyval.literal) = jv_string("if"); } -#line 3617 "src/parser.c" /* yacc.c:1646 */ +#line 3914 "src/parser.c" break; - case 143: -#line 911 "src/parser.y" /* yacc.c:1646 */ - { + case 144: /* Keyword: "then" */ +#line 914 "src/parser.y" + { (yyval.literal) = jv_string("then"); } -#line 3625 "src/parser.c" /* yacc.c:1646 */ +#line 3922 "src/parser.c" break; - case 144: -#line 914 "src/parser.y" /* yacc.c:1646 */ - { + case 145: /* Keyword: "else" */ +#line 917 "src/parser.y" + { (yyval.literal) = jv_string("else"); } -#line 3633 "src/parser.c" /* yacc.c:1646 */ +#line 3930 "src/parser.c" break; - case 145: -#line 917 "src/parser.y" /* yacc.c:1646 */ - { + case 146: /* Keyword: "elif" */ +#line 920 "src/parser.y" + { (yyval.literal) = jv_string("elif"); } -#line 3641 "src/parser.c" /* yacc.c:1646 */ +#line 3938 "src/parser.c" break; - case 146: -#line 920 "src/parser.y" /* yacc.c:1646 */ - { + case 147: /* Keyword: "reduce" */ +#line 923 "src/parser.y" + { (yyval.literal) = jv_string("reduce"); } -#line 3649 "src/parser.c" /* yacc.c:1646 */ +#line 3946 "src/parser.c" break; - case 147: -#line 923 "src/parser.y" /* yacc.c:1646 */ - { + case 148: /* Keyword: "foreach" */ +#line 926 "src/parser.y" + { (yyval.literal) = jv_string("foreach"); } -#line 3657 "src/parser.c" /* yacc.c:1646 */ +#line 3954 "src/parser.c" break; - case 148: -#line 926 "src/parser.y" /* yacc.c:1646 */ - { + case 149: /* Keyword: "end" */ +#line 929 "src/parser.y" + { (yyval.literal) = jv_string("end"); } -#line 3665 "src/parser.c" /* yacc.c:1646 */ +#line 3962 "src/parser.c" break; - case 149: -#line 929 "src/parser.y" /* yacc.c:1646 */ - { + case 150: /* Keyword: "and" */ +#line 932 "src/parser.y" + { (yyval.literal) = jv_string("and"); } -#line 3673 "src/parser.c" /* yacc.c:1646 */ +#line 3970 "src/parser.c" break; - case 150: -#line 932 "src/parser.y" /* yacc.c:1646 */ - { + case 151: /* Keyword: "or" */ +#line 935 "src/parser.y" + { (yyval.literal) = jv_string("or"); } -#line 3681 "src/parser.c" /* yacc.c:1646 */ +#line 3978 "src/parser.c" break; - case 151: -#line 935 "src/parser.y" /* yacc.c:1646 */ - { + case 152: /* Keyword: "try" */ +#line 938 "src/parser.y" + { (yyval.literal) = jv_string("try"); } -#line 3689 "src/parser.c" /* yacc.c:1646 */ +#line 3986 "src/parser.c" break; - case 152: -#line 938 "src/parser.y" /* yacc.c:1646 */ - { + case 153: /* Keyword: "catch" */ +#line 941 "src/parser.y" + { (yyval.literal) = jv_string("catch"); } -#line 3697 "src/parser.c" /* yacc.c:1646 */ +#line 3994 "src/parser.c" break; - case 153: -#line 941 "src/parser.y" /* yacc.c:1646 */ - { + case 154: /* Keyword: "label" */ +#line 944 "src/parser.y" + { (yyval.literal) = jv_string("label"); } -#line 3705 "src/parser.c" /* yacc.c:1646 */ +#line 4002 "src/parser.c" break; - case 154: -#line 944 "src/parser.y" /* yacc.c:1646 */ - { + case 155: /* Keyword: "break" */ +#line 947 "src/parser.y" + { (yyval.literal) = jv_string("break"); } -#line 3713 "src/parser.c" /* yacc.c:1646 */ +#line 4010 "src/parser.c" break; - case 155: -#line 947 "src/parser.y" /* yacc.c:1646 */ - { + case 156: /* Keyword: "__loc__" */ +#line 950 "src/parser.y" + { (yyval.literal) = jv_string("__loc__"); } -#line 3721 "src/parser.c" /* yacc.c:1646 */ +#line 4018 "src/parser.c" break; - case 156: -#line 952 "src/parser.y" /* yacc.c:1646 */ - { + case 157: /* MkDict: %empty */ +#line 955 "src/parser.y" + { (yyval.blk)=gen_noop(); } -#line 3729 "src/parser.c" /* yacc.c:1646 */ +#line 4026 "src/parser.c" break; - case 157: -#line 955 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk) = (yyvsp[0].blk); } -#line 3735 "src/parser.c" /* yacc.c:1646 */ + case 158: /* MkDict: MkDictPair */ +#line 958 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } +#line 4032 "src/parser.c" break; - case 158: -#line 956 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk)=block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3741 "src/parser.c" /* yacc.c:1646 */ + case 159: /* MkDict: MkDictPair ',' MkDict */ +#line 959 "src/parser.y" + { (yyval.blk)=block_join((yyvsp[-2].blk), (yyvsp[0].blk)); } +#line 4038 "src/parser.c" break; - case 159: -#line 957 "src/parser.y" /* yacc.c:1646 */ - { (yyval.blk) = (yyvsp[0].blk); } -#line 3747 "src/parser.c" /* yacc.c:1646 */ + case 160: /* MkDict: error ',' MkDict */ +#line 960 "src/parser.y" + { (yyval.blk) = (yyvsp[0].blk); } +#line 4044 "src/parser.c" break; - case 160: -#line 960 "src/parser.y" /* yacc.c:1646 */ - { + case 161: /* MkDictPair: IDENT ':' ExpD */ +#line 963 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3755 "src/parser.c" /* yacc.c:1646 */ +#line 4052 "src/parser.c" break; - case 161: -#line 963 "src/parser.y" /* yacc.c:1646 */ - { + case 162: /* MkDictPair: Keyword ':' ExpD */ +#line 966 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk)); } -#line 3763 "src/parser.c" /* yacc.c:1646 */ +#line 4060 "src/parser.c" break; - case 162: -#line 966 "src/parser.y" /* yacc.c:1646 */ - { + case 163: /* MkDictPair: String ':' ExpD */ +#line 969 "src/parser.y" + { (yyval.blk) = gen_dictpair((yyvsp[-2].blk), (yyvsp[0].blk)); } -#line 3771 "src/parser.c" /* yacc.c:1646 */ +#line 4068 "src/parser.c" break; - case 163: -#line 969 "src/parser.y" /* yacc.c:1646 */ - { + case 164: /* MkDictPair: String */ +#line 972 "src/parser.y" + { (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 3780 "src/parser.c" /* yacc.c:1646 */ +#line 4077 "src/parser.c" break; - case 164: -#line 973 "src/parser.y" /* yacc.c:1646 */ - { + case 165: /* MkDictPair: '$' IDENT ':' ExpD */ +#line 976 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[-2].literal)))), (yyvsp[0].blk)); } -#line 3789 "src/parser.c" /* yacc.c:1646 */ +#line 4086 "src/parser.c" break; - case 165: -#line 977 "src/parser.y" /* yacc.c:1646 */ - { + case 166: /* MkDictPair: '$' IDENT */ +#line 980 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_const((yyvsp[0].literal)), gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal))))); } -#line 3798 "src/parser.c" /* yacc.c:1646 */ +#line 4095 "src/parser.c" break; - case 166: -#line 981 "src/parser.y" /* yacc.c:1646 */ - { + case 167: /* MkDictPair: '$' Keyword */ +#line 984 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_const((yyvsp[0].literal)), gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal))))); } -#line 3807 "src/parser.c" /* yacc.c:1646 */ +#line 4104 "src/parser.c" break; - case 167: -#line 985 "src/parser.y" /* yacc.c:1646 */ - { + case 168: /* MkDictPair: IDENT */ +#line 988 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_const(jv_copy((yyvsp[0].literal))), gen_index(gen_noop(), gen_const((yyvsp[0].literal)))); } -#line 3816 "src/parser.c" /* yacc.c:1646 */ +#line 4113 "src/parser.c" break; - case 168: -#line 989 "src/parser.y" /* yacc.c:1646 */ - { + case 169: /* MkDictPair: Keyword */ +#line 992 "src/parser.y" + { (yyval.blk) = gen_dictpair(gen_const(jv_copy((yyvsp[0].literal))), gen_index(gen_noop(), gen_const((yyvsp[0].literal)))); } -#line 3825 "src/parser.c" /* yacc.c:1646 */ +#line 4122 "src/parser.c" break; - case 169: -#line 993 "src/parser.y" /* yacc.c:1646 */ - { + case 170: /* MkDictPair: '(' Exp ')' ':' ExpD */ +#line 996 "src/parser.y" + { jv msg = check_object_key((yyvsp[-3].blk)); if (jv_is_valid(msg)) { FAIL((yyloc), jv_string_value(msg)); @@ -3834,20 +4131,21 @@ YYLTYPE yylloc = yyloc_default; jv_free(msg); (yyval.blk) = gen_dictpair((yyvsp[-3].blk), (yyvsp[0].blk)); } -#line 3838 "src/parser.c" /* yacc.c:1646 */ +#line 4135 "src/parser.c" break; - case 170: -#line 1001 "src/parser.y" /* yacc.c:1646 */ - { + case 171: /* MkDictPair: error ':' ExpD */ +#line 1004 "src/parser.y" + { FAIL((yyloc), "May need parentheses around object key expression"); (yyval.blk) = (yyvsp[0].blk); } -#line 3847 "src/parser.c" /* yacc.c:1646 */ +#line 4144 "src/parser.c" break; -#line 3851 "src/parser.c" /* yacc.c:1646 */ +#line 4148 "src/parser.c" + default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3861,11 +4159,10 @@ YYLTYPE yylloc = yyloc_default; case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; *++yylsp = yyloc; @@ -3873,14 +4170,13 @@ YYLTYPE yylloc = yyloc_default; /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -3891,50 +4187,45 @@ YYLTYPE yylloc = yyloc_default; yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (&yylloc, answer, errors, locations, lexer_param_ptr, YY_("syntax error")); -#else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) { + yypcontext_t yyctx + = {yyssp, yytoken, &yylloc}; char const *yymsgp = YY_("syntax error"); int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; + yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); if (yysyntax_error_status == 0) yymsgp = yymsg; - else if (yysyntax_error_status == 1) + else if (yysyntax_error_status == -1) { if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) + yymsg = YY_CAST (char *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); + if (yymsg) { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; + yysyntax_error_status + = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); + yymsgp = yymsg; } else { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = YYENOMEM; } } yyerror (&yylloc, answer, errors, locations, lexer_param_ptr, yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; + if (yysyntax_error_status == YYENOMEM) + YYNOMEM; } -# undef YYSYNTAX_ERROR -#endif } yyerror_range[1] = yylloc; - if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an @@ -3963,14 +4254,12 @@ YYLTYPE yylloc = yyloc_default; | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; + ++yynerrs; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - yyerror_range[1] = yylsp[1-yylen]; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -3986,13 +4275,14 @@ YYLTYPE yylloc = yyloc_default; yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) { yyn = yytable[yyn]; if (0 < yyn) @@ -4006,7 +4296,7 @@ YYLTYPE yylloc = yyloc_default; yyerror_range[1] = *yylsp; yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp, answer, errors, locations, lexer_param_ptr); + YY_ACCESSING_SYMBOL (yystate), yyvsp, yylsp, answer, errors, locations, lexer_param_ptr); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -4017,13 +4307,11 @@ YYLTYPE yylloc = yyloc_default; YY_IGNORE_MAYBE_UNINITIALIZED_END yyerror_range[2] = yylloc; - /* Using YYLLOC is tempting, but would change the location of - the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, yyerror_range, 2); - *++yylsp = yyloc; + ++yylsp; + YYLLOC_DEFAULT (*yylsp, yyerror_range, 2); /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -4034,26 +4322,30 @@ YYLTYPE yylloc = yyloc_default; `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; + -#if !defined yyoverflow || YYERROR_VERBOSE -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (&yylloc, answer, errors, locations, lexer_param_ptr, YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ -#endif + goto yyreturnlab; -yyreturn: + +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: if (yychar != YYEMPTY) { /* Make sure we have latest lookahead translation. See comments at @@ -4069,20 +4361,19 @@ YYLTYPE yylloc = yyloc_default; while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp, answer, errors, locations, lexer_param_ptr); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, yylsp, answer, errors, locations, lexer_param_ptr); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); -#endif return yyresult; } -#line 1005 "src/parser.y" /* yacc.c:1906 */ + +#line 1008 "src/parser.y" int jq_parse(struct locfile* locations, block* answer) { diff --git a/src/parser.h b/src/parser.h index b15c53aad4..e694610aca 100644 --- a/src/parser.h +++ b/src/parser.h @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -30,6 +31,10 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + #ifndef YY_YY_SRC_PARSER_H_INCLUDED # define YY_YY_SRC_PARSER_H_INCLUDED /* Debug traces. */ @@ -40,7 +45,7 @@ extern int yydebug; #endif /* "%code requires" blocks. */ -#line 11 "src/parser.y" /* yacc.c:1909 */ +#line 11 "src/parser.y" #include "locfile.h" struct lexer_param; @@ -57,61 +62,70 @@ struct lexer_param; } \ } while (0) -#line 61 "src/parser.h" /* yacc.c:1909 */ +#line 66 "src/parser.h" -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - INVALID_CHARACTER = 258, - IDENT = 259, - FIELD = 260, - LITERAL = 261, - FORMAT = 262, - REC = 263, - SETMOD = 264, - EQ = 265, - NEQ = 266, - DEFINEDOR = 267, - AS = 268, - DEF = 269, - MODULE = 270, - IMPORT = 271, - INCLUDE = 272, - IF = 273, - THEN = 274, - ELSE = 275, - ELSE_IF = 276, - REDUCE = 277, - FOREACH = 278, - END = 279, - AND = 280, - OR = 281, - TRY = 282, - CATCH = 283, - LABEL = 284, - BREAK = 285, - LOC = 286, - SETPIPE = 287, - SETPLUS = 288, - SETMINUS = 289, - SETMULT = 290, - SETDIV = 291, - SETDEFINEDOR = 292, - 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 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + INVALID_CHARACTER = 258, /* INVALID_CHARACTER */ + IDENT = 259, /* IDENT */ + FIELD = 260, /* FIELD */ + LITERAL = 261, /* LITERAL */ + FORMAT = 262, /* FORMAT */ + REC = 263, /* ".." */ + SETMOD = 264, /* "%=" */ + EQ = 265, /* "==" */ + NEQ = 266, /* "!=" */ + DEFINEDOR = 267, /* "//" */ + AS = 268, /* "as" */ + DEF = 269, /* "def" */ + MODULE = 270, /* "module" */ + IMPORT = 271, /* "import" */ + INCLUDE = 272, /* "include" */ + IF = 273, /* "if" */ + THEN = 274, /* "then" */ + ELSE = 275, /* "else" */ + ELSE_IF = 276, /* "elif" */ + REDUCE = 277, /* "reduce" */ + FOREACH = 278, /* "foreach" */ + END = 279, /* "end" */ + AND = 280, /* "and" */ + OR = 281, /* "or" */ + TRY = 282, /* "try" */ + CATCH = 283, /* "catch" */ + LABEL = 284, /* "label" */ + BREAK = 285, /* "break" */ + LOC = 286, /* "__loc__" */ + SETPIPE = 287, /* "|=" */ + SETPLUS = 288, /* "+=" */ + SETMINUS = 289, /* "-=" */ + SETMULT = 290, /* "*=" */ + SETDIV = 291, /* "/=" */ + SETDEFINEDOR = 292, /* "//=" */ + LESSEQ = 293, /* "<=" */ + GREATEREQ = 294, /* ">=" */ + ALTERNATION = 295, /* "?//" */ + QQSTRING_START = 296, /* QQSTRING_START */ + QQSTRING_TEXT = 297, /* QQSTRING_TEXT */ + QQSTRING_INTERP_START = 298, /* QQSTRING_INTERP_START */ + QQSTRING_INTERP_END = 299, /* QQSTRING_INTERP_END */ + QQSTRING_END = 300, /* QQSTRING_END */ + FUNCDEF = 301, /* FUNCDEF */ + NONOPT = 302 /* NONOPT */ }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define INVALID_CHARACTER 258 #define IDENT 259 #define FIELD 260 @@ -160,17 +174,16 @@ struct lexer_param; /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 31 "src/parser.y" /* yacc.c:1909 */ +#line 31 "src/parser.y" jv literal; block blk; -#line 172 "src/parser.h" /* yacc.c:1909 */ -}; +#line 185 "src/parser.h" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -192,6 +205,8 @@ struct YYLTYPE + int yyparse (block* answer, int* errors, struct locfile* locations, struct lexer_param* lexer_param_ptr); + #endif /* !YY_YY_SRC_PARSER_H_INCLUDED */ diff --git a/src/parser.y b/src/parser.y index f04853f510..92fa90339c 100644 --- a/src/parser.y +++ b/src/parser.y @@ -619,6 +619,9 @@ ElseBody: "elif" Exp "then" Exp ElseBody { $$ = gen_cond($2, $4, $5); } | +"elif" Exp "then" Exp "end" { + $$ = gen_cond($2, $4, gen_noop()); +} | "else" Exp "end" { $$ = $2; } diff --git a/tests/jq.test b/tests/jq.test index 2d5c36b887..b64d58f9e8 100644 --- a/tests/jq.test +++ b/tests/jq.test @@ -1105,6 +1105,13 @@ null 7 [7] +[if false then 3 elif false then 4 end] +7 +[7] + +[if false then 3 elif false then 4 else . end] +7 +[7] [.[] | [.foo[] // .bar]] [{"foo":[1,2], "bar": 42}, {"foo":[1], "bar": null}, {"foo":[null,false,3], "bar": 18}, {"foo":[], "bar":42}, {"foo": [null,false,null], "bar": 41}]