Skip to content

L
linux
Commit c80de52d authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Michal Marek
Browse files
Options

kconfig: regenerate bison parser 

Regenerate bison parser after changes made in:
    6902dccf: kconfig: do not special-case 'MODULES' symbol
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 6902dccf
Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 264 deletions
scripts/kconfig/zconf.tab.c_shipped
View file @ c80de52d
/* A Bison parser, made by GNU Bison 2.4.3. */ /* A Bison parser, made by GNU Bison 2.5. */
/* Skeleton implementation for Bison's Yacc-like parsers in C /* Bison implementation for Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -45,7 +44,7 @@ ...@@ -45,7 +44,7 @@
#define YYBISON 1 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "2.4.3" #define YYBISON_VERSION "2.5"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #define YYSKELETON_NAME "yacc.c"
...@@ -302,11 +301,11 @@ YYID (yyi) ...@@ -302,11 +301,11 @@ YYID (yyi)
# define alloca _alloca # define alloca _alloca
# else # else
# define YYSTACK_ALLOC alloca # define YYSTACK_ALLOC alloca
# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER) || defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H # ifndef EXIT_SUCCESS
# define _STDLIB_H 1 # define EXIT_SUCCESS 0
# endif # endif
# endif # endif
# endif # endif
...@@ -329,24 +328,24 @@ YYID (yyi) ...@@ -329,24 +328,24 @@ YYID (yyi)
# ifndef YYSTACK_ALLOC_MAXIMUM # ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif # endif
# if (defined __cplusplus && ! defined _STDLIB_H \ # if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \ && ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free))) && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef _STDLIB_H # ifndef EXIT_SUCCESS
# define _STDLIB_H 1 # define EXIT_SUCCESS 0
# endif # endif
# endif # endif
# ifndef YYMALLOC # ifndef YYMALLOC
# define YYMALLOC malloc # define YYMALLOC malloc
# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ # if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER) || defined __cplusplus || defined _MSC_VER)
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif # endif
# endif # endif
# ifndef YYFREE # ifndef YYFREE
# define YYFREE free # define YYFREE free
# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ # if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER) || defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */ void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif # endif
...@@ -375,23 +374,7 @@ union yyalloc ...@@ -375,23 +374,7 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM) + YYSTACK_GAP_MAXIMUM)
/* Copy COUNT objects from FROM to TO. The source and destination do # define YYCOPY_NEEDED 1
not overlap. */
# ifndef YYCOPY
# if defined __GNUC__ && 1 < __GNUC__
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
# define YYCOPY(To, From, Count) \
do \
{ \
YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
while (YYID (0))
# endif
# endif
/* Relocate STACK from its old location to the new one. The /* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of local variables YYSIZE and YYSTACKSIZE give the old and new number of
...@@ -411,6 +394,26 @@ union yyalloc ...@@ -411,6 +394,26 @@ union yyalloc
#endif #endif
#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
/* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */
# ifndef YYCOPY
# if defined __GNUC__ && 1 < __GNUC__
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
# define YYCOPY(To, From, Count) \
do \
{ \
YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
while (YYID (0))
# endif
# endif
#endif /* !YYCOPY_NEEDED */
/* YYFINAL -- State number of the termination state. */ /* YYFINAL -- State number of the termination state. */
#define YYFINAL 11 #define YYFINAL 11
/* YYLAST -- Last index in YYTABLE. */ /* YYLAST -- Last index in YYTABLE. */
...@@ -529,18 +532,18 @@ static const yytype_int8 yyrhs[] = ...@@ -529,18 +532,18 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 104, 104, 104, 106, 106, 108, 110, 111, 112, 0, 103, 103, 103, 105, 105, 107, 109, 110, 111,
113, 114, 115, 119, 123, 123, 123, 123, 123, 123, 112, 113, 114, 118, 122, 122, 122, 122, 122, 122,
123, 123, 127, 128, 129, 130, 131, 132, 136, 137, 122, 122, 126, 127, 128, 129, 130, 131, 135, 136,
143, 151, 157, 165, 175, 177, 178, 179, 180, 181, 142, 150, 156, 164, 174, 176, 177, 178, 179, 180,
182, 185, 193, 199, 209, 215, 221, 224, 226, 237, 181, 184, 192, 198, 208, 214, 220, 223, 225, 236,
238, 243, 252, 257, 265, 268, 270, 271, 272, 273, 237, 242, 251, 256, 264, 267, 269, 270, 271, 272,
274, 277, 283, 294, 300, 310, 312, 317, 325, 333, 273, 276, 282, 293, 299, 309, 311, 316, 324, 332,
336, 338, 339, 340, 345, 352, 359, 364, 372, 375, 335, 337, 338, 339, 344, 351, 358, 363, 371, 374,
377, 378, 379, 382, 390, 397, 404, 410, 417, 419, 376, 377, 378, 381, 389, 396, 403, 409, 416, 418,
420, 421, 424, 432, 434, 435, 438, 445, 447, 452, 419, 420, 423, 431, 433, 434, 437, 444, 446, 451,
453, 456, 457, 458, 462, 463, 466, 467, 470, 471, 452, 455, 456, 457, 461, 462, 465, 466, 469, 470,
472, 473, 474, 475, 476, 479, 480, 483, 484 471, 472, 473, 474, 475, 478, 479, 482, 483
}; };
#endif #endif
...@@ -615,8 +618,8 @@ static const yytype_uint8 yyr2[] = ...@@ -615,8 +618,8 @@ static const yytype_uint8 yyr2[] =
3, 3, 2, 3, 3, 1, 1, 0, 1 3, 3, 2, 3, 3, 1, 1, 0, 1
}; };
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
STATE-NUM when YYTABLE doesn't specify something else to do. Zero Performed when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */ means the default is an error. */
static const yytype_uint8 yydefact[] = static const yytype_uint8 yydefact[] =
{ {
...@@ -691,8 +694,7 @@ static const yytype_int16 yypgoto[] = ...@@ -691,8 +694,7 @@ static const yytype_int16 yypgoto[] =
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says. number is the opposite. If YYTABLE_NINF, syntax error. */
If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -86 #define YYTABLE_NINF -86
static const yytype_int16 yytable[] = static const yytype_int16 yytable[] =
{ {
...@@ -728,6 +730,12 @@ static const yytype_int16 yytable[] = ...@@ -728,6 +730,12 @@ static const yytype_int16 yytable[] =
184 184
}; };
#define yypact_value_is_default(yystate) \
((yystate) == (-90))
#define yytable_value_is_error(yytable_value) \
YYID (0)
static const yytype_int16 yycheck[] = static const yytype_int16 yycheck[] =
{ {
1, 67, 68, 10, 93, 94, 76, 3, 76, 14, 1, 67, 68, 10, 93, 94, 76, 3, 76, 14,
...@@ -821,7 +829,6 @@ do \ ...@@ -821,7 +829,6 @@ do \
{ \ { \
yychar = (Token); \ yychar = (Token); \
yylval = (Value); \ yylval = (Value); \
yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \ YYPOPSTACK (1); \
goto yybackup; \ goto yybackup; \
} \ } \
...@@ -863,19 +870,10 @@ while (YYID (0)) ...@@ -863,19 +870,10 @@ while (YYID (0))
#endif #endif
/* YY_LOCATION_PRINT -- Print the location on the stream. /* This macro is provided for backward compatibility. */
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 #ifndef YY_LOCATION_PRINT
# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
(Loc).last_line, (Loc).last_column)
# else
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
#endif #endif
...@@ -1067,7 +1065,6 @@ int yydebug; ...@@ -1067,7 +1065,6 @@ int yydebug;
# define YYMAXDEPTH 10000 # define YYMAXDEPTH 10000
#endif #endif
#if YYERROR_VERBOSE #if YYERROR_VERBOSE
...@@ -1170,115 +1167,142 @@ yytnamerr (char *yyres, const char *yystr) ...@@ -1170,115 +1167,142 @@ yytnamerr (char *yyres, const char *yystr)
} }
# endif # endif
/* Copy into YYRESULT an error message about the unexpected token /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
YYCHAR while in state YYSTATE. Return the number of bytes copied, about the unexpected token YYTOKEN for the state stack whose top is
including the terminating null byte. If YYRESULT is null, do not YYSSP.
copy anything; just return the number of bytes that would be
copied. As a special case, return 0 if an ordinary "syntax error"
message will do. Return YYSIZE_MAXIMUM if overflow occurs during
size calculation. */
static YYSIZE_T
yysyntax_error (char *yyresult, int yystate, int yychar)
{
int yyn = yypact[yystate];
if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
return 0; not large enough to hold the message. In that case, also set
else *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)
{
YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
YYSIZE_T yysize1;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
const char *yyformat = 0;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
"expected"). */
int yycount = 0;
/* There are many possibilities here to consider:
- Assume YYFAIL is not used. It's too flawed to consider. See
<http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
for details. YYERROR is fine as it does not invoke this
function.
- If this state is a consistent state with a default action, then
the only way this function was invoked is if the default action
is an error action. In that case, don't check for expected
tokens because there are none.
- The only way there can be no lookahead present (in yychar) is if
this state is a consistent state with a default action. Thus,
detecting the absence of a lookahead is sufficient to determine
that there is no unexpected or expected token to report. In that
case, just report a simple "syntax error".
- Don't assume there isn't a lookahead just because this state is a
consistent state with a default action. There might have been a
previous inconsistent state, consistent state with a non-default
action, or user semantic action that manipulated yychar.
- Of course, the expected token list depends on states to have
correct lookahead information, and it depends on the parser not
to perform extra reductions after fetching a lookahead from the
scanner and before detecting a syntax error. Thus, state merging
(from LALR or IELR) and default reductions corrupt the expected
token list. However, the list is correct for canonical LR with
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 yytype = YYTRANSLATE (yychar); int yyn = yypact[*yyssp];
YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); yyarg[yycount++] = yytname[yytoken];
YYSIZE_T yysize = yysize0; if (!yypact_value_is_default (yyn))
YYSIZE_T yysize1; {
int yysize_overflow = 0; /* Start YYX at -YYN if negative to avoid negative indexes in
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; YYCHECK. In other words, skip the first -YYN actions for
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; this state because they are default actions. */
int yyx; int yyxbegin = yyn < 0 ? -yyn : 0;
/* Stay within bounds of both yycheck and yytname. */
# if 0 int yychecklim = YYLAST - yyn + 1;
/* This is so xgettext sees the translatable formats that are int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
constructed on the fly. */ int yyx;
YY_("syntax error, unexpected %s");
YY_("syntax error, unexpected %s, expecting %s"); for (yyx = yyxbegin; yyx < yyxend; ++yyx)
YY_("syntax error, unexpected %s, expecting %s or %s"); if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
YY_("syntax error, unexpected %s, expecting %s or %s or %s"); && !yytable_value_is_error (yytable[yyx + yyn]))
YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); {
# endif if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
char *yyfmt; {
char const *yyf; yycount = 1;
static char const yyunexpected[] = "syntax error, unexpected %s"; yysize = yysize0;
static char const yyexpecting[] = ", expecting %s"; break;
static char const yyor[] = " or %s"; }
char yyformat[sizeof yyunexpected yyarg[yycount++] = yytname[yyx];
+ sizeof yyexpecting - 1 yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) if (! (yysize <= yysize1
* (sizeof yyor - 1))]; && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
char const *yyprefix = yyexpecting; return 2;
yysize = yysize1;
/* Start YYX at -YYN if negative to avoid negative indexes in }
YYCHECK. */ }
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 yycount = 1;
yyarg[0] = yytname[yytype];
yyfmt = yystpcpy (yyformat, yyunexpected);
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
{
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{
yycount = 1;
yysize = yysize0;
yyformat[sizeof yyunexpected - 1] = '\0';
break;
}
yyarg[yycount++] = yytname[yyx];
yysize1 = yysize + yytnamerr (0, yytname[yyx]);
yysize_overflow |= (yysize1 < yysize);
yysize = yysize1;
yyfmt = yystpcpy (yyfmt, yyprefix);
yyprefix = yyor;
}
yyf = YY_(yyformat); switch (yycount)
yysize1 = yysize + yystrlen (yyf); {
yysize_overflow |= (yysize1 < yysize); # define YYCASE_(N, S) \
yysize = yysize1; case N: \
yyformat = S; \
break
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_
}
if (yysize_overflow) yysize1 = yysize + yystrlen (yyformat);
return YYSIZE_MAXIMUM; if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
return 2;
yysize = yysize1;
if (yyresult) if (*yymsg_alloc < yysize)
{ {
/* Avoid sprintf, as that infringes on the user's name space. *yymsg_alloc = 2 * yysize;
Don't have undefined behavior even if the translation if (! (yysize <= *yymsg_alloc
produced a string with the wrong number of "%s"s. */ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
char *yyp = yyresult; *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
int yyi = 0; return 1;
while ((*yyp = *yyf) != '\0')
{
if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
{
yyp += yytnamerr (yyp, yyarg[yyi++]);
yyf += 2;
}
else
{
yyp++;
yyf++;
}
}
}
return yysize;
} }
/* Avoid sprintf, as that infringes on the user's name space.
Don't have undefined behavior even if the translation
produced a string with the wrong number of "%s"s. */
{
char *yyp = *yymsg;
int yyi = 0;
while ((*yyp = *yyformat) != '\0')
if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
{
yyp += yytnamerr (yyp, yyarg[yyi++]);
yyformat += 2;
}
else
{
yyp++;
yyformat++;
}
}
return 0;
} }
#endif /* YYERROR_VERBOSE */ #endif /* YYERROR_VERBOSE */
/*-----------------------------------------------. /*-----------------------------------------------.
| Release the memory associated to this symbol. | | Release the memory associated to this symbol. |
...@@ -1341,6 +1365,7 @@ yydestruct (yymsg, yytype, yyvaluep) ...@@ -1341,6 +1365,7 @@ yydestruct (yymsg, yytype, yyvaluep)
} }
} }
/* Prevent warnings from -Wmissing-prototypes. */ /* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM #ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus #if defined __STDC__ || defined __cplusplus
...@@ -1367,10 +1392,9 @@ YYSTYPE yylval; ...@@ -1367,10 +1392,9 @@ YYSTYPE yylval;
int yynerrs; int yynerrs;
/*----------.
/*-------------------------. | yyparse. |
| yyparse or yypush_parse. | `----------*/
`-------------------------*/
#ifdef YYPARSE_PARAM #ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \ #if (defined __STDC__ || defined __C99__FUNC__ \
...@@ -1394,8 +1418,6 @@ yyparse () ...@@ -1394,8 +1418,6 @@ yyparse ()
#endif #endif
#endif #endif
{ {
int yystate; int yystate;
/* Number of tokens to shift before error messages enabled. */ /* Number of tokens to shift before error messages enabled. */
int yyerrstatus; int yyerrstatus;
...@@ -1550,7 +1572,7 @@ yybackup: ...@@ -1550,7 +1572,7 @@ yybackup:
/* First try to decide what to do without reference to lookahead token. */ /* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate]; yyn = yypact[yystate];
if (yyn == YYPACT_NINF) if (yypact_value_is_default (yyn))
goto yydefault; goto yydefault;
/* Not known => get a lookahead token if don't already have one. */ /* Not known => get a lookahead token if don't already have one. */
...@@ -1581,8 +1603,8 @@ yybackup: ...@@ -1581,8 +1603,8 @@ yybackup:
yyn = yytable[yyn]; yyn = yytable[yyn];
if (yyn <= 0) if (yyn <= 0)
{ {
if (yyn == 0 || yyn == YYTABLE_NINF) if (yytable_value_is_error (yyn))
goto yyerrlab; goto yyerrlab;
yyn = -yyn; yyn = -yyn;
goto yyreduce; goto yyreduce;
} }
...@@ -1637,34 +1659,34 @@ yyreduce: ...@@ -1637,34 +1659,34 @@ yyreduce:
{ {
case 10: case 10:
{ zconf_error("unexpected end statement"); ;} { zconf_error("unexpected end statement"); }
break; break;
case 11: case 11:
{ zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;} { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); }
break; break;
case 12: case 12:
{ {
zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name); zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
;} }
break; break;
case 13: case 13:
{ zconf_error("invalid statement"); ;} { zconf_error("invalid statement"); }
break; break;
case 28: case 28:
{ zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;} { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); }
break; break;
case 29: case 29:
{ zconf_error("invalid option"); ;} { zconf_error("invalid option"); }
break; break;
case 30: case 30:
...@@ -1674,7 +1696,7 @@ yyreduce: ...@@ -1674,7 +1696,7 @@ yyreduce:
sym->flags |= SYMBOL_OPTIONAL; sym->flags |= SYMBOL_OPTIONAL;
menu_add_entry(sym); menu_add_entry(sym);
printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
;} }
break; break;
case 31: case 31:
...@@ -1682,7 +1704,7 @@ yyreduce: ...@@ -1682,7 +1704,7 @@ yyreduce:
{ {
menu_end_entry(); menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 32: case 32:
...@@ -1692,7 +1714,7 @@ yyreduce: ...@@ -1692,7 +1714,7 @@ yyreduce:
sym->flags |= SYMBOL_OPTIONAL; sym->flags |= SYMBOL_OPTIONAL;
menu_add_entry(sym); menu_add_entry(sym);
printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
;} }
break; break;
case 33: case 33:
...@@ -1704,7 +1726,7 @@ yyreduce: ...@@ -1704,7 +1726,7 @@ yyreduce:
zconfprint("warning: menuconfig statement without prompt"); zconfprint("warning: menuconfig statement without prompt");
menu_end_entry(); menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 41: case 41:
...@@ -1714,7 +1736,7 @@ yyreduce: ...@@ -1714,7 +1736,7 @@ yyreduce:
printd(DEBUG_PARSE, "%s:%d:type(%u)\n", printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
zconf_curname(), zconf_lineno(), zconf_curname(), zconf_lineno(),
(yyvsp[(1) - (3)].id)->stype); (yyvsp[(1) - (3)].id)->stype);
;} }
break; break;
case 42: case 42:
...@@ -1722,7 +1744,7 @@ yyreduce: ...@@ -1722,7 +1744,7 @@ yyreduce:
{ {
menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 43: case 43:
...@@ -1734,7 +1756,7 @@ yyreduce: ...@@ -1734,7 +1756,7 @@ yyreduce:
printd(DEBUG_PARSE, "%s:%d:default(%u)\n", printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
zconf_curname(), zconf_lineno(), zconf_curname(), zconf_lineno(),
(yyvsp[(1) - (4)].id)->stype); (yyvsp[(1) - (4)].id)->stype);
;} }
break; break;
case 44: case 44:
...@@ -1742,7 +1764,7 @@ yyreduce: ...@@ -1742,7 +1764,7 @@ yyreduce:
{ {
menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr)); menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 45: case 45:
...@@ -1750,7 +1772,7 @@ yyreduce: ...@@ -1750,7 +1772,7 @@ yyreduce:
{ {
menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr)); menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 48: case 48:
...@@ -1762,17 +1784,17 @@ yyreduce: ...@@ -1762,17 +1784,17 @@ yyreduce:
else else
zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string)); zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string));
free((yyvsp[(2) - (3)].string)); free((yyvsp[(2) - (3)].string));
;} }
break; break;
case 49: case 49:
{ (yyval.string) = NULL; ;} { (yyval.string) = NULL; }
break; break;
case 50: case 50:
{ (yyval.string) = (yyvsp[(2) - (2)].string); ;} { (yyval.string) = (yyvsp[(2) - (2)].string); }
break; break;
case 51: case 51:
...@@ -1783,14 +1805,14 @@ yyreduce: ...@@ -1783,14 +1805,14 @@ yyreduce:
menu_add_entry(sym); menu_add_entry(sym);
menu_add_expr(P_CHOICE, NULL, NULL); menu_add_expr(P_CHOICE, NULL, NULL);
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 52: case 52:
{ {
(yyval.menu) = menu_add_menu(); (yyval.menu) = menu_add_menu();
;} }
break; break;
case 53: case 53:
...@@ -1800,7 +1822,7 @@ yyreduce: ...@@ -1800,7 +1822,7 @@ yyreduce:
menu_end_menu(); menu_end_menu();
printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
} }
;} }
break; break;
case 61: case 61:
...@@ -1808,7 +1830,7 @@ yyreduce: ...@@ -1808,7 +1830,7 @@ yyreduce:
{ {
menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 62: case 62:
...@@ -1821,7 +1843,7 @@ yyreduce: ...@@ -1821,7 +1843,7 @@ yyreduce:
(yyvsp[(1) - (3)].id)->stype); (yyvsp[(1) - (3)].id)->stype);
} else } else
YYERROR; YYERROR;
;} }
break; break;
case 63: case 63:
...@@ -1829,7 +1851,7 @@ yyreduce: ...@@ -1829,7 +1851,7 @@ yyreduce:
{ {
current_entry->sym->flags |= SYMBOL_OPTIONAL; current_entry->sym->flags |= SYMBOL_OPTIONAL;
printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 64: case 64:
...@@ -1841,7 +1863,7 @@ yyreduce: ...@@ -1841,7 +1863,7 @@ yyreduce:
zconf_curname(), zconf_lineno()); zconf_curname(), zconf_lineno());
} else } else
YYERROR; YYERROR;
;} }
break; break;
case 67: case 67:
...@@ -1851,7 +1873,7 @@ yyreduce: ...@@ -1851,7 +1873,7 @@ yyreduce:
menu_add_entry(NULL); menu_add_entry(NULL);
menu_add_dep((yyvsp[(2) - (3)].expr)); menu_add_dep((yyvsp[(2) - (3)].expr));
(yyval.menu) = menu_add_menu(); (yyval.menu) = menu_add_menu();
;} }
break; break;
case 68: case 68:
...@@ -1861,14 +1883,14 @@ yyreduce: ...@@ -1861,14 +1883,14 @@ yyreduce:
menu_end_menu(); menu_end_menu();
printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
} }
;} }
break; break;
case 74: case 74:
{ {
menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL); menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
;} }
break; break;
case 75: case 75:
...@@ -1877,14 +1899,14 @@ yyreduce: ...@@ -1877,14 +1899,14 @@ yyreduce:
menu_add_entry(NULL); menu_add_entry(NULL);
menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL); menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 76: case 76:
{ {
(yyval.menu) = menu_add_menu(); (yyval.menu) = menu_add_menu();
;} }
break; break;
case 77: case 77:
...@@ -1894,7 +1916,7 @@ yyreduce: ...@@ -1894,7 +1916,7 @@ yyreduce:
menu_end_menu(); menu_end_menu();
printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
} }
;} }
break; break;
case 83: case 83:
...@@ -1902,7 +1924,7 @@ yyreduce: ...@@ -1902,7 +1924,7 @@ yyreduce:
{ {
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
zconf_nextfile((yyvsp[(2) - (3)].string)); zconf_nextfile((yyvsp[(2) - (3)].string));
;} }
break; break;
case 84: case 84:
...@@ -1911,14 +1933,14 @@ yyreduce: ...@@ -1911,14 +1933,14 @@ yyreduce:
menu_add_entry(NULL); menu_add_entry(NULL);
menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL); menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 85: case 85:
{ {
menu_end_entry(); menu_end_entry();
;} }
break; break;
case 86: case 86:
...@@ -1926,14 +1948,14 @@ yyreduce: ...@@ -1926,14 +1948,14 @@ yyreduce:
{ {
printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
zconf_starthelp(); zconf_starthelp();
;} }
break; break;
case 87: case 87:
{ {
current_entry->help = (yyvsp[(2) - (2)].string); current_entry->help = (yyvsp[(2) - (2)].string);
;} }
break; break;
case 92: case 92:
...@@ -1941,102 +1963,113 @@ yyreduce: ...@@ -1941,102 +1963,113 @@ yyreduce:
{ {
menu_add_dep((yyvsp[(3) - (4)].expr)); menu_add_dep((yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
;} }
break; break;
case 96: case 96:
{ {
menu_add_visibility((yyvsp[(2) - (2)].expr)); menu_add_visibility((yyvsp[(2) - (2)].expr));
;} }
break; break;
case 98: case 98:
{ {
menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr)); menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
;} }
break; break;
case 101: case 101:
{ (yyval.id) = (yyvsp[(1) - (2)].id); ;} { (yyval.id) = (yyvsp[(1) - (2)].id); }
break; break;
case 102: case 102:
{ (yyval.id) = (yyvsp[(1) - (2)].id); ;} { (yyval.id) = (yyvsp[(1) - (2)].id); }
break; break;
case 103: case 103:
{ (yyval.id) = (yyvsp[(1) - (2)].id); ;} { (yyval.id) = (yyvsp[(1) - (2)].id); }
break; break;
case 106: case 106:
{ (yyval.expr) = NULL; ;} { (yyval.expr) = NULL; }
break; break;
case 107: case 107:
{ (yyval.expr) = (yyvsp[(2) - (2)].expr); ;} { (yyval.expr) = (yyvsp[(2) - (2)].expr); }
break; break;
case 108: case 108:
{ (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;} { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); }
break; break;
case 109: case 109:
{ (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 110: case 110:
{ (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 111: case 111:
{ (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
break; break;
case 112: case 112:
{ (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;} { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); }
break; break;
case 113: case 113:
{ (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
break; break;
case 114: case 114:
{ (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
break; break;
case 115: case 115:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;} { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); }
break; break;
case 116: case 116:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;} { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); }
break; break;
case 117: case 117:
{ (yyval.string) = NULL; ;} { (yyval.string) = NULL; }
break; break;
default: break; default: break;
} }
/* User semantic actions sometimes alter yychar, and that requires
that yytoken be updated with the new translation. We take the
approach of translating immediately before every use of yytoken.
One alternative is translating here after every semantic action,
but that translation would be missed if the semantic action invokes
YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
incorrect destructor might then be invoked immediately. In the
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 ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
...@@ -2064,6 +2097,10 @@ yyreduce: ...@@ -2064,6 +2097,10 @@ yyreduce:
| yyerrlab -- here on detecting error | | yyerrlab -- here on detecting error |
`------------------------------------*/ `------------------------------------*/
yyerrlab: 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);
/* If not already recovering from an error, report this error. */ /* If not already recovering from an error, report this error. */
if (!yyerrstatus) if (!yyerrstatus)
{ {
...@@ -2071,37 +2108,36 @@ yyerrlab: ...@@ -2071,37 +2108,36 @@ yyerrlab:
#if ! YYERROR_VERBOSE #if ! YYERROR_VERBOSE
yyerror (YY_("syntax error")); yyerror (YY_("syntax error"));
#else #else
# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
yyssp, yytoken)
{ {
YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); char const *yymsgp = YY_("syntax error");
if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) int yysyntax_error_status;
{ yysyntax_error_status = YYSYNTAX_ERROR;
YYSIZE_T yyalloc = 2 * yysize; if (yysyntax_error_status == 0)
if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) yymsgp = yymsg;
yyalloc = YYSTACK_ALLOC_MAXIMUM; else if (yysyntax_error_status == 1)
if (yymsg != yymsgbuf) {
YYSTACK_FREE (yymsg); if (yymsg != yymsgbuf)
yymsg = (char *) YYSTACK_ALLOC (yyalloc); YYSTACK_FREE (yymsg);
if (yymsg) yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
yymsg_alloc = yyalloc; if (!yymsg)
else {
{ yymsg = yymsgbuf;
yymsg = yymsgbuf; yymsg_alloc = sizeof yymsgbuf;
yymsg_alloc = sizeof yymsgbuf; yysyntax_error_status = 2;
} }
} else
{
if (0 < yysize && yysize <= yymsg_alloc) yysyntax_error_status = YYSYNTAX_ERROR;
{ yymsgp = yymsg;
(void) yysyntax_error (yymsg, yystate, yychar); }
yyerror (yymsg); }
} yyerror (yymsgp);
else if (yysyntax_error_status == 2)
{ goto yyexhaustedlab;
yyerror (YY_("syntax error"));
if (yysize != 0)
goto yyexhaustedlab;
}
} }
# undef YYSYNTAX_ERROR
#endif #endif
} }
...@@ -2160,7 +2196,7 @@ yyerrlab1: ...@@ -2160,7 +2196,7 @@ yyerrlab1:
for (;;) for (;;)
{ {
yyn = yypact[yystate]; yyn = yypact[yystate];
if (yyn != YYPACT_NINF) if (!yypact_value_is_default (yyn))
{ {
yyn += YYTERROR; yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
...@@ -2219,8 +2255,13 @@ yyexhaustedlab: ...@@ -2219,8 +2255,13 @@ yyexhaustedlab:
yyreturn: yyreturn:
if (yychar != YYEMPTY) if (yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead", {
yytoken, &yylval); /* Make sure we have latest lookahead translation. See comments at
user semantic actions for why this is necessary. */
yytoken = YYTRANSLATE (yychar);
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
}
/* Do not reclaim the symbols of the rule which action triggered /* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */ this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
...@@ -2256,9 +2297,6 @@ void conf_parse(const char *name) ...@@ -2256,9 +2297,6 @@ void conf_parse(const char *name)
sym_init(); sym_init();
_menu_init(); _menu_init();
modules_sym = sym_lookup(NULL, 0);
modules_sym->type = S_BOOLEAN;
modules_sym->flags |= SYMBOL_AUTO;
rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
if (getenv("ZCONF_DEBUG")) if (getenv("ZCONF_DEBUG"))
...@@ -2266,12 +2304,8 @@ void conf_parse(const char *name) ...@@ -2266,12 +2304,8 @@ void conf_parse(const char *name)
zconfparse(); zconfparse();
if (zconfnerrs) if (zconfnerrs)
exit(1); exit(1);
if (!modules_sym->prop) { if (!modules_sym)
struct property *prop; modules_sym = sym_find( "n" );
prop = prop_alloc(P_DEFAULT, modules_sym);
prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
}
rootmenu.prompt->text = _(rootmenu.prompt->text); rootmenu.prompt->text = _(rootmenu.prompt->text);
rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7