KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts/config: warn on deprected "depends" syntax instead of throwing a syntax error

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36375
This commit is contained in:
Felix Fietkau 2013-04-22 12:53:32 +00:00
parent cd35ea2174
commit 45339e03de
2 changed files with 160 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

301
scripts/config/zconf.tab.c_shipped
View file

@ -447,16 +447,16 @@ union yyalloc
/* 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. */
#define YYLAST 295 #define YYLAST 308
/* YYNTOKENS -- Number of terminals. */ /* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 37 #define YYNTOKENS 37
/* YYNNTS -- Number of nonterminals. */ /* YYNNTS -- Number of nonterminals. */
#define YYNNTS 50 #define YYNNTS 50
/* YYNRULES -- Number of rules. */ /* YYNRULES -- Number of rules. */
#define YYNRULES 120 #define YYNRULES 121
/* YYNRULES -- Number of states. */ /* YYNRULES -- Number of states. */
#define YYNSTATES 195 #define YYNSTATES 197
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2 #define YYUNDEFTOK 2
@ -514,10 +514,10 @@ static const yytype_uint16 yyprhs[] =
171, 174, 177, 182, 186, 189, 193, 198, 199, 202, 171, 174, 177, 182, 186, 189, 193, 198, 199, 202,
206, 208, 212, 213, 216, 219, 222, 226, 230, 234, 206, 208, 212, 213, 216, 219, 222, 226, 230, 234,
236, 240, 241, 244, 247, 250, 254, 258, 261, 264, 236, 240, 241, 244, 247, 250, 254, 258, 261, 264,
267, 268, 271, 274, 277, 282, 283, 286, 289, 292, 267, 268, 271, 274, 277, 282, 286, 287, 290, 293,
293, 296, 298, 300, 303, 306, 309, 311, 314, 315, 296, 297, 300, 302, 304, 307, 310, 313, 315, 318,
318, 320, 324, 328, 332, 335, 339, 343, 345, 347, 319, 322, 324, 328, 332, 336, 339, 343, 347, 349,
348 351, 352
}; };
/* YYRHS -- A `-1'-separated list of the rules' RHS. */ /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@ -551,13 +551,14 @@ static const yytype_int8 yyrhs[] =
6, 80, 32, -1, 9, 80, 32, -1, 71, 75, 6, 80, 32, -1, 9, 80, 32, -1, 71, 75,
-1, 12, 32, -1, 73, 13, -1, -1, 75, 76, -1, 12, 32, -1, 73, 13, -1, -1, 75, 76,
-1, 75, 32, -1, 75, 43, -1, 16, 25, 84, -1, 75, 32, -1, 75, 43, -1, 16, 25, 84,
32, -1, -1, 77, 78, -1, 77, 32, -1, 23, 32, -1, 16, 84, 32, -1, -1, 77, 78, -1,
83, -1, -1, 80, 83, -1, 27, -1, 28, -1, 77, 32, -1, 23, 83, -1, -1, 80, 83, -1,
5, 32, -1, 8, 32, -1, 15, 32, -1, 32, 27, -1, 28, -1, 5, 32, -1, 8, 32, -1,
-1, 82, 32, -1, -1, 14, 84, -1, 85, -1, 15, 32, -1, 32, -1, 82, 32, -1, -1, 14,
85, 35, 85, -1, 85, 29, 85, -1, 31, 84, 84, -1, 85, -1, 85, 35, 85, -1, 85, 29,
30, -1, 36, 84, -1, 84, 33, 84, -1, 84, 85, -1, 31, 84, 30, -1, 36, 84, -1, 84,
34, 84, -1, 27, -1, 28, -1, -1, 27, -1 33, 84, -1, 84, 34, 84, -1, 27, -1, 28,
-1, -1, 27, -1
}; };
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@ -572,10 +573,10 @@ static const yytype_uint16 yyrline[] =
273, 274, 277, 283, 294, 300, 305, 315, 317, 322, 273, 274, 277, 283, 294, 300, 305, 315, 317, 322,
330, 338, 341, 343, 344, 345, 350, 357, 364, 369, 330, 338, 341, 343, 344, 345, 350, 357, 364, 369,
377, 380, 382, 383, 384, 387, 395, 402, 409, 415, 377, 380, 382, 383, 384, 387, 395, 402, 409, 415,
422, 424, 425, 426, 429, 437, 439, 440, 443, 450, 422, 424, 425, 426, 429, 433, 441, 443, 444, 447,
452, 457, 458, 461, 462, 463, 467, 468, 471, 472, 454, 456, 461, 462, 465, 466, 467, 471, 472, 475,
475, 476, 477, 478, 479, 480, 481, 484, 485, 488, 476, 479, 480, 481, 482, 483, 484, 485, 488, 489,
489 492, 493
}; };
#endif #endif
@ -629,10 +630,10 @@ static const yytype_uint8 yyr1[] =
57, 57, 58, 58, 58, 58, 58, 59, 59, 60, 57, 57, 58, 58, 58, 58, 58, 59, 59, 60,
61, 62, 63, 63, 63, 63, 64, 65, 66, 67, 61, 62, 63, 63, 63, 63, 64, 65, 66, 67,
68, 69, 69, 69, 69, 70, 71, 72, 73, 74, 68, 69, 69, 69, 69, 70, 71, 72, 73, 74,
75, 75, 75, 75, 76, 77, 77, 77, 78, 79, 75, 75, 75, 75, 76, 76, 77, 77, 77, 78,
79, 80, 80, 81, 81, 81, 82, 82, 83, 83, 79, 79, 80, 80, 81, 81, 81, 82, 82, 83,
84, 84, 84, 84, 84, 84, 84, 85, 85, 86, 83, 84, 84, 84, 84, 84, 84, 84, 85, 85,
86 86, 86
}; };
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@ -647,10 +648,10 @@ static const yytype_uint8 yyr2[] =
2, 2, 4, 3, 2, 3, 4, 0, 2, 3, 2, 2, 4, 3, 2, 3, 4, 0, 2, 3,
1, 3, 0, 2, 2, 2, 3, 3, 3, 1, 1, 3, 0, 2, 2, 2, 3, 3, 3, 1,
3, 0, 2, 2, 2, 3, 3, 2, 2, 2, 3, 0, 2, 2, 2, 3, 3, 2, 2, 2,
0, 2, 2, 2, 4, 0, 2, 2, 2, 0, 0, 2, 2, 2, 4, 3, 0, 2, 2, 2,
2, 1, 1, 2, 2, 2, 1, 2, 0, 2, 0, 2, 1, 1, 2, 2, 2, 1, 2, 0,
1, 3, 3, 3, 2, 3, 3, 1, 1, 0, 2, 1, 3, 3, 3, 2, 3, 3, 1, 1,
1 0, 1
}; };
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@ -658,36 +659,36 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */ means the default is an error. */
static const yytype_uint8 yydefact[] = static const yytype_uint8 yydefact[] =
{ {
6, 0, 106, 0, 3, 0, 6, 6, 101, 102, 6, 0, 107, 0, 3, 0, 6, 6, 102, 103,
0, 1, 0, 0, 0, 0, 119, 0, 0, 0, 0, 1, 0, 0, 0, 0, 120, 0, 0, 0,
0, 0, 0, 14, 18, 15, 16, 20, 17, 19, 0, 0, 0, 14, 18, 15, 16, 20, 17, 19,
21, 22, 0, 23, 0, 7, 35, 26, 35, 27, 21, 22, 0, 23, 0, 7, 35, 26, 35, 27,
56, 67, 8, 72, 24, 95, 81, 9, 28, 90, 56, 67, 8, 72, 24, 96, 81, 9, 28, 90,
25, 10, 0, 107, 2, 76, 13, 0, 103, 0, 25, 10, 0, 108, 2, 76, 13, 0, 104, 0,
120, 0, 104, 0, 0, 0, 117, 118, 0, 0, 121, 0, 105, 0, 0, 0, 118, 119, 0, 0,
0, 110, 105, 0, 0, 0, 0, 0, 0, 0, 0, 111, 106, 0, 0, 0, 0, 0, 0, 0,
90, 0, 0, 77, 85, 52, 86, 31, 33, 0, 90, 0, 0, 77, 85, 52, 86, 31, 33, 0,
114, 0, 0, 69, 0, 0, 11, 12, 0, 0, 115, 0, 0, 69, 0, 0, 11, 12, 0, 0,
0, 0, 99, 0, 0, 0, 48, 0, 41, 40, 0, 0, 100, 0, 0, 0, 48, 0, 41, 40,
36, 37, 0, 39, 38, 0, 0, 99, 0, 108, 36, 37, 0, 39, 38, 0, 0, 100, 0, 109,
60, 61, 57, 59, 58, 68, 55, 54, 73, 75, 60, 61, 57, 59, 58, 68, 55, 54, 73, 75,
71, 74, 70, 108, 97, 0, 96, 82, 84, 80, 71, 74, 70, 109, 98, 0, 97, 82, 84, 80,
83, 79, 92, 93, 91, 113, 115, 116, 112, 111, 83, 79, 92, 93, 91, 114, 116, 117, 113, 112,
30, 88, 0, 108, 0, 108, 108, 108, 0, 0, 30, 88, 0, 0, 109, 0, 109, 109, 109, 0,
0, 89, 64, 108, 0, 108, 0, 0, 98, 0, 0, 0, 89, 64, 109, 0, 109, 0, 0, 99,
0, 42, 100, 0, 0, 108, 50, 47, 29, 0, 0, 95, 0, 42, 101, 0, 0, 109, 50, 47,
63, 0, 109, 65, 94, 43, 44, 45, 0, 0, 29, 0, 63, 0, 110, 65, 94, 43, 44, 45,
49, 62, 66, 46, 51 0, 0, 49, 62, 66, 46, 51
}; };
/* YYDEFGOTO[NTERM-NUM]. */ /* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] = static const yytype_int16 yydefgoto[] =
{ {
-1, 3, 4, 5, 34, 35, 109, 36, 37, 38, -1, 3, 4, 5, 34, 35, 109, 36, 37, 38,
39, 75, 110, 111, 159, 190, 40, 41, 126, 42, 39, 75, 110, 111, 160, 192, 40, 41, 126, 42,
77, 122, 78, 43, 130, 44, 79, 6, 45, 46, 77, 122, 78, 43, 130, 44, 79, 6, 45, 46,
139, 47, 81, 48, 49, 50, 112, 113, 82, 114, 139, 47, 81, 48, 49, 50, 112, 113, 82, 114,
80, 136, 154, 155, 51, 7, 167, 70, 71, 61 80, 136, 155, 156, 51, 7, 168, 70, 71, 61
}; };
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@ -695,36 +696,36 @@ static const yytype_int16 yydefgoto[] =
#define YYPACT_NINF -127 #define YYPACT_NINF -127
static const yytype_int16 yypact[] = static const yytype_int16 yypact[] =
{ {
6, 16, -127, 10, -127, 160, -127, 13, -127, -127, 7, 30, -127, 9, -127, 160, -127, 13, -127, -127,
-14, -127, -10, 16, 25, 16, 21, 35, 16, 44, -13, -127, 14, 30, 17, 30, -4, 21, 30, 35,
61, -8, 62, -127, -127, -127, -127, -127, -127, -127, 38, 16, 43, -127, -127, -127, -127, -127, -127, -127,
-127, -127, 100, -127, 126, -127, -127, -127, -127, -127, -127, -127, 82, -127, 91, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, 189, -127, -127, 98, -127, 101, -127, 112, -127, -127, 193, -127, -127, 72, -127, 73, -127, 95,
-127, 124, -127, 127, 130, 140, -127, -127, -8, -8, -127, 98, -127, 101, 112, 124, -127, -127, 16, 16,
0, 17, -127, 141, 152, 102, 131, 64, 45, 261, 63, 19, -127, 127, 130, 102, 131, 62, 276, 265,
3, 261, 218, -127, -127, -127, -127, -127, -127, 28, 4, 265, 222, -127, -127, -127, -127, -127, -127, 26,
-127, -8, -8, 98, 70, 70, -127, -127, 153, 159, -127, 16, 16, 72, 71, 71, -127, -127, 152, 153,
176, 16, 16, -8, 175, 70, -127, 212, -127, -127, -7, 30, 30, 16, 161, 71, -127, 194, -127, -127,
-127, -127, 201, -127, -127, 185, 16, 16, 193, 216, -127, -127, 183, -127, -127, 173, 30, 30, 179, 203,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, 216, -127, 247, -127, -127, -127, -127, -127, -127, -127, 203, -127, 251, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, 197, -127, -127, -127, -127, -127, -127, -127, -127, -127, 184, -127, -127, -127,
-127, -127, -8, 216, 210, 216, 7, 216, 70, 15, -127, -127, 16, 260, 203, 189, 203, 8, 203, 71,
211, -127, -127, 216, 214, 216, -8, 227, -127, 248, 23, 192, -127, -127, 203, 202, 203, 16, 214, -127,
228, -127, -127, 232, 241, 216, 242, -127, -127, 246, 266, -127, 215, -127, -127, 218, 219, 203, 200, -127,
-127, 252, 71, -127, -127, -127, -127, -127, 254, 16, -127, 221, -127, 231, 139, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127 232, 30, -127, -127, -127, -127, -127
}; };
/* YYPGOTO[NTERM-NUM]. */ /* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] = static const yytype_int16 yypgoto[] =
{ {
-127, -127, 280, 282, -127, 8, -71, -127, -127, -127, -127, -127, 261, 271, -127, 6, -71, -127, -127, -127,
-127, 251, -127, -127, -127, -127, -127, -127, -127, 168, -127, 250, -127, -127, -127, -127, -127, -127, -127, -46,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, 204, -127, -127, -127, -127, -127, 213, 215, -69, -127, 110, -127, -127, -127, -127, -127, 212, 216, -69,
-127, -127, 174, -1, 14, -7, -126, -67, -90, -127 -127, -127, 178, -1, 12, -9, -126, -66, -90, -127
}; };
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@ -734,70 +735,72 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -88 #define YYTABLE_NINF -88
static const yytype_int16 yytable[] = static const yytype_int16 yytable[] =
{ {
10, 89, 90, 55, 148, 149, 121, 168, 124, 1, 10, 55, 89, 90, 148, 149, 121, 169, 124, 11,
11, 143, 57, 144, 59, 158, 1, 63, 2, 66, 1, 143, 57, 144, 59, 159, 1, 63, 152, 2,
67, 166, 56, 68, 146, 147, 133, 170, 69, 172, 66, 67, 167, 60, 68, 146, 147, 133, 172, 69,
173, 174, 2, 91, 92, 134, 156, 179, 2, 181, 174, 175, 176, 129, 153, 138, 134, 157, 181, 2,
91, 92, 176, 8, 9, 53, 94, 177, 60, 188, 183, 91, 92, 66, 67, 53, 56, 68, 94, 58,
14, 15, 95, 17, 18, 19, 20, 58, 145, 21, 178, 190, 69, 62, 95, 179, 145, 8, 9, 91,
22, 91, 92, 93, 143, 98, 144, 62, 175, -53, 92, 93, 64, 98, 143, 65, 144, -53, -53, 177,
-53, 64, -53, -53, -53, -53, 99, 33, -53, -53, -53, -53, -53, -53, 99, 72, -53, -53, 100, 115,
100, 115, 116, 117, 118, 169, 125, 128, 65, 137, 116, 117, 118, 73, 125, 128, 170, 137, 119, 107,
119, 107, 127, 132, 72, 141, 120, 66, 67, 182, 127, 132, 74, 141, 120, 2, 91, 92, 66, 67,
153, 73, -32, 98, 91, 92, -32, -32, -32, -32, 154, 184, -32, 98, 53, 83, -32, -32, -32, -32,
-32, -32, -32, -32, 99, 163, -32, -32, 100, -32, -32, -32, -32, -32, 99, 164, -32, -32, 100, -32,
101, 102, 103, 104, 105, -32, 106, 74, -32, 107, 101, 102, 103, 104, 105, -32, 106, 84, -32, 107,
53, -34, 98, 83, 108, -34, -34, -34, -34, -34, 85, -34, 98, 86, 108, -34, -34, -34, -34, -34,
-34, -34, -34, 99, 84, -34, -34, 100, -34, 101, -34, -34, -34, 99, 87, -34, -34, 100, -34, 101,
102, 103, 104, 105, -34, 106, 85, -34, 107, 86, 102, 103, 104, 105, -34, 106, 88, -34, 107, 96,
-5, 12, 87, 108, 13, 14, 15, 16, 17, 18, -5, 12, 97, 108, 13, 14, 15, 16, 17, 18,
19, 20, 88, 96, 21, 22, 23, 24, 25, 26, 19, 20, 91, 92, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 97, 150, 31, 32, 194, -4, 27, 28, 29, 30, 150, 151, 31, 32, 158, 131,
12, 151, 33, 13, 14, 15, 16, 17, 18, 19, 196, 140, 33, -4, 12, 161, 162, 13, 14, 15,
20, 152, 157, 21, 22, 23, 24, 25, 26, 27, 16, 17, 18, 19, 20, 163, 166, 21, 22, 23,
28, 29, 30, 160, 161, 31, 32, 162, -87, 98, 24, 25, 26, 27, 28, 29, 30, 167, 92, 31,
165, 33, -87, -87, -87, -87, -87, -87, -87, -87, 32, 173, -87, 98, 180, 33, -87, -87, -87, -87,
166, 92, -87, -87, 100, -87, -87, -87, -87, -87, -87, -87, -87, -87, 182, 191, -87, -87, 100, -87,
-87, -87, 171, 178, -87, 107, 180, 129, 98, 138, -87, -87, -87, -87, -87, -87, 185, 187, -87, 107,
142, -78, -78, -78, -78, -78, -78, -78, -78, 183, 188, 189, 98, 193, 142, -78, -78, -78, -78, -78,
185, -78, -78, 100, 186, 13, 14, 15, 16, 17, -78, -78, -78, 194, 195, -78, -78, 100, 54, 13,
18, 19, 20, 187, 107, 21, 22, 189, 191, 142, 14, 15, 16, 17, 18, 19, 20, 52, 107, 21,
184, 91, 92, 131, 192, 140, 193, 54, 52, 76, 22, 14, 15, 142, 17, 18, 19, 20, 76, 123,
123, 164, 0, 33, 0, 135 21, 22, 171, 91, 92, 165, 135, 33, 186, 91,
92, 0, 0, 0, 0, 0, 0, 0, 33
}; };
static const yytype_int16 yycheck[] = static const yytype_int16 yycheck[] =
{ {
1, 68, 69, 10, 94, 95, 77, 133, 77, 3, 1, 10, 68, 69, 94, 95, 77, 133, 77, 0,
0, 82, 13, 82, 15, 105, 3, 18, 32, 27, 3, 82, 13, 82, 15, 105, 3, 18, 25, 32,
28, 14, 32, 31, 91, 92, 23, 153, 36, 155, 27, 28, 14, 27, 31, 91, 92, 23, 154, 36,
156, 157, 32, 33, 34, 32, 103, 163, 32, 165, 156, 157, 158, 79, 100, 81, 32, 103, 164, 32,
33, 34, 27, 27, 28, 32, 29, 32, 27, 175, 166, 33, 34, 27, 28, 32, 32, 31, 29, 32,
5, 6, 35, 8, 9, 10, 11, 32, 30, 14, 27, 177, 36, 32, 35, 32, 30, 27, 28, 33,
15, 33, 34, 70, 135, 1, 135, 32, 158, 5, 34, 70, 27, 1, 135, 27, 135, 5, 6, 159,
6, 27, 8, 9, 10, 11, 12, 32, 14, 15, 8, 9, 10, 11, 12, 32, 14, 15, 16, 17,
16, 17, 18, 19, 20, 152, 78, 79, 27, 81, 18, 19, 20, 1, 78, 79, 152, 81, 26, 27,
26, 27, 78, 79, 32, 81, 32, 27, 28, 166, 78, 79, 1, 81, 32, 32, 33, 34, 27, 28,
101, 1, 0, 1, 33, 34, 4, 5, 6, 7, 101, 167, 0, 1, 32, 32, 4, 5, 6, 7,
8, 9, 10, 11, 12, 116, 14, 15, 16, 17, 8, 9, 10, 11, 12, 116, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 1, 26, 27, 18, 19, 20, 21, 22, 23, 24, 32, 26, 27,
32, 0, 1, 32, 32, 4, 5, 6, 7, 8, 32, 0, 1, 32, 32, 4, 5, 6, 7, 8,
9, 10, 11, 12, 32, 14, 15, 16, 17, 18, 9, 10, 11, 12, 32, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 32, 26, 27, 32, 19, 20, 21, 22, 23, 24, 32, 26, 27, 32,
0, 1, 32, 32, 4, 5, 6, 7, 8, 9, 0, 1, 32, 32, 4, 5, 6, 7, 8, 9,
10, 11, 32, 32, 14, 15, 16, 17, 18, 19, 10, 11, 33, 34, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 32, 32, 26, 27, 189, 0, 20, 21, 22, 23, 32, 32, 26, 27, 27, 79,
1, 32, 32, 4, 5, 6, 7, 8, 9, 10, 191, 81, 32, 0, 1, 1, 13, 4, 5, 6,
11, 25, 27, 14, 15, 16, 17, 18, 19, 20, 7, 8, 9, 10, 11, 32, 27, 14, 15, 16,
21, 22, 23, 1, 13, 26, 27, 32, 0, 1, 17, 18, 19, 20, 21, 22, 23, 14, 34, 26,
27, 32, 4, 5, 6, 7, 8, 9, 10, 11, 27, 32, 0, 1, 32, 32, 4, 5, 6, 7,
14, 34, 14, 15, 16, 17, 18, 19, 20, 21, 8, 9, 10, 11, 32, 35, 14, 15, 16, 17,
22, 23, 32, 32, 26, 27, 32, 79, 1, 81, 18, 19, 20, 21, 22, 23, 32, 32, 26, 27,
32, 4, 5, 6, 7, 8, 9, 10, 11, 32, 32, 32, 1, 32, 32, 4, 5, 6, 7, 8,
32, 14, 15, 16, 32, 4, 5, 6, 7, 8, 9, 10, 11, 32, 32, 14, 15, 16, 7, 4,
9, 10, 11, 32, 27, 14, 15, 35, 32, 32, 5, 6, 7, 8, 9, 10, 11, 6, 27, 14,
32, 33, 34, 79, 32, 81, 32, 7, 6, 38, 15, 5, 6, 32, 8, 9, 10, 11, 38, 77,
77, 117, -1, 32, -1, 80 14, 15, 32, 33, 34, 117, 80, 32, 32, 33,
34, -1, -1, -1, -1, -1, -1, -1, 32
}; };
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@ -819,11 +822,11 @@ static const yytype_uint8 yystos[] =
32, 43, 58, 74, 76, 42, 55, 81, 42, 56, 32, 43, 58, 74, 76, 42, 55, 81, 42, 56,
61, 68, 81, 23, 32, 75, 78, 42, 56, 67, 61, 68, 81, 23, 32, 75, 78, 42, 56, 67,
68, 81, 32, 43, 76, 30, 84, 84, 85, 85, 68, 81, 32, 43, 76, 30, 84, 84, 85, 85,
32, 32, 25, 80, 79, 80, 84, 27, 85, 51, 32, 32, 25, 84, 80, 79, 80, 84, 27, 85,
1, 13, 32, 80, 79, 27, 14, 83, 83, 84, 51, 1, 13, 32, 80, 79, 27, 14, 83, 83,
83, 32, 83, 83, 83, 85, 27, 32, 32, 83, 84, 32, 83, 32, 83, 83, 83, 85, 27, 32,
32, 83, 84, 32, 32, 32, 32, 32, 83, 35, 32, 83, 32, 83, 84, 32, 32, 32, 32, 32,
52, 32, 32, 32, 80 83, 35, 52, 32, 32, 32, 80
}; };
#define yyerrok (yyerrstatus = 0) #define yyerrok (yyerrstatus = 0)
@ -1983,25 +1986,28 @@ yyreduce:
;} ;}
break; break;
case 98: case 95:
{
menu_add_dep((yyvsp[(2) - (3)].expr));
zconfprint("warning: deprecated 'depends' syntax, use 'depends on' instead.");
;}
break;
case 99:
{ {
menu_add_visibility((yyvsp[(2) - (2)].expr)); menu_add_visibility((yyvsp[(2) - (2)].expr));
;} ;}
break; break;
case 100: case 101:
{ {
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 103:
{ (yyval.id) = (yyvsp[(1) - (2)].id); ;}
break;
case 104: case 104:
{ (yyval.id) = (yyvsp[(1) - (2)].id); ;} { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
@ -2012,63 +2018,68 @@ yyreduce:
{ (yyval.id) = (yyvsp[(1) - (2)].id); ;} { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
break; break;
case 108: case 106:
{ (yyval.expr) = NULL; ;} { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
break; break;
case 109: case 109:
{ (yyval.expr) = (yyvsp[(2) - (2)].expr); ;} { (yyval.expr) = NULL; ;}
break; break;
case 110: case 110:
{ (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;} { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
break; break;
case 111: case 111:
{ (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
break; break;
case 112: case 112:
{ (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (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 113: case 113:
{ (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
break; break;
case 114: case 114:
{ (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;} { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
break; break;
case 115: case 115:
{ (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
break; break;
case 116: case 116:
{ (yyval.expr) = expr_alloc_two(E_AND, (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 117: case 117:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;} { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
break; break;
case 118: case 118:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;} { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
break; break;
case 119: case 119:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
break;
case 120:
{ (yyval.string) = NULL; ;} { (yyval.string) = NULL; ;}
break; break;

4
scripts/config/zconf.y
View file

@ -430,6 +430,10 @@ depends: T_DEPENDS T_ON expr T_EOL
{ {
menu_add_dep($3); menu_add_dep($3);
printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
} | T_DEPENDS expr T_EOL
{
menu_add_dep($2);
zconfprint("warning: deprecated 'depends' syntax, use 'depends on' instead.");
}; };
/* visibility option */ /* visibility option */