1.1 --- a/kconfig/zconf.tab.c Sun Sep 28 10:33:30 2008 +0000
1.2 +++ b/kconfig/zconf.tab.c Tue Aug 03 06:17:51 2010 +0200
1.3 @@ -1,7 +1,9 @@
1.4 -/* A Bison parser, made by GNU Bison 2.1. */
1.5 +/* A Bison parser, made by GNU Bison 2.3. */
1.6
1.7 -/* Skeleton parser for Yacc-like parsing with Bison,
1.8 - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
1.9 +/* Skeleton implementation for Bison's Yacc-like parsers in C
1.10 +
1.11 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
1.12 + Free Software Foundation, Inc.
1.13
1.14 This program is free software; you can redistribute it and/or modify
1.15 it under the terms of the GNU General Public License as published by
1.16 @@ -18,13 +20,21 @@
1.17 Foundation, Inc., 51 Franklin Street, Fifth Floor,
1.18 Boston, MA 02110-1301, USA. */
1.19
1.20 -/* As a special exception, when this file is copied by Bison into a
1.21 - Bison output file, you may use that output file without restriction.
1.22 - This special exception was added by the Free Software Foundation
1.23 - in version 1.24 of Bison. */
1.24 +/* As a special exception, you may create a larger work that contains
1.25 + part or all of the Bison parser skeleton and distribute that work
1.26 + under terms of your choice, so long as that work isn't itself a
1.27 + parser generator using the skeleton or a modified version thereof
1.28 + as a parser skeleton. Alternatively, if you modify or redistribute
1.29 + the parser skeleton itself, you may (at your option) remove this
1.30 + special exception, which will cause the skeleton and the resulting
1.31 + Bison output files to be licensed under the GNU General Public
1.32 + License without this special exception.
1.33
1.34 -/* Written by Richard Stallman by simplifying the original so called
1.35 - ``semantic'' parser. */
1.36 + This special exception was added by the Free Software Foundation in
1.37 + version 2.2 of Bison. */
1.38 +
1.39 +/* C LALR(1) parser skeleton written by Richard Stallman, by
1.40 + simplifying the original so-called "semantic" parser. */
1.41
1.42 /* All symbols defined below should begin with yy or YY, to avoid
1.43 infringing on user name space. This should be done even for local
1.44 @@ -37,7 +47,7 @@
1.45 #define YYBISON 1
1.46
1.47 /* Bison version. */
1.48 -#define YYBISON_VERSION "2.1"
1.49 +#define YYBISON_VERSION "2.3"
1.50
1.51 /* Skeleton name. */
1.52 #define YYSKELETON_NAME "yacc.c"
1.53 @@ -78,25 +88,24 @@
1.54 T_IF = 269,
1.55 T_ENDIF = 270,
1.56 T_DEPENDS = 271,
1.57 - T_REQUIRES = 272,
1.58 - T_OPTIONAL = 273,
1.59 - T_PROMPT = 274,
1.60 - T_TYPE = 275,
1.61 - T_DEFAULT = 276,
1.62 - T_SELECT = 277,
1.63 - T_RANGE = 278,
1.64 - T_OPTION = 279,
1.65 - T_ON = 280,
1.66 - T_WORD = 281,
1.67 - T_WORD_QUOTE = 282,
1.68 - T_UNEQUAL = 283,
1.69 - T_CLOSE_PAREN = 284,
1.70 - T_OPEN_PAREN = 285,
1.71 - T_EOL = 286,
1.72 - T_OR = 287,
1.73 - T_AND = 288,
1.74 - T_EQUAL = 289,
1.75 - T_NOT = 290
1.76 + T_OPTIONAL = 272,
1.77 + T_PROMPT = 273,
1.78 + T_TYPE = 274,
1.79 + T_DEFAULT = 275,
1.80 + T_SELECT = 276,
1.81 + T_RANGE = 277,
1.82 + T_OPTION = 278,
1.83 + T_ON = 279,
1.84 + T_WORD = 280,
1.85 + T_WORD_QUOTE = 281,
1.86 + T_UNEQUAL = 282,
1.87 + T_CLOSE_PAREN = 283,
1.88 + T_OPEN_PAREN = 284,
1.89 + T_EOL = 285,
1.90 + T_OR = 286,
1.91 + T_AND = 287,
1.92 + T_EQUAL = 288,
1.93 + T_NOT = 289
1.94 };
1.95 #endif
1.96 /* Tokens. */
1.97 @@ -114,25 +123,24 @@
1.98 #define T_IF 269
1.99 #define T_ENDIF 270
1.100 #define T_DEPENDS 271
1.101 -#define T_REQUIRES 272
1.102 -#define T_OPTIONAL 273
1.103 -#define T_PROMPT 274
1.104 -#define T_TYPE 275
1.105 -#define T_DEFAULT 276
1.106 -#define T_SELECT 277
1.107 -#define T_RANGE 278
1.108 -#define T_OPTION 279
1.109 -#define T_ON 280
1.110 -#define T_WORD 281
1.111 -#define T_WORD_QUOTE 282
1.112 -#define T_UNEQUAL 283
1.113 -#define T_CLOSE_PAREN 284
1.114 -#define T_OPEN_PAREN 285
1.115 -#define T_EOL 286
1.116 -#define T_OR 287
1.117 -#define T_AND 288
1.118 -#define T_EQUAL 289
1.119 -#define T_NOT 290
1.120 +#define T_OPTIONAL 272
1.121 +#define T_PROMPT 273
1.122 +#define T_TYPE 274
1.123 +#define T_DEFAULT 275
1.124 +#define T_SELECT 276
1.125 +#define T_RANGE 277
1.126 +#define T_OPTION 278
1.127 +#define T_ON 279
1.128 +#define T_WORD 280
1.129 +#define T_WORD_QUOTE 281
1.130 +#define T_UNEQUAL 282
1.131 +#define T_CLOSE_PAREN 283
1.132 +#define T_OPEN_PAREN 284
1.133 +#define T_EOL 285
1.134 +#define T_OR 286
1.135 +#define T_AND 287
1.136 +#define T_EQUAL 288
1.137 +#define T_NOT 289
1.138
1.139
1.140
1.141 @@ -198,18 +206,20 @@
1.142 # define YYTOKEN_TABLE 0
1.143 #endif
1.144
1.145 -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
1.146 +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
1.147 +typedef union YYSTYPE
1.148
1.149 -typedef union YYSTYPE {
1.150 +{
1.151 char *string;
1.152 struct file *file;
1.153 struct symbol *symbol;
1.154 struct expr *expr;
1.155 struct menu *menu;
1.156 struct kconf_id *id;
1.157 -} YYSTYPE;
1.158 -/* Line 196 of yacc.c. */
1.159 +}
1.160 +/* Line 187 of yacc.c. */
1.161
1.162 + YYSTYPE;
1.163 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
1.164 # define YYSTYPE_IS_DECLARED 1
1.165 # define YYSTYPE_IS_TRIVIAL 1
1.166 @@ -220,23 +230,56 @@
1.167 /* Copy the second part of user declarations. */
1.168
1.169
1.170 -/* Line 219 of yacc.c. */
1.171 +/* Line 216 of yacc.c. */
1.172
1.173
1.174 -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
1.175 -# define YYSIZE_T __SIZE_TYPE__
1.176 +#ifdef short
1.177 +# undef short
1.178 #endif
1.179 -#if ! defined (YYSIZE_T) && defined (size_t)
1.180 -# define YYSIZE_T size_t
1.181 +
1.182 +#ifdef YYTYPE_UINT8
1.183 +typedef YYTYPE_UINT8 yytype_uint8;
1.184 +#else
1.185 +typedef unsigned char yytype_uint8;
1.186 #endif
1.187 -#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
1.188 -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
1.189 -# define YYSIZE_T size_t
1.190 +
1.191 +#ifdef YYTYPE_INT8
1.192 +typedef YYTYPE_INT8 yytype_int8;
1.193 +#elif (defined __STDC__ || defined __C99__FUNC__ \
1.194 + || defined __cplusplus || defined _MSC_VER)
1.195 +typedef signed char yytype_int8;
1.196 +#else
1.197 +typedef short int yytype_int8;
1.198 #endif
1.199 -#if ! defined (YYSIZE_T)
1.200 -# define YYSIZE_T unsigned int
1.201 +
1.202 +#ifdef YYTYPE_UINT16
1.203 +typedef YYTYPE_UINT16 yytype_uint16;
1.204 +#else
1.205 +typedef unsigned short int yytype_uint16;
1.206 #endif
1.207
1.208 +#ifdef YYTYPE_INT16
1.209 +typedef YYTYPE_INT16 yytype_int16;
1.210 +#else
1.211 +typedef short int yytype_int16;
1.212 +#endif
1.213 +
1.214 +#ifndef YYSIZE_T
1.215 +# ifdef __SIZE_TYPE__
1.216 +# define YYSIZE_T __SIZE_TYPE__
1.217 +# elif defined size_t
1.218 +# define YYSIZE_T size_t
1.219 +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
1.220 + || defined __cplusplus || defined _MSC_VER)
1.221 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
1.222 +# define YYSIZE_T size_t
1.223 +# else
1.224 +# define YYSIZE_T unsigned int
1.225 +# endif
1.226 +#endif
1.227 +
1.228 +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
1.229 +
1.230 #ifndef YY_
1.231 # if YYENABLE_NLS
1.232 # if ENABLE_NLS
1.233 @@ -249,7 +292,32 @@
1.234 # endif
1.235 #endif
1.236
1.237 -#if ! defined (yyoverflow) || YYERROR_VERBOSE
1.238 +/* Suppress unused-variable warnings by "using" E. */
1.239 +#if ! defined lint || defined __GNUC__
1.240 +# define YYUSE(e) ((void) (e))
1.241 +#else
1.242 +# define YYUSE(e) /* empty */
1.243 +#endif
1.244 +
1.245 +/* Identity function, used to suppress warnings about constant conditions. */
1.246 +#ifndef lint
1.247 +# define YYID(n) (n)
1.248 +#else
1.249 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.250 + || defined __cplusplus || defined _MSC_VER)
1.251 +static int
1.252 +YYID (int i)
1.253 +#else
1.254 +static int
1.255 +YYID (i)
1.256 + int i;
1.257 +#endif
1.258 +{
1.259 + return i;
1.260 +}
1.261 +#endif
1.262 +
1.263 +#if ! defined yyoverflow || YYERROR_VERBOSE
1.264
1.265 /* The parser invokes alloca or malloc; define the necessary symbols. */
1.266
1.267 @@ -257,64 +325,76 @@
1.268 # if YYSTACK_USE_ALLOCA
1.269 # ifdef __GNUC__
1.270 # define YYSTACK_ALLOC __builtin_alloca
1.271 +# elif defined __BUILTIN_VA_ARG_INCR
1.272 +# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
1.273 +# elif defined _AIX
1.274 +# define YYSTACK_ALLOC __alloca
1.275 +# elif defined _MSC_VER
1.276 +# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
1.277 +# define alloca _alloca
1.278 # else
1.279 # define YYSTACK_ALLOC alloca
1.280 -# if defined (__STDC__) || defined (__cplusplus)
1.281 +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
1.282 + || defined __cplusplus || defined _MSC_VER)
1.283 # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
1.284 -# define YYINCLUDED_STDLIB_H
1.285 +# ifndef _STDLIB_H
1.286 +# define _STDLIB_H 1
1.287 +# endif
1.288 # endif
1.289 # endif
1.290 # endif
1.291 # endif
1.292
1.293 # ifdef YYSTACK_ALLOC
1.294 - /* Pacify GCC's `empty if-body' warning. */
1.295 -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
1.296 + /* Pacify GCC's `empty if-body' warning. */
1.297 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
1.298 # ifndef YYSTACK_ALLOC_MAXIMUM
1.299 /* The OS might guarantee only one guard page at the bottom of the stack,
1.300 and a page size can be as small as 4096 bytes. So we cannot safely
1.301 invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
1.302 to allow for a few compiler-allocated temporary stack slots. */
1.303 -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
1.304 +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
1.305 # endif
1.306 # else
1.307 # define YYSTACK_ALLOC YYMALLOC
1.308 # define YYSTACK_FREE YYFREE
1.309 # ifndef YYSTACK_ALLOC_MAXIMUM
1.310 -# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
1.311 +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
1.312 # endif
1.313 -# ifdef __cplusplus
1.314 -extern "C" {
1.315 +# if (defined __cplusplus && ! defined _STDLIB_H \
1.316 + && ! ((defined YYMALLOC || defined malloc) \
1.317 + && (defined YYFREE || defined free)))
1.318 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
1.319 +# ifndef _STDLIB_H
1.320 +# define _STDLIB_H 1
1.321 +# endif
1.322 # endif
1.323 # ifndef YYMALLOC
1.324 # define YYMALLOC malloc
1.325 -# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
1.326 - && (defined (__STDC__) || defined (__cplusplus)))
1.327 +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
1.328 + || defined __cplusplus || defined _MSC_VER)
1.329 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
1.330 # endif
1.331 # endif
1.332 # ifndef YYFREE
1.333 # define YYFREE free
1.334 -# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
1.335 - && (defined (__STDC__) || defined (__cplusplus)))
1.336 +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
1.337 + || defined __cplusplus || defined _MSC_VER)
1.338 void free (void *); /* INFRINGES ON USER NAME SPACE */
1.339 # endif
1.340 # endif
1.341 -# ifdef __cplusplus
1.342 -}
1.343 -# endif
1.344 # endif
1.345 -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
1.346 +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
1.347
1.348
1.349 -#if (! defined (yyoverflow) \
1.350 - && (! defined (__cplusplus) \
1.351 - || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
1.352 +#if (! defined yyoverflow \
1.353 + && (! defined __cplusplus \
1.354 + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
1.355
1.356 /* A type that is properly aligned for any stack member. */
1.357 union yyalloc
1.358 {
1.359 - short int yyss;
1.360 + yytype_int16 yyss;
1.361 YYSTYPE yyvs;
1.362 };
1.363
1.364 @@ -324,13 +404,13 @@
1.365 /* The size of an array large to enough to hold all stacks, each with
1.366 N elements. */
1.367 # define YYSTACK_BYTES(N) \
1.368 - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
1.369 + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
1.370 + YYSTACK_GAP_MAXIMUM)
1.371
1.372 /* Copy COUNT objects from FROM to TO. The source and destination do
1.373 not overlap. */
1.374 # ifndef YYCOPY
1.375 -# if defined (__GNUC__) && 1 < __GNUC__
1.376 +# if defined __GNUC__ && 1 < __GNUC__
1.377 # define YYCOPY(To, From, Count) \
1.378 __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
1.379 # else
1.380 @@ -341,7 +421,7 @@
1.381 for (yyi = 0; yyi < (Count); yyi++) \
1.382 (To)[yyi] = (From)[yyi]; \
1.383 } \
1.384 - while (0)
1.385 + while (YYID (0))
1.386 # endif
1.387 # endif
1.388
1.389 @@ -359,39 +439,33 @@
1.390 yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
1.391 yyptr += yynewbytes / sizeof (*yyptr); \
1.392 } \
1.393 - while (0)
1.394 + while (YYID (0))
1.395
1.396 #endif
1.397
1.398 -#if defined (__STDC__) || defined (__cplusplus)
1.399 - typedef signed char yysigned_char;
1.400 -#else
1.401 - typedef short int yysigned_char;
1.402 -#endif
1.403 -
1.404 -/* YYFINAL -- State number of the termination state. */
1.405 +/* YYFINAL -- State number of the termination state. */
1.406 #define YYFINAL 3
1.407 /* YYLAST -- Last index in YYTABLE. */
1.408 -#define YYLAST 275
1.409 +#define YYLAST 259
1.410
1.411 -/* YYNTOKENS -- Number of terminals. */
1.412 -#define YYNTOKENS 36
1.413 -/* YYNNTS -- Number of nonterminals. */
1.414 -#define YYNNTS 45
1.415 -/* YYNRULES -- Number of rules. */
1.416 +/* YYNTOKENS -- Number of terminals. */
1.417 +#define YYNTOKENS 35
1.418 +/* YYNNTS -- Number of nonterminals. */
1.419 +#define YYNNTS 46
1.420 +/* YYNRULES -- Number of rules. */
1.421 #define YYNRULES 110
1.422 -/* YYNRULES -- Number of states. */
1.423 -#define YYNSTATES 183
1.424 +/* YYNRULES -- Number of states. */
1.425 +#define YYNSTATES 180
1.426
1.427 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
1.428 #define YYUNDEFTOK 2
1.429 -#define YYMAXUTOK 290
1.430 +#define YYMAXUTOK 289
1.431
1.432 #define YYTRANSLATE(YYX) \
1.433 ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
1.434
1.435 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
1.436 -static const unsigned char yytranslate[] =
1.437 +static const yytype_uint8 yytranslate[] =
1.438 {
1.439 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1.440 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
1.441 @@ -421,98 +495,97 @@
1.442 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
1.443 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
1.444 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
1.445 - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
1.446 - 35
1.447 + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34
1.448 };
1.449
1.450 #if YYDEBUG
1.451 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
1.452 YYRHS. */
1.453 -static const unsigned short int yyprhs[] =
1.454 +static const yytype_uint16 yyprhs[] =
1.455 {
1.456 0, 0, 3, 5, 6, 9, 12, 15, 20, 23,
1.457 28, 33, 37, 39, 41, 43, 45, 47, 49, 51,
1.458 53, 55, 57, 59, 61, 63, 67, 70, 74, 77,
1.459 81, 84, 85, 88, 91, 94, 97, 100, 103, 107,
1.460 - 112, 117, 122, 128, 132, 133, 137, 138, 141, 144,
1.461 - 147, 149, 153, 154, 157, 160, 163, 166, 169, 174,
1.462 - 178, 181, 186, 187, 190, 194, 196, 200, 201, 204,
1.463 - 207, 210, 214, 217, 219, 223, 224, 227, 230, 233,
1.464 - 237, 241, 244, 247, 250, 251, 254, 257, 260, 265,
1.465 - 269, 273, 274, 277, 279, 281, 284, 287, 290, 292,
1.466 - 295, 296, 299, 301, 305, 309, 313, 316, 320, 324,
1.467 - 326
1.468 + 112, 117, 122, 128, 132, 133, 137, 138, 141, 145,
1.469 + 148, 150, 154, 155, 158, 161, 164, 167, 170, 175,
1.470 + 179, 182, 187, 188, 191, 195, 197, 201, 202, 205,
1.471 + 208, 211, 215, 218, 220, 224, 225, 228, 231, 234,
1.472 + 238, 242, 245, 248, 251, 252, 255, 258, 261, 266,
1.473 + 267, 270, 272, 274, 277, 280, 283, 285, 288, 289,
1.474 + 292, 294, 298, 302, 306, 309, 313, 317, 319, 321,
1.475 + 322
1.476 };
1.477
1.478 -/* YYRHS -- A `-1'-separated list of the rules' RHS. */
1.479 -static const yysigned_char yyrhs[] =
1.480 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
1.481 +static const yytype_int8 yyrhs[] =
1.482 {
1.483 - 37, 0, -1, 38, -1, -1, 38, 40, -1, 38,
1.484 - 54, -1, 38, 65, -1, 38, 3, 75, 77, -1,
1.485 - 38, 76, -1, 38, 26, 1, 31, -1, 38, 39,
1.486 - 1, 31, -1, 38, 1, 31, -1, 16, -1, 19,
1.487 - -1, 20, -1, 22, -1, 18, -1, 23, -1, 21,
1.488 - -1, 31, -1, 60, -1, 69, -1, 43, -1, 45,
1.489 - -1, 67, -1, 26, 1, 31, -1, 1, 31, -1,
1.490 - 10, 26, 31, -1, 42, 46, -1, 11, 26, 31,
1.491 - -1, 44, 46, -1, -1, 46, 47, -1, 46, 48,
1.492 - -1, 46, 73, -1, 46, 71, -1, 46, 41, -1,
1.493 - 46, 31, -1, 20, 74, 31, -1, 19, 75, 78,
1.494 - 31, -1, 21, 79, 78, 31, -1, 22, 26, 78,
1.495 - 31, -1, 23, 80, 80, 78, 31, -1, 24, 49,
1.496 - 31, -1, -1, 49, 26, 50, -1, -1, 34, 75,
1.497 - -1, 7, 31, -1, 51, 55, -1, 76, -1, 52,
1.498 - 57, 53, -1, -1, 55, 56, -1, 55, 73, -1,
1.499 - 55, 71, -1, 55, 31, -1, 55, 41, -1, 19,
1.500 - 75, 78, 31, -1, 20, 74, 31, -1, 18, 31,
1.501 - -1, 21, 26, 78, 31, -1, -1, 57, 40, -1,
1.502 - 14, 79, 77, -1, 76, -1, 58, 61, 59, -1,
1.503 - -1, 61, 40, -1, 61, 65, -1, 61, 54, -1,
1.504 - 4, 75, 31, -1, 62, 72, -1, 76, -1, 63,
1.505 - 66, 64, -1, -1, 66, 40, -1, 66, 65, -1,
1.506 - 66, 54, -1, 6, 75, 31, -1, 9, 75, 31,
1.507 - -1, 68, 72, -1, 12, 31, -1, 70, 13, -1,
1.508 - -1, 72, 73, -1, 72, 31, -1, 72, 41, -1,
1.509 - 16, 25, 79, 31, -1, 16, 79, 31, -1, 17,
1.510 - 79, 31, -1, -1, 75, 78, -1, 26, -1, 27,
1.511 - -1, 5, 31, -1, 8, 31, -1, 15, 31, -1,
1.512 - 31, -1, 77, 31, -1, -1, 14, 79, -1, 80,
1.513 - -1, 80, 34, 80, -1, 80, 28, 80, -1, 30,
1.514 - 79, 29, -1, 35, 79, -1, 79, 32, 79, -1,
1.515 - 79, 33, 79, -1, 26, -1, 27, -1
1.516 + 36, 0, -1, 37, -1, -1, 37, 39, -1, 37,
1.517 + 53, -1, 37, 64, -1, 37, 3, 74, 76, -1,
1.518 + 37, 75, -1, 37, 25, 1, 30, -1, 37, 38,
1.519 + 1, 30, -1, 37, 1, 30, -1, 16, -1, 18,
1.520 + -1, 19, -1, 21, -1, 17, -1, 22, -1, 20,
1.521 + -1, 30, -1, 59, -1, 68, -1, 42, -1, 44,
1.522 + -1, 66, -1, 25, 1, 30, -1, 1, 30, -1,
1.523 + 10, 25, 30, -1, 41, 45, -1, 11, 25, 30,
1.524 + -1, 43, 45, -1, -1, 45, 46, -1, 45, 47,
1.525 + -1, 45, 72, -1, 45, 70, -1, 45, 40, -1,
1.526 + 45, 30, -1, 19, 73, 30, -1, 18, 74, 77,
1.527 + 30, -1, 20, 78, 77, 30, -1, 21, 25, 77,
1.528 + 30, -1, 22, 79, 79, 77, 30, -1, 23, 48,
1.529 + 30, -1, -1, 48, 25, 49, -1, -1, 33, 74,
1.530 + -1, 7, 80, 30, -1, 50, 54, -1, 75, -1,
1.531 + 51, 56, 52, -1, -1, 54, 55, -1, 54, 72,
1.532 + -1, 54, 70, -1, 54, 30, -1, 54, 40, -1,
1.533 + 18, 74, 77, 30, -1, 19, 73, 30, -1, 17,
1.534 + 30, -1, 20, 25, 77, 30, -1, -1, 56, 39,
1.535 + -1, 14, 78, 76, -1, 75, -1, 57, 60, 58,
1.536 + -1, -1, 60, 39, -1, 60, 64, -1, 60, 53,
1.537 + -1, 4, 74, 30, -1, 61, 71, -1, 75, -1,
1.538 + 62, 65, 63, -1, -1, 65, 39, -1, 65, 64,
1.539 + -1, 65, 53, -1, 6, 74, 30, -1, 9, 74,
1.540 + 30, -1, 67, 71, -1, 12, 30, -1, 69, 13,
1.541 + -1, -1, 71, 72, -1, 71, 30, -1, 71, 40,
1.542 + -1, 16, 24, 78, 30, -1, -1, 74, 77, -1,
1.543 + 25, -1, 26, -1, 5, 30, -1, 8, 30, -1,
1.544 + 15, 30, -1, 30, -1, 76, 30, -1, -1, 14,
1.545 + 78, -1, 79, -1, 79, 33, 79, -1, 79, 27,
1.546 + 79, -1, 29, 78, 28, -1, 34, 78, -1, 78,
1.547 + 31, 78, -1, 78, 32, 78, -1, 25, -1, 26,
1.548 + -1, -1, 25, -1
1.549 };
1.550
1.551 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
1.552 -static const unsigned short int yyrline[] =
1.553 +static const yytype_uint16 yyrline[] =
1.554 {
1.555 - 0, 105, 105, 107, 109, 110, 111, 112, 113, 114,
1.556 - 115, 119, 123, 123, 123, 123, 123, 123, 123, 127,
1.557 - 128, 129, 130, 131, 132, 136, 137, 143, 151, 157,
1.558 - 165, 175, 177, 178, 179, 180, 181, 182, 185, 193,
1.559 - 199, 209, 215, 221, 224, 226, 237, 238, 243, 252,
1.560 - 257, 265, 268, 270, 271, 272, 273, 274, 277, 283,
1.561 - 294, 300, 310, 312, 317, 325, 333, 336, 338, 339,
1.562 - 340, 345, 352, 357, 365, 368, 370, 371, 372, 375,
1.563 - 383, 390, 397, 403, 410, 412, 413, 414, 417, 422,
1.564 - 427, 435, 437, 442, 443, 446, 447, 448, 452, 453,
1.565 - 456, 457, 460, 461, 462, 463, 464, 465, 466, 469,
1.566 - 470
1.567 + 0, 104, 104, 106, 108, 109, 110, 111, 112, 113,
1.568 + 114, 118, 122, 122, 122, 122, 122, 122, 122, 126,
1.569 + 127, 128, 129, 130, 131, 135, 136, 142, 150, 156,
1.570 + 164, 174, 176, 177, 178, 179, 180, 181, 184, 192,
1.571 + 198, 208, 214, 220, 223, 225, 236, 237, 242, 251,
1.572 + 256, 264, 267, 269, 270, 271, 272, 273, 276, 282,
1.573 + 293, 299, 309, 311, 316, 324, 332, 335, 337, 338,
1.574 + 339, 344, 351, 356, 364, 367, 369, 370, 371, 374,
1.575 + 382, 389, 396, 402, 409, 411, 412, 413, 416, 424,
1.576 + 426, 431, 432, 435, 436, 437, 441, 442, 445, 446,
1.577 + 449, 450, 451, 452, 453, 454, 455, 458, 459, 462,
1.578 + 463
1.579 };
1.580 #endif
1.581
1.582 #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
1.583 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
1.584 - First, the terminals, then, starting at YYNTOKENS, nonterminals. */
1.585 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
1.586 static const char *const yytname[] =
1.587 {
1.588 "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU",
1.589 "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG",
1.590 "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
1.591 - "T_REQUIRES", "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT",
1.592 - "T_SELECT", "T_RANGE", "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE",
1.593 - "T_UNEQUAL", "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND",
1.594 - "T_EQUAL", "T_NOT", "$accept", "input", "stmt_list", "option_name",
1.595 - "common_stmt", "option_error", "config_entry_start", "config_stmt",
1.596 + "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE",
1.597 + "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL",
1.598 + "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL",
1.599 + "T_NOT", "$accept", "input", "stmt_list", "option_name", "common_stmt",
1.600 + "option_error", "config_entry_start", "config_stmt",
1.601 "menuconfig_entry_start", "menuconfig_stmt", "config_option_list",
1.602 "config_option", "symbol_option", "symbol_option_list",
1.603 "symbol_option_arg", "choice", "choice_entry", "choice_end",
1.604 @@ -520,126 +593,125 @@
1.605 "if_entry", "if_end", "if_stmt", "if_block", "menu", "menu_entry",
1.606 "menu_end", "menu_stmt", "menu_block", "source_stmt", "comment",
1.607 "comment_stmt", "help_start", "help", "depends_list", "depends",
1.608 - "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol", 0
1.609 + "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol",
1.610 + "word_opt", 0
1.611 };
1.612 #endif
1.613
1.614 # ifdef YYPRINT
1.615 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1.616 token YYLEX-NUM. */
1.617 -static const unsigned short int yytoknum[] =
1.618 +static const yytype_uint16 yytoknum[] =
1.619 {
1.620 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
1.621 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
1.622 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
1.623 - 285, 286, 287, 288, 289, 290
1.624 + 285, 286, 287, 288, 289
1.625 };
1.626 # endif
1.627
1.628 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
1.629 -static const unsigned char yyr1[] =
1.630 +static const yytype_uint8 yyr1[] =
1.631 {
1.632 - 0, 36, 37, 38, 38, 38, 38, 38, 38, 38,
1.633 - 38, 38, 39, 39, 39, 39, 39, 39, 39, 40,
1.634 - 40, 40, 40, 40, 40, 41, 41, 42, 43, 44,
1.635 - 45, 46, 46, 46, 46, 46, 46, 46, 47, 47,
1.636 - 47, 47, 47, 48, 49, 49, 50, 50, 51, 52,
1.637 - 53, 54, 55, 55, 55, 55, 55, 55, 56, 56,
1.638 - 56, 56, 57, 57, 58, 59, 60, 61, 61, 61,
1.639 - 61, 62, 63, 64, 65, 66, 66, 66, 66, 67,
1.640 - 68, 69, 70, 71, 72, 72, 72, 72, 73, 73,
1.641 - 73, 74, 74, 75, 75, 76, 76, 76, 77, 77,
1.642 - 78, 78, 79, 79, 79, 79, 79, 79, 79, 80,
1.643 + 0, 35, 36, 37, 37, 37, 37, 37, 37, 37,
1.644 + 37, 37, 38, 38, 38, 38, 38, 38, 38, 39,
1.645 + 39, 39, 39, 39, 39, 40, 40, 41, 42, 43,
1.646 + 44, 45, 45, 45, 45, 45, 45, 45, 46, 46,
1.647 + 46, 46, 46, 47, 48, 48, 49, 49, 50, 51,
1.648 + 52, 53, 54, 54, 54, 54, 54, 54, 55, 55,
1.649 + 55, 55, 56, 56, 57, 58, 59, 60, 60, 60,
1.650 + 60, 61, 62, 63, 64, 65, 65, 65, 65, 66,
1.651 + 67, 68, 69, 70, 71, 71, 71, 71, 72, 73,
1.652 + 73, 74, 74, 75, 75, 75, 76, 76, 77, 77,
1.653 + 78, 78, 78, 78, 78, 78, 78, 79, 79, 80,
1.654 80
1.655 };
1.656
1.657 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
1.658 -static const unsigned char yyr2[] =
1.659 +static const yytype_uint8 yyr2[] =
1.660 {
1.661 0, 2, 1, 0, 2, 2, 2, 4, 2, 4,
1.662 4, 3, 1, 1, 1, 1, 1, 1, 1, 1,
1.663 1, 1, 1, 1, 1, 3, 2, 3, 2, 3,
1.664 2, 0, 2, 2, 2, 2, 2, 2, 3, 4,
1.665 - 4, 4, 5, 3, 0, 3, 0, 2, 2, 2,
1.666 + 4, 4, 5, 3, 0, 3, 0, 2, 3, 2,
1.667 1, 3, 0, 2, 2, 2, 2, 2, 4, 3,
1.668 2, 4, 0, 2, 3, 1, 3, 0, 2, 2,
1.669 2, 3, 2, 1, 3, 0, 2, 2, 2, 3,
1.670 - 3, 2, 2, 2, 0, 2, 2, 2, 4, 3,
1.671 - 3, 0, 2, 1, 1, 2, 2, 2, 1, 2,
1.672 - 0, 2, 1, 3, 3, 3, 2, 3, 3, 1,
1.673 + 3, 2, 2, 2, 0, 2, 2, 2, 4, 0,
1.674 + 2, 1, 1, 2, 2, 2, 1, 2, 0, 2,
1.675 + 1, 3, 3, 3, 2, 3, 3, 1, 1, 0,
1.676 1
1.677 };
1.678
1.679 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
1.680 STATE-NUM when YYTABLE doesn't specify something else to do. Zero
1.681 means the default is an error. */
1.682 -static const unsigned char yydefact[] =
1.683 +static const yytype_uint8 yydefact[] =
1.684 {
1.685 - 3, 0, 0, 1, 0, 0, 0, 0, 0, 0,
1.686 + 3, 0, 0, 1, 0, 0, 0, 0, 0, 109,
1.687 0, 0, 0, 0, 0, 0, 12, 16, 13, 14,
1.688 18, 15, 17, 0, 19, 0, 4, 31, 22, 31,
1.689 23, 52, 62, 5, 67, 20, 84, 75, 6, 24,
1.690 - 84, 21, 8, 11, 93, 94, 0, 0, 95, 0,
1.691 - 48, 96, 0, 0, 0, 109, 110, 0, 0, 0,
1.692 - 102, 97, 0, 0, 0, 0, 0, 0, 0, 0,
1.693 - 0, 0, 98, 7, 71, 79, 80, 27, 29, 0,
1.694 - 106, 0, 0, 64, 0, 0, 9, 10, 0, 0,
1.695 - 0, 0, 0, 91, 0, 0, 0, 44, 0, 37,
1.696 - 36, 32, 33, 0, 35, 34, 0, 0, 91, 0,
1.697 - 56, 57, 53, 55, 54, 63, 51, 50, 68, 70,
1.698 - 66, 69, 65, 86, 87, 85, 76, 78, 74, 77,
1.699 - 73, 99, 105, 107, 108, 104, 103, 26, 82, 0,
1.700 - 0, 0, 100, 0, 100, 100, 100, 0, 0, 0,
1.701 - 83, 60, 100, 0, 100, 0, 89, 90, 0, 0,
1.702 - 38, 92, 0, 0, 100, 46, 43, 25, 0, 59,
1.703 - 0, 88, 101, 39, 40, 41, 0, 0, 45, 58,
1.704 - 61, 42, 47
1.705 + 84, 21, 8, 11, 91, 92, 0, 0, 93, 0,
1.706 + 110, 0, 94, 0, 0, 0, 107, 108, 0, 0,
1.707 + 0, 100, 95, 0, 0, 0, 0, 0, 0, 0,
1.708 + 0, 0, 0, 96, 7, 71, 79, 48, 80, 27,
1.709 + 29, 0, 104, 0, 0, 64, 0, 0, 9, 10,
1.710 + 0, 0, 0, 0, 89, 0, 0, 0, 44, 0,
1.711 + 37, 36, 32, 33, 0, 35, 34, 0, 0, 89,
1.712 + 0, 56, 57, 53, 55, 54, 63, 51, 50, 68,
1.713 + 70, 66, 69, 65, 86, 87, 85, 76, 78, 74,
1.714 + 77, 73, 97, 103, 105, 106, 102, 101, 26, 82,
1.715 + 0, 98, 0, 98, 98, 98, 0, 0, 0, 83,
1.716 + 60, 98, 0, 98, 0, 0, 0, 38, 90, 0,
1.717 + 0, 98, 46, 43, 25, 0, 59, 0, 88, 99,
1.718 + 39, 40, 41, 0, 0, 45, 58, 61, 42, 47
1.719 };
1.720
1.721 -/* YYDEFGOTO[NTERM-NUM]. */
1.722 -static const short int yydefgoto[] =
1.723 +/* YYDEFGOTO[NTERM-NUM]. */
1.724 +static const yytype_int16 yydefgoto[] =
1.725 {
1.726 - -1, 1, 2, 25, 26, 100, 27, 28, 29, 30,
1.727 - 64, 101, 102, 148, 178, 31, 32, 116, 33, 66,
1.728 - 112, 67, 34, 120, 35, 68, 36, 37, 128, 38,
1.729 - 70, 39, 40, 41, 103, 104, 69, 105, 143, 144,
1.730 - 42, 73, 159, 59, 60
1.731 + -1, 1, 2, 25, 26, 101, 27, 28, 29, 30,
1.732 + 65, 102, 103, 147, 175, 31, 32, 117, 33, 67,
1.733 + 113, 68, 34, 121, 35, 69, 36, 37, 129, 38,
1.734 + 71, 39, 40, 41, 104, 105, 70, 106, 142, 143,
1.735 + 42, 74, 156, 60, 61, 51
1.736 };
1.737
1.738 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1.739 STATE-NUM. */
1.740 -#define YYPACT_NINF -135
1.741 -static const short int yypact[] =
1.742 +#define YYPACT_NINF -80
1.743 +static const yytype_int16 yypact[] =
1.744 {
1.745 - -135, 2, 170, -135, -14, 56, 56, -8, 56, 24,
1.746 - 67, 56, 7, 14, 62, 97, -135, -135, -135, -135,
1.747 - -135, -135, -135, 156, -135, 166, -135, -135, -135, -135,
1.748 - -135, -135, -135, -135, -135, -135, -135, -135, -135, -135,
1.749 - -135, -135, -135, -135, -135, -135, 138, 151, -135, 152,
1.750 - -135, -135, 163, 167, 176, -135, -135, 62, 62, 185,
1.751 - -19, -135, 188, 190, 42, 103, 194, 85, 70, 222,
1.752 - 70, 132, -135, 191, -135, -135, -135, -135, -135, 127,
1.753 - -135, 62, 62, 191, 104, 104, -135, -135, 193, 203,
1.754 - 9, 62, 56, 56, 62, 161, 104, -135, 196, -135,
1.755 - -135, -135, -135, 233, -135, -135, 204, 56, 56, 221,
1.756 - -135, -135, -135, -135, -135, -135, -135, -135, -135, -135,
1.757 - -135, -135, -135, -135, -135, -135, -135, -135, -135, -135,
1.758 - -135, -135, -135, 219, -135, -135, -135, -135, -135, 62,
1.759 - 209, 212, 240, 224, 240, -1, 240, 104, 41, 225,
1.760 - -135, -135, 240, 226, 240, 218, -135, -135, 62, 227,
1.761 - -135, -135, 228, 229, 240, 230, -135, -135, 231, -135,
1.762 - 232, -135, 112, -135, -135, -135, 234, 56, -135, -135,
1.763 - -135, -135, -135
1.764 + -80, 2, 132, -80, -13, -1, -1, -2, -1, 9,
1.765 + 33, -1, 27, 40, -3, 38, -80, -80, -80, -80,
1.766 + -80, -80, -80, 71, -80, 77, -80, -80, -80, -80,
1.767 + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80,
1.768 + -80, -80, -80, -80, -80, -80, 57, 61, -80, 63,
1.769 + -80, 76, -80, 87, 101, 133, -80, -80, -3, -3,
1.770 + 195, -6, -80, 136, 149, 39, 104, 65, 150, 5,
1.771 + 194, 5, 167, -80, 176, -80, -80, -80, -80, -80,
1.772 + -80, 68, -80, -3, -3, 176, 72, 72, -80, -80,
1.773 + 177, 187, 78, -1, -1, -3, 196, 72, -80, 222,
1.774 + -80, -80, -80, -80, 221, -80, -80, 205, -1, -1,
1.775 + 211, -80, -80, -80, -80, -80, -80, -80, -80, -80,
1.776 + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80,
1.777 + -80, -80, -80, -80, 206, -80, -80, -80, -80, -80,
1.778 + -3, 223, 209, 223, 197, 223, 72, 7, 210, -80,
1.779 + -80, 223, 212, 223, 201, -3, 213, -80, -80, 214,
1.780 + 215, 223, 208, -80, -80, 216, -80, 217, -80, 113,
1.781 + -80, -80, -80, 218, -1, -80, -80, -80, -80, -80
1.782 };
1.783
1.784 /* YYPGOTO[NTERM-NUM]. */
1.785 -static const short int yypgoto[] =
1.786 +static const yytype_int16 yypgoto[] =
1.787 {
1.788 - -135, -135, -135, -135, 94, -45, -135, -135, -135, -135,
1.789 - 237, -135, -135, -135, -135, -135, -135, -135, -54, -135,
1.790 - -135, -135, -135, -135, -135, -135, -135, -135, -135, 1,
1.791 - -135, -135, -135, -135, -135, 195, 235, -44, 159, -5,
1.792 - 98, 210, -134, -53, -77
1.793 + -80, -80, -80, -80, 122, -34, -80, -80, -80, -80,
1.794 + 220, -80, -80, -80, -80, -80, -80, -80, 59, -80,
1.795 + -80, -80, -80, -80, -80, -80, -80, -80, -80, 125,
1.796 + -80, -80, -80, -80, -80, 183, 219, 22, 142, -5,
1.797 + 147, 192, 69, -54, -79, -80
1.798 };
1.799
1.800 /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
1.801 @@ -647,93 +719,88 @@
1.802 number is the opposite. If zero, do what YYDEFACT says.
1.803 If YYTABLE_NINF, syntax error. */
1.804 #define YYTABLE_NINF -82
1.805 -static const short int yytable[] =
1.806 +static const yytype_int16 yytable[] =
1.807 {
1.808 - 46, 47, 3, 49, 79, 80, 52, 135, 136, 84,
1.809 - 161, 162, 163, 158, 119, 85, 127, 43, 168, 147,
1.810 - 170, 111, 114, 48, 124, 125, 124, 125, 133, 134,
1.811 - 176, 81, 82, 53, 139, 55, 56, 140, 141, 57,
1.812 - 54, 145, -28, 88, 58, -28, -28, -28, -28, -28,
1.813 - -28, -28, -28, -28, 89, 50, -28, -28, 90, 91,
1.814 - -28, 92, 93, 94, 95, 96, 97, 165, 98, 121,
1.815 - 164, 129, 166, 99, 6, 7, 8, 9, 10, 11,
1.816 - 12, 13, 44, 45, 14, 15, 155, 142, 55, 56,
1.817 - 7, 8, 57, 10, 11, 12, 13, 58, 51, 14,
1.818 - 15, 24, 152, -30, 88, 172, -30, -30, -30, -30,
1.819 - -30, -30, -30, -30, -30, 89, 24, -30, -30, 90,
1.820 - 91, -30, 92, 93, 94, 95, 96, 97, 61, 98,
1.821 - 55, 56, -81, 88, 99, -81, -81, -81, -81, -81,
1.822 - -81, -81, -81, -81, 81, 82, -81, -81, 90, 91,
1.823 - -81, -81, -81, -81, -81, -81, 132, 62, 98, 81,
1.824 - 82, 115, 118, 123, 126, 117, 122, 63, 130, 72,
1.825 - -2, 4, 182, 5, 6, 7, 8, 9, 10, 11,
1.826 - 12, 13, 74, 75, 14, 15, 16, 146, 17, 18,
1.827 - 19, 20, 21, 22, 76, 88, 23, 149, 77, -49,
1.828 - -49, 24, -49, -49, -49, -49, 89, 78, -49, -49,
1.829 - 90, 91, 106, 107, 108, 109, 72, 81, 82, 86,
1.830 - 98, 87, 131, 88, 137, 110, -72, -72, -72, -72,
1.831 - -72, -72, -72, -72, 138, 151, -72, -72, 90, 91,
1.832 - 156, 81, 82, 157, 81, 82, 150, 154, 98, 171,
1.833 - 81, 82, 82, 123, 158, 160, 167, 169, 173, 174,
1.834 - 175, 113, 179, 180, 177, 181, 65, 153, 0, 83,
1.835 - 0, 0, 0, 0, 0, 71
1.836 + 46, 47, 3, 49, 81, 82, 53, 136, 137, 6,
1.837 + 7, 8, 9, 10, 11, 12, 13, 43, 146, 14,
1.838 + 15, 86, 56, 57, 44, 45, 58, 87, 48, 134,
1.839 + 135, 59, 162, 112, 50, 24, 125, 163, 125, -28,
1.840 + 90, 144, -28, -28, -28, -28, -28, -28, -28, -28,
1.841 + -28, 91, 54, -28, -28, 92, -28, 93, 94, 95,
1.842 + 96, 97, 98, 52, 99, 55, 90, 161, 62, 100,
1.843 + -49, -49, 63, -49, -49, -49, -49, 91, 64, -49,
1.844 + -49, 92, 107, 108, 109, 110, 154, 73, 141, 115,
1.845 + 99, 75, 126, 76, 126, 111, 133, 56, 57, 83,
1.846 + 84, 169, 140, 151, -30, 90, 77, -30, -30, -30,
1.847 + -30, -30, -30, -30, -30, -30, 91, 78, -30, -30,
1.848 + 92, -30, 93, 94, 95, 96, 97, 98, 120, 99,
1.849 + 128, 79, -2, 4, 100, 5, 6, 7, 8, 9,
1.850 + 10, 11, 12, 13, 83, 84, 14, 15, 16, 17,
1.851 + 18, 19, 20, 21, 22, 7, 8, 23, 10, 11,
1.852 + 12, 13, 24, 80, 14, 15, 88, -81, 90, 179,
1.853 + -81, -81, -81, -81, -81, -81, -81, -81, -81, 89,
1.854 + 24, -81, -81, 92, -81, -81, -81, -81, -81, -81,
1.855 + 116, 119, 99, 127, 122, 90, 130, 124, -72, -72,
1.856 + -72, -72, -72, -72, -72, -72, 132, 138, -72, -72,
1.857 + 92, 155, 158, 159, 160, 118, 123, 139, 131, 99,
1.858 + 165, 145, 167, 148, 124, 73, 83, 84, 83, 84,
1.859 + 173, 168, 83, 84, 149, 150, 153, 155, 84, 157,
1.860 + 164, 174, 166, 170, 171, 172, 176, 177, 178, 66,
1.861 + 114, 152, 85, 0, 0, 0, 0, 0, 0, 72
1.862 };
1.863
1.864 -static const short int yycheck[] =
1.865 +static const yytype_int16 yycheck[] =
1.866 {
1.867 - 5, 6, 0, 8, 57, 58, 11, 84, 85, 28,
1.868 - 144, 145, 146, 14, 68, 34, 70, 31, 152, 96,
1.869 - 154, 66, 66, 31, 69, 69, 71, 71, 81, 82,
1.870 - 164, 32, 33, 26, 25, 26, 27, 90, 91, 30,
1.871 - 26, 94, 0, 1, 35, 3, 4, 5, 6, 7,
1.872 - 8, 9, 10, 11, 12, 31, 14, 15, 16, 17,
1.873 - 18, 19, 20, 21, 22, 23, 24, 26, 26, 68,
1.874 - 147, 70, 31, 31, 4, 5, 6, 7, 8, 9,
1.875 - 10, 11, 26, 27, 14, 15, 139, 92, 26, 27,
1.876 - 5, 6, 30, 8, 9, 10, 11, 35, 31, 14,
1.877 - 15, 31, 107, 0, 1, 158, 3, 4, 5, 6,
1.878 - 7, 8, 9, 10, 11, 12, 31, 14, 15, 16,
1.879 - 17, 18, 19, 20, 21, 22, 23, 24, 31, 26,
1.880 - 26, 27, 0, 1, 31, 3, 4, 5, 6, 7,
1.881 - 8, 9, 10, 11, 32, 33, 14, 15, 16, 17,
1.882 - 18, 19, 20, 21, 22, 23, 29, 1, 26, 32,
1.883 - 33, 67, 68, 31, 70, 67, 68, 1, 70, 31,
1.884 - 0, 1, 177, 3, 4, 5, 6, 7, 8, 9,
1.885 - 10, 11, 31, 31, 14, 15, 16, 26, 18, 19,
1.886 - 20, 21, 22, 23, 31, 1, 26, 1, 31, 5,
1.887 - 6, 31, 8, 9, 10, 11, 12, 31, 14, 15,
1.888 - 16, 17, 18, 19, 20, 21, 31, 32, 33, 31,
1.889 - 26, 31, 31, 1, 31, 31, 4, 5, 6, 7,
1.890 - 8, 9, 10, 11, 31, 31, 14, 15, 16, 17,
1.891 - 31, 32, 33, 31, 32, 33, 13, 26, 26, 31,
1.892 - 32, 33, 33, 31, 14, 31, 31, 31, 31, 31,
1.893 - 31, 66, 31, 31, 34, 31, 29, 108, -1, 59,
1.894 - -1, -1, -1, -1, -1, 40
1.895 + 5, 6, 0, 8, 58, 59, 11, 86, 87, 4,
1.896 + 5, 6, 7, 8, 9, 10, 11, 30, 97, 14,
1.897 + 15, 27, 25, 26, 25, 26, 29, 33, 30, 83,
1.898 + 84, 34, 25, 67, 25, 30, 70, 30, 72, 0,
1.899 + 1, 95, 3, 4, 5, 6, 7, 8, 9, 10,
1.900 + 11, 12, 25, 14, 15, 16, 17, 18, 19, 20,
1.901 + 21, 22, 23, 30, 25, 25, 1, 146, 30, 30,
1.902 + 5, 6, 1, 8, 9, 10, 11, 12, 1, 14,
1.903 + 15, 16, 17, 18, 19, 20, 140, 30, 93, 67,
1.904 + 25, 30, 70, 30, 72, 30, 28, 25, 26, 31,
1.905 + 32, 155, 24, 108, 0, 1, 30, 3, 4, 5,
1.906 + 6, 7, 8, 9, 10, 11, 12, 30, 14, 15,
1.907 + 16, 17, 18, 19, 20, 21, 22, 23, 69, 25,
1.908 + 71, 30, 0, 1, 30, 3, 4, 5, 6, 7,
1.909 + 8, 9, 10, 11, 31, 32, 14, 15, 16, 17,
1.910 + 18, 19, 20, 21, 22, 5, 6, 25, 8, 9,
1.911 + 10, 11, 30, 30, 14, 15, 30, 0, 1, 174,
1.912 + 3, 4, 5, 6, 7, 8, 9, 10, 11, 30,
1.913 + 30, 14, 15, 16, 17, 18, 19, 20, 21, 22,
1.914 + 68, 69, 25, 71, 69, 1, 71, 30, 4, 5,
1.915 + 6, 7, 8, 9, 10, 11, 30, 30, 14, 15,
1.916 + 16, 14, 143, 144, 145, 68, 69, 30, 71, 25,
1.917 + 151, 25, 153, 1, 30, 30, 31, 32, 31, 32,
1.918 + 161, 30, 31, 32, 13, 30, 25, 14, 32, 30,
1.919 + 30, 33, 30, 30, 30, 30, 30, 30, 30, 29,
1.920 + 67, 109, 60, -1, -1, -1, -1, -1, -1, 40
1.921 };
1.922
1.923 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1.924 symbol of state STATE-NUM. */
1.925 -static const unsigned char yystos[] =
1.926 +static const yytype_uint8 yystos[] =
1.927 {
1.928 - 0, 37, 38, 0, 1, 3, 4, 5, 6, 7,
1.929 - 8, 9, 10, 11, 14, 15, 16, 18, 19, 20,
1.930 - 21, 22, 23, 26, 31, 39, 40, 42, 43, 44,
1.931 - 45, 51, 52, 54, 58, 60, 62, 63, 65, 67,
1.932 - 68, 69, 76, 31, 26, 27, 75, 75, 31, 75,
1.933 - 31, 31, 75, 26, 26, 26, 27, 30, 35, 79,
1.934 - 80, 31, 1, 1, 46, 46, 55, 57, 61, 72,
1.935 - 66, 72, 31, 77, 31, 31, 31, 31, 31, 79,
1.936 - 79, 32, 33, 77, 28, 34, 31, 31, 1, 12,
1.937 - 16, 17, 19, 20, 21, 22, 23, 24, 26, 31,
1.938 - 41, 47, 48, 70, 71, 73, 18, 19, 20, 21,
1.939 - 31, 41, 56, 71, 73, 40, 53, 76, 40, 54,
1.940 - 59, 65, 76, 31, 41, 73, 40, 54, 64, 65,
1.941 - 76, 31, 29, 79, 79, 80, 80, 31, 31, 25,
1.942 - 79, 79, 75, 74, 75, 79, 26, 80, 49, 1,
1.943 - 13, 31, 75, 74, 26, 79, 31, 31, 14, 78,
1.944 - 31, 78, 78, 78, 80, 26, 31, 31, 78, 31,
1.945 - 78, 31, 79, 31, 31, 31, 78, 34, 50, 31,
1.946 - 31, 31, 75
1.947 + 0, 36, 37, 0, 1, 3, 4, 5, 6, 7,
1.948 + 8, 9, 10, 11, 14, 15, 16, 17, 18, 19,
1.949 + 20, 21, 22, 25, 30, 38, 39, 41, 42, 43,
1.950 + 44, 50, 51, 53, 57, 59, 61, 62, 64, 66,
1.951 + 67, 68, 75, 30, 25, 26, 74, 74, 30, 74,
1.952 + 25, 80, 30, 74, 25, 25, 25, 26, 29, 34,
1.953 + 78, 79, 30, 1, 1, 45, 45, 54, 56, 60,
1.954 + 71, 65, 71, 30, 76, 30, 30, 30, 30, 30,
1.955 + 30, 78, 78, 31, 32, 76, 27, 33, 30, 30,
1.956 + 1, 12, 16, 18, 19, 20, 21, 22, 23, 25,
1.957 + 30, 40, 46, 47, 69, 70, 72, 17, 18, 19,
1.958 + 20, 30, 40, 55, 70, 72, 39, 52, 75, 39,
1.959 + 53, 58, 64, 75, 30, 40, 72, 39, 53, 63,
1.960 + 64, 75, 30, 28, 78, 78, 79, 79, 30, 30,
1.961 + 24, 74, 73, 74, 78, 25, 79, 48, 1, 13,
1.962 + 30, 74, 73, 25, 78, 14, 77, 30, 77, 77,
1.963 + 77, 79, 25, 30, 30, 77, 30, 77, 30, 78,
1.964 + 30, 30, 30, 77, 33, 49, 30, 30, 30, 74
1.965 };
1.966
1.967 #define yyerrok (yyerrstatus = 0)
1.968 @@ -761,7 +828,7 @@
1.969 yychar = (Token); \
1.970 yylval = (Value); \
1.971 yytoken = YYTRANSLATE (yychar); \
1.972 - YYPOPSTACK; \
1.973 + YYPOPSTACK (1); \
1.974 goto yybackup; \
1.975 } \
1.976 else \
1.977 @@ -769,7 +836,7 @@
1.978 yyerror (YY_("syntax error: cannot back up")); \
1.979 YYERROR; \
1.980 } \
1.981 -while (0)
1.982 +while (YYID (0))
1.983
1.984
1.985 #define YYTERROR 1
1.986 @@ -784,7 +851,7 @@
1.987 #ifndef YYLLOC_DEFAULT
1.988 # define YYLLOC_DEFAULT(Current, Rhs, N) \
1.989 do \
1.990 - if (N) \
1.991 + if (YYID (N)) \
1.992 { \
1.993 (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
1.994 (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
1.995 @@ -798,7 +865,7 @@
1.996 (Current).first_column = (Current).last_column = \
1.997 YYRHSLOC (Rhs, 0).last_column; \
1.998 } \
1.999 - while (0)
1.1000 + while (YYID (0))
1.1001 #endif
1.1002
1.1003
1.1004 @@ -810,8 +877,8 @@
1.1005 # if YYLTYPE_IS_TRIVIAL
1.1006 # define YY_LOCATION_PRINT(File, Loc) \
1.1007 fprintf (File, "%d.%d-%d.%d", \
1.1008 - (Loc).first_line, (Loc).first_column, \
1.1009 - (Loc).last_line, (Loc).last_column)
1.1010 + (Loc).first_line, (Loc).first_column, \
1.1011 + (Loc).last_line, (Loc).last_column)
1.1012 # else
1.1013 # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
1.1014 # endif
1.1015 @@ -838,36 +905,96 @@
1.1016 do { \
1.1017 if (yydebug) \
1.1018 YYFPRINTF Args; \
1.1019 -} while (0)
1.1020 +} while (YYID (0))
1.1021
1.1022 -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
1.1023 -do { \
1.1024 - if (yydebug) \
1.1025 - { \
1.1026 - YYFPRINTF (stderr, "%s ", Title); \
1.1027 - yysymprint (stderr, \
1.1028 - Type, Value); \
1.1029 - YYFPRINTF (stderr, "\n"); \
1.1030 - } \
1.1031 -} while (0)
1.1032 +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
1.1033 +do { \
1.1034 + if (yydebug) \
1.1035 + { \
1.1036 + YYFPRINTF (stderr, "%s ", Title); \
1.1037 + yy_symbol_print (stderr, \
1.1038 + Type, Value); \
1.1039 + YYFPRINTF (stderr, "\n"); \
1.1040 + } \
1.1041 +} while (YYID (0))
1.1042 +
1.1043 +
1.1044 +/*--------------------------------.
1.1045 +| Print this symbol on YYOUTPUT. |
1.1046 +`--------------------------------*/
1.1047 +
1.1048 +/*ARGSUSED*/
1.1049 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1050 + || defined __cplusplus || defined _MSC_VER)
1.1051 +static void
1.1052 +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
1.1053 +#else
1.1054 +static void
1.1055 +yy_symbol_value_print (yyoutput, yytype, yyvaluep)
1.1056 + FILE *yyoutput;
1.1057 + int yytype;
1.1058 + YYSTYPE const * const yyvaluep;
1.1059 +#endif
1.1060 +{
1.1061 + if (!yyvaluep)
1.1062 + return;
1.1063 +# ifdef YYPRINT
1.1064 + if (yytype < YYNTOKENS)
1.1065 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
1.1066 +# else
1.1067 + YYUSE (yyoutput);
1.1068 +# endif
1.1069 + switch (yytype)
1.1070 + {
1.1071 + default:
1.1072 + break;
1.1073 + }
1.1074 +}
1.1075 +
1.1076 +
1.1077 +/*--------------------------------.
1.1078 +| Print this symbol on YYOUTPUT. |
1.1079 +`--------------------------------*/
1.1080 +
1.1081 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1082 + || defined __cplusplus || defined _MSC_VER)
1.1083 +static void
1.1084 +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
1.1085 +#else
1.1086 +static void
1.1087 +yy_symbol_print (yyoutput, yytype, yyvaluep)
1.1088 + FILE *yyoutput;
1.1089 + int yytype;
1.1090 + YYSTYPE const * const yyvaluep;
1.1091 +#endif
1.1092 +{
1.1093 + if (yytype < YYNTOKENS)
1.1094 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
1.1095 + else
1.1096 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
1.1097 +
1.1098 + yy_symbol_value_print (yyoutput, yytype, yyvaluep);
1.1099 + YYFPRINTF (yyoutput, ")");
1.1100 +}
1.1101
1.1102 /*------------------------------------------------------------------.
1.1103 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
1.1104 | TOP (included). |
1.1105 `------------------------------------------------------------------*/
1.1106
1.1107 -#if defined (__STDC__) || defined (__cplusplus)
1.1108 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1109 + || defined __cplusplus || defined _MSC_VER)
1.1110 static void
1.1111 -yy_stack_print (short int *bottom, short int *top)
1.1112 +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
1.1113 #else
1.1114 static void
1.1115 yy_stack_print (bottom, top)
1.1116 - short int *bottom;
1.1117 - short int *top;
1.1118 + yytype_int16 *bottom;
1.1119 + yytype_int16 *top;
1.1120 #endif
1.1121 {
1.1122 YYFPRINTF (stderr, "Stack now");
1.1123 - for (/* Nothing. */; bottom <= top; ++bottom)
1.1124 + for (; bottom <= top; ++bottom)
1.1125 YYFPRINTF (stderr, " %d", *bottom);
1.1126 YYFPRINTF (stderr, "\n");
1.1127 }
1.1128 @@ -876,37 +1003,45 @@
1.1129 do { \
1.1130 if (yydebug) \
1.1131 yy_stack_print ((Bottom), (Top)); \
1.1132 -} while (0)
1.1133 +} while (YYID (0))
1.1134
1.1135
1.1136 /*------------------------------------------------.
1.1137 | Report that the YYRULE is going to be reduced. |
1.1138 `------------------------------------------------*/
1.1139
1.1140 -#if defined (__STDC__) || defined (__cplusplus)
1.1141 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1142 + || defined __cplusplus || defined _MSC_VER)
1.1143 static void
1.1144 -yy_reduce_print (int yyrule)
1.1145 +yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
1.1146 #else
1.1147 static void
1.1148 -yy_reduce_print (yyrule)
1.1149 +yy_reduce_print (yyvsp, yyrule)
1.1150 + YYSTYPE *yyvsp;
1.1151 int yyrule;
1.1152 #endif
1.1153 {
1.1154 + int yynrhs = yyr2[yyrule];
1.1155 int yyi;
1.1156 unsigned long int yylno = yyrline[yyrule];
1.1157 - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
1.1158 - yyrule - 1, yylno);
1.1159 - /* Print the symbols being reduced, and their result. */
1.1160 - for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
1.1161 - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
1.1162 - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
1.1163 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
1.1164 + yyrule - 1, yylno);
1.1165 + /* The symbols being reduced. */
1.1166 + for (yyi = 0; yyi < yynrhs; yyi++)
1.1167 + {
1.1168 + fprintf (stderr, " $%d = ", yyi + 1);
1.1169 + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
1.1170 + &(yyvsp[(yyi + 1) - (yynrhs)])
1.1171 + );
1.1172 + fprintf (stderr, "\n");
1.1173 + }
1.1174 }
1.1175
1.1176 # define YY_REDUCE_PRINT(Rule) \
1.1177 do { \
1.1178 if (yydebug) \
1.1179 - yy_reduce_print (Rule); \
1.1180 -} while (0)
1.1181 + yy_reduce_print (yyvsp, Rule); \
1.1182 +} while (YYID (0))
1.1183
1.1184 /* Nonzero means print parse trace. It is left uninitialized so that
1.1185 multiple parsers can coexist. */
1.1186 @@ -940,42 +1075,44 @@
1.1187 #if YYERROR_VERBOSE
1.1188
1.1189 # ifndef yystrlen
1.1190 -# if defined (__GLIBC__) && defined (_STRING_H)
1.1191 +# if defined __GLIBC__ && defined _STRING_H
1.1192 # define yystrlen strlen
1.1193 # else
1.1194 /* Return the length of YYSTR. */
1.1195 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1196 + || defined __cplusplus || defined _MSC_VER)
1.1197 static YYSIZE_T
1.1198 -# if defined (__STDC__) || defined (__cplusplus)
1.1199 yystrlen (const char *yystr)
1.1200 -# else
1.1201 +#else
1.1202 +static YYSIZE_T
1.1203 yystrlen (yystr)
1.1204 - const char *yystr;
1.1205 -# endif
1.1206 + const char *yystr;
1.1207 +#endif
1.1208 {
1.1209 - const char *yys = yystr;
1.1210 -
1.1211 - while (*yys++ != '\0')
1.1212 + YYSIZE_T yylen;
1.1213 + for (yylen = 0; yystr[yylen]; yylen++)
1.1214 continue;
1.1215 -
1.1216 - return yys - yystr - 1;
1.1217 + return yylen;
1.1218 }
1.1219 # endif
1.1220 # endif
1.1221
1.1222 # ifndef yystpcpy
1.1223 -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
1.1224 +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
1.1225 # define yystpcpy stpcpy
1.1226 # else
1.1227 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
1.1228 YYDEST. */
1.1229 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1230 + || defined __cplusplus || defined _MSC_VER)
1.1231 static char *
1.1232 -# if defined (__STDC__) || defined (__cplusplus)
1.1233 yystpcpy (char *yydest, const char *yysrc)
1.1234 -# else
1.1235 +#else
1.1236 +static char *
1.1237 yystpcpy (yydest, yysrc)
1.1238 - char *yydest;
1.1239 - const char *yysrc;
1.1240 -# endif
1.1241 + char *yydest;
1.1242 + const char *yysrc;
1.1243 +#endif
1.1244 {
1.1245 char *yyd = yydest;
1.1246 const char *yys = yysrc;
1.1247 @@ -1001,7 +1138,7 @@
1.1248 {
1.1249 if (*yystr == '"')
1.1250 {
1.1251 - size_t yyn = 0;
1.1252 + YYSIZE_T yyn = 0;
1.1253 char const *yyp = yystr;
1.1254
1.1255 for (;;)
1.1256 @@ -1036,53 +1173,123 @@
1.1257 }
1.1258 # endif
1.1259
1.1260 +/* Copy into YYRESULT an error message about the unexpected token
1.1261 + YYCHAR while in state YYSTATE. Return the number of bytes copied,
1.1262 + including the terminating null byte. If YYRESULT is null, do not
1.1263 + copy anything; just return the number of bytes that would be
1.1264 + copied. As a special case, return 0 if an ordinary "syntax error"
1.1265 + message will do. Return YYSIZE_MAXIMUM if overflow occurs during
1.1266 + size calculation. */
1.1267 +static YYSIZE_T
1.1268 +yysyntax_error (char *yyresult, int yystate, int yychar)
1.1269 +{
1.1270 + int yyn = yypact[yystate];
1.1271 +
1.1272 + if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
1.1273 + return 0;
1.1274 + else
1.1275 + {
1.1276 + int yytype = YYTRANSLATE (yychar);
1.1277 + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
1.1278 + YYSIZE_T yysize = yysize0;
1.1279 + YYSIZE_T yysize1;
1.1280 + int yysize_overflow = 0;
1.1281 + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
1.1282 + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
1.1283 + int yyx;
1.1284 +
1.1285 +# if 0
1.1286 + /* This is so xgettext sees the translatable formats that are
1.1287 + constructed on the fly. */
1.1288 + YY_("syntax error, unexpected %s");
1.1289 + YY_("syntax error, unexpected %s, expecting %s");
1.1290 + YY_("syntax error, unexpected %s, expecting %s or %s");
1.1291 + YY_("syntax error, unexpected %s, expecting %s or %s or %s");
1.1292 + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
1.1293 +# endif
1.1294 + char *yyfmt;
1.1295 + char const *yyf;
1.1296 + static char const yyunexpected[] = "syntax error, unexpected %s";
1.1297 + static char const yyexpecting[] = ", expecting %s";
1.1298 + static char const yyor[] = " or %s";
1.1299 + char yyformat[sizeof yyunexpected
1.1300 + + sizeof yyexpecting - 1
1.1301 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
1.1302 + * (sizeof yyor - 1))];
1.1303 + char const *yyprefix = yyexpecting;
1.1304 +
1.1305 + /* Start YYX at -YYN if negative to avoid negative indexes in
1.1306 + YYCHECK. */
1.1307 + int yyxbegin = yyn < 0 ? -yyn : 0;
1.1308 +
1.1309 + /* Stay within bounds of both yycheck and yytname. */
1.1310 + int yychecklim = YYLAST - yyn + 1;
1.1311 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
1.1312 + int yycount = 1;
1.1313 +
1.1314 + yyarg[0] = yytname[yytype];
1.1315 + yyfmt = yystpcpy (yyformat, yyunexpected);
1.1316 +
1.1317 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
1.1318 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
1.1319 + {
1.1320 + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
1.1321 + {
1.1322 + yycount = 1;
1.1323 + yysize = yysize0;
1.1324 + yyformat[sizeof yyunexpected - 1] = '\0';
1.1325 + break;
1.1326 + }
1.1327 + yyarg[yycount++] = yytname[yyx];
1.1328 + yysize1 = yysize + yytnamerr (0, yytname[yyx]);
1.1329 + yysize_overflow |= (yysize1 < yysize);
1.1330 + yysize = yysize1;
1.1331 + yyfmt = yystpcpy (yyfmt, yyprefix);
1.1332 + yyprefix = yyor;
1.1333 + }
1.1334 +
1.1335 + yyf = YY_(yyformat);
1.1336 + yysize1 = yysize + yystrlen (yyf);
1.1337 + yysize_overflow |= (yysize1 < yysize);
1.1338 + yysize = yysize1;
1.1339 +
1.1340 + if (yysize_overflow)
1.1341 + return YYSIZE_MAXIMUM;
1.1342 +
1.1343 + if (yyresult)
1.1344 + {
1.1345 + /* Avoid sprintf, as that infringes on the user's name space.
1.1346 + Don't have undefined behavior even if the translation
1.1347 + produced a string with the wrong number of "%s"s. */
1.1348 + char *yyp = yyresult;
1.1349 + int yyi = 0;
1.1350 + while ((*yyp = *yyf) != '\0')
1.1351 + {
1.1352 + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
1.1353 + {
1.1354 + yyp += yytnamerr (yyp, yyarg[yyi++]);
1.1355 + yyf += 2;
1.1356 + }
1.1357 + else
1.1358 + {
1.1359 + yyp++;
1.1360 + yyf++;
1.1361 + }
1.1362 + }
1.1363 + }
1.1364 + return yysize;
1.1365 + }
1.1366 +}
1.1367 #endif /* YYERROR_VERBOSE */
1.1368 -
1.1369
1.1370
1.1371 -#if YYDEBUG
1.1372 -/*--------------------------------.
1.1373 -| Print this symbol on YYOUTPUT. |
1.1374 -`--------------------------------*/
1.1375 -
1.1376 -#if defined (__STDC__) || defined (__cplusplus)
1.1377 -static void
1.1378 -yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
1.1379 -#else
1.1380 -static void
1.1381 -yysymprint (yyoutput, yytype, yyvaluep)
1.1382 - FILE *yyoutput;
1.1383 - int yytype;
1.1384 - YYSTYPE *yyvaluep;
1.1385 -#endif
1.1386 -{
1.1387 - /* Pacify ``unused variable'' warnings. */
1.1388 - (void) yyvaluep;
1.1389 -
1.1390 - if (yytype < YYNTOKENS)
1.1391 - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
1.1392 - else
1.1393 - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
1.1394 -
1.1395 -
1.1396 -# ifdef YYPRINT
1.1397 - if (yytype < YYNTOKENS)
1.1398 - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
1.1399 -# endif
1.1400 - switch (yytype)
1.1401 - {
1.1402 - default:
1.1403 - break;
1.1404 - }
1.1405 - YYFPRINTF (yyoutput, ")");
1.1406 -}
1.1407 -
1.1408 -#endif /* ! YYDEBUG */
1.1409 /*-----------------------------------------------.
1.1410 | Release the memory associated to this symbol. |
1.1411 `-----------------------------------------------*/
1.1412
1.1413 -#if defined (__STDC__) || defined (__cplusplus)
1.1414 +/*ARGSUSED*/
1.1415 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1416 + || defined __cplusplus || defined _MSC_VER)
1.1417 static void
1.1418 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
1.1419 #else
1.1420 @@ -1093,8 +1300,7 @@
1.1421 YYSTYPE *yyvaluep;
1.1422 #endif
1.1423 {
1.1424 - /* Pacify ``unused variable'' warnings. */
1.1425 - (void) yyvaluep;
1.1426 + YYUSE (yyvaluep);
1.1427
1.1428 if (!yymsg)
1.1429 yymsg = "Deleting";
1.1430 @@ -1102,39 +1308,39 @@
1.1431
1.1432 switch (yytype)
1.1433 {
1.1434 - case 52: /* "choice_entry" */
1.1435 + case 51: /* "choice_entry" */
1.1436
1.1437 - {
1.1438 + {
1.1439 fprintf(stderr, "%s:%d: missing end statement for this entry\n",
1.1440 (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
1.1441 if (current_menu == (yyvaluep->menu))
1.1442 menu_end_menu();
1.1443 };
1.1444
1.1445 - break;
1.1446 - case 58: /* "if_entry" */
1.1447 + break;
1.1448 + case 57: /* "if_entry" */
1.1449
1.1450 - {
1.1451 + {
1.1452 fprintf(stderr, "%s:%d: missing end statement for this entry\n",
1.1453 (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
1.1454 if (current_menu == (yyvaluep->menu))
1.1455 menu_end_menu();
1.1456 };
1.1457
1.1458 - break;
1.1459 - case 63: /* "menu_entry" */
1.1460 + break;
1.1461 + case 62: /* "menu_entry" */
1.1462
1.1463 - {
1.1464 + {
1.1465 fprintf(stderr, "%s:%d: missing end statement for this entry\n",
1.1466 (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
1.1467 if (current_menu == (yyvaluep->menu))
1.1468 menu_end_menu();
1.1469 };
1.1470
1.1471 - break;
1.1472 + break;
1.1473
1.1474 default:
1.1475 - break;
1.1476 + break;
1.1477 }
1.1478 }
1.1479
1.1480 @@ -1142,13 +1348,13 @@
1.1481 /* Prevent warnings from -Wmissing-prototypes. */
1.1482
1.1483 #ifdef YYPARSE_PARAM
1.1484 -# if defined (__STDC__) || defined (__cplusplus)
1.1485 +#if defined __STDC__ || defined __cplusplus
1.1486 int yyparse (void *YYPARSE_PARAM);
1.1487 -# else
1.1488 +#else
1.1489 int yyparse ();
1.1490 -# endif
1.1491 +#endif
1.1492 #else /* ! YYPARSE_PARAM */
1.1493 -#if defined (__STDC__) || defined (__cplusplus)
1.1494 +#if defined __STDC__ || defined __cplusplus
1.1495 int yyparse (void);
1.1496 #else
1.1497 int yyparse ();
1.1498 @@ -1173,20 +1379,24 @@
1.1499 `----------*/
1.1500
1.1501 #ifdef YYPARSE_PARAM
1.1502 -# if defined (__STDC__) || defined (__cplusplus)
1.1503 -int yyparse (void *YYPARSE_PARAM)
1.1504 -# else
1.1505 -int yyparse (YYPARSE_PARAM)
1.1506 - void *YYPARSE_PARAM;
1.1507 -# endif
1.1508 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1509 + || defined __cplusplus || defined _MSC_VER)
1.1510 +int
1.1511 +yyparse (void *YYPARSE_PARAM)
1.1512 +#else
1.1513 +int
1.1514 +yyparse (YYPARSE_PARAM)
1.1515 + void *YYPARSE_PARAM;
1.1516 +#endif
1.1517 #else /* ! YYPARSE_PARAM */
1.1518 -#if defined (__STDC__) || defined (__cplusplus)
1.1519 +#if (defined __STDC__ || defined __C99__FUNC__ \
1.1520 + || defined __cplusplus || defined _MSC_VER)
1.1521 int
1.1522 yyparse (void)
1.1523 #else
1.1524 int
1.1525 yyparse ()
1.1526 - ;
1.1527 +
1.1528 #endif
1.1529 #endif
1.1530 {
1.1531 @@ -1198,6 +1408,12 @@
1.1532 int yyerrstatus;
1.1533 /* Look-ahead token as an internal (translated) token number. */
1.1534 int yytoken = 0;
1.1535 +#if YYERROR_VERBOSE
1.1536 + /* Buffer for error messages, and its allocated size. */
1.1537 + char yymsgbuf[128];
1.1538 + char *yymsg = yymsgbuf;
1.1539 + YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
1.1540 +#endif
1.1541
1.1542 /* Three stacks and their tools:
1.1543 `yyss': related to states,
1.1544 @@ -1208,9 +1424,9 @@
1.1545 to reallocate them elsewhere. */
1.1546
1.1547 /* The state stack. */
1.1548 - short int yyssa[YYINITDEPTH];
1.1549 - short int *yyss = yyssa;
1.1550 - short int *yyssp;
1.1551 + yytype_int16 yyssa[YYINITDEPTH];
1.1552 + yytype_int16 *yyss = yyssa;
1.1553 + yytype_int16 *yyssp;
1.1554
1.1555 /* The semantic value stack. */
1.1556 YYSTYPE yyvsa[YYINITDEPTH];
1.1557 @@ -1219,7 +1435,7 @@
1.1558
1.1559
1.1560
1.1561 -#define YYPOPSTACK (yyvsp--, yyssp--)
1.1562 +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
1.1563
1.1564 YYSIZE_T yystacksize = YYINITDEPTH;
1.1565
1.1566 @@ -1228,9 +1444,9 @@
1.1567 YYSTYPE yyval;
1.1568
1.1569
1.1570 - /* When reducing, the number of symbols on the RHS of the reduced
1.1571 - rule. */
1.1572 - int yylen;
1.1573 + /* The number of symbols on the RHS of the reduced rule.
1.1574 + Keep to zero when no symbol should be popped. */
1.1575 + int yylen = 0;
1.1576
1.1577 YYDPRINTF ((stderr, "Starting parse\n"));
1.1578
1.1579 @@ -1254,8 +1470,7 @@
1.1580 `------------------------------------------------------------*/
1.1581 yynewstate:
1.1582 /* In all cases, when you get here, the value and location stacks
1.1583 - have just been pushed. so pushing a state here evens the stacks.
1.1584 - */
1.1585 + have just been pushed. So pushing a state here evens the stacks. */
1.1586 yyssp++;
1.1587
1.1588 yysetstate:
1.1589 @@ -1268,11 +1483,11 @@
1.1590
1.1591 #ifdef yyoverflow
1.1592 {
1.1593 - /* Give user a chance to reallocate the stack. Use copies of
1.1594 + /* Give user a chance to reallocate the stack. Use copies of
1.1595 these so that the &'s don't force the real ones into
1.1596 memory. */
1.1597 YYSTYPE *yyvs1 = yyvs;
1.1598 - short int *yyss1 = yyss;
1.1599 + yytype_int16 *yyss1 = yyss;
1.1600
1.1601
1.1602 /* Each stack pointer address is followed by the size of the
1.1603 @@ -1300,7 +1515,7 @@
1.1604 yystacksize = YYMAXDEPTH;
1.1605
1.1606 {
1.1607 - short int *yyss1 = yyss;
1.1608 + yytype_int16 *yyss1 = yyss;
1.1609 union yyalloc *yyptr =
1.1610 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
1.1611 if (! yyptr)
1.1612 @@ -1335,12 +1550,10 @@
1.1613 `-----------*/
1.1614 yybackup:
1.1615
1.1616 -/* Do appropriate processing given the current state. */
1.1617 -/* Read a look-ahead token if we need one and don't already have one. */
1.1618 -/* yyresume: */
1.1619 + /* Do appropriate processing given the current state. Read a
1.1620 + look-ahead token if we need one and don't already have one. */
1.1621
1.1622 /* First try to decide what to do without reference to look-ahead token. */
1.1623 -
1.1624 yyn = yypact[yystate];
1.1625 if (yyn == YYPACT_NINF)
1.1626 goto yydefault;
1.1627 @@ -1382,22 +1595,21 @@
1.1628 if (yyn == YYFINAL)
1.1629 YYACCEPT;
1.1630
1.1631 - /* Shift the look-ahead token. */
1.1632 - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
1.1633 -
1.1634 - /* Discard the token being shifted unless it is eof. */
1.1635 - if (yychar != YYEOF)
1.1636 - yychar = YYEMPTY;
1.1637 -
1.1638 - *++yyvsp = yylval;
1.1639 -
1.1640 -
1.1641 /* Count tokens shifted since error; after three, turn off error
1.1642 status. */
1.1643 if (yyerrstatus)
1.1644 yyerrstatus--;
1.1645
1.1646 + /* Shift the look-ahead token. */
1.1647 + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
1.1648 +
1.1649 + /* Discard the shifted token unless it is eof. */
1.1650 + if (yychar != YYEOF)
1.1651 + yychar = YYEMPTY;
1.1652 +
1.1653 yystate = yyn;
1.1654 + *++yyvsp = yylval;
1.1655 +
1.1656 goto yynewstate;
1.1657
1.1658
1.1659 @@ -1439,13 +1651,13 @@
1.1660
1.1661 case 9:
1.1662
1.1663 - { zconf_error("unknown statement \"%s\"", (yyvsp[-2].string)); ;}
1.1664 + { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;}
1.1665 break;
1.1666
1.1667 case 10:
1.1668
1.1669 {
1.1670 - zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[-2].id)->name);
1.1671 + zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
1.1672 ;}
1.1673 break;
1.1674
1.1675 @@ -1456,7 +1668,7 @@
1.1676
1.1677 case 25:
1.1678
1.1679 - { zconf_error("unknown option \"%s\"", (yyvsp[-2].string)); ;}
1.1680 + { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;}
1.1681 break;
1.1682
1.1683 case 26:
1.1684 @@ -1467,10 +1679,10 @@
1.1685 case 27:
1.1686
1.1687 {
1.1688 - struct symbol *sym = sym_lookup((yyvsp[-1].string), 0);
1.1689 + struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
1.1690 sym->flags |= SYMBOL_OPTIONAL;
1.1691 menu_add_entry(sym);
1.1692 - printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
1.1693 + printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
1.1694 ;}
1.1695 break;
1.1696
1.1697 @@ -1485,10 +1697,10 @@
1.1698 case 29:
1.1699
1.1700 {
1.1701 - struct symbol *sym = sym_lookup((yyvsp[-1].string), 0);
1.1702 + struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
1.1703 sym->flags |= SYMBOL_OPTIONAL;
1.1704 menu_add_entry(sym);
1.1705 - printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
1.1706 + printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
1.1707 ;}
1.1708 break;
1.1709
1.1710 @@ -1507,17 +1719,17 @@
1.1711 case 38:
1.1712
1.1713 {
1.1714 - menu_set_type((yyvsp[-2].id)->stype);
1.1715 + menu_set_type((yyvsp[(1) - (3)].id)->stype);
1.1716 printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
1.1717 zconf_curname(), zconf_lineno(),
1.1718 - (yyvsp[-2].id)->stype);
1.1719 + (yyvsp[(1) - (3)].id)->stype);
1.1720 ;}
1.1721 break;
1.1722
1.1723 case 39:
1.1724
1.1725 {
1.1726 - menu_add_prompt(P_PROMPT, (yyvsp[-2].string), (yyvsp[-1].expr));
1.1727 + menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
1.1728 printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
1.1729 ;}
1.1730 break;
1.1731 @@ -1525,19 +1737,19 @@
1.1732 case 40:
1.1733
1.1734 {
1.1735 - menu_add_expr(P_DEFAULT, (yyvsp[-2].expr), (yyvsp[-1].expr));
1.1736 - if ((yyvsp[-3].id)->stype != S_UNKNOWN)
1.1737 - menu_set_type((yyvsp[-3].id)->stype);
1.1738 + menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr));
1.1739 + if ((yyvsp[(1) - (4)].id)->stype != S_UNKNOWN)
1.1740 + menu_set_type((yyvsp[(1) - (4)].id)->stype);
1.1741 printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
1.1742 zconf_curname(), zconf_lineno(),
1.1743 - (yyvsp[-3].id)->stype);
1.1744 + (yyvsp[(1) - (4)].id)->stype);
1.1745 ;}
1.1746 break;
1.1747
1.1748 case 41:
1.1749
1.1750 {
1.1751 - menu_add_symbol(P_SELECT, sym_lookup((yyvsp[-2].string), 0), (yyvsp[-1].expr));
1.1752 + menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
1.1753 printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
1.1754 ;}
1.1755 break;
1.1756 @@ -1545,7 +1757,7 @@
1.1757 case 42:
1.1758
1.1759 {
1.1760 - menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[-3].symbol), (yyvsp[-2].symbol)), (yyvsp[-1].expr));
1.1761 + menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
1.1762 printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
1.1763 ;}
1.1764 break;
1.1765 @@ -1553,12 +1765,12 @@
1.1766 case 45:
1.1767
1.1768 {
1.1769 - struct kconf_id *id = kconf_id_lookup((yyvsp[-1].string), strlen((yyvsp[-1].string)));
1.1770 + struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string)));
1.1771 if (id && id->flags & TF_OPTION)
1.1772 - menu_add_option(id->token, (yyvsp[0].string));
1.1773 + menu_add_option(id->token, (yyvsp[(3) - (3)].string));
1.1774 else
1.1775 - zconfprint("warning: ignoring unknown option %s", (yyvsp[-1].string));
1.1776 - free((yyvsp[-1].string));
1.1777 + zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string));
1.1778 + free((yyvsp[(2) - (3)].string));
1.1779 ;}
1.1780 break;
1.1781
1.1782 @@ -1569,14 +1781,14 @@
1.1783
1.1784 case 47:
1.1785
1.1786 - { (yyval.string) = (yyvsp[0].string); ;}
1.1787 + { (yyval.string) = (yyvsp[(2) - (2)].string); ;}
1.1788 break;
1.1789
1.1790 case 48:
1.1791
1.1792 {
1.1793 - struct symbol *sym = sym_lookup(NULL, 0);
1.1794 - sym->flags |= SYMBOL_CHOICE;
1.1795 + struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE);
1.1796 + sym->flags |= SYMBOL_AUTO;
1.1797 menu_add_entry(sym);
1.1798 menu_add_expr(P_CHOICE, NULL, NULL);
1.1799 printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
1.1800 @@ -1593,7 +1805,7 @@
1.1801 case 50:
1.1802
1.1803 {
1.1804 - if (zconf_endtoken((yyvsp[0].id), T_CHOICE, T_ENDCHOICE)) {
1.1805 + if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) {
1.1806 menu_end_menu();
1.1807 printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
1.1808 }
1.1809 @@ -1603,7 +1815,7 @@
1.1810 case 58:
1.1811
1.1812 {
1.1813 - menu_add_prompt(P_PROMPT, (yyvsp[-2].string), (yyvsp[-1].expr));
1.1814 + menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
1.1815 printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
1.1816 ;}
1.1817 break;
1.1818 @@ -1611,11 +1823,11 @@
1.1819 case 59:
1.1820
1.1821 {
1.1822 - if ((yyvsp[-2].id)->stype == S_BOOLEAN || (yyvsp[-2].id)->stype == S_TRISTATE) {
1.1823 - menu_set_type((yyvsp[-2].id)->stype);
1.1824 + if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) {
1.1825 + menu_set_type((yyvsp[(1) - (3)].id)->stype);
1.1826 printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
1.1827 zconf_curname(), zconf_lineno(),
1.1828 - (yyvsp[-2].id)->stype);
1.1829 + (yyvsp[(1) - (3)].id)->stype);
1.1830 } else
1.1831 YYERROR;
1.1832 ;}
1.1833 @@ -1632,8 +1844,8 @@
1.1834 case 61:
1.1835
1.1836 {
1.1837 - if ((yyvsp[-3].id)->stype == S_UNKNOWN) {
1.1838 - menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[-2].string), 0), (yyvsp[-1].expr));
1.1839 + if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) {
1.1840 + menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
1.1841 printd(DEBUG_PARSE, "%s:%d:default\n",
1.1842 zconf_curname(), zconf_lineno());
1.1843 } else
1.1844 @@ -1646,7 +1858,7 @@
1.1845 {
1.1846 printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
1.1847 menu_add_entry(NULL);
1.1848 - menu_add_dep((yyvsp[-1].expr));
1.1849 + menu_add_dep((yyvsp[(2) - (3)].expr));
1.1850 (yyval.menu) = menu_add_menu();
1.1851 ;}
1.1852 break;
1.1853 @@ -1654,7 +1866,7 @@
1.1854 case 65:
1.1855
1.1856 {
1.1857 - if (zconf_endtoken((yyvsp[0].id), T_IF, T_ENDIF)) {
1.1858 + if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) {
1.1859 menu_end_menu();
1.1860 printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
1.1861 }
1.1862 @@ -1665,7 +1877,7 @@
1.1863
1.1864 {
1.1865 menu_add_entry(NULL);
1.1866 - menu_add_prompt(P_MENU, (yyvsp[-1].string), NULL);
1.1867 + menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
1.1868 printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
1.1869 ;}
1.1870 break;
1.1871 @@ -1680,7 +1892,7 @@
1.1872 case 73:
1.1873
1.1874 {
1.1875 - if (zconf_endtoken((yyvsp[0].id), T_MENU, T_ENDMENU)) {
1.1876 + if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) {
1.1877 menu_end_menu();
1.1878 printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
1.1879 }
1.1880 @@ -1690,8 +1902,8 @@
1.1881 case 79:
1.1882
1.1883 {
1.1884 - printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
1.1885 - zconf_nextfile((yyvsp[-1].string));
1.1886 + printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
1.1887 + zconf_nextfile((yyvsp[(2) - (3)].string));
1.1888 ;}
1.1889 break;
1.1890
1.1891 @@ -1699,7 +1911,7 @@
1.1892
1.1893 {
1.1894 menu_add_entry(NULL);
1.1895 - menu_add_prompt(P_COMMENT, (yyvsp[-1].string), NULL);
1.1896 + menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
1.1897 printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
1.1898 ;}
1.1899 break;
1.1900 @@ -1722,122 +1934,109 @@
1.1901 case 83:
1.1902
1.1903 {
1.1904 - current_entry->sym->help = (yyvsp[0].string);
1.1905 + current_entry->help = (yyvsp[(2) - (2)].string);
1.1906 ;}
1.1907 break;
1.1908
1.1909 case 88:
1.1910
1.1911 {
1.1912 - menu_add_dep((yyvsp[-1].expr));
1.1913 + menu_add_dep((yyvsp[(3) - (4)].expr));
1.1914 printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
1.1915 ;}
1.1916 break;
1.1917
1.1918 - case 89:
1.1919 -
1.1920 - {
1.1921 - menu_add_dep((yyvsp[-1].expr));
1.1922 - printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
1.1923 -;}
1.1924 - break;
1.1925 -
1.1926 case 90:
1.1927
1.1928 {
1.1929 - menu_add_dep((yyvsp[-1].expr));
1.1930 - printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
1.1931 + menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
1.1932 ;}
1.1933 break;
1.1934
1.1935 - case 92:
1.1936 + case 93:
1.1937
1.1938 - {
1.1939 - menu_add_prompt(P_PROMPT, (yyvsp[-1].string), (yyvsp[0].expr));
1.1940 -;}
1.1941 + { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
1.1942 + break;
1.1943 +
1.1944 + case 94:
1.1945 +
1.1946 + { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
1.1947 break;
1.1948
1.1949 case 95:
1.1950
1.1951 - { (yyval.id) = (yyvsp[-1].id); ;}
1.1952 + { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
1.1953 break;
1.1954
1.1955 - case 96:
1.1956 + case 98:
1.1957
1.1958 - { (yyval.id) = (yyvsp[-1].id); ;}
1.1959 + { (yyval.expr) = NULL; ;}
1.1960 break;
1.1961
1.1962 - case 97:
1.1963 + case 99:
1.1964
1.1965 - { (yyval.id) = (yyvsp[-1].id); ;}
1.1966 + { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
1.1967 break;
1.1968
1.1969 case 100:
1.1970
1.1971 - { (yyval.expr) = NULL; ;}
1.1972 + { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
1.1973 break;
1.1974
1.1975 case 101:
1.1976
1.1977 - { (yyval.expr) = (yyvsp[0].expr); ;}
1.1978 + { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
1.1979 break;
1.1980
1.1981 case 102:
1.1982
1.1983 - { (yyval.expr) = expr_alloc_symbol((yyvsp[0].symbol)); ;}
1.1984 + { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
1.1985 break;
1.1986
1.1987 case 103:
1.1988
1.1989 - { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[-2].symbol), (yyvsp[0].symbol)); ;}
1.1990 + { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
1.1991 break;
1.1992
1.1993 case 104:
1.1994
1.1995 - { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[-2].symbol), (yyvsp[0].symbol)); ;}
1.1996 + { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
1.1997 break;
1.1998
1.1999 case 105:
1.2000
1.2001 - { (yyval.expr) = (yyvsp[-1].expr); ;}
1.2002 + { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
1.2003 break;
1.2004
1.2005 case 106:
1.2006
1.2007 - { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[0].expr)); ;}
1.2008 + { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
1.2009 break;
1.2010
1.2011 case 107:
1.2012
1.2013 - { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;}
1.2014 + { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
1.2015 break;
1.2016
1.2017 case 108:
1.2018
1.2019 - { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[-2].expr), (yyvsp[0].expr)); ;}
1.2020 + { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
1.2021 break;
1.2022
1.2023 case 109:
1.2024
1.2025 - { (yyval.symbol) = sym_lookup((yyvsp[0].string), 0); free((yyvsp[0].string)); ;}
1.2026 + { (yyval.string) = NULL; ;}
1.2027 break;
1.2028
1.2029 - case 110:
1.2030
1.2031 - { (yyval.symbol) = sym_lookup((yyvsp[0].string), 1); free((yyvsp[0].string)); ;}
1.2032 - break;
1.2033 -
1.2034 +/* Line 1267 of yacc.c. */
1.2035
1.2036 default: break;
1.2037 }
1.2038 + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
1.2039
1.2040 -/* Line 1126 of yacc.c. */
1.2041 -
1.2042 -
1.2043 - yyvsp -= yylen;
1.2044 - yyssp -= yylen;
1.2045 -
1.2046 -
1.2047 + YYPOPSTACK (yylen);
1.2048 + yylen = 0;
1.2049 YY_STACK_PRINT (yyss, yyssp);
1.2050
1.2051 *++yyvsp = yyval;
1.2052 @@ -1866,110 +2065,41 @@
1.2053 if (!yyerrstatus)
1.2054 {
1.2055 ++yynerrs;
1.2056 -#if YYERROR_VERBOSE
1.2057 - yyn = yypact[yystate];
1.2058 +#if ! YYERROR_VERBOSE
1.2059 + yyerror (YY_("syntax error"));
1.2060 +#else
1.2061 + {
1.2062 + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
1.2063 + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
1.2064 + {
1.2065 + YYSIZE_T yyalloc = 2 * yysize;
1.2066 + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
1.2067 + yyalloc = YYSTACK_ALLOC_MAXIMUM;
1.2068 + if (yymsg != yymsgbuf)
1.2069 + YYSTACK_FREE (yymsg);
1.2070 + yymsg = (char *) YYSTACK_ALLOC (yyalloc);
1.2071 + if (yymsg)
1.2072 + yymsg_alloc = yyalloc;
1.2073 + else
1.2074 + {
1.2075 + yymsg = yymsgbuf;
1.2076 + yymsg_alloc = sizeof yymsgbuf;
1.2077 + }
1.2078 + }
1.2079
1.2080 - if (YYPACT_NINF < yyn && yyn < YYLAST)
1.2081 - {
1.2082 - int yytype = YYTRANSLATE (yychar);
1.2083 - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
1.2084 - YYSIZE_T yysize = yysize0;
1.2085 - YYSIZE_T yysize1;
1.2086 - int yysize_overflow = 0;
1.2087 - char *yymsg = 0;
1.2088 -# define YYERROR_VERBOSE_ARGS_MAXIMUM 5
1.2089 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
1.2090 - int yyx;
1.2091 -
1.2092 -#if 0
1.2093 - /* This is so xgettext sees the translatable formats that are
1.2094 - constructed on the fly. */
1.2095 - YY_("syntax error, unexpected %s");
1.2096 - YY_("syntax error, unexpected %s, expecting %s");
1.2097 - YY_("syntax error, unexpected %s, expecting %s or %s");
1.2098 - YY_("syntax error, unexpected %s, expecting %s or %s or %s");
1.2099 - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
1.2100 + if (0 < yysize && yysize <= yymsg_alloc)
1.2101 + {
1.2102 + (void) yysyntax_error (yymsg, yystate, yychar);
1.2103 + yyerror (yymsg);
1.2104 + }
1.2105 + else
1.2106 + {
1.2107 + yyerror (YY_("syntax error"));
1.2108 + if (yysize != 0)
1.2109 + goto yyexhaustedlab;
1.2110 + }
1.2111 + }
1.2112 #endif
1.2113 - char *yyfmt;
1.2114 - char const *yyf;
1.2115 - static char const yyunexpected[] = "syntax error, unexpected %s";
1.2116 - static char const yyexpecting[] = ", expecting %s";
1.2117 - static char const yyor[] = " or %s";
1.2118 - char yyformat[sizeof yyunexpected
1.2119 - + sizeof yyexpecting - 1
1.2120 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
1.2121 - * (sizeof yyor - 1))];
1.2122 - char const *yyprefix = yyexpecting;
1.2123 -
1.2124 - /* Start YYX at -YYN if negative to avoid negative indexes in
1.2125 - YYCHECK. */
1.2126 - int yyxbegin = yyn < 0 ? -yyn : 0;
1.2127 -
1.2128 - /* Stay within bounds of both yycheck and yytname. */
1.2129 - int yychecklim = YYLAST - yyn;
1.2130 - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
1.2131 - int yycount = 1;
1.2132 -
1.2133 - yyarg[0] = yytname[yytype];
1.2134 - yyfmt = yystpcpy (yyformat, yyunexpected);
1.2135 -
1.2136 - for (yyx = yyxbegin; yyx < yyxend; ++yyx)
1.2137 - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
1.2138 - {
1.2139 - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
1.2140 - {
1.2141 - yycount = 1;
1.2142 - yysize = yysize0;
1.2143 - yyformat[sizeof yyunexpected - 1] = '\0';
1.2144 - break;
1.2145 - }
1.2146 - yyarg[yycount++] = yytname[yyx];
1.2147 - yysize1 = yysize + yytnamerr (0, yytname[yyx]);
1.2148 - yysize_overflow |= yysize1 < yysize;
1.2149 - yysize = yysize1;
1.2150 - yyfmt = yystpcpy (yyfmt, yyprefix);
1.2151 - yyprefix = yyor;
1.2152 - }
1.2153 -
1.2154 - yyf = YY_(yyformat);
1.2155 - yysize1 = yysize + yystrlen (yyf);
1.2156 - yysize_overflow |= yysize1 < yysize;
1.2157 - yysize = yysize1;
1.2158 -
1.2159 - if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
1.2160 - yymsg = (char *) YYSTACK_ALLOC (yysize);
1.2161 - if (yymsg)
1.2162 - {
1.2163 - /* Avoid sprintf, as that infringes on the user's name space.
1.2164 - Don't have undefined behavior even if the translation
1.2165 - produced a string with the wrong number of "%s"s. */
1.2166 - char *yyp = yymsg;
1.2167 - int yyi = 0;
1.2168 - while ((*yyp = *yyf))
1.2169 - {
1.2170 - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
1.2171 - {
1.2172 - yyp += yytnamerr (yyp, yyarg[yyi++]);
1.2173 - yyf += 2;
1.2174 - }
1.2175 - else
1.2176 - {
1.2177 - yyp++;
1.2178 - yyf++;
1.2179 - }
1.2180 - }
1.2181 - yyerror (yymsg);
1.2182 - YYSTACK_FREE (yymsg);
1.2183 - }
1.2184 - else
1.2185 - {
1.2186 - yyerror (YY_("syntax error"));
1.2187 - goto yyexhaustedlab;
1.2188 - }
1.2189 - }
1.2190 - else
1.2191 -#endif /* YYERROR_VERBOSE */
1.2192 - yyerror (YY_("syntax error"));
1.2193 }
1.2194
1.2195
1.2196 @@ -1980,14 +2110,15 @@
1.2197 error, discard it. */
1.2198
1.2199 if (yychar <= YYEOF)
1.2200 - {
1.2201 + {
1.2202 /* Return failure if at end of input. */
1.2203 if (yychar == YYEOF)
1.2204 YYABORT;
1.2205 - }
1.2206 + }
1.2207 else
1.2208 {
1.2209 - yydestruct ("Error: discarding", yytoken, &yylval);
1.2210 + yydestruct ("Error: discarding",
1.2211 + yytoken, &yylval);
1.2212 yychar = YYEMPTY;
1.2213 }
1.2214 }
1.2215 @@ -2005,11 +2136,14 @@
1.2216 /* Pacify compilers like GCC when the user code never invokes
1.2217 YYERROR and the label yyerrorlab therefore never appears in user
1.2218 code. */
1.2219 - if (0)
1.2220 + if (/*CONSTCOND*/ 0)
1.2221 goto yyerrorlab;
1.2222
1.2223 -yyvsp -= yylen;
1.2224 - yyssp -= yylen;
1.2225 + /* Do not reclaim the symbols of the rule which action triggered
1.2226 + this YYERROR. */
1.2227 + YYPOPSTACK (yylen);
1.2228 + yylen = 0;
1.2229 + YY_STACK_PRINT (yyss, yyssp);
1.2230 yystate = *yyssp;
1.2231 goto yyerrlab1;
1.2232
1.2233 @@ -2039,8 +2173,9 @@
1.2234 YYABORT;
1.2235
1.2236
1.2237 - yydestruct ("Error: popping", yystos[yystate], yyvsp);
1.2238 - YYPOPSTACK;
1.2239 + yydestruct ("Error: popping",
1.2240 + yystos[yystate], yyvsp);
1.2241 + YYPOPSTACK (1);
1.2242 yystate = *yyssp;
1.2243 YY_STACK_PRINT (yyss, yyssp);
1.2244 }
1.2245 @@ -2051,7 +2186,7 @@
1.2246 *++yyvsp = yylval;
1.2247
1.2248
1.2249 - /* Shift the error token. */
1.2250 + /* Shift the error token. */
1.2251 YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
1.2252
1.2253 yystate = yyn;
1.2254 @@ -2086,17 +2221,26 @@
1.2255 if (yychar != YYEOF && yychar != YYEMPTY)
1.2256 yydestruct ("Cleanup: discarding lookahead",
1.2257 yytoken, &yylval);
1.2258 + /* Do not reclaim the symbols of the rule which action triggered
1.2259 + this YYABORT or YYACCEPT. */
1.2260 + YYPOPSTACK (yylen);
1.2261 + YY_STACK_PRINT (yyss, yyssp);
1.2262 while (yyssp != yyss)
1.2263 {
1.2264 yydestruct ("Cleanup: popping",
1.2265 yystos[*yyssp], yyvsp);
1.2266 - YYPOPSTACK;
1.2267 + YYPOPSTACK (1);
1.2268 }
1.2269 #ifndef yyoverflow
1.2270 if (yyss != yyssa)
1.2271 YYSTACK_FREE (yyss);
1.2272 #endif
1.2273 - return yyresult;
1.2274 +#if YYERROR_VERBOSE
1.2275 + if (yymsg != yymsgbuf)
1.2276 + YYSTACK_FREE (yymsg);
1.2277 +#endif
1.2278 + /* Make sure YYID is used. */
1.2279 + return YYID (yyresult);
1.2280 }
1.2281
1.2282
1.2283 @@ -2115,7 +2259,7 @@
1.2284 modules_sym = sym_lookup(NULL, 0);
1.2285 modules_sym->type = S_BOOLEAN;
1.2286 modules_sym->flags |= SYMBOL_AUTO;
1.2287 - rootmenu.prompt = menu_add_prompt(P_MENU, PROJECT_NAME" Configuration", NULL);
1.2288 + rootmenu.prompt = menu_add_prompt(P_MENU, PACKAGE, NULL);
1.2289
1.2290 #if YYDEBUG
1.2291 if (getenv("ZCONF_DEBUG"))
1.2292 @@ -2132,9 +2276,11 @@
1.2293 }
1.2294 menu_finalize(&rootmenu);
1.2295 for_all_symbols(i, sym) {
1.2296 - sym_check_deps(sym);
1.2297 + if (sym_check_deps(sym))
1.2298 + zconfnerrs++;
1.2299 }
1.2300 -
1.2301 + if (zconfnerrs)
1.2302 + exit(1);
1.2303 sym_set_change_count(1);
1.2304 }
1.2305
1.2306 @@ -2278,11 +2424,11 @@
1.2307 break;
1.2308 }
1.2309 }
1.2310 - if (sym->help) {
1.2311 - int len = strlen(sym->help);
1.2312 - while (sym->help[--len] == '\n')
1.2313 - sym->help[len] = 0;
1.2314 - fprintf(out, " help\n%s\n", sym->help);
1.2315 + if (menu->help) {
1.2316 + int len = strlen(menu->help);
1.2317 + while (menu->help[--len] == '\n')
1.2318 + menu->help[len] = 0;
1.2319 + fprintf(out, " help\n%s\n", menu->help);
1.2320 }
1.2321 fputc('\n', out);
1.2322 }
1.2323 @@ -2342,4 +2488,3 @@
1.2324 #include "symbol.c"
1.2325 #include "menu.c"
1.2326
1.2327 -