kconfig: introduce menu type enum
PATCH 1/1 kconfig: introduce menu type enum
Currently, menu->prompt->type is checked to distinguish "comment" (P_COMMENT) and "menu" (P_MENU) entries from regular "config" entries. This is odd because P_COMMENT and P_MENU are not properties.
This commit introduces menu type enum to distinguish menu types more naturally.
Signed-off-by Masahiro Yamada <[email protected]>
---
scripts/kconfig/expr.h | 11 +++++++++++ scripts/kconfig/lkc.h | 2 +- scripts/kconfig/menu.c | 5 +++-- scripts/kconfig/parser.y | 12 ++++++------ 4 files changed, 21 insertions(+), 9 deletions(-)
scripts/kconfig/expr.h +11 -0
@@ -205,15 +205,26 @@ struct property {for (st = sym->prop; st; st = st->next) \if (st->text) +enum menu_type { +M_CHOICE ,// "choice" +M_COMMENT ,// "comment" +M_IF ,// "if" +M_MENU ,// "mainmenu", "menu", "menuconfig" + M_NORMAL, // others, i.e., "config" +}; +/* * Represents a node in the menu tree, as seen in e.g. menuconfig (though used * for all front ends). Each symbol, menu, etc. defined in the Kconfig files * gets a node. A symbol defined in multiple locations gets one node at each * location. * +* @type: type of the menu entry * @choice_members: list of choice members with priority. */ struct menu { +enum menu_type type; +/* The next menu node at the same level */ struct menu *next;
scripts/kconfig/lkc.h +1 -1
@@ -81,7 +81,7 @@ void _menu_init(void);void menu_warn (const struct menu *menu,const char *fmt, ...);struct menu *menu_add_menu (void );void menu_end_menu (void ); -void menu_add_entry (struct symbol *sym); +void menu_add_entry (struct symbol *sym,enum menu_type type);void menu_add_dep (struct expr *dep);void menu_add_visibility (struct expr *dep); struct property *menu_add_prompt(enum prop_type type, const char *prompt,
scripts/kconfig/menu.c +3 -2
@@ -15,7 +15,7 @@static const char nohelp_text[] ="There is no help available for this option." ; -struct menu rootmenu; +struct menu rootmenu = { .type =M_MENU };static struct menu **last_entry_ptr;/**
@@ -65,12 +65,13 @@ void _menu_init(void) last_entry_ptr = &rootmenu.list; } -void menu_add_entry (struct symbol *sym) +void menu_add_entry (struct symbol *sym,enum menu_type type) {struct menu *menu; menu =xmalloc (sizeof (*menu));memset (menu,0 ,sizeof (*menu)); + menu->type = type; menu->sym = sym; menu->parent = current_menu; menu->filename = cur_filename;
scripts/kconfig/parser.y +6 -6
@@ -139,7 +139,7 @@ stmt_list_in_choice: config_entry_start: T_CONFIG nonconst_symbol T_EOL { - menu_add_entry($2); + menu_add_entry($2, M_NORMAL); printd(DEBUG_PARSE, "%s:%d:config %s\n", cur_filename, cur_lineno, $2->name); };
@@ -173,7 +173,7 @@ config_stmt: config_entry_start config_option_list menuconfig_entry_start: T_MENUCONFIG nonconst_symbol T_EOL { - menu_add_entry($2); + menu_add_entry($2, M_MENU); printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", cur_filename, cur_lineno, $2->name); };
@@ -246,7 +246,7 @@ choice: T_CHOICE T_EOL { struct symbol *sym = sym_lookup(NULL, 0); - menu_add_entry(sym); + menu_add_entry(sym, M_CHOICE); menu_set_type(S_BOOLEAN); INIT_LIST_HEAD(¤t_entry->choice_members);
@@ -315,7 +315,7 @@ default: if_entry: T_IF expr T_EOL { printd(DEBUG_PARSE, "%s:%d:if\n", cur_filename, cur_lineno); - menu_add_entry(NULL); + menu_add_entry(NULL, M_IF); menu_add_dep($2); $$ = menu_add_menu(); };
@@ -338,7 +338,7 @@ if_stmt_in_choice: if_entry stmt_list_in_choice if_end menu: T_MENU T_WORD_QUOTE T_EOL { - menu_add_entry(NULL); + menu_add_entry(NULL, M_MENU); menu_add_prompt(P_MENU, $2, NULL); printd(DEBUG_PARSE, "%s:%d:menu\n", cur_filename, cur_lineno); };
@@ -376,7 +376,7 @@ source_stmt: T_SOURCE T_WORD_QUOTE T_EOL comment: T_COMMENT T_WORD_QUOTE T_EOL { - menu_add_entry(NULL); + menu_add_entry(NULL, M_COMMENT); menu_add_prompt(P_COMMENT, $2, NULL); printd(DEBUG_PARSE, "%s:%d:comment\n", cur_filename, cur_lineno); };
Signature · 1 line
2.43.0