projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: remove redundant token defines
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index b3564a2c5d09922cd0380f5788f8fa2011a7c307..1dac176e24fd90a31d95d3c0f442393c84cadd2a 100644
(file)
--- a/
config/zconf.y
+++ b/
config/zconf.y
@@
-69,11
+69,6
@@
static struct menu *current_menu, *current_entry;
%token <id>T_ON
%token <string> T_WORD
%token <string> T_WORD_QUOTE
%token <id>T_ON
%token <string> T_WORD
%token <string> T_WORD_QUOTE
-%token T_UNEQUAL
-%token T_LESS
-%token T_LESS_EQUAL
-%token T_GREATER
-%token T_GREATER_EQUAL
%token T_CLOSE_PAREN
%token T_OPEN_PAREN
%token T_EOL
%token T_CLOSE_PAREN
%token T_OPEN_PAREN
%token T_EOL
@@
-341,7
+336,7
@@
menu: T_MENU prompt T_EOL
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
};
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
};
-menu_entry: menu
visibility_list depends
_list
+menu_entry: menu
menu_option
_list
{
$$ = menu_add_menu();
};
{
$$ = menu_add_menu();
};
@@
-354,14
+349,13
@@
menu_end: end
}
};
}
};
-menu_stmt: menu_entry
menu_block
menu_end
+menu_stmt: menu_entry
stmt_list
menu_end
;
;
-menu_
block
:
+menu_
option_list
:
/* empty */
/* empty */
- | menu_block common_stmt
- | menu_block menu_stmt
- | menu_block choice_stmt
+ | menu_option_list visible
+ | menu_option_list depends
;
source_stmt: T_SOURCE prompt T_EOL
;
source_stmt: T_SOURCE prompt T_EOL
@@
-380,7
+374,12
@@
comment: T_COMMENT prompt T_EOL
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
};
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
};
-comment_stmt: comment depends_list
+comment_stmt: comment comment_option_list
+;
+
+comment_option_list:
+ /* empty */
+ | comment_option_list depends
;
/* help option */
;
/* help option */
@@
-409,11
+408,6
@@
help: help_start T_HELPTEXT
/* depends option */
/* depends option */
-depends_list:
- /* empty */
- | depends_list depends
-;
-
depends: T_DEPENDS T_ON expr T_EOL
{
menu_add_dep($3);
depends: T_DEPENDS T_ON expr T_EOL
{
menu_add_dep($3);
@@
-421,12
+415,6
@@
depends: T_DEPENDS T_ON expr T_EOL
};
/* visibility option */
};
/* visibility option */
-
-visibility_list:
- /* empty */
- | visibility_list visible
-;
-
visible: T_VISIBLE if_expr T_EOL
{
menu_add_visibility($2);
visible: T_VISIBLE if_expr T_EOL
{
menu_add_visibility($2);