summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-08-18 17:36:36 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-08-18 17:38:31 +0200
commitaa401d229c721f7a8d8f8d6b3ff0b963ca60844f (patch)
treeceeae233c1bc62cf85abcad760e7c6820875b701 /scripts
parent99c8d3955a3d58f42bd70365d26f3f2470ee0f0c (diff)
downloadembtoolkit-aa401d229c721f7a8d8f8d6b3ff0b963ca60844f.tar.gz
embtoolkit-aa401d229c721f7a8d8f8d6b3ff0b963ca60844f.tar.bz2
embtoolkit-aa401d229c721f7a8d8f8d6b3ff0b963ca60844f.tar.xz
Revert "Build system: kconfig: Initial attempt to implement kconfig integer comparison"
This reverts commit 34d211a44d2075c62ba35080ee5e68c25e820002. The implementation is incomplete. The implementation will be completed after upstream merge Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/expr.c66
-rw-r--r--scripts/kconfig/expr.h12
-rw-r--r--scripts/kconfig/symbol.c2
-rw-r--r--scripts/kconfig/zconf.l2
-rw-r--r--scripts/kconfig/zconf.lex.c_shipped286
-rw-r--r--scripts/kconfig/zconf.tab.c_shipped542
-rw-r--r--scripts/kconfig/zconf.y4
7 files changed, 399 insertions, 515 deletions
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 5efd761..290ce41 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -77,8 +77,6 @@ struct expr *expr_copy(const struct expr *org)
break;
case E_EQUAL:
case E_UNEQUAL:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
e->left.sym = org->left.sym;
e->right.sym = org->right.sym;
break;
@@ -111,8 +109,6 @@ void expr_free(struct expr *e)
return;
case E_EQUAL:
case E_UNEQUAL:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
break;
case E_OR:
case E_AND:
@@ -199,8 +195,6 @@ int expr_eq(struct expr *e1, struct expr *e2)
switch (e1->type) {
case E_EQUAL:
case E_UNEQUAL:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
return e1->left.sym == e2->left.sym && e1->right.sym == e2->right.sym;
case E_SYMBOL:
return e1->left.sym == e2->left.sym;
@@ -356,27 +350,13 @@ static struct expr *expr_join_or(struct expr *e1, struct expr *e2)
if (expr_eq(e1, e2))
return expr_copy(e1);
- if (e1->type != E_EQUAL
- && e1->type != E_UNEQUAL
- && e1->type != E_STRICT_GREATER_THAN
- && e1->type != E_STRICT_LESS_THAN
- && e1->type != E_SYMBOL
- && e1->type != E_NOT)
+ if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT)
return NULL;
- if (e2->type != E_EQUAL
- && e2->type != E_UNEQUAL
- && e2->type != E_STRICT_GREATER_THAN
- && e2->type != E_STRICT_LESS_THAN
- && e2->type != E_SYMBOL
- && e2->type != E_NOT)
+ if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT)
return NULL;
if (e1->type == E_NOT) {
tmp = e1->left.expr;
- if (tmp->type != E_EQUAL
- && tmp->type != E_UNEQUAL
- && tmp->type != E_STRICT_GREATER_THAN
- && tmp->type != E_STRICT_LESS_THAN
- && tmp->type != E_SYMBOL)
+ if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL)
return NULL;
sym1 = tmp->left.sym;
} else
@@ -434,27 +414,13 @@ static struct expr *expr_join_and(struct expr *e1, struct expr *e2)
if (expr_eq(e1, e2))
return expr_copy(e1);
- if (e1->type != E_EQUAL
- && e1->type != E_UNEQUAL
- && e1->type != E_STRICT_GREATER_THAN
- && e1->type != E_STRICT_LESS_THAN
- && e1->type != E_SYMBOL
- && e1->type != E_NOT)
+ if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT)
return NULL;
- if (e1->type != E_EQUAL
- && e1->type != E_UNEQUAL
- && e1->type != E_STRICT_GREATER_THAN
- && e1->type != E_STRICT_LESS_THAN
- && e1->type != E_SYMBOL
- && e1->type != E_NOT)
+ if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT)
return NULL;
if (e1->type == E_NOT) {
tmp = e1->left.expr;
- if (tmp->type != E_EQUAL
- && tmp->type != E_UNEQUAL
- && tmp->type != E_STRICT_GREATER_THAN
- && tmp->type != E_STRICT_LESS_THAN
- && tmp->type != E_SYMBOL)
+ if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL)
return NULL;
sym1 = tmp->left.sym;
} else
@@ -676,8 +642,6 @@ struct expr *expr_transform(struct expr *e)
switch (e->type) {
case E_EQUAL:
case E_UNEQUAL:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
case E_SYMBOL:
case E_LIST:
break;
@@ -820,8 +784,6 @@ int expr_contains_symbol(struct expr *dep, struct symbol *sym)
return dep->left.sym == sym;
case E_EQUAL:
case E_UNEQUAL:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
return dep->left.sym == sym ||
dep->right.sym == sym;
case E_NOT:
@@ -968,8 +930,6 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
case E_LIST:
case E_RANGE:
case E_NONE:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
/* panic */;
}
return NULL;
@@ -1010,20 +970,6 @@ tristate expr_calc_value(struct expr *e)
str1 = sym_get_string_value(e->left.sym);
str2 = sym_get_string_value(e->right.sym);
return !strcmp(str1, str2) ? no : yes;
- case E_STRICT_GREATER_THAN:
- sym_calc_value(e->left.sym);
- sym_calc_value(e->right.sym);
- str1 = sym_get_string_value(e->left.sym);
- str2 = sym_get_string_value(e->right.sym);
- return strtol(str1, NULL, 10) > strtol(str2, NULL, 10) ?
- yes : no;
- case E_STRICT_LESS_THAN:
- sym_calc_value(e->left.sym);
- sym_calc_value(e->right.sym);
- str1 = sym_get_string_value(e->left.sym);
- str2 = sym_get_string_value(e->right.sym);
- return strtol(str1, NULL, 10) < strtol(str2, NULL, 10) ?
- yes : no;
default:
printf("expr_calc_value: %d?\n", e->type);
return no;
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index eb0bf6d..80fce57 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -27,17 +27,7 @@ typedef enum tristate {
} tristate;
enum expr_type {
- E_NONE,
- E_OR,
- E_AND,
- E_NOT,
- E_EQUAL,
- E_UNEQUAL,
- E_STRICT_GREATER_THAN,
- E_STRICT_LESS_THAN,
- E_LIST,
- E_SYMBOL,
- E_RANGE
+ E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LIST, E_SYMBOL, E_RANGE
};
union expr_data {
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 2e810f5..071f00c 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1097,8 +1097,6 @@ static struct symbol *sym_check_expr_deps(struct expr *e)
return sym_check_expr_deps(e->left.expr);
case E_EQUAL:
case E_UNEQUAL:
- case E_STRICT_GREATER_THAN:
- case E_STRICT_LESS_THAN:
sym = sym_check_deps(e->left.sym);
if (sym)
return sym;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 640e23c..00f9d3a 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -123,8 +123,6 @@ n [A-Za-z0-9_]
"!" return T_NOT;
"=" return T_EQUAL;
"!=" return T_UNEQUAL;
- ">" return T_STRICT_GREATER_THAN;
- "<" return T_STRICT_LESS_THAN;
\"|\' {
str = yytext[0];
new_string();
diff --git a/scripts/kconfig/zconf.lex.c_shipped b/scripts/kconfig/zconf.lex.c_shipped
index ef37653..c32b1a4 100644
--- a/scripts/kconfig/zconf.lex.c_shipped
+++ b/scripts/kconfig/zconf.lex.c_shipped
@@ -72,6 +72,7 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -102,8 +103,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! C99 */
-
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -160,15 +159,7 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -268,8 +259,8 @@ struct yy_buffer_state
* possible backing-up.
*
* When we actually see the EOF, we change the status to "new"
- * (via yyrestart()), so that the user can continue scanning by
- * just pointing yyin at a new input file.
+ * (via zconfrestart()), so that the user can continue scanning by
+ * just pointing zconfin at a new input file.
*/
#define YY_BUFFER_EOF_PENDING 2
@@ -374,333 +365,323 @@ int zconflineno = 1;
extern char *zconftext;
#define yytext_ptr zconftext
-static yyconst flex_int16_t yy_nxt[][19] =
+static yyconst flex_int16_t yy_nxt[][17] =
{
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0
},
{
11, 12, 13, 14, 12, 12, 15, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12, 12
+ 12, 12, 12, 12, 12, 12, 12
},
{
11, 12, 13, 14, 12, 12, 15, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12, 12
+ 12, 12, 12, 12, 12, 12, 12
},
{
11, 16, 16, 17, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 18, 16, 16, 16, 16, 16
+ 16, 16, 16, 18, 16, 16, 16
},
{
11, 16, 16, 17, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 18, 16, 16, 16, 16, 16
+ 16, 16, 16, 18, 16, 16, 16
},
{
11, 19, 20, 21, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19
+ 19, 19, 19, 19, 19, 19, 19
},
{
11, 19, 20, 21, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19
+ 19, 19, 19, 19, 19, 19, 19
},
{
11, 22, 22, 23, 22, 24, 22, 22, 24, 22,
- 22, 22, 22, 22, 22, 22, 22, 25, 22
+ 22, 22, 22, 22, 22, 25, 22
},
{
11, 22, 22, 23, 22, 24, 22, 22, 24, 22,
- 22, 22, 22, 22, 22, 22, 22, 25, 22
+ 22, 22, 22, 22, 22, 25, 22
},
{
11, 26, 26, 27, 28, 29, 30, 31, 29, 32,
- 33, 34, 35, 35, 36, 37, 38, 39, 40
+ 33, 34, 35, 35, 36, 37, 38
},
{
11, 26, 26, 27, 28, 29, 30, 31, 29, 32,
- 33, 34, 35, 35, 36, 37, 38, 39, 40
+ 33, 34, 35, 35, 36, 37, 38
},
{
-11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
- -11, -11, -11, -11, -11, -11, -11, -11, -11
+ -11, -11, -11, -11, -11, -11, -11
},
{
11, -12, -12, -12, -12, -12, -12, -12, -12, -12,
- -12, -12, -12, -12, -12, -12, -12, -12, -12
+ -12, -12, -12, -12, -12, -12, -12
},
{
- 11, -13, 41, 42, -13, -13, 43, -13, -13, -13,
- -13, -13, -13, -13, -13, -13, -13, -13, -13
+ 11, -13, 39, 40, -13, -13, 41, -13, -13, -13,
+ -13, -13, -13, -13, -13, -13, -13
},
{
11, -14, -14, -14, -14, -14, -14, -14, -14, -14,
- -14, -14, -14, -14, -14, -14, -14, -14, -14
+ -14, -14, -14, -14, -14, -14, -14
},
{
- 11, 44, 44, 45, 44, 44, 44, 44, 44, 44,
- 44, 44, 44, 44, 44, 44, 44, 44, 44
+ 11, 42, 42, 43, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42
},
{
11, -16, -16, -16, -16, -16, -16, -16, -16, -16,
- -16, -16, -16, -16, -16, -16, -16, -16, -16
+ -16, -16, -16, -16, -16, -16, -16
},
{
11, -17, -17, -17, -17, -17, -17, -17, -17, -17,
- -17, -17, -17, -17, -17, -17, -17, -17, -17
+ -17, -17, -17, -17, -17, -17, -17
},
{
11, -18, -18, -18, -18, -18, -18, -18, -18, -18,
- -18, -18, -18, 46, -18, -18, -18, -18, -18
+ -18, -18, -18, 44, -18, -18, -18
},
{
- 11, 47, 47, -19, 47, 47, 47, 47, 47, 47,
- 47, 47, 47, 47, 47, 47, 47, 47, 47
+ 11, 45, 45, -19, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45
},
{
- 11, -20, 48, 49, -20, -20, -20, -20, -20, -20,
- -20, -20, -20, -20, -20, -20, -20, -20, -20
+ 11, -20, 46, 47, -20, -20, -20, -20, -20, -20,
+ -20, -20, -20, -20, -20, -20, -20
},
{
- 11, 50, -21, -21, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50, 50
+ 11, 48, -21, -21, 48, 48, 48, 48, 48, 48,
+ 48, 48, 48, 48, 48, 48, 48
},
{
- 11, 51, 51, 52, 51, -22, 51, 51, -22, 51,
- 51, 51, 51, 51, 51, 51, 51, -22, 51
+ 11, 49, 49, 50, 49, -22, 49, 49, -22, 49,
+ 49, 49, 49, 49, 49, -22, 49
},
{
11, -23, -23, -23, -23, -23, -23, -23, -23, -23,
- -23, -23, -23, -23, -23, -23, -23, -23, -23
+ -23, -23, -23, -23, -23, -23, -23
},
{
11, -24, -24, -24, -24, -24, -24, -24, -24, -24,
- -24, -24, -24, -24, -24, -24, -24, -24, -24
+ -24, -24, -24, -24, -24, -24, -24
},
{
- 11, 53, 53, 54, 53, 53, 53, 53, 53, 53,
- 53, 53, 53, 53, 53, 53, 53, 53, 53
+ 11, 51, 51, 52, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51
},
{
11, -26, -26, -26, -26, -26, -26, -26, -26, -26,
- -26, -26, -26, -26, -26, -26, -26, -26, -26
+ -26, -26, -26, -26, -26, -26, -26
},
{
11, -27, -27, -27, -27, -27, -27, -27, -27, -27,
- -27, -27, -27, -27, -27, -27, -27, -27, -27
+ -27, -27, -27, -27, -27, -27, -27
},
{
11, -28, -28, -28, -28, -28, -28, -28, -28, -28,
- -28, -28, -28, -28, -28, 55, -28, -28, -28
+ -28, -28, -28, -28, 53, -28, -28
},
{
11, -29, -29, -29, -29, -29, -29, -29, -29, -29,
- -29, -29, -29, -29, -29, -29, -29, -29, -29
+ -29, -29, -29, -29, -29, -29, -29
},
{
- 11, 56, 56, -30, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56
+ 11, 54, 54, -30, 54, 54, 54, 54, 54, 54,
+ 54, 54, 54, 54, 54, 54, 54
},
{
- 11, -31, -31, -31, -31, -31, -31, 57, -31, -31,
- -31, -31, -31, -31, -31, -31, -31, -31, -31
+ 11, -31, -31, -31, -31, -31, -31, 55, -31, -31,
+ -31, -31, -31, -31, -31, -31, -31
},
{
11, -32, -32, -32, -32, -32, -32, -32, -32, -32,
- -32, -32, -32, -32, -32, -32, -32, -32, -32
+ -32, -32, -32, -32, -32, -32, -32
},
{
11, -33, -33, -33, -33, -33, -33, -33, -33, -33,
- -33, -33, -33, -33, -33, -33, -33, -33, -33
+ -33, -33, -33, -33, -33, -33, -33
},
{
11, -34, -34, -34, -34, -34, -34, -34, -34, -34,
- -34, 58, 59, 59, -34, -34, -34, -34, -34
+ -34, 56, 57, 57, -34, -34, -34
},
{
11, -35, -35, -35, -35, -35, -35, -35, -35, -35,
- -35, 59, 59, 59, -35, -35, -35, -35, -35
+ -35, 57, 57, 57, -35, -35, -35
},
{
11, -36, -36, -36, -36, -36, -36, -36, -36, -36,
- -36, -36, -36, -36, -36, -36, -36, -36, -36
+ -36, -36, -36, -36, -36, -36, -36
},
{
- 11, -37, -37, -37, -37, -37, -37, -37, -37, -37,
- -37, -37, -37, -37, -37, -37, -37, -37, -37
+ 11, -37, -37, 58, -37, -37, -37, -37, -37, -37,
+ -37, -37, -37, -37, -37, -37, -37
},
{
11, -38, -38, -38, -38, -38, -38, -38, -38, -38,
- -38, -38, -38, -38, -38, -38, -38, -38, -38
+ -38, -38, -38, -38, -38, -38, 59
},
{
- 11, -39, -39, 60, -39, -39, -39, -39, -39, -39,
- -39, -39, -39, -39, -39, -39, -39, -39, -39
+ 11, -39, 39, 40, -39, -39, 41, -39, -39, -39,
+ -39, -39, -39, -39, -39, -39, -39
},
{
11, -40, -40, -40, -40, -40, -40, -40, -40, -40,
- -40, -40, -40, -40, -40, -40, -40, -40, 61
+ -40, -40, -40, -40, -40, -40, -40
},
{
- 11, -41, 41, 42, -41, -41, 43, -41, -41, -41,
- -41, -41, -41, -41, -41, -41, -41, -41, -41
+ 11, 42, 42, 43, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42
},
{
- 11, -42, -42, -42, -42, -42, -42, -42, -42, -42,
- -42, -42, -42, -42, -42, -42, -42, -42, -42
+ 11, 42, 42, 43, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42
},
{
- 11, 44, 44, 45, 44, 44, 44, 44, 44, 44,
- 44, 44, 44, 44, 44, 44, 44, 44, 44
+ 11, -43, -43, -43, -43, -43, -43, -43, -43, -43,
+ -43, -43, -43, -43, -43, -43, -43
},
{
- 11, 44, 44, 45, 44, 44, 44, 44, 44, 44,
- 44, 44, 44, 44, 44, 44, 44, 44, 44
+ 11, -44, -44, -44, -44, -44, -44, -44, -44, -44,
+ -44, -44, -44, 44, -44, -44, -44
},
{
- 11, -45, -45, -45, -45, -45, -45, -45, -45, -45,
- -45, -45, -45, -45, -45, -45, -45, -45, -45
+ 11, 45, 45, -45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45
},
{
- 11, -46, -46, -46, -46, -46, -46, -46, -46, -46,
- -46, -46, -46, 46, -46, -46, -46, -46, -46
+ 11, -46, 46, 47, -46, -46, -46, -46, -46, -46,
+ -46, -46, -46, -46, -46, -46, -46
},
{
- 11, 47, 47, -47, 47, 47, 47, 47, 47, 47,
- 47, 47, 47, 47, 47, 47, 47, 47, 47
+ 11, 48, -47, -47, 48, 48, 48, 48, 48, 48,
+ 48, 48, 48, 48, 48, 48, 48
},
{
- 11, -48, 48, 49, -48, -48, -48, -48, -48, -48,
- -48, -48, -48, -48, -48, -48, -48, -48, -48
+ 11, -48, -48, -48, -48, -48, -48, -48, -48, -48,
+ -48, -48, -48, -48, -48, -48, -48
},
{
- 11, 50, -49, -49, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50, 50
+ 11, 49, 49, 50, 49, -49, 49, 49, -49, 49,
+ 49, 49, 49, 49, 49, -49, 49
},
{
11, -50, -50, -50, -50, -50, -50, -50, -50, -50,
- -50, -50, -50, -50, -50, -50, -50, -50, -50
+ -50, -50, -50, -50, -50, -50, -50
},
{
- 11, 51, 51, 52, 51, -51, 51, 51, -51, 51,
- 51, 51, 51, 51, 51, 51, 51, -51, 51
+ 11, -51, -51, 52, -51, -51, -51, -51, -51, -51,
+ -51, -51, -51, -51, -51, -51, -51
},
{
11, -52, -52, -52, -52, -52, -52, -52, -52, -52,
- -52, -52, -52, -52, -52, -52, -52, -52, -52
+ -52, -52, -52, -52, -52, -52, -52
},
{
- 11, -53, -53, 54, -53, -53, -53, -53, -53, -53,
- -53, -53, -53, -53, -53, -53, -53, -53, -53
+ 11, -53, -53, -53, -53, -53, -53, -53, -53, -53,
+ -53, -53, -53, -53, -53, -53, -53
},
{
- 11, -54, -54, -54, -54, -54, -54, -54, -54, -54,
- -54, -54, -54, -54, -54, -54, -54, -54, -54
+ 11, 54, 54, -54, 54, 54, 54, 54, 54, 54,
+ 54, 54, 54, 54, 54, 54, 54
},
{
11, -55, -55, -55, -55, -55, -55, -55, -55, -55,
- -55, -55, -55, -55, -55, -55, -55, -55, -55
+ -55, -55, -55, -55, -55, -55, -55
},
{
- 11, 56, 56, -56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56
+ 11, -56, -56, -56, -56, -56, -56, -56, -56, -56,
+ -56, 60, 57, 57, -56, -56, -56
},
{
11, -57, -57, -57, -57, -57, -57, -57, -57, -57,
- -57, -57, -57, -57, -57, -57, -57, -57, -57
+ -57, 57, 57, 57, -57, -57, -57
},
{
11, -58, -58, -58, -58, -58, -58, -58, -58, -58,
- -58, 62, 59, 59, -58, -58, -58, -58, -58
+ -58, -58, -58, -58, -58, -58, -58
},
{
11, -59, -59, -59, -59, -59, -59, -59, -59, -59,
- -59, 59, 59, 59, -59, -59, -59, -59, -59
+ -59, -59, -59, -59, -59, -59, -59
},
{
11, -60, -60, -60, -60, -60, -60, -60, -60, -60,
- -60, -60, -60, -60, -60, -60, -60, -60, -60
- },
-
- {
- 11, -61, -61, -61, -61, -61, -61, -61, -61, -61,
- -61, -61, -61, -61, -61, -61, -61, -61, -61
- },
-
- {
- 11, -62, -62, -62, -62, -62, -62, -62, -62, -62,
- -62, 59, 59, 59, -62, -62, -62, -62, -62
+ -60, 57, 57, 57, -60, -60, -60
},
} ;
@@ -720,8 +701,8 @@ static void yy_fatal_error (yyconst char msg[] );
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 35
-#define YY_END_OF_BUFFER 36
+#define YY_NUM_RULES 33
+#define YY_END_OF_BUFFER 34
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -729,15 +710,14 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[63] =
+static yyconst flex_int16_t yy_accept[61] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 36, 5, 4, 2, 3, 7, 8, 6, 34, 31,
- 33, 26, 30, 29, 28, 24, 19, 13, 18, 22,
- 24, 11, 12, 21, 21, 17, 14, 16, 24, 24,
- 4, 2, 3, 3, 1, 6, 34, 31, 33, 32,
- 26, 25, 28, 27, 15, 22, 9, 21, 21, 23,
- 10, 20
+ 34, 5, 4, 2, 3, 7, 8, 6, 32, 29,
+ 31, 24, 28, 27, 26, 22, 17, 13, 16, 20,
+ 22, 11, 12, 19, 19, 14, 22, 22, 4, 2,
+ 3, 3, 1, 6, 32, 29, 31, 30, 24, 23,
+ 26, 25, 15, 20, 9, 19, 19, 21, 10, 18
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -747,15 +727,15 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 2, 4, 5, 6, 1, 1, 7, 8, 9,
10, 1, 1, 1, 11, 12, 12, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 1, 1, 14,
- 15, 16, 1, 1, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 1, 1, 1,
+ 14, 1, 1, 1, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 1, 17, 1, 1, 13, 1, 13, 13, 13, 13,
+ 1, 15, 1, 1, 13, 1, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 1, 18, 1, 1, 1, 1, 1, 1,
+ 13, 13, 1, 16, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -932,12 +912,7 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1167,30 +1142,22 @@ return T_UNEQUAL;
YY_BREAK
case 16:
YY_RULE_SETUP
-return T_STRICT_GREATER_THAN;
- YY_BREAK
-case 17:
-YY_RULE_SETUP
-return T_STRICT_LESS_THAN;
- YY_BREAK
-case 18:
-YY_RULE_SETUP
{
str = zconftext[0];
new_string();
BEGIN(STRING);
}
YY_BREAK
-case 19:
-/* rule 19 can match eol */
+case 17:
+/* rule 17 can match eol */
YY_RULE_SETUP
BEGIN(INITIAL); current_file->lineno++; return T_EOL;
YY_BREAK
-case 20:
+case 18:
YY_RULE_SETUP
/* ignore */
YY_BREAK
-case 21:
+case 19:
YY_RULE_SETUP
{
const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
@@ -1203,16 +1170,16 @@ YY_RULE_SETUP
return T_WORD;
}
YY_BREAK
-case 22:
+case 20:
YY_RULE_SETUP
/* comment */
YY_BREAK
-case 23:
-/* rule 23 can match eol */
+case 21:
+/* rule 21 can match eol */
YY_RULE_SETUP
current_file->lineno++;
YY_BREAK
-case 24:
+case 22:
YY_RULE_SETUP
YY_BREAK
@@ -1222,9 +1189,8 @@ case YY_STATE_EOF(PARAM):
}
YY_BREAK
-
-case 25:
-/* rule 25 can match eol */
+case 23:
+/* rule 23 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up zconftext again */
@@ -1235,14 +1201,14 @@ YY_RULE_SETUP
return T_WORD_QUOTE;
}
YY_BREAK
-case 26:
+case 24:
YY_RULE_SETUP
{
append_string(zconftext, zconfleng);
}
YY_BREAK
-case 27:
-/* rule 27 can match eol */
+case 25:
+/* rule 25 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up zconftext again */
@@ -1253,13 +1219,13 @@ YY_RULE_SETUP
return T_WORD_QUOTE;
}
YY_BREAK
-case 28:
+case 26:
YY_RULE_SETUP
{
append_string(zconftext + 1, zconfleng - 1);
}
YY_BREAK
-case 29:
+case 27:
YY_RULE_SETUP
{
if (str == zconftext[0]) {
@@ -1270,8 +1236,8 @@ YY_RULE_SETUP
append_string(zconftext, 1);
}
YY_BREAK
-case 30:
-/* rule 30 can match eol */
+case 28:
+/* rule 28 can match eol */
YY_RULE_SETUP
{
printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
@@ -1286,8 +1252,7 @@ case YY_STATE_EOF(STRING):
}
YY_BREAK
-
-case 31:
+case 29:
YY_RULE_SETUP
{
ts = 0;
@@ -1312,8 +1277,8 @@ YY_RULE_SETUP
}
}
YY_BREAK
-case 32:
-/* rule 32 can match eol */
+case 30:
+/* rule 30 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up zconftext again */
@@ -1324,15 +1289,15 @@ YY_RULE_SETUP
return T_HELPTEXT;
}
YY_BREAK
-case 33:
-/* rule 33 can match eol */
+case 31:
+/* rule 31 can match eol */
YY_RULE_SETUP
{
current_file->lineno++;
append_string("\n", 1);
}
YY_BREAK
-case 34:
+case 32:
YY_RULE_SETUP
{
while (zconfleng) {
@@ -1354,7 +1319,6 @@ case YY_STATE_EOF(HELP):
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(COMMAND):
-#line 237 "zconf.l"
{
if (current_file) {
zconf_endfile();
@@ -1364,7 +1328,7 @@ case YY_STATE_EOF(COMMAND):
yyterminate();
}
YY_BREAK
-case 35:
+case 33:
YY_RULE_SETUP
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 40a62e2..f636141 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.4.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2009, 2010 Free Software Foundation, Inc.
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
@@ -46,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -166,10 +165,8 @@ static struct menu *current_menu, *current_entry;
T_EOL = 286,
T_OR = 287,
T_AND = 288,
- T_STRICT_LESS_THAN = 289,
- T_STRICT_GREATER_THAN = 290,
- T_EQUAL = 291,
- T_NOT = 292
+ T_EQUAL = 289,
+ T_NOT = 290
};
#endif
@@ -417,20 +414,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 11
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 291
+#define YYLAST 290
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 38
+#define YYNTOKENS 36
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 50
/* YYNRULES -- Number of rules. */
-#define YYNRULES 120
+#define YYNRULES 118
/* YYNRULES -- Number of states. */
-#define YYNSTATES 195
+#define YYNSTATES 191
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 292
+#define YYMAXUTOK 290
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -467,7 +464,7 @@ static const yytype_uint8 yytranslate[] =
5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37
+ 35
};
#if YYDEBUG
@@ -486,67 +483,64 @@ static const yytype_uint16 yyprhs[] =
235, 238, 241, 244, 248, 252, 255, 258, 261, 262,
265, 268, 271, 276, 277, 280, 283, 286, 287, 290,
292, 294, 297, 300, 303, 305, 308, 309, 312, 314,
- 318, 322, 326, 330, 334, 337, 341, 345, 347, 349,
- 350
+ 318, 322, 326, 329, 333, 337, 339, 341, 342
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 39, 0, -1, 83, 40, -1, 40, -1, 65, 41,
- -1, 41, -1, -1, 41, 43, -1, 41, 57, -1,
- 41, 69, -1, 41, 82, -1, 41, 26, 1, 31,
- -1, 41, 42, 1, 31, -1, 41, 1, 31, -1,
+ 37, 0, -1, 81, 38, -1, 38, -1, 63, 39,
+ -1, 39, -1, -1, 39, 41, -1, 39, 55, -1,
+ 39, 67, -1, 39, 80, -1, 39, 26, 1, 31,
+ -1, 39, 40, 1, 31, -1, 39, 1, 31, -1,
16, -1, 18, -1, 19, -1, 21, -1, 17, -1,
- 22, -1, 20, -1, 23, -1, 31, -1, 63, -1,
- 73, -1, 46, -1, 48, -1, 71, -1, 26, 1,
- 31, -1, 1, 31, -1, 10, 26, 31, -1, 45,
- 49, -1, 11, 26, 31, -1, 47, 49, -1, -1,
- 49, 50, -1, 49, 51, -1, 49, 77, -1, 49,
- 75, -1, 49, 44, -1, 49, 31, -1, 19, 80,
- 31, -1, 18, 81, 84, 31, -1, 20, 85, 84,
- 31, -1, 21, 26, 84, 31, -1, 22, 86, 86,
- 84, 31, -1, 24, 52, 31, -1, -1, 52, 26,
- 53, -1, -1, 36, 81, -1, 7, 87, 31, -1,
- 54, 58, -1, 82, -1, 55, 60, 56, -1, -1,
- 58, 59, -1, 58, 77, -1, 58, 75, -1, 58,
- 31, -1, 58, 44, -1, 18, 81, 84, 31, -1,
- 19, 80, 31, -1, 17, 31, -1, 20, 26, 84,
- 31, -1, -1, 60, 43, -1, 14, 85, 83, -1,
- 82, -1, 61, 64, 62, -1, -1, 64, 43, -1,
- 64, 69, -1, 64, 57, -1, 3, 81, 83, -1,
- 4, 81, 31, -1, 66, 78, 76, -1, 82, -1,
- 67, 70, 68, -1, -1, 70, 43, -1, 70, 69,
- -1, 70, 57, -1, 6, 81, 31, -1, 9, 81,
- 31, -1, 72, 76, -1, 12, 31, -1, 74, 13,
- -1, -1, 76, 77, -1, 76, 31, -1, 76, 44,
- -1, 16, 25, 85, 31, -1, -1, 78, 79, -1,
- 78, 31, -1, 23, 84, -1, -1, 81, 84, -1,
+ 22, -1, 20, -1, 23, -1, 31, -1, 61, -1,
+ 71, -1, 44, -1, 46, -1, 69, -1, 26, 1,
+ 31, -1, 1, 31, -1, 10, 26, 31, -1, 43,
+ 47, -1, 11, 26, 31, -1, 45, 47, -1, -1,
+ 47, 48, -1, 47, 49, -1, 47, 75, -1, 47,
+ 73, -1, 47, 42, -1, 47, 31, -1, 19, 78,
+ 31, -1, 18, 79, 82, 31, -1, 20, 83, 82,
+ 31, -1, 21, 26, 82, 31, -1, 22, 84, 84,
+ 82, 31, -1, 24, 50, 31, -1, -1, 50, 26,
+ 51, -1, -1, 34, 79, -1, 7, 85, 31, -1,
+ 52, 56, -1, 80, -1, 53, 58, 54, -1, -1,
+ 56, 57, -1, 56, 75, -1, 56, 73, -1, 56,
+ 31, -1, 56, 42, -1, 18, 79, 82, 31, -1,
+ 19, 78, 31, -1, 17, 31, -1, 20, 26, 82,
+ 31, -1, -1, 58, 41, -1, 14, 83, 81, -1,
+ 80, -1, 59, 62, 60, -1, -1, 62, 41, -1,
+ 62, 67, -1, 62, 55, -1, 3, 79, 81, -1,
+ 4, 79, 31, -1, 64, 76, 74, -1, 80, -1,
+ 65, 68, 66, -1, -1, 68, 41, -1, 68, 67,
+ -1, 68, 55, -1, 6, 79, 31, -1, 9, 79,
+ 31, -1, 70, 74, -1, 12, 31, -1, 72, 13,
+ -1, -1, 74, 75, -1, 74, 31, -1, 74, 42,
+ -1, 16, 25, 83, 31, -1, -1, 76, 77, -1,
+ 76, 31, -1, 23, 82, -1, -1, 79, 82, -1,
26, -1, 27, -1, 5, 31, -1, 8, 31, -1,
- 15, 31, -1, 31, -1, 83, 31, -1, -1, 14,
- 85, -1, 86, -1, 86, 36, 86, -1, 86, 28,
- 86, -1, 86, 35, 86, -1, 86, 34, 86, -1,
- 30, 85, 29, -1, 37, 85, -1, 85, 32, 85,
- -1, 85, 33, 85, -1, 26, -1, 27, -1, -1,
- 26, -1
+ 15, 31, -1, 31, -1, 81, 31, -1, -1, 14,
+ 83, -1, 84, -1, 84, 34, 84, -1, 84, 28,
+ 84, -1, 30, 83, 29, -1, 35, 83, -1, 83,
+ 32, 83, -1, 83, 33, 83, -1, 26, -1, 27,
+ -1, -1, 26, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 103, 103, 103, 105, 105, 107, 109, 110, 111,
- 112, 113, 114, 118, 122, 122, 122, 122, 122, 122,
- 122, 122, 126, 127, 128, 129, 130, 131, 135, 136,
- 142, 150, 156, 164, 174, 176, 177, 178, 179, 180,
- 181, 184, 192, 198, 208, 214, 220, 223, 225, 236,
- 237, 242, 251, 256, 264, 267, 269, 270, 271, 272,
- 273, 276, 282, 293, 299, 309, 311, 316, 324, 332,
- 335, 337, 338, 339, 344, 351, 358, 363, 371, 374,
- 376, 377, 378, 381, 389, 396, 403, 409, 416, 418,
- 419, 420, 423, 431, 433, 434, 437, 444, 446, 451,
- 452, 455, 456, 457, 461, 462, 465, 466, 469, 470,
- 471, 472, 473, 474, 475, 476, 477, 480, 481, 484,
- 485
+ 0, 104, 104, 104, 106, 106, 108, 110, 111, 112,
+ 113, 114, 115, 119, 123, 123, 123, 123, 123, 123,
+ 123, 123, 127, 128, 129, 130, 131, 132, 136, 137,
+ 143, 151, 157, 165, 175, 177, 178, 179, 180, 181,
+ 182, 185, 193, 199, 209, 215, 221, 224, 226, 237,
+ 238, 243, 252, 257, 265, 268, 270, 271, 272, 273,
+ 274, 277, 283, 294, 300, 310, 312, 317, 325, 333,
+ 336, 338, 339, 340, 345, 352, 359, 364, 372, 375,
+ 377, 378, 379, 382, 390, 397, 404, 410, 417, 419,
+ 420, 421, 424, 432, 434, 435, 438, 445, 447, 452,
+ 453, 456, 457, 458, 462, 463, 466, 467, 470, 471,
+ 472, 473, 474, 475, 476, 479, 480, 483, 484
};
#endif
@@ -560,10 +554,9 @@ static const char *const yytname[] =
"T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
"T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE",
"T_VISIBLE", "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL",
- "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND",
- "T_STRICT_LESS_THAN", "T_STRICT_GREATER_THAN", "T_EQUAL", "T_NOT",
- "$accept", "input", "start", "stmt_list", "option_name", "common_stmt",
- "option_error", "config_entry_start", "config_stmt",
+ "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL",
+ "T_NOT", "$accept", "input", "start", "stmt_list", "option_name",
+ "common_stmt", "option_error", "config_entry_start", "config_stmt",
"menuconfig_entry_start", "menuconfig_stmt", "config_option_list",
"config_option", "symbol_option", "symbol_option_list",
"symbol_option_arg", "choice", "choice_entry", "choice_end",
@@ -584,26 +577,25 @@ static const yytype_uint16 yytoknum[] =
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292
+ 285, 286, 287, 288, 289, 290
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 38, 39, 39, 40, 40, 41, 41, 41, 41,
- 41, 41, 41, 41, 42, 42, 42, 42, 42, 42,
- 42, 42, 43, 43, 43, 43, 43, 43, 44, 44,
- 45, 46, 47, 48, 49, 49, 49, 49, 49, 49,
- 49, 50, 50, 50, 50, 50, 51, 52, 52, 53,
- 53, 54, 55, 56, 57, 58, 58, 58, 58, 58,
- 58, 59, 59, 59, 59, 60, 60, 61, 62, 63,
- 64, 64, 64, 64, 65, 66, 67, 68, 69, 70,
- 70, 70, 70, 71, 72, 73, 74, 75, 76, 76,
- 76, 76, 77, 78, 78, 78, 79, 80, 80, 81,
- 81, 82, 82, 82, 83, 83, 84, 84, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 86, 86, 87,
- 87
+ 0, 36, 37, 37, 38, 38, 39, 39, 39, 39,
+ 39, 39, 39, 39, 40, 40, 40, 40, 40, 40,
+ 40, 40, 41, 41, 41, 41, 41, 41, 42, 42,
+ 43, 44, 45, 46, 47, 47, 47, 47, 47, 47,
+ 47, 48, 48, 48, 48, 48, 49, 50, 50, 51,
+ 51, 52, 53, 54, 55, 56, 56, 56, 56, 56,
+ 56, 57, 57, 57, 57, 58, 58, 59, 60, 61,
+ 62, 62, 62, 62, 63, 64, 65, 66, 67, 68,
+ 68, 68, 68, 69, 70, 71, 72, 73, 74, 74,
+ 74, 74, 75, 76, 76, 76, 77, 78, 78, 79,
+ 79, 80, 80, 80, 81, 81, 82, 82, 83, 83,
+ 83, 83, 83, 83, 83, 84, 84, 85, 85
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -620,8 +612,7 @@ static const yytype_uint8 yyr2[] =
2, 2, 2, 3, 3, 2, 2, 2, 0, 2,
2, 2, 4, 0, 2, 2, 2, 0, 2, 1,
1, 2, 2, 2, 1, 2, 0, 2, 1, 3,
- 3, 3, 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
@@ -630,72 +621,72 @@ static const yytype_uint8 yyr2[] =
static const yytype_uint8 yydefact[] =
{
6, 0, 104, 0, 3, 0, 6, 6, 99, 100,
- 0, 1, 0, 0, 0, 0, 119, 0, 0, 0,
+ 0, 1, 0, 0, 0, 0, 117, 0, 0, 0,
0, 0, 0, 14, 18, 15, 16, 20, 17, 19,
21, 0, 22, 0, 7, 34, 25, 34, 26, 55,
65, 8, 70, 23, 93, 79, 9, 27, 88, 24,
- 10, 0, 105, 2, 74, 13, 0, 101, 0, 120,
- 0, 102, 0, 0, 0, 117, 118, 0, 0, 0,
+ 10, 0, 105, 2, 74, 13, 0, 101, 0, 118,
+ 0, 102, 0, 0, 0, 115, 116, 0, 0, 0,
108, 103, 0, 0, 0, 0, 0, 0, 0, 88,
- 0, 0, 75, 83, 51, 84, 30, 32, 0, 114,
- 0, 0, 67, 0, 0, 0, 0, 11, 12, 0,
- 0, 0, 0, 97, 0, 0, 0, 47, 0, 40,
- 39, 35, 36, 0, 38, 37, 0, 0, 97, 0,
- 59, 60, 56, 58, 57, 66, 54, 53, 71, 73,
- 69, 72, 68, 106, 95, 0, 94, 80, 82, 78,
- 81, 77, 90, 91, 89, 113, 115, 116, 110, 112,
- 111, 109, 29, 86, 0, 106, 0, 106, 106, 106,
- 0, 0, 0, 87, 63, 106, 0, 106, 0, 96,
- 0, 0, 41, 98, 0, 0, 106, 49, 46, 28,
- 0, 62, 0, 107, 92, 42, 43, 44, 0, 0,
- 48, 61, 64, 45, 50
+ 0, 0, 75, 83, 51, 84, 30, 32, 0, 112,
+ 0, 0, 67, 0, 0, 11, 12, 0, 0, 0,
+ 0, 97, 0, 0, 0, 47, 0, 40, 39, 35,
+ 36, 0, 38, 37, 0, 0, 97, 0, 59, 60,
+ 56, 58, 57, 66, 54, 53, 71, 73, 69, 72,
+ 68, 106, 95, 0, 94, 80, 82, 78, 81, 77,
+ 90, 91, 89, 111, 113, 114, 110, 109, 29, 86,
+ 0, 106, 0, 106, 106, 106, 0, 0, 0, 87,
+ 63, 106, 0, 106, 0, 96, 0, 0, 41, 98,
+ 0, 0, 106, 49, 46, 28, 0, 62, 0, 107,
+ 92, 42, 43, 44, 0, 0, 48, 61, 64, 45,
+ 50
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 3, 4, 5, 33, 34, 110, 35, 36, 37,
- 38, 74, 111, 112, 161, 190, 39, 40, 126, 41,
- 76, 122, 77, 42, 130, 43, 78, 6, 44, 45,
- 139, 46, 80, 47, 48, 49, 113, 114, 81, 115,
- 79, 136, 156, 157, 50, 7, 169, 69, 70, 60
+ -1, 3, 4, 5, 33, 34, 108, 35, 36, 37,
+ 38, 74, 109, 110, 157, 186, 39, 40, 124, 41,
+ 76, 120, 77, 42, 128, 43, 78, 6, 44, 45,
+ 137, 46, 80, 47, 48, 49, 111, 112, 81, 113,
+ 79, 134, 152, 153, 50, 7, 165, 69, 70, 60
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -97
+#define YYPACT_NINF -90
static const yytype_int16 yypact[] =
{
- 8, 73, -97, 9, -97, 26, -97, 19, -97, -97,
- 29, -97, 59, 73, 97, 73, 104, 102, 73, 118,
- 130, 28, 127, -97, -97, -97, -97, -97, -97, -97,
- -97, 160, -97, 183, -97, -97, -97, -97, -97, -97,
- -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
- -97, 159, -97, -97, 158, -97, 162, -97, 163, -97,
- 172, -97, 173, 188, 190, -97, -97, 28, 28, 228,
- 61, -97, 200, 201, 103, 131, 67, 243, 232, 33,
- 232, 191, -97, -97, -97, -97, -97, -97, 154, -97,
- 28, 28, 158, 79, 79, 79, 79, -97, -97, 213,
- 224, 231, 73, 73, 28, 236, 79, -97, 266, -97,
- -97, -97, -97, 255, -97, -97, 238, 73, 73, 244,
- -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
- -97, -97, -97, 257, -97, 219, -97, -97, -97, -97,
- -97, -97, -97, -97, -97, -97, 239, -97, -97, -97,
- -97, -97, -97, -97, 28, 257, 242, 257, -4, 257,
- 79, -8, 245, -97, -97, 257, 246, 257, 28, -97,
- 233, 247, -97, -97, 248, 249, 257, 250, -97, -97,
- 251, -97, 252, 139, -97, -97, -97, -97, 253, 73,
- -97, -97, -97, -97, -97
+ 4, 42, -90, 96, -90, 111, -90, 15, -90, -90,
+ 75, -90, 82, 42, 104, 42, 110, 107, 42, 115,
+ 125, -4, 121, -90, -90, -90, -90, -90, -90, -90,
+ -90, 162, -90, 163, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, 139, -90, -90, 138, -90, 142, -90, 143, -90,
+ 152, -90, 164, 167, 168, -90, -90, -4, -4, 77,
+ -18, -90, 177, 185, 33, 71, 195, 247, 236, -2,
+ 236, 171, -90, -90, -90, -90, -90, -90, 41, -90,
+ -4, -4, 138, 97, 97, -90, -90, 186, 187, 194,
+ 42, 42, -4, 196, 97, -90, 219, -90, -90, -90,
+ -90, 210, -90, -90, 204, 42, 42, 199, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, 222, -90, 223, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, 215, -90, -90, -90, -90, -90,
+ -4, 222, 228, 222, -5, 222, 97, 35, 229, -90,
+ -90, 222, 232, 222, -4, -90, 135, 233, -90, -90,
+ 234, 235, 222, 240, -90, -90, 237, -90, 239, -13,
+ -90, -90, -90, -90, 244, 42, -90, -90, -90, -90,
+ -90
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -97, -97, 268, 275, -97, 14, -68, -97, -97, -97,
- -97, 254, -97, -97, -97, -97, -97, -97, -97, -59,
- -97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
- -97, -27, -97, -97, -97, -97, -97, 209, 208, -61,
- -97, -97, 170, -1, 138, -3, -96, -66, -90, -97
+ -90, -90, 269, 271, -90, 23, -70, -90, -90, -90,
+ -90, 243, -90, -90, -90, -90, -90, -90, -90, -48,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -20, -90, -90, -90, -90, -90, 206, 205, -68,
+ -90, -90, 169, -1, 27, -7, 118, -66, -89, -90
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -705,96 +696,96 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -86
static const yytype_int16 yytable[] =
{
- 10, 88, 89, 148, 149, 150, 151, 54, 121, 11,
- 168, 1, 56, 143, 58, 124, 160, 62, 177, 129,
- 144, 138, 1, 178, 146, 147, -5, 12, 90, 91,
- 13, 14, 15, 16, 17, 18, 19, 20, 158, 2,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 52, 131, 31, 140, 65, 66, 133, 32, 67, 171,
- 2, 173, 174, 175, 134, 68, 92, 143, 99, 180,
- 176, 182, -52, -52, 144, -52, -52, -52, -52, 100,
- 188, -52, -52, 101, 116, 117, 118, 119, 170, 93,
- 55, 125, 128, 108, 137, 94, 95, 96, 120, 8,
- 9, 155, 183, -31, 99, 65, 66, -31, -31, -31,
- -31, -31, -31, -31, -31, 100, 165, -31, -31, 101,
- -31, 102, 103, 104, 105, 106, -31, 107, 57, 108,
- 59, -33, 99, 61, 109, -33, -33, -33, -33, -33,
- -33, -33, -33, 100, 63, -33, -33, 101, -33, 102,
- 103, 104, 105, 106, -33, 107, 64, 108, 71, -4,
- 12, 72, 109, 13, 14, 15, 16, 17, 18, 19,
- 20, 90, 91, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 145, 73, 31, 90, 91, 194, 52,
- 32, -85, 99, 82, 83, -85, -85, -85, -85, -85,
- -85, -85, -85, 84, 85, -85, -85, 101, -85, -85,
- -85, -85, -85, -85, -85, 127, 132, 108, 141, 86,
- 99, 87, 142, -76, -76, -76, -76, -76, -76, -76,
- -76, 97, 98, -76, -76, 101, 13, 14, 15, 16,
- 17, 18, 19, 20, 152, 108, 21, 22, 14, 15,
- 142, 17, 18, 19, 20, 153, 154, 21, 22, 2,
- 90, 91, 159, 32, 184, 90, 91, 162, 163, 164,
- 167, 168, 91, 172, 32, 53, 179, 181, 185, 186,
- 187, 51, 191, 192, 193, 123, 189, 135, 166, 0,
- 0, 75
+ 10, 88, 89, 54, 146, 147, 119, 1, 122, 164,
+ 93, 141, 56, 142, 58, 156, 94, 62, 1, 90,
+ 91, 131, 65, 66, 144, 145, 67, 90, 91, 132,
+ 127, 68, 136, -31, 97, 2, 154, -31, -31, -31,
+ -31, -31, -31, -31, -31, 98, 52, -31, -31, 99,
+ -31, 100, 101, 102, 103, 104, -31, 105, 129, 106,
+ 138, 173, 92, 141, 107, 142, 174, 172, 8, 9,
+ 143, -33, 97, 90, 91, -33, -33, -33, -33, -33,
+ -33, -33, -33, 98, 166, -33, -33, 99, -33, 100,
+ 101, 102, 103, 104, -33, 105, 11, 106, 179, 151,
+ 123, 126, 107, 135, 125, 130, 2, 139, 2, 90,
+ 91, -5, 12, 55, 161, 13, 14, 15, 16, 17,
+ 18, 19, 20, 65, 66, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 57, 59, 31, 61, -4,
+ 12, 63, 32, 13, 14, 15, 16, 17, 18, 19,
+ 20, 64, 71, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 72, 73, 31, 180, 90, 91, 52,
+ 32, -85, 97, 82, 83, -85, -85, -85, -85, -85,
+ -85, -85, -85, 84, 190, -85, -85, 99, -85, -85,
+ -85, -85, -85, -85, -85, 85, 97, 106, 86, 87,
+ -52, -52, 140, -52, -52, -52, -52, 98, 95, -52,
+ -52, 99, 114, 115, 116, 117, 96, 148, 149, 150,
+ 158, 106, 155, 159, 97, 163, 118, -76, -76, -76,
+ -76, -76, -76, -76, -76, 160, 164, -76, -76, 99,
+ 13, 14, 15, 16, 17, 18, 19, 20, 91, 106,
+ 21, 22, 14, 15, 140, 17, 18, 19, 20, 168,
+ 175, 21, 22, 177, 181, 182, 183, 32, 187, 167,
+ 188, 169, 170, 171, 185, 189, 53, 51, 32, 176,
+ 75, 178, 121, 0, 133, 162, 0, 0, 0, 0,
+ 184
};
static const yytype_int16 yycheck[] =
{
- 1, 67, 68, 93, 94, 95, 96, 10, 76, 0,
- 14, 3, 13, 81, 15, 76, 106, 18, 26, 78,
- 81, 80, 3, 31, 90, 91, 0, 1, 32, 33,
- 4, 5, 6, 7, 8, 9, 10, 11, 104, 31,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 31, 78, 26, 80, 26, 27, 23, 31, 30, 155,
- 31, 157, 158, 159, 31, 37, 69, 135, 1, 165,
- 160, 167, 5, 6, 135, 8, 9, 10, 11, 12,
- 176, 14, 15, 16, 17, 18, 19, 20, 154, 28,
- 31, 77, 78, 26, 80, 34, 35, 36, 31, 26,
- 27, 102, 168, 0, 1, 26, 27, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 117, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 31, 26,
- 26, 0, 1, 31, 31, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 26, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 26, 26, 31, 0,
- 1, 1, 31, 4, 5, 6, 7, 8, 9, 10,
- 11, 32, 33, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 29, 1, 26, 32, 33, 189, 31,
+ 1, 67, 68, 10, 93, 94, 76, 3, 76, 14,
+ 28, 81, 13, 81, 15, 104, 34, 18, 3, 32,
+ 33, 23, 26, 27, 90, 91, 30, 32, 33, 31,
+ 78, 35, 80, 0, 1, 31, 102, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 31, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 78, 26,
+ 80, 26, 69, 133, 31, 133, 31, 156, 26, 27,
+ 29, 0, 1, 32, 33, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, 150, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 0, 26, 164, 100,
+ 77, 78, 31, 80, 77, 78, 31, 80, 31, 32,
+ 33, 0, 1, 31, 115, 4, 5, 6, 7, 8,
+ 9, 10, 11, 26, 27, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 31, 26, 26, 31, 0,
+ 1, 26, 31, 4, 5, 6, 7, 8, 9, 10,
+ 11, 26, 31, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 1, 1, 26, 31, 32, 33, 31,
31, 0, 1, 31, 31, 4, 5, 6, 7, 8,
- 9, 10, 11, 31, 31, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 77, 78, 26, 80, 31,
- 1, 31, 31, 4, 5, 6, 7, 8, 9, 10,
- 11, 31, 31, 14, 15, 16, 4, 5, 6, 7,
- 8, 9, 10, 11, 31, 26, 14, 15, 5, 6,
- 31, 8, 9, 10, 11, 31, 25, 14, 15, 31,
- 32, 33, 26, 31, 31, 32, 33, 1, 13, 31,
- 26, 14, 33, 31, 31, 7, 31, 31, 31, 31,
- 31, 6, 31, 31, 31, 76, 36, 79, 118, -1,
- -1, 37
+ 9, 10, 11, 31, 185, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 31, 1, 26, 31, 31,
+ 5, 6, 31, 8, 9, 10, 11, 12, 31, 14,
+ 15, 16, 17, 18, 19, 20, 31, 31, 31, 25,
+ 1, 26, 26, 13, 1, 26, 31, 4, 5, 6,
+ 7, 8, 9, 10, 11, 31, 14, 14, 15, 16,
+ 4, 5, 6, 7, 8, 9, 10, 11, 33, 26,
+ 14, 15, 5, 6, 31, 8, 9, 10, 11, 31,
+ 31, 14, 15, 31, 31, 31, 31, 31, 31, 151,
+ 31, 153, 154, 155, 34, 31, 7, 6, 31, 161,
+ 37, 163, 76, -1, 79, 116, -1, -1, -1, -1,
+ 172
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 3, 31, 39, 40, 41, 65, 83, 26, 27,
- 81, 0, 1, 4, 5, 6, 7, 8, 9, 10,
+ 0, 3, 31, 37, 38, 39, 63, 81, 26, 27,
+ 79, 0, 1, 4, 5, 6, 7, 8, 9, 10,
11, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 26, 31, 42, 43, 45, 46, 47, 48, 54,
- 55, 57, 61, 63, 66, 67, 69, 71, 72, 73,
- 82, 41, 31, 40, 83, 31, 81, 31, 81, 26,
- 87, 31, 81, 26, 26, 26, 27, 30, 37, 85,
- 86, 31, 1, 1, 49, 49, 58, 60, 64, 78,
- 70, 76, 31, 31, 31, 31, 31, 31, 85, 85,
- 32, 33, 83, 28, 34, 35, 36, 31, 31, 1,
- 12, 16, 18, 19, 20, 21, 22, 24, 26, 31,
- 44, 50, 51, 74, 75, 77, 17, 18, 19, 20,
- 31, 44, 59, 75, 77, 43, 56, 82, 43, 57,
- 62, 69, 82, 23, 31, 76, 79, 43, 57, 68,
- 69, 82, 31, 44, 77, 29, 85, 85, 86, 86,
- 86, 86, 31, 31, 25, 81, 80, 81, 85, 26,
- 86, 52, 1, 13, 31, 81, 80, 26, 14, 84,
- 85, 84, 31, 84, 84, 84, 86, 26, 31, 31,
- 84, 31, 84, 85, 31, 31, 31, 31, 84, 36,
- 53, 31, 31, 31, 81
+ 23, 26, 31, 40, 41, 43, 44, 45, 46, 52,
+ 53, 55, 59, 61, 64, 65, 67, 69, 70, 71,
+ 80, 39, 31, 38, 81, 31, 79, 31, 79, 26,
+ 85, 31, 79, 26, 26, 26, 27, 30, 35, 83,
+ 84, 31, 1, 1, 47, 47, 56, 58, 62, 76,
+ 68, 74, 31, 31, 31, 31, 31, 31, 83, 83,
+ 32, 33, 81, 28, 34, 31, 31, 1, 12, 16,
+ 18, 19, 20, 21, 22, 24, 26, 31, 42, 48,
+ 49, 72, 73, 75, 17, 18, 19, 20, 31, 42,
+ 57, 73, 75, 41, 54, 80, 41, 55, 60, 67,
+ 80, 23, 31, 74, 77, 41, 55, 66, 67, 80,
+ 31, 42, 75, 29, 83, 83, 84, 84, 31, 31,
+ 25, 79, 78, 79, 83, 26, 84, 50, 1, 13,
+ 31, 79, 78, 26, 14, 82, 83, 82, 31, 82,
+ 82, 82, 84, 26, 31, 31, 82, 31, 82, 83,
+ 31, 31, 31, 31, 82, 34, 51, 31, 31, 31,
+ 79
};
#define yyerrok (yyerrstatus = 0)
@@ -809,9 +800,18 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ Once GCC version 2 has supplanted version 1, this can go. However,
+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+ discussed. */
#define YYFAIL goto yyerrlab
+#if defined YYFAIL
+ /* This is here to suppress warnings from the GCC cpp's
+ -Wunused-macros. Normally we don't worry about that warning, but
+ some users do, and we want to make it easy for users to remove
+ YYFAIL uses, which will produce warnings from Bison 2.5. */
+#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -1305,7 +1305,7 @@ yydestruct (yymsg, yytype, yyvaluep)
switch (yytype)
{
- case 55: /* "choice_entry" */
+ case 53: /* "choice_entry" */
{
fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -1315,7 +1315,7 @@ yydestruct (yymsg, yytype, yyvaluep)
};
break;
- case 61: /* "if_entry" */
+ case 59: /* "if_entry" */
{
fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -1325,7 +1325,7 @@ yydestruct (yymsg, yytype, yyvaluep)
};
break;
- case 67: /* "menu_entry" */
+ case 65: /* "menu_entry" */
{
fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -1637,34 +1637,34 @@ yyreduce:
{
case 10:
- { zconf_error("unexpected end statement"); }
+ { zconf_error("unexpected end statement"); ;}
break;
case 11:
- { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); }
+ { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;}
break;
case 12:
{
zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
-}
+;}
break;
case 13:
- { zconf_error("invalid statement"); }
+ { zconf_error("invalid statement"); ;}
break;
case 28:
- { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); }
+ { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;}
break;
case 29:
- { zconf_error("invalid option"); }
+ { zconf_error("invalid option"); ;}
break;
case 30:
@@ -1674,7 +1674,7 @@ yyreduce:
sym->flags |= SYMBOL_OPTIONAL;
menu_add_entry(sym);
printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
-}
+;}
break;
case 31:
@@ -1682,7 +1682,7 @@ yyreduce:
{
menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 32:
@@ -1692,7 +1692,7 @@ yyreduce:
sym->flags |= SYMBOL_OPTIONAL;
menu_add_entry(sym);
printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
-}
+;}
break;
case 33:
@@ -1704,7 +1704,7 @@ yyreduce:
zconfprint("warning: menuconfig statement without prompt");
menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 41:
@@ -1714,7 +1714,7 @@ yyreduce:
printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
zconf_curname(), zconf_lineno(),
(yyvsp[(1) - (3)].id)->stype);
-}
+;}
break;
case 42:
@@ -1722,7 +1722,7 @@ yyreduce:
{
menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 43:
@@ -1734,7 +1734,7 @@ yyreduce:
printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
zconf_curname(), zconf_lineno(),
(yyvsp[(1) - (4)].id)->stype);
-}
+;}
break;
case 44:
@@ -1742,7 +1742,7 @@ yyreduce:
{
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());
-}
+;}
break;
case 45:
@@ -1750,7 +1750,7 @@ yyreduce:
{
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());
-}
+;}
break;
case 48:
@@ -1762,17 +1762,17 @@ yyreduce:
else
zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string));
free((yyvsp[(2) - (3)].string));
-}
+;}
break;
case 49:
- { (yyval.string) = NULL; }
+ { (yyval.string) = NULL; ;}
break;
case 50:
- { (yyval.string) = (yyvsp[(2) - (2)].string); }
+ { (yyval.string) = (yyvsp[(2) - (2)].string); ;}
break;
case 51:
@@ -1783,14 +1783,14 @@ yyreduce:
menu_add_entry(sym);
menu_add_expr(P_CHOICE, NULL, NULL);
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 52:
{
(yyval.menu) = menu_add_menu();
-}
+;}
break;
case 53:
@@ -1800,7 +1800,7 @@ yyreduce:
menu_end_menu();
printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
}
-}
+;}
break;
case 61:
@@ -1808,7 +1808,7 @@ yyreduce:
{
menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 62:
@@ -1821,7 +1821,7 @@ yyreduce:
(yyvsp[(1) - (3)].id)->stype);
} else
YYERROR;
-}
+;}
break;
case 63:
@@ -1829,7 +1829,7 @@ yyreduce:
{
current_entry->sym->flags |= SYMBOL_OPTIONAL;
printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 64:
@@ -1841,7 +1841,7 @@ yyreduce:
zconf_curname(), zconf_lineno());
} else
YYERROR;
-}
+;}
break;
case 67:
@@ -1851,7 +1851,7 @@ yyreduce:
menu_add_entry(NULL);
menu_add_dep((yyvsp[(2) - (3)].expr));
(yyval.menu) = menu_add_menu();
-}
+;}
break;
case 68:
@@ -1861,14 +1861,14 @@ yyreduce:
menu_end_menu();
printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
}
-}
+;}
break;
case 74:
{
menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
-}
+;}
break;
case 75:
@@ -1877,14 +1877,14 @@ yyreduce:
menu_add_entry(NULL);
menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 76:
{
(yyval.menu) = menu_add_menu();
-}
+;}
break;
case 77:
@@ -1894,7 +1894,7 @@ yyreduce:
menu_end_menu();
printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
}
-}
+;}
break;
case 83:
@@ -1902,7 +1902,7 @@ yyreduce:
{
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
zconf_nextfile((yyvsp[(2) - (3)].string));
-}
+;}
break;
case 84:
@@ -1911,14 +1911,14 @@ yyreduce:
menu_add_entry(NULL);
menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 85:
{
menu_end_entry();
-}
+;}
break;
case 86:
@@ -1926,14 +1926,14 @@ yyreduce:
{
printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
zconf_starthelp();
-}
+;}
break;
case 87:
{
current_entry->help = (yyvsp[(2) - (2)].string);
-}
+;}
break;
case 92:
@@ -1941,106 +1941,96 @@ yyreduce:
{
menu_add_dep((yyvsp[(3) - (4)].expr));
printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
-}
+;}
break;
case 96:
{
menu_add_visibility((yyvsp[(2) - (2)].expr));
-}
+;}
break;
case 98:
{
menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
-}
+;}
break;
case 101:
- { (yyval.id) = (yyvsp[(1) - (2)].id); }
+ { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
break;
case 102:
- { (yyval.id) = (yyvsp[(1) - (2)].id); }
+ { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
break;
case 103:
- { (yyval.id) = (yyvsp[(1) - (2)].id); }
+ { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
break;
case 106:
- { (yyval.expr) = NULL; }
+ { (yyval.expr) = NULL; ;}
break;
case 107:
- { (yyval.expr) = (yyvsp[(2) - (2)].expr); }
+ { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
break;
case 108:
- { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); }
+ { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
break;
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;
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;
case 111:
- { (yyval.expr) = expr_alloc_comp(E_STRICT_GREATER_THAN, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
+ { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
break;
case 112:
- { (yyval.expr) = expr_alloc_comp(E_STRICT_LESS_THAN, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
+ { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
break;
case 113:
- { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
+ { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
break;
case 114:
- { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); }
+ { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
break;
case 115:
- { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
+ { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
break;
case 116:
- { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
+ { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
break;
case 117:
- { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); }
- break;
-
- case 118:
-
- { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); }
- break;
-
- case 119:
-
- { (yyval.string) = NULL; }
+ { (yyval.string) = NULL; ;}
break;
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 6d6f25d..864da07 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -75,7 +75,7 @@ static struct menu *current_menu, *current_entry;
%left T_OR
%left T_AND
-%left T_EQUAL T_UNEQUAL T_STRICT_GREATER_THAN T_STRICT_LESS_THAN
+%left T_EQUAL T_UNEQUAL
%nonassoc T_NOT
%type <string> prompt
@@ -469,8 +469,6 @@ if_expr: /* empty */ { $$ = NULL; }
expr: symbol { $$ = expr_alloc_symbol($1); }
| symbol T_EQUAL symbol { $$ = expr_alloc_comp(E_EQUAL, $1, $3); }
| symbol T_UNEQUAL symbol { $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); }
- | symbol T_STRICT_GREATER_THAN symbol { $$ = expr_alloc_comp(E_STRICT_GREATER_THAN, $1, $3); }
- | symbol T_STRICT_LESS_THAN symbol { $$ = expr_alloc_comp(E_STRICT_LESS_THAN, $1, $3); }
| T_OPEN_PAREN expr T_CLOSE_PAREN { $$ = $2; }
| T_NOT expr { $$ = expr_alloc_one(E_NOT, $2); }
| expr T_OR expr { $$ = expr_alloc_two(E_OR, $1, $3); }
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 20:38:00 +0000