kconfig: fix ambiguous grammar in terms of new lines

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index a4b17758bf1013422d0ea624ebd604092d236c89..be5d68941b027f985d35a5dfaec006569a02feda 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 32
+%expect 21
 
 %union
 {
@@ -111,13 +111,11 @@ static struct menu *current_menu, *current_entry;
 %}
 
 %%
-input: nl start | start;
-
-start: mainmenu_stmt stmt_list | stmt_list;
+input: 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);
 };
@@ -141,8 +139,7 @@ option_name:
 ;
 
 common_stmt:
-         T_EOL
-       | if_stmt
+         if_stmt
        | comment_stmt
        | config_stmt
        | menuconfig_stmt
@@ -193,7 +190,6 @@ config_option_list:
        | config_option_list depends
        | config_option_list help
        | config_option_list option_error
-       | config_option_list T_EOL
 ;
 
 config_option: T_TYPE prompt_stmt_opt T_EOL
@@ -265,7 +261,7 @@ symbol_option_arg:
 choice: T_CHOICE word_opt T_EOL
 {
        struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);
-       sym->flags |= SYMBOL_AUTO;
+       sym->flags |= SYMBOL_NO_WRITE;
        menu_add_entry(sym);
        menu_add_expr(P_CHOICE, NULL, NULL);
        free($2);
@@ -293,7 +289,6 @@ choice_option_list:
        | choice_option_list choice_option
        | choice_option_list depends
        | choice_option_list help
-       | choice_option_list T_EOL
        | choice_option_list option_error
 ;
 
@@ -337,7 +332,7 @@ choice_block:
 
 /* if entry */
 
-if_entry: T_IF expr nl
+if_entry: T_IF expr T_EOL
 {
        printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
        menu_add_entry(NULL);
@@ -443,7 +438,6 @@ help: help_start T_HELPTEXT
 depends_list:
          /* empty */
        | depends_list depends
-       | depends_list T_EOL
        | depends_list option_error
 ;
 
@@ -458,10 +452,9 @@ depends: T_DEPENDS T_ON expr T_EOL
 visibility_list:
          /* empty */
        | visibility_list visible
-       | visibility_list T_EOL
 ;
 
-visible: T_VISIBLE if_expr
+visible: T_VISIBLE if_expr T_EOL
 {
        menu_add_visibility($2);
 };
@@ -484,11 +477,6 @@ end:         T_ENDMENU T_EOL       { $$ = $1; }
        | T_ENDIF T_EOL         { $$ = $1; }
 ;
 
-nl:
-         T_EOL
-       | nl T_EOL
-;
-
 if_expr:  /* empty */                  { $$ = NULL; }
        | T_IF expr                     { $$ = $2; }
 ;
@@ -718,6 +706,10 @@ static void print_symbol(FILE *out, struct menu *menu)
                        print_quoted_string(out, prop->text);
                        fputc('\n', out);
                        break;
+               case P_SYMBOL:
+                       fputs( "  symbol ", out);
+                       fprintf(out, "%s\n", prop->sym->name);
+                       break;
                default:
                        fprintf(out, "  unknown prop %d!\n", prop->type);
                        break;