kconfig: remove redundant menu_block rule

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index 59e40a3e3b74353534c1af42e8817056952b02d2..f72e8994429cd8080042f0135466ef26fd4c23fd 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -31,7 +31,6 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
 
 %}
-%expect 6
 
 %union
 {
@@ -124,7 +123,6 @@ stmt_list:
        | stmt_list common_stmt
        | stmt_list choice_stmt
        | stmt_list menu_stmt
-       | stmt_list end                 { zconf_error("unexpected end statement"); }
        | stmt_list T_WORD error T_EOL  { zconf_error("unknown statement \"%s\"", $2); }
        | stmt_list error T_EOL         { zconf_error("invalid statement"); }
 ;
@@ -138,12 +136,6 @@ common_stmt:
        | assignment_stmt
 ;
 
-option_error:
-         T_WORD error T_EOL            { zconf_error("unknown option \"%s\"", $1); }
-       | error T_EOL                   { zconf_error("invalid option"); }
-;
-
-
 /* config/menuconfig entry */
 
 config_entry_start: T_CONFIG nonconst_symbol T_EOL
@@ -180,7 +172,6 @@ config_option_list:
        | config_option_list symbol_option
        | config_option_list depends
        | config_option_list help
-       | config_option_list option_error
 ;
 
 config_option: T_TYPE prompt_stmt_opt T_EOL
@@ -280,7 +271,6 @@ choice_option_list:
        | choice_option_list choice_option
        | choice_option_list depends
        | choice_option_list help
-       | choice_option_list option_error
 ;
 
 choice_option: T_PROMPT prompt if_expr T_EOL
@@ -339,14 +329,7 @@ if_end: end
        }
 };
 
-if_stmt: if_entry if_block if_end
-;
-
-if_block:
-         /* empty */
-       | if_block common_stmt
-       | if_block menu_stmt
-       | if_block choice_stmt
+if_stmt: if_entry stmt_list if_end
 ;
 
 /* menu entry */
@@ -371,14 +354,7 @@ menu_end: end
        }
 };
 
-menu_stmt: menu_entry menu_block menu_end
-;
-
-menu_block:
-         /* empty */
-       | menu_block common_stmt
-       | menu_block menu_stmt
-       | menu_block choice_stmt
+menu_stmt: menu_entry stmt_list menu_end
 ;
 
 source_stmt: T_SOURCE prompt T_EOL
@@ -429,7 +405,6 @@ help: help_start T_HELPTEXT
 depends_list:
          /* empty */
        | depends_list depends
-       | depends_list option_error
 ;
 
 depends: T_DEPENDS T_ON expr T_EOL