kconfig: refactor pattern matching in STRING state

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index 496bf27dd8ce97955eed182e6bd278accc07faa9..4aa5ad8dc874049a3ad8130d23078df8090f67d7 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
 
 %}
-%expect 31
+%expect 29
 
 %union
 {
@@ -117,7 +117,7 @@ start: mainmenu_stmt stmt_list | stmt_list;
 
 /* mainmenu entry */
 
-mainmenu_stmt: T_MAINMENU prompt nl
+mainmenu_stmt: T_MAINMENU prompt T_EOL
 {
        menu_add_prompt(P_MENU, $2, NULL);
 };
@@ -461,7 +461,7 @@ visibility_list:
        | visibility_list T_EOL
 ;
 
-visible: T_VISIBLE if_expr
+visible: T_VISIBLE if_expr T_EOL
 {
        menu_add_visibility($2);
 };