Skip to content

L
linux
Commit 4cd4dbac authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files
Options

[PATCH] kconfig: dependencies for choices 

Enable dependencies for choice defaults.
parent 3cc84419
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 133 deletions
scripts/kconfig/zconf.tab.c_shipped
View file @ 4cd4dbac
......@@ -132,7 +132,6 @@
/* Copy the first part of user declarations. */
#line 1 "zconf.y"
/*
* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
......@@ -165,7 +164,7 @@ struct symbol *symbol_hash[257];
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
# define YYDEBUG 0
#endif
/* Enabling verbose error messages. */
......@@ -186,7 +185,7 @@ typedef union {
struct menu *menu;
} yystype;
/* Line 193 of /usr/share/bison/yacc.c. */
#line 190 "zconf.tab.c"
#line 189 "zconf.tab.c"
# define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1
#endif
......@@ -204,14 +203,13 @@ typedef struct yyltype
#endif
/* Copy the second part of user declarations. */
#line 83 "zconf.y"
#define LKC_DIRECT_LINK
#include "lkc.h"
/* Line 213 of /usr/share/bison/yacc.c. */
#line 215 "zconf.tab.c"
#line 213 "zconf.tab.c"
#if ! defined (yyoverflow) || YYERROR_VERBOSE
......@@ -309,7 +307,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
#define YYLAST 151
#define YYLAST 154
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 36
......@@ -318,7 +316,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 96
/* YYNRULES -- Number of states. */
#define YYNSTATES 145
#define YYNSTATES 146
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
......@@ -371,12 +369,12 @@ static const unsigned short yyprhs[] =
21, 23, 26, 28, 30, 32, 34, 36, 39, 43,
44, 48, 52, 55, 58, 61, 64, 67, 70, 73,
77, 81, 83, 87, 89, 94, 97, 98, 102, 106,
109, 112, 116, 118, 121, 122, 125, 128, 130, 136,
140, 141, 144, 147, 150, 153, 157, 159, 164, 167,
168, 171, 174, 177, 181, 184, 187, 190, 194, 197,
200, 201, 205, 208, 212, 215, 218, 219, 221, 225,
227, 229, 231, 233, 235, 237, 239, 240, 243, 245,
249, 253, 257, 260, 264, 268, 270
109, 112, 116, 118, 122, 123, 126, 129, 131, 137,
141, 142, 145, 148, 151, 154, 158, 160, 165, 168,
169, 172, 175, 178, 182, 185, 188, 191, 195, 198,
201, 202, 206, 209, 213, 216, 219, 220, 222, 226,
228, 230, 232, 234, 236, 238, 240, 241, 244, 246,
250, 254, 258, 261, 265, 269, 271
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
......@@ -394,22 +392,22 @@ static const yysigned_char yyrhs[] =
50, 46, 28, -1, 45, 50, -1, -1, 48, 49,
28, -1, 48, 67, 28, -1, 48, 65, -1, 48,
28, -1, 18, 69, 72, -1, 17, -1, 19, 74,
-1, -1, 50, 39, -1, 13, 73, -1, 70, -1,
51, 28, 54, 52, 28, -1, 51, 28, 54, -1,
-1, 54, 39, -1, 54, 58, -1, 54, 47, -1,
4, 69, -1, 55, 28, 66, -1, 70, -1, 56,
59, 57, 28, -1, 56, 59, -1, -1, 59, 39,
-1, 59, 58, -1, 59, 47, -1, 59, 1, 28,
-1, 6, 69, -1, 60, 28, -1, 9, 69, -1,
62, 28, 66, -1, 11, 28, -1, 64, 12, -1,
-1, 66, 67, 28, -1, 66, 28, -1, 15, 31,
73, -1, 15, 73, -1, 16, 73, -1, -1, 69,
-1, 69, 13, 73, -1, 24, -1, 25, -1, 5,
-1, 8, -1, 14, -1, 28, -1, 27, -1, -1,
13, 73, -1, 74, -1, 74, 34, 74, -1, 74,
26, 74, -1, 30, 73, 29, -1, 35, 73, -1,
73, 32, 73, -1, 73, 33, 73, -1, 24, -1,
25, -1
72, -1, -1, 50, 39, -1, 13, 73, -1, 70,
-1, 51, 28, 54, 52, 28, -1, 51, 28, 54,
-1, -1, 54, 39, -1, 54, 58, -1, 54, 47,
-1, 4, 69, -1, 55, 28, 66, -1, 70, -1,
56, 59, 57, 28, -1, 56, 59, -1, -1, 59,
39, -1, 59, 58, -1, 59, 47, -1, 59, 1,
28, -1, 6, 69, -1, 60, 28, -1, 9, 69,
-1, 62, 28, 66, -1, 11, 28, -1, 64, 12,
-1, -1, 66, 67, 28, -1, 66, 28, -1, 15,
31, 73, -1, 15, 73, -1, 16, 73, -1, -1,
69, -1, 69, 13, 73, -1, 24, -1, 25, -1,
5, -1, 8, -1, 14, -1, 28, -1, 27, -1,
-1, 13, 73, -1, 74, -1, 74, 34, 74, -1,
74, 26, 74, -1, 30, 73, 29, -1, 35, 73,
-1, 73, 32, 73, -1, 73, 33, 73, -1, 24,
-1, 25, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
......@@ -419,12 +417,12 @@ static const unsigned short yyrline[] =
98, 99, 102, 104, 105, 106, 107, 113, 121, 127,
129, 130, 131, 132, 135, 141, 147, 153, 159, 165,
171, 179, 188, 194, 202, 204, 210, 212, 213, 214,
215, 218, 224, 230, 237, 239, 244, 254, 262, 264,
270, 272, 273, 274, 279, 286, 292, 300, 302, 308,
310, 311, 312, 313, 316, 322, 329, 336, 343, 349,
356, 357, 358, 361, 366, 371, 379, 381, 385, 390,
391, 394, 395, 396, 399, 400, 402, 403, 406, 407,
408, 409, 410, 411, 412, 415, 416
215, 218, 224, 230, 236, 238, 243, 252, 260, 262,
268, 270, 271, 272, 277, 284, 290, 298, 300, 306,
308, 309, 310, 311, 314, 320, 327, 334, 341, 347,
354, 355, 356, 359, 364, 369, 377, 379, 383, 388,
389, 392, 393, 394, 397, 398, 400, 401, 404, 405,
406, 407, 408, 409, 410, 413, 414
};
#endif
......@@ -484,7 +482,7 @@ static const unsigned char yyr2[] =
1, 2, 1, 1, 1, 1, 1, 2, 3, 0,
3, 3, 2, 2, 2, 2, 2, 2, 2, 3,
3, 1, 3, 1, 4, 2, 0, 3, 3, 2,
2, 3, 1, 2, 0, 2, 2, 1, 5, 3,
2, 3, 1, 3, 0, 2, 2, 1, 5, 3,
0, 2, 2, 2, 2, 3, 1, 4, 2, 0,
2, 2, 2, 3, 2, 2, 2, 3, 2, 2,
0, 3, 2, 3, 2, 2, 0, 1, 3, 1,
......@@ -510,8 +508,8 @@ static const unsigned char yydefact[] =
0, 0, 40, 0, 39, 0, 34, 51, 53, 0,
52, 47, 72, 0, 63, 57, 68, 0, 74, 75,
86, 86, 24, 77, 25, 26, 27, 28, 20, 69,
21, 86, 43, 37, 38, 48, 71, 73, 0, 29,
30, 0, 41, 87, 78
21, 86, 86, 37, 38, 48, 71, 73, 0, 29,
30, 0, 41, 43, 87, 78
};
/* YYDEFGOTO[NTERM-NUM]. */
......@@ -529,20 +527,20 @@ static const short yydefgoto[] =
static const short yypact[] =
{
-120, 17, -120, 41, 48, 48, -120, 48, -120, -120,
48, -11, 40, -120, -120, -120, -120, -120, 13, -120,
23, -120, -120, 66, -120, 72, -120, -120, 77, -120,
81, -120, -120, -120, -120, -120, 41, -120, -120, -120,
48, 27, 40, -120, -120, -120, -120, -120, 13, -120,
66, -120, -120, 72, -120, 77, -120, -120, 81, -120,
85, -120, -120, -120, -120, -120, 41, -120, -120, -120,
-120, -120, -120, 40, 40, 57, 59, -120, -120, 98,
-120, -120, 49, -120, -120, -120, 7, -120, 40, 40,
67, 67, 99, 117, -120, -120, -120, -120, 85, -120,
74, 18, 88, -120, -120, 95, -120, -120, 18, -120,
96, -120, -120, -120, 102, 36, 40, 48, 67, 48,
48, 48, 48, 48, -120, 103, 129, -120, 114, -120,
48, 67, -120, 115, -120, 116, -120, -120, -120, 118,
-120, -120, -120, 119, -120, -120, -120, 40, 57, 57,
135, 135, -120, 136, -120, -120, -120, -120, -120, -120,
-120, 135, -120, -120, -120, -120, -120, 57, 40, -120,
-120, 40, -120, 57, 57
67, 67, 99, 117, -120, -120, -120, -120, 88, -120,
74, 18, 95, -120, -120, 101, -120, -120, 18, -120,
97, -120, -120, -120, 103, 36, 40, 48, 67, 48,
48, 48, 48, 48, -120, 113, 130, -120, 115, -120,
48, 67, -120, 116, -120, 118, -120, -120, -120, 119,
-120, -120, -120, 120, -120, -120, -120, 40, 57, 57,
136, 136, -120, 137, -120, -120, -120, -120, -120, -120,
-120, 136, 136, -120, -120, -120, -120, 57, 40, -120,
-120, 40, -120, -120, 57, 57
};
/* YYPGOTO[NTERM-NUM]. */
......@@ -550,8 +548,8 @@ static const yysigned_char yypgoto[] =
{
-120, -120, -120, -38, -120, -120, -120, -120, -120, -120,
-120, -42, -120, -120, -120, -120, -120, -120, -120, -120,
-120, -120, -33, -120, -120, -120, -120, -120, -120, 87,
97, 34, 47, -1, -23, 2, -119, -43, -53
-120, -120, -33, -120, -120, -120, -120, -120, -120, 89,
100, 34, 47, -1, -23, 2, -119, -43, -53
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
......@@ -562,41 +560,41 @@ static const yysigned_char yypgoto[] =
static const short yytable[] =
{
56, 57, 140, 36, 37, 33, 38, 82, 83, 39,
74, 67, 142, 40, 73, 80, 81, 2, 3, 76,
74, 67, 142, 143, 73, 80, 81, 2, 3, 76,
4, 5, 6, 7, 8, 9, 10, 11, 108, 77,
12, 13, 107, 85, 86, 121, 79, 110, 55, 58,
59, 47, 118, 119, 14, 15, 112, 111, 132, -58,
72, 48, -58, 5, 64, 7, 8, 65, 10, 11,
72, 40, -58, 5, 64, 7, 8, 65, 10, 11,
41, 42, 12, 66, 41, 42, 43, 117, 14, 15,
43, 44, 34, 35, 137, 44, 14, 15, 5, 64,
7, 8, 65, 10, 11, 60, 120, 12, 66, 58,
59, 41, 42, 61, 50, 143, 98, 105, 144, 131,
51, 14, 15, 64, 7, 53, 65, 10, 11, 54,
84, 12, 66, 106, 85, 86, 114, 87, 88, 89,
90, 91, 92, 115, 93, 14, 15, 94, 84, 59,
116, 128, 85, 86, 99, 100, 101, 124, 125, 126,
127, 129, 130, 133, 134, 102, 135, 136, 138, 141,
104, 78
59, 41, 42, 61, 48, 144, 98, 105, 145, 131,
50, 14, 15, 64, 7, 51, 65, 10, 11, 53,
84, 12, 66, 54, 85, 86, 106, 87, 88, 89,
90, 91, 92, 114, 93, 14, 15, 94, 84, 115,
59, 116, 85, 86, 99, 100, 101, 124, 125, 126,
127, 128, 129, 130, 133, 102, 134, 135, 136, 138,
141, 0, 104, 0, 78
};
static const unsigned char yycheck[] =
static const short yycheck[] =
{
43, 44, 121, 4, 5, 3, 7, 60, 61, 10,
52, 49, 131, 24, 52, 58, 59, 0, 1, 52,
52, 49, 131, 132, 52, 58, 59, 0, 1, 52,
3, 4, 5, 6, 7, 8, 9, 10, 70, 52,
13, 14, 70, 15, 16, 88, 29, 70, 36, 32,
33, 28, 85, 86, 27, 28, 28, 70, 101, 0,
1, 28, 3, 4, 5, 6, 7, 8, 9, 10,
1, 24, 3, 4, 5, 6, 7, 8, 9, 10,
24, 25, 13, 14, 24, 25, 30, 31, 27, 28,
30, 35, 24, 25, 117, 35, 27, 28, 4, 5,
6, 7, 8, 9, 10, 26, 87, 13, 14, 32,
33, 24, 25, 34, 28, 138, 62, 63, 141, 100,
28, 27, 28, 5, 6, 28, 8, 9, 10, 28,
11, 13, 14, 28, 15, 16, 28, 18, 19, 20,
21, 22, 23, 28, 25, 27, 28, 28, 11, 33,
28, 28, 15, 16, 17, 18, 19, 90, 91, 92,
93, 12, 28, 28, 28, 28, 28, 28, 13, 13,
63, 54
21, 22, 23, 28, 25, 27, 28, 28, 11, 28,
33, 28, 15, 16, 17, 18, 19, 90, 91, 92,
93, 28, 12, 28, 28, 28, 28, 28, 28, 13,
13, -1, 63, -1, 54
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
......@@ -617,7 +615,7 @@ static const unsigned char yystos[] =
58, 70, 28, 67, 28, 28, 28, 31, 73, 73,
69, 74, 68, 69, 68, 68, 68, 68, 28, 12,
28, 69, 74, 28, 28, 28, 28, 73, 13, 72,
72, 13, 72, 73, 73
72, 13, 72, 72, 73, 73
};
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
......@@ -1168,27 +1166,22 @@ yyreduce:
switch (yyn)
{
case 8:
#line 96 "zconf.y"
{ zconfprint("unexpected 'endmenu' statement"); }
break;
case 9:
#line 97 "zconf.y"
{ zconfprint("unexpected 'endif' statement"); }
break;
case 10:
#line 98 "zconf.y"
{ zconfprint("unexpected 'endchoice' statement"); }
break;
case 11:
#line 99 "zconf.y"
{ zconfprint("syntax error"); yyerrok; }
break;
case 17:
#line 114 "zconf.y"
{
struct symbol *sym = sym_lookup(yyvsp[0].string, 0);
sym->flags |= SYMBOL_OPTIONAL;
......@@ -1198,7 +1191,6 @@ yyreduce:
break;
case 18:
#line 122 "zconf.y"
{
menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
......@@ -1206,12 +1198,10 @@ yyreduce:
break;
case 23:
#line 133 "zconf.y"
{ }
break;
case 24:
#line 136 "zconf.y"
{
menu_set_type(S_TRISTATE);
printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
......@@ -1219,7 +1209,6 @@ yyreduce:
break;
case 25:
#line 142 "zconf.y"
{
menu_set_type(S_BOOLEAN);
printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
......@@ -1227,7 +1216,6 @@ yyreduce:
break;
case 26:
#line 148 "zconf.y"
{
menu_set_type(S_INT);
printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
......@@ -1235,7 +1223,6 @@ yyreduce:
break;
case 27:
#line 154 "zconf.y"
{
menu_set_type(S_HEX);
printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
......@@ -1243,7 +1230,6 @@ yyreduce:
break;
case 28:
#line 160 "zconf.y"
{
menu_set_type(S_STRING);
printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
......@@ -1251,7 +1237,6 @@ yyreduce:
break;
case 29:
#line 166 "zconf.y"
{
menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
......@@ -1259,7 +1244,6 @@ yyreduce:
break;
case 30:
#line 172 "zconf.y"
{
menu_add_prop(P_DEFAULT, NULL, yyvsp[-1].symbol, yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
......@@ -1267,7 +1251,6 @@ yyreduce:
break;
case 31:
#line 180 "zconf.y"
{
struct symbol *sym = sym_lookup(NULL, 0);
sym->flags |= SYMBOL_CHOICE;
......@@ -1278,7 +1261,6 @@ yyreduce:
break;
case 32:
#line 189 "zconf.y"
{
menu_end_entry();
menu_add_menu();
......@@ -1286,7 +1268,6 @@ yyreduce:
break;
case 33:
#line 195 "zconf.y"
{
if (zconf_endtoken(yyvsp[0].token, T_CHOICE, T_ENDCHOICE)) {
menu_end_menu();
......@@ -1296,7 +1277,6 @@ yyreduce:
break;
case 35:
#line 205 "zconf.y"
{
printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
zconfnerrs++;
......@@ -1304,7 +1284,6 @@ yyreduce:
break;
case 41:
#line 219 "zconf.y"
{
menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
......@@ -1312,7 +1291,6 @@ yyreduce:
break;
case 42:
#line 225 "zconf.y"
{
current_entry->sym->flags |= SYMBOL_OPTIONAL;
printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
......@@ -1320,20 +1298,16 @@ yyreduce:
break;
case 43:
#line 231 "zconf.y"
{
menu_add_prop(P_DEFAULT, NULL, yyvsp[0].symbol, NULL);
//current_choice->prop->def = ;
menu_add_prop(P_DEFAULT, NULL, yyvsp[-1].symbol, yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
}
break;
case 46:
#line 245 "zconf.y"
{
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL);
//current_entry->prompt = menu_add_prop(T_IF, NULL, NULL, );
menu_add_dep(yyvsp[0].expr);
menu_end_entry();
menu_add_menu();
......@@ -1341,7 +1315,6 @@ yyreduce:
break;
case 47:
#line 255 "zconf.y"
{
if (zconf_endtoken(yyvsp[0].token, T_IF, T_ENDIF)) {
menu_end_menu();
......@@ -1351,7 +1324,6 @@ yyreduce:
break;
case 49:
#line 265 "zconf.y"
{
printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
zconfnerrs++;
......@@ -1359,7 +1331,6 @@ yyreduce:
break;
case 54:
#line 280 "zconf.y"
{
menu_add_entry(NULL);
menu_add_prop(P_MENU, yyvsp[0].string, NULL, NULL);
......@@ -1368,7 +1339,6 @@ yyreduce:
break;
case 55:
#line 287 "zconf.y"
{
menu_end_entry();
menu_add_menu();
......@@ -1376,7 +1346,6 @@ yyreduce:
break;
case 56:
#line 293 "zconf.y"
{
if (zconf_endtoken(yyvsp[0].token, T_MENU, T_ENDMENU)) {
menu_end_menu();
......@@ -1386,7 +1355,6 @@ yyreduce:
break;
case 58:
#line 303 "zconf.y"
{
printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
zconfnerrs++;
......@@ -1394,12 +1362,10 @@ yyreduce:
break;
case 63:
#line 313 "zconf.y"
{ zconfprint("invalid menu option"); yyerrok; }
break;
case 64:
#line 317 "zconf.y"
{
yyval.string = yyvsp[0].string;
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), yyvsp[0].string);
......@@ -1407,14 +1373,12 @@ yyreduce:
break;
case 65:
#line 323 "zconf.y"
{
zconf_nextfile(yyvsp[-1].string);
}
break;
case 66:
#line 330 "zconf.y"
{
menu_add_entry(NULL);
menu_add_prop(P_COMMENT, yyvsp[0].string, NULL, NULL);
......@@ -1423,14 +1387,12 @@ yyreduce:
break;
case 67:
#line 337 "zconf.y"
{
menu_end_entry();
}
break;
case 68:
#line 344 "zconf.y"
{
printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
zconf_starthelp();
......@@ -1438,19 +1400,16 @@ yyreduce:
break;
case 69:
#line 350 "zconf.y"
{
current_entry->sym->help = yyvsp[0].string;
}
break;
case 72:
#line 359 "zconf.y"
{ }
break;
case 73:
#line 362 "zconf.y"
{
menu_add_dep(yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
......@@ -1458,7 +1417,6 @@ yyreduce:
break;
case 74:
#line 367 "zconf.y"
{
menu_add_dep(yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
......@@ -1466,7 +1424,6 @@ yyreduce:
break;
case 75:
#line 372 "zconf.y"
{
menu_add_dep(yyvsp[0].expr);
printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
......@@ -1474,86 +1431,70 @@ yyreduce:
break;
case 77:
#line 382 "zconf.y"
{
menu_add_prop(P_PROMPT, yyvsp[0].string, NULL, NULL);
}
break;
case 78:
#line 386 "zconf.y"
{
menu_add_prop(P_PROMPT, yyvsp[-2].string, NULL, yyvsp[0].expr);
}
break;
case 81:
#line 394 "zconf.y"
{ yyval.token = T_ENDMENU; }
break;
case 82:
#line 395 "zconf.y"
{ yyval.token = T_ENDCHOICE; }
break;
case 83:
#line 396 "zconf.y"
{ yyval.token = T_ENDIF; }
break;
case 86:
#line 402 "zconf.y"
{ yyval.expr = NULL; }
break;
case 87:
#line 403 "zconf.y"
{ yyval.expr = yyvsp[0].expr; }
break;
case 88:
#line 406 "zconf.y"
{ yyval.expr = expr_alloc_symbol(yyvsp[0].symbol); }
break;
case 89:
#line 407 "zconf.y"
{ yyval.expr = expr_alloc_comp(E_EQUAL, yyvsp[-2].symbol, yyvsp[0].symbol); }
break;
case 90:
#line 408 "zconf.y"
{ yyval.expr = expr_alloc_comp(E_UNEQUAL, yyvsp[-2].symbol, yyvsp[0].symbol); }
break;
case 91:
#line 409 "zconf.y"
{ yyval.expr = yyvsp[-1].expr; }
break;
case 92:
#line 410 "zconf.y"
{ yyval.expr = expr_alloc_one(E_NOT, yyvsp[0].expr); }
break;
case 93:
#line 411 "zconf.y"
{ yyval.expr = expr_alloc_two(E_OR, yyvsp[-2].expr, yyvsp[0].expr); }
break;
case 94:
#line 412 "zconf.y"
{ yyval.expr = expr_alloc_two(E_AND, yyvsp[-2].expr, yyvsp[0].expr); }
break;
case 95:
#line 415 "zconf.y"
{ yyval.symbol = sym_lookup(yyvsp[0].string, 0); free(yyvsp[0].string); }
break;
case 96:
#line 416 "zconf.y"
{ yyval.symbol = sym_lookup(yyvsp[0].string, 1); free(yyvsp[0].string); }
break;
......@@ -1561,7 +1502,7 @@ yyreduce:
}
/* Line 1016 of /usr/share/bison/yacc.c. */
#line 1565 "zconf.tab.c"
#line 1506 "zconf.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
......@@ -1780,7 +1721,6 @@ yyreturn:
}
#line 419 "zconf.y"
void conf_parse(const char *name)
......@@ -2015,3 +1955,4 @@ void zconfdump(FILE *out)
#include "symbol.c"
#include "menu.c"
scripts/kconfig/zconf.y
View file @ 4cd4dbac
......@@ -227,10 +227,9 @@ choice_option: T_OPTIONAL
printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
};
choice_option: T_DEFAULT symbol
choice_option: T_DEFAULT symbol if_expr
{
menu_add_prop(P_DEFAULT, NULL, $2, NULL);
//current_choice->prop->def = $2;
menu_add_prop(P_DEFAULT, NULL, $2, $3);
printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
};
......@@ -245,7 +244,6 @@ if: T_IF expr
{
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL);
//current_entry->prompt = menu_add_prop(T_IF, NULL, NULL, $2);
menu_add_dep($2);
menu_end_entry();
menu_add_menu();
......
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