Commit 9a826842 authored by Ulf Magnusson's avatar Ulf Magnusson Committed by Masahiro Yamada

kconfig: Rename menu_check_dep() to rewrite_m()

More directly describes the only thing it does.
Signed-off-by: default avatarUlf Magnusson <ulfalizer@gmail.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent c8734434
...@@ -79,19 +79,23 @@ void menu_end_menu(void) ...@@ -79,19 +79,23 @@ void menu_end_menu(void)
current_menu = current_menu->parent; current_menu = current_menu->parent;
} }
static struct expr *menu_check_dep(struct expr *e) /*
* Rewrites 'm' to 'm' && MODULES, so that it evaluates to 'n' when running
* without modules
*/
static struct expr *rewrite_m(struct expr *e)
{ {
if (!e) if (!e)
return e; return e;
switch (e->type) { switch (e->type) {
case E_NOT: case E_NOT:
e->left.expr = menu_check_dep(e->left.expr); e->left.expr = rewrite_m(e->left.expr);
break; break;
case E_OR: case E_OR:
case E_AND: case E_AND:
e->left.expr = menu_check_dep(e->left.expr); e->left.expr = rewrite_m(e->left.expr);
e->right.expr = menu_check_dep(e->right.expr); e->right.expr = rewrite_m(e->right.expr);
break; break;
case E_SYMBOL: case E_SYMBOL:
/* change 'm' into 'm' && MODULES */ /* change 'm' into 'm' && MODULES */
...@@ -106,7 +110,7 @@ static struct expr *menu_check_dep(struct expr *e) ...@@ -106,7 +110,7 @@ static struct expr *menu_check_dep(struct expr *e)
void menu_add_dep(struct expr *dep) void menu_add_dep(struct expr *dep)
{ {
current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep)); current_entry->dep = expr_alloc_and(current_entry->dep, rewrite_m(dep));
} }
void menu_set_type(int type) void menu_set_type(int type)
...@@ -131,7 +135,7 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct ...@@ -131,7 +135,7 @@ static struct property *menu_add_prop(enum prop_type type, char *prompt, struct
prop->menu = current_entry; prop->menu = current_entry;
prop->expr = expr; prop->expr = expr;
prop->visible.expr = menu_check_dep(dep); prop->visible.expr = rewrite_m(dep);
if (prompt) { if (prompt) {
if (isspace(*prompt)) { if (isspace(*prompt)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment