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 addd4a68b549c5557a5ba41781e1a31d96ed7729..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
32
+%expect
6
%union
{
%union
{
@@
-41,6
+41,7
@@
static struct menu *current_menu, *current_entry;
struct expr *expr;
struct menu *menu;
const struct kconf_id *id;
struct expr *expr;
struct menu *menu;
const struct kconf_id *id;
+ enum variable_flavor flavor;
}
%token <id>T_MAINMENU
}
%token <id>T_MAINMENU
@@
-78,7
+79,7
@@
static struct menu *current_menu, *current_entry;
%token T_OPEN_PAREN
%token T_EOL
%token <string> T_VARIABLE
%token T_OPEN_PAREN
%token T_EOL
%token <string> T_VARIABLE
-%token T_ASSIGN
+%token
<flavor>
T_ASSIGN
%token <string> T_ASSIGN_VAL
%left T_OR
%token <string> T_ASSIGN_VAL
%left T_OR
@@
-93,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
@@
-110,13
+110,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 entry */
-mainmenu_stmt: T_MAINMENU prompt
nl
+mainmenu_stmt: T_MAINMENU prompt
T_EOL
{
menu_add_prompt(P_MENU, $2, NULL);
};
{
menu_add_prompt(P_MENU, $2, NULL);
};
@@
-128,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
@@
-192,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
@@
-264,7
+252,7
@@
symbol_option_arg:
choice: T_CHOICE word_opt T_EOL
{
struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);
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);
menu_add_entry(sym);
menu_add_expr(P_CHOICE, NULL, NULL);
free($2);
@@
-292,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
;
@@
-336,7
+323,7
@@
choice_block:
/* if entry */
/* 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);
{
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL);
@@
-442,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
;
@@
-457,10
+443,9
@@
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
+visible: T_VISIBLE if_expr
T_EOL
{
menu_add_visibility($2);
};
{
menu_add_visibility($2);
};
@@
-483,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; }
;
@@
-517,7
+497,7
@@
word_opt: /* empty */ { $$ = NULL; }
/* assignment statement */
/* assignment statement */
-assignment_stmt: T_VARIABLE T_ASSIGN assign_val T_EOL { variable_add($1, $3); free($1); free($3); }
+assignment_stmt: T_VARIABLE T_ASSIGN assign_val T_EOL { variable_add($1, $3
, $2
); free($1); free($3); }
assign_val:
/* empty */ { $$ = xstrdup(""); };
assign_val:
/* empty */ { $$ = xstrdup(""); };
@@
-717,6
+697,10
@@
static void print_symbol(FILE *out, struct menu *menu)
print_quoted_string(out, prop->text);
fputc('\n', out);
break;
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;
default:
fprintf(out, " unknown prop %d!\n", prop->type);
break;