projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: loosen the order of "visible" and "depends on" in menu entry
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index f72e8994429cd8080042f0135466ef26fd4c23fd..95da8126d7047f28e77224da33f15b66a8bfcbfe 100644
(file)
--- a/
config/zconf.y
+++ b/
config/zconf.y
@@
-341,7
+341,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();
};
@@
-357,6
+357,12
@@
menu_end: end
menu_stmt: menu_entry stmt_list menu_end
;
menu_stmt: menu_entry stmt_list menu_end
;
+menu_option_list:
+ /* empty */
+ | menu_option_list visible
+ | menu_option_list depends
+;
+
source_stmt: T_SOURCE prompt T_EOL
{
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
source_stmt: T_SOURCE prompt T_EOL
{
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
@@
-414,12
+420,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);