projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: rename depends_list to comment_option_list
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index 0599a847cf88f11a7f124f3dcd884d17d85b1469..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;
%}
static struct menu *current_menu, *current_entry;
%}
-%expect 31
%union
{
%union
{
@@
-94,7
+93,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,13
+109,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);
};
@@
-127,22
+123,12
@@
stmt_list:
| stmt_list common_stmt
| stmt_list choice_stmt
| stmt_list menu_stmt
| 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 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
@@
-150,12
+136,6
@@
common_stmt:
| assignment_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
/* config/menuconfig entry */
config_entry_start: T_CONFIG nonconst_symbol T_EOL
@@
-192,8
+172,6
@@
config_option_list:
| config_option_list symbol_option
| config_option_list depends
| config_option_list help
| config_option_list symbol_option
| 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
@@
-265,7
+243,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);
@@
-293,8
+271,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: T_PROMPT prompt if_expr T_EOL
;
choice_option: T_PROMPT prompt if_expr T_EOL
@@
-353,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 */
;
/* menu entry */
@@
-372,7
+341,7
@@
menu: T_MENU prompt T_EOL
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
};
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();
};
{
$$ = menu_add_menu();
};
@@
-385,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 */
/* 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
;
source_stmt: T_SOURCE prompt T_EOL
@@
-411,7
+379,12
@@
comment: T_COMMENT prompt T_EOL
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
};
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 */
;
/* help option */
@@
-440,13
+413,6
@@
help: help_start T_HELPTEXT
/* depends option */
/* depends option */
-depends_list:
- /* empty */
- | depends_list depends
- | depends_list T_EOL
- | depends_list option_error
-;
-
depends: T_DEPENDS T_ON expr T_EOL
{
menu_add_dep($3);
depends: T_DEPENDS T_ON expr T_EOL
{
menu_add_dep($3);
@@
-454,14
+420,7
@@
depends: T_DEPENDS T_ON expr T_EOL
};
/* visibility option */
};
/* visibility option */
-
-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);
};
@@
-484,11
+443,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; }
;
@@
-718,6
+672,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;