sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kconfig: add named choice group

Browse Source 
As choice dependency are now fully checked, it's quite easy to add support
for named choices. This lifts the restriction that a choice value can only
appear once, although it still has to be within the same group,
but multiple choices can be joined by giving them a name.
While at it I cleaned up a little the choice type logic to simplify it a
bit.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

=======

Cherry-picked from the Linux kernel.

Change-Id: If0f00d1783907d606220cda5307b8960d3bfc38d
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3291
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Roman Zippel
2008-02-29 05:11:50 +01:00
committed by Ronald G. Minnich
parent 5750fddcba
commit 543aa7ba7b
6 changed files with 206 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

301
util/kconfig/zconf.tab.c_shipped
View File

@@ -445,16 +445,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
#define YYLAST 258
#define YYLAST 259
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 35
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 45
#define YYNNTS 46
/* YYNRULES -- Number of rules. */
#define YYNRULES 108
#define YYNRULES 110
/* YYNRULES -- Number of states. */
#define YYNSTATES 178
#define YYNSTATES 180
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -506,13 +506,14 @@ static const yytype_uint16 yyprhs[] =
28, 33, 37, 39, 41, 43, 45, 47, 49, 51,
53, 55, 57, 59, 61, 63, 67, 70, 74, 77,
81, 84, 85, 88, 91, 94, 97, 100, 103, 107,
112, 117, 122, 128, 132, 133, 137, 138, 141, 144,
147, 149, 153, 154, 157, 160, 163, 166, 169, 174,
178, 181, 186, 187, 190, 194, 196, 200, 201, 204,
207, 210, 214, 217, 219, 223, 224, 227, 230, 233,
237, 241, 244, 247, 250, 251, 254, 257, 260, 265,
266, 269, 271, 273, 276, 279, 282, 284, 287, 288,
291, 293, 297, 301, 305, 308, 312, 316, 318
112, 117, 122, 128, 132, 133, 137, 138, 141, 145,
148, 150, 154, 155, 158, 161, 164, 167, 170, 175,
179, 182, 187, 188, 191, 195, 197, 201, 202, 205,
208, 211, 215, 218, 220, 224, 225, 228, 231, 234,
238, 242, 245, 248, 251, 252, 255, 258, 261, 266,
267, 270, 272, 274, 277, 280, 283, 285, 288, 289,
292, 294, 298, 302, 306, 309, 313, 317, 319, 321,
322
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -532,24 +533,25 @@ static const yytype_int8 yyrhs[] =
30, -1, 20, 78, 77, 30, -1, 21, 25, 77,
30, -1, 22, 79, 79, 77, 30, -1, 23, 48,
30, -1, -1, 48, 25, 49, -1, -1, 33, 74,
-1, 7, 30, -1, 50, 54, -1, 75, -1, 51,
56, 52, -1, -1, 54, 55, -1, 54, 72, -1,
54, 70, -1, 54, 30, -1, 54, 40, -1, 18,
74, 77, 30, -1, 19, 73, 30, -1, 17, 30,
-1, 20, 25, 77, 30, -1, -1, 56, 39, -1,
14, 78, 76, -1, 75, -1, 57, 60, 58, -1,
-1, 60, 39, -1, 60, 64, -1, 60, 53, -1,
4, 74, 30, -1, 61, 71, -1, 75, -1, 62,
65, 63, -1, -1, 65, 39, -1, 65, 64, -1,
65, 53, -1, 6, 74, 30, -1, 9, 74, 30,
-1, 67, 71, -1, 12, 30, -1, 69, 13, -1,
-1, 71, 72, -1, 71, 30, -1, 71, 40, -1,
16, 24, 78, 30, -1, -1, 74, 77, -1, 25,
-1, 26, -1, 5, 30, -1, 8, 30, -1, 15,
30, -1, 30, -1, 76, 30, -1, -1, 14, 78,
-1, 79, -1, 79, 33, 79, -1, 79, 27, 79,
-1, 29, 78, 28, -1, 34, 78, -1, 78, 31,
78, -1, 78, 32, 78, -1, 25, -1, 26, -1
-1, 7, 80, 30, -1, 50, 54, -1, 75, -1,
51, 56, 52, -1, -1, 54, 55, -1, 54, 72,
-1, 54, 70, -1, 54, 30, -1, 54, 40, -1,
18, 74, 77, 30, -1, 19, 73, 30, -1, 17,
30, -1, 20, 25, 77, 30, -1, -1, 56, 39,
-1, 14, 78, 76, -1, 75, -1, 57, 60, 58,
-1, -1, 60, 39, -1, 60, 64, -1, 60, 53,
-1, 4, 74, 30, -1, 61, 71, -1, 75, -1,
62, 65, 63, -1, -1, 65, 39, -1, 65, 64,
-1, 65, 53, -1, 6, 74, 30, -1, 9, 74,
30, -1, 67, 71, -1, 12, 30, -1, 69, 13,
-1, -1, 71, 72, -1, 71, 30, -1, 71, 40,
-1, 16, 24, 78, 30, -1, -1, 74, 77, -1,
25, -1, 26, -1, 5, 30, -1, 8, 30, -1,
15, 30, -1, 30, -1, 76, 30, -1, -1, 14,
78, -1, 79, -1, 79, 33, 79, -1, 79, 27,
79, -1, 29, 78, 28, -1, 34, 78, -1, 78,
31, 78, -1, 78, 32, 78, -1, 25, -1, 26,
-1, -1, 25, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -565,7 +567,8 @@ static const yytype_uint16 yyrline[] =
339, 344, 351, 356, 364, 367, 369, 370, 371, 374,
382, 389, 396, 402, 409, 411, 412, 413, 416, 424,
426, 431, 432, 435, 436, 437, 441, 442, 445, 446,
449, 450, 451, 452, 453, 454, 455, 458, 459
449, 450, 451, 452, 453, 454, 455, 458, 459, 462,
463
};
#endif
@@ -589,7 +592,8 @@ static const char *const yytname[] =
"if_entry", "if_end", "if_stmt", "if_block", "menu", "menu_entry",
"menu_end", "menu_stmt", "menu_block", "source_stmt", "comment",
"comment_stmt", "help_start", "help", "depends_list", "depends",
"prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol", 0
"prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol",
"word_opt", 0
};
#endif
@@ -618,7 +622,8 @@ static const yytype_uint8 yyr1[] =
60, 61, 62, 63, 64, 65, 65, 65, 65, 66,
67, 68, 69, 70, 71, 71, 71, 71, 72, 73,
73, 74, 74, 75, 75, 75, 76, 76, 77, 77,
78, 78, 78, 78, 78, 78, 78, 79, 79
78, 78, 78, 78, 78, 78, 78, 79, 79, 80,
80
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -628,13 +633,14 @@ static const yytype_uint8 yyr2[] =
4, 3, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 3, 2, 3, 2, 3,
2, 0, 2, 2, 2, 2, 2, 2, 3, 4,
4, 4, 5, 3, 0, 3, 0, 2, 2, 2,
4, 4, 5, 3, 0, 3, 0, 2, 3, 2,
1, 3, 0, 2, 2, 2, 2, 2, 4, 3,
2, 4, 0, 2, 3, 1, 3, 0, 2, 2,
2, 3, 2, 1, 3, 0, 2, 2, 2, 3,
3, 2, 2, 2, 0, 2, 2, 2, 4, 0,
2, 1, 1, 2, 2, 2, 1, 2, 0, 2,
1, 3, 3, 3, 2, 3, 3, 1, 1
1, 3, 3, 3, 2, 3, 3, 1, 1, 0,
1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -642,69 +648,69 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
3, 0, 0, 1, 0, 0, 0, 0, 0, 0,
3, 0, 0, 1, 0, 0, 0, 0, 0, 109,
0, 0, 0, 0, 0, 0, 12, 16, 13, 14,
18, 15, 17, 0, 19, 0, 4, 31, 22, 31,
23, 52, 62, 5, 67, 20, 84, 75, 6, 24,
84, 21, 8, 11, 91, 92, 0, 0, 93, 0,
48, 94, 0, 0, 0, 107, 108, 0, 0, 0,
100, 95, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 96, 7, 71, 79, 80, 27, 29, 0,
104, 0, 0, 64, 0, 0, 9, 10, 0, 0,
0, 0, 89, 0, 0, 0, 44, 0, 37, 36,
32, 33, 0, 35, 34, 0, 0, 89, 0, 56,
57, 53, 55, 54, 63, 51, 50, 68, 70, 66,
69, 65, 86, 87, 85, 76, 78, 74, 77, 73,
97, 103, 105, 106, 102, 101, 26, 82, 0, 98,
0, 98, 98, 98, 0, 0, 0, 83, 60, 98,
0, 98, 0, 0, 0, 38, 90, 0, 0, 98,
46, 43, 25, 0, 59, 0, 88, 99, 39, 40,
41, 0, 0, 45, 58, 61, 42, 47
110, 0, 94, 0, 0, 0, 107, 108, 0, 0,
0, 100, 95, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 96, 7, 71, 79, 48, 80, 27,
29, 0, 104, 0, 0, 64, 0, 0, 9, 10,
0, 0, 0, 0, 89, 0, 0, 0, 44, 0,
37, 36, 32, 33, 0, 35, 34, 0, 0, 89,
0, 56, 57, 53, 55, 54, 63, 51, 50, 68,
70, 66, 69, 65, 86, 87, 85, 76, 78, 74,
77, 73, 97, 103, 105, 106, 102, 101, 26, 82,
0, 98, 0, 98, 98, 98, 0, 0, 0, 83,
60, 98, 0, 98, 0, 0, 0, 38, 90, 0,
0, 98, 46, 43, 25, 0, 59, 0, 88, 99,
39, 40, 41, 0, 0, 45, 58, 61, 42, 47
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
-1, 1, 2, 25, 26, 99, 27, 28, 29, 30,
64, 100, 101, 145, 173, 31, 32, 115, 33, 66,
111, 67, 34, 119, 35, 68, 36, 37, 127, 38,
70, 39, 40, 41, 102, 103, 69, 104, 140, 141,
42, 73, 154, 59, 60
-1, 1, 2, 25, 26, 101, 27, 28, 29, 30,
65, 102, 103, 147, 175, 31, 32, 117, 33, 67,
113, 68, 34, 121, 35, 69, 36, 37, 129, 38,
71, 39, 40, 41, 104, 105, 70, 106, 142, 143,
42, 74, 156, 60, 61, 51
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
#define YYPACT_NINF -78
#define YYPACT_NINF -80
static const yytype_int16 yypact[] =
{
-78, 33, 130, -78, -28, 73, 73, 7, 73, 36,
41, 73, 26, 52, -4, 58, -78, -78, -78, -78,
-78, -78, -78, 90, -78, 94, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, 74, 85, -78, 96,
-78, -78, 131, 134, 147, -78, -78, -4, -4, 193,
-10, -78, 162, 164, 38, 102, 64, 148, 5, 192,
5, 165, -78, 174, -78, -78, -78, -78, -78, 65,
-78, -4, -4, 174, 103, 103, -78, -78, 175, 185,
197, 73, 73, -4, 194, 103, -78, 231, -78, -78,
-78, -78, 220, -78, -78, 204, 73, 73, 210, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, 205, -78, -78, -78, -78, -78, -4, 222,
208, 222, 195, 222, 103, 2, 209, -78, -78, 222,
211, 222, 199, -4, 212, -78, -78, 213, 214, 222,
207, -78, -78, 215, -78, 216, -78, 111, -78, -78,
-78, 217, 73, -78, -78, -78, -78, -78
-80, 2, 132, -80, -13, -1, -1, -2, -1, 9,
33, -1, 27, 40, -3, 38, -80, -80, -80, -80,
-80, -80, -80, 71, -80, 77, -80, -80, -80, -80,
-80, -80, -80, -80, -80, -80, -80, -80, -80, -80,
-80, -80, -80, -80, -80, -80, 57, 61, -80, 63,
-80, 76, -80, 87, 101, 133, -80, -80, -3, -3,
195, -6, -80, 136, 149, 39, 104, 65, 150, 5,
194, 5, 167, -80, 176, -80, -80, -80, -80, -80,
-80, 68, -80, -3, -3, 176, 72, 72, -80, -80,
177, 187, 78, -1, -1, -3, 196, 72, -80, 222,
-80, -80, -80, -80, 221, -80, -80, 205, -1, -1,
211, -80, -80, -80, -80, -80, -80, -80, -80, -80,
-80, -80, -80, -80, -80, -80, -80, -80, -80, -80,
-80, -80, -80, -80, 206, -80, -80, -80, -80, -80,
-3, 223, 209, 223, 197, 223, 72, 7, 210, -80,
-80, 223, 212, 223, 201, -3, 213, -80, -80, 214,
215, 223, 208, -80, -80, 216, -80, 217, -80, 113,
-80, -80, -80, 218, -1, -80, -80, -80, -80, -80
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
-78, -78, -78, -78, 121, -35, -78, -78, -78, -78,
219, -78, -78, -78, -78, -78, -78, -78, -44, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -6,
-78, -78, -78, -78, -78, 183, 218, 21, 143, -5,
146, 196, 69, -53, -77
-80, -80, -80, -80, 122, -34, -80, -80, -80, -80,
220, -80, -80, -80, -80, -80, -80, -80, 59, -80,
-80, -80, -80, -80, -80, -80, -80, -80, -80, 125,
-80, -80, -80, -80, -80, 183, 219, 22, 142, -5,
147, 192, 69, -54, -79, -80
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -714,62 +720,62 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -82
static const yytype_int16 yytable[] =
{
46, 47, 43, 49, 79, 80, 52, 134, 135, 6,
7, 8, 9, 10, 11, 12, 13, 84, 144, 14,
15, 55, 56, 85, 118, 57, 126, 160, 132, 133,
58, 110, 161, 3, 123, 24, 123, 48, -28, 88,
142, -28, -28, -28, -28, -28, -28, -28, -28, -28,
89, 53, -28, -28, 90, -28, 91, 92, 93, 94,
95, 96, 120, 97, 128, 88, 50, 159, 98, -49,
-49, 51, -49, -49, -49, -49, 89, 54, -49, -49,
90, 105, 106, 107, 108, 152, 139, 113, 61, 97,
124, 62, 124, 131, 109, 63, 81, 82, 44, 45,
167, 149, -30, 88, 72, -30, -30, -30, -30, -30,
-30, -30, -30, -30, 89, 74, -30, -30, 90, -30,
91, 92, 93, 94, 95, 96, 75, 97, 55, 56,
-2, 4, 98, 5, 6, 7, 8, 9, 10, 11,
12, 13, 81, 82, 14, 15, 16, 17, 18, 19,
20, 21, 22, 7, 8, 23, 10, 11, 12, 13,
24, 76, 14, 15, 77, -81, 88, 177, -81, -81,
-81, -81, -81, -81, -81, -81, -81, 78, 24, -81,
-81, 90, -81, -81, -81, -81, -81, -81, 114, 117,
97, 125, 86, 88, 87, 122, -72, -72, -72, -72,
-72, -72, -72, -72, 130, 136, -72, -72, 90, 153,
156, 157, 158, 116, 121, 137, 129, 97, 163, 143,
165, 138, 122, 72, 81, 82, 81, 82, 171, 166,
81, 82, 146, 147, 148, 151, 153, 82, 155, 162,
172, 164, 168, 169, 170, 174, 175, 176, 65, 112,
150, 0, 0, 0, 0, 83, 0, 0, 71
46, 47, 3, 49, 81, 82, 53, 136, 137, 6,
7, 8, 9, 10, 11, 12, 13, 43, 146, 14,
15, 86, 56, 57, 44, 45, 58, 87, 48, 134,
135, 59, 162, 112, 50, 24, 125, 163, 125, -28,
90, 144, -28, -28, -28, -28, -28, -28, -28, -28,
-28, 91, 54, -28, -28, 92, -28, 93, 94, 95,
96, 97, 98, 52, 99, 55, 90, 161, 62, 100,
-49, -49, 63, -49, -49, -49, -49, 91, 64, -49,
-49, 92, 107, 108, 109, 110, 154, 73, 141, 115,
99, 75, 126, 76, 126, 111, 133, 56, 57, 83,
84, 169, 140, 151, -30, 90, 77, -30, -30, -30,
-30, -30, -30, -30, -30, -30, 91, 78, -30, -30,
92, -30, 93, 94, 95, 96, 97, 98, 120, 99,
128, 79, -2, 4, 100, 5, 6, 7, 8, 9,
10, 11, 12, 13, 83, 84, 14, 15, 16, 17,
18, 19, 20, 21, 22, 7, 8, 23, 10, 11,
12, 13, 24, 80, 14, 15, 88, -81, 90, 179,
-81, -81, -81, -81, -81, -81, -81, -81, -81, 89,
24, -81, -81, 92, -81, -81, -81, -81, -81, -81,
116, 119, 99, 127, 122, 90, 130, 124, -72, -72,
-72, -72, -72, -72, -72, -72, 132, 138, -72, -72,
92, 155, 158, 159, 160, 118, 123, 139, 131, 99,
165, 145, 167, 148, 124, 73, 83, 84, 83, 84,
173, 168, 83, 84, 149, 150, 153, 155, 84, 157,
164, 174, 166, 170, 171, 172, 176, 177, 178, 66,
114, 152, 85, 0, 0, 0, 0, 0, 0, 72
};
static const yytype_int16 yycheck[] =
{
5, 6, 30, 8, 57, 58, 11, 84, 85, 4,
5, 6, 7, 8, 9, 10, 11, 27, 95, 14,
15, 25, 26, 33, 68, 29, 70, 25, 81, 82,
34, 66, 30, 0, 69, 30, 71, 30, 0, 1,
93, 3, 4, 5, 6, 7, 8, 9, 10, 11,
12, 25, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 68, 25, 70, 1, 30, 144, 30, 5,
6, 30, 8, 9, 10, 11, 12, 25, 14, 15,
16, 17, 18, 19, 20, 138, 91, 66, 30, 25,
69, 1, 71, 28, 30, 1, 31, 32, 25, 26,
153, 106, 0, 1, 30, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 30, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 30, 25, 25, 26,
0, 1, 30, 3, 4, 5, 6, 7, 8, 9,
10, 11, 31, 32, 14, 15, 16, 17, 18, 19,
20, 21, 22, 5, 6, 25, 8, 9, 10, 11,
30, 30, 14, 15, 30, 0, 1, 172, 3, 4,
5, 6, 7, 8, 9, 10, 11, 30, 30, 14,
15, 16, 17, 18, 19, 20, 21, 22, 67, 68,
25, 70, 30, 1, 30, 30, 4, 5, 6, 7,
8, 9, 10, 11, 30, 30, 14, 15, 16, 14,
141, 142, 143, 67, 68, 30, 70, 25, 149, 25,
151, 24, 30, 30, 31, 32, 31, 32, 159, 30,
31, 32, 1, 13, 30, 25, 14, 32, 30, 30,
33, 30, 30, 30, 30, 30, 30, 30, 29, 66,
107, -1, -1, -1, -1, 59, -1, -1, 40
5, 6, 0, 8, 58, 59, 11, 86, 87, 4,
5, 6, 7, 8, 9, 10, 11, 30, 97, 14,
15, 27, 25, 26, 25, 26, 29, 33, 30, 83,
84, 34, 25, 67, 25, 30, 70, 30, 72, 0,
1, 95, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 25, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 30, 25, 25, 1, 146, 30, 30,
5, 6, 1, 8, 9, 10, 11, 12, 1, 14,
15, 16, 17, 18, 19, 20, 140, 30, 93, 67,
25, 30, 70, 30, 72, 30, 28, 25, 26, 31,
32, 155, 24, 108, 0, 1, 30, 3, 4, 5,
6, 7, 8, 9, 10, 11, 12, 30, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 69, 25,
71, 30, 0, 1, 30, 3, 4, 5, 6, 7,
8, 9, 10, 11, 31, 32, 14, 15, 16, 17,
18, 19, 20, 21, 22, 5, 6, 25, 8, 9,
10, 11, 30, 30, 14, 15, 30, 0, 1, 174,
3, 4, 5, 6, 7, 8, 9, 10, 11, 30,
30, 14, 15, 16, 17, 18, 19, 20, 21, 22,
68, 69, 25, 71, 69, 1, 71, 30, 4, 5,
6, 7, 8, 9, 10, 11, 30, 30, 14, 15,
16, 14, 143, 144, 145, 68, 69, 30, 71, 25,
151, 25, 153, 1, 30, 30, 31, 32, 31, 32,
161, 30, 31, 32, 13, 30, 25, 14, 32, 30,
30, 33, 30, 30, 30, 30, 30, 30, 30, 29,
67, 109, 60, -1, -1, -1, -1, -1, -1, 40
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -781,19 +787,19 @@ static const yytype_uint8 yystos[] =
20, 21, 22, 25, 30, 38, 39, 41, 42, 43,
44, 50, 51, 53, 57, 59, 61, 62, 64, 66,
67, 68, 75, 30, 25, 26, 74, 74, 30, 74,
30, 30, 74, 25, 25, 25, 26, 29, 34, 78,
79, 30, 1, 1, 45, 45, 54, 56, 60, 71,
65, 71, 30, 76, 30, 30, 30, 30, 30, 78,
78, 31, 32, 76, 27, 33, 30, 30, 1, 12,
16, 18, 19, 20, 21, 22, 23, 25, 30, 40,
46, 47, 69, 70, 72, 17, 18, 19, 20, 30,
40, 55, 70, 72, 39, 52, 75, 39, 53, 58,
64, 75, 30, 40, 72, 39, 53, 63, 64, 75,
30, 28, 78, 78, 79, 79, 30, 30, 24, 74,
73, 74, 78, 25, 79, 48, 1, 13, 30, 74,
73, 25, 78, 14, 77, 30, 77, 77, 77, 79,
25, 30, 30, 77, 30, 77, 30, 78, 30, 30,
30, 77, 33, 49, 30, 30, 30, 74
25, 80, 30, 74, 25, 25, 25, 26, 29, 34,
78, 79, 30, 1, 1, 45, 45, 54, 56, 60,
71, 65, 71, 30, 76, 30, 30, 30, 30, 30,
30, 78, 78, 31, 32, 76, 27, 33, 30, 30,
1, 12, 16, 18, 19, 20, 21, 22, 23, 25,
30, 40, 46, 47, 69, 70, 72, 17, 18, 19,
20, 30, 40, 55, 70, 72, 39, 52, 75, 39,
53, 58, 64, 75, 30, 40, 72, 39, 53, 63,
64, 75, 30, 28, 78, 78, 79, 79, 30, 30,
24, 74, 73, 74, 78, 25, 79, 48, 1, 13,
30, 74, 73, 25, 78, 14, 77, 30, 77, 77,
77, 79, 25, 30, 30, 77, 30, 77, 30, 78,
30, 30, 30, 77, 33, 49, 30, 30, 30, 74
};
#define yyerrok (yyerrstatus = 0)
@@ -1780,8 +1786,8 @@ yyreduce:
case 48:
{
struct symbol *sym = sym_lookup(NULL, 0);
sym->flags |= SYMBOL_CHOICE;
struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE);
sym->flags |= SYMBOL_AUTO;
menu_add_entry(sym);
menu_add_expr(P_CHOICE, NULL, NULL);
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
@@ -2013,7 +2019,12 @@ yyreduce:
case 108:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 1); free((yyvsp[(1) - (1)].string)); ;}
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
break;
case 109:
{ (yyval.string) = NULL; ;}
break;