kconfig: rename depends_list to comment_option_list

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index 59e40a3e3b74353534c1af42e8817056952b02d2..0f4368aa24cf5f2ad4b8de714b9bae3d31cdcc86 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 */
@@ -358,7 +341,7 @@ menu: T_MENU prompt T_EOL
        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();
 };
@@ -371,14 +354,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 */
-       | 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
@@ -397,7 +379,12 @@ comment: T_COMMENT prompt T_EOL
        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 */
@@ -426,12 +413,6 @@ help: help_start T_HELPTEXT
 
 /* depends option */
 
-depends_list:
-         /* empty */
-       | depends_list depends
-       | depends_list option_error
-;
-
 depends: T_DEPENDS T_ON expr T_EOL
 {
        menu_add_dep($3);
@@ -439,12 +420,6 @@ depends: T_DEPENDS T_ON expr T_EOL
 };
 
 /* visibility option */
-
-visibility_list:
-         /* empty */
-       | visibility_list visible
-;
-
 visible: T_VISIBLE if_expr T_EOL
 {
        menu_add_visibility($2);