diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-10-10 13:14:15 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-10-10 13:14:15 +0000 |
| commit | 7738ddaa1197c6201886e1c8f6837af5c2c47611 (patch) | |
| tree | 12e2672ee9e34031fce0c334913ab7a4cb3e2026 /extra/config/zconf.y | |
| parent | 9c2d269cfa77cf10eeb9acb24f5eab084a66644a (diff) | |
- pull kconfig from linux-2.6.27
Diffstat (limited to 'extra/config/zconf.y')
| -rw-r--r-- | extra/config/zconf.y | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/extra/config/zconf.y b/extra/config/zconf.y index 4c6a8e3a3..029c9b6c3 100644 --- a/extra/config/zconf.y +++ b/extra/config/zconf.y @@ -91,7 +91,7 @@ static struct menu *current_menu, *current_entry; %type <id> end %type <id> option_name %type <menu> if_entry menu_entry choice_entry -%type <string> symbol_option_arg +%type <string> symbol_option_arg word_opt %destructor { fprintf(stderr, "%s:%d: missing end statement for this entry\n", @@ -239,10 +239,10 @@ symbol_option_arg: /* choice entry */ -choice: T_CHOICE T_EOL +choice: T_CHOICE word_opt T_EOL { - struct symbol *sym = sym_lookup(NULL, 0); - sym->flags |= SYMBOL_CHOICE; + struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE); + sym->flags |= SYMBOL_AUTO; menu_add_entry(sym); menu_add_expr(P_CHOICE, NULL, NULL); printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno()); @@ -456,9 +456,12 @@ expr: symbol { $$ = expr_alloc_symbol($1); } ; symbol: T_WORD { $$ = sym_lookup($1, 0); free($1); } - | T_WORD_QUOTE { $$ = sym_lookup($1, 1); free($1); } + | T_WORD_QUOTE { $$ = sym_lookup($1, SYMBOL_CONST); free($1); } ; +word_opt: /* empty */ { $$ = NULL; } + | T_WORD + %% void conf_parse(const char *name) |