projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: remove grammatically ambiguous "unexpected option" diagnostic
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index 4aa5ad8dc874049a3ad8130d23078df8090f67d7..59e40a3e3b74353534c1af42e8817056952b02d2 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;
%}
static struct menu *current_menu, *current_entry;
%}
-%expect
29
+%expect
6
%union
{
%union
{
@@
-94,7
+94,6
@@
static struct menu *current_menu, *current_entry;
%type <expr> expr
%type <expr> if_expr
%type <id> end
%type <expr> expr
%type <expr> if_expr
%type <id> end
-%type <id> option_name
%type <menu> if_entry menu_entry choice_entry
%type <string> symbol_option_arg word_opt assign_val
%type <menu> if_entry menu_entry choice_entry
%type <string> symbol_option_arg word_opt assign_val
@@
-111,9
+110,7
@@
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 entry */
@@
-129,20
+126,11
@@
stmt_list:
| 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 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 option_name error T_EOL
-{
- zconf_error("unexpected option \"%s\"", $2->name);
-}
| stmt_list error T_EOL { zconf_error("invalid statement"); }
;
| stmt_list error T_EOL { zconf_error("invalid statement"); }
;
-option_name:
- T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_IMPLY | T_OPTIONAL | T_RANGE | T_DEFAULT | T_VISIBLE
-;
-
common_stmt:
common_stmt:
- T_EOL
- | if_stmt
+ if_stmt
| comment_stmt
| config_stmt
| menuconfig_stmt
| comment_stmt
| config_stmt
| menuconfig_stmt
@@
-193,7
+181,6
@@
config_option_list:
| config_option_list depends
| config_option_list help
| config_option_list option_error
| 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
;
config_option: T_TYPE prompt_stmt_opt T_EOL
@@
-293,7
+280,6
@@
choice_option_list:
| choice_option_list choice_option
| choice_option_list depends
| choice_option_list help
| choice_option_list choice_option
| choice_option_list depends
| choice_option_list help
- | choice_option_list T_EOL
| choice_option_list option_error
;
| choice_option_list option_error
;
@@
-443,7
+429,6
@@
help: help_start T_HELPTEXT
depends_list:
/* empty */
| depends_list depends
depends_list:
/* empty */
| depends_list depends
- | depends_list T_EOL
| depends_list option_error
;
| depends_list option_error
;
@@
-458,7
+443,6
@@
depends: T_DEPENDS T_ON expr T_EOL
visibility_list:
/* empty */
| visibility_list visible
visibility_list:
/* empty */
| visibility_list visible
- | visibility_list T_EOL
;
visible: T_VISIBLE if_expr T_EOL
;
visible: T_VISIBLE if_expr T_EOL
@@
-484,11
+468,6
@@
end: T_ENDMENU T_EOL { $$ = $1; }
| T_ENDIF T_EOL { $$ = $1; }
;
| T_ENDIF T_EOL { $$ = $1; }
;
-nl:
- T_EOL
- | nl T_EOL
-;
-
if_expr: /* empty */ { $$ = NULL; }
| T_IF expr { $$ = $2; }
;
if_expr: /* empty */ { $$ = NULL; }
| T_IF expr { $$ = $2; }
;