kconfig: add named choice group (5a1aa8a1) · Commits · 戴 / test

scripts/kconfig/lex.zconf.c_shipped

+3 −22

Original line number	Diff line number	Diff line
		@@ -5,25 +5,6 @@

		/* A lexical scanner generated by flex */

		#define yy_create_buffer zconf_create_buffer
		#define yy_delete_buffer zconf_delete_buffer
		#define yy_flex_debug zconf_flex_debug
		#define yy_init_buffer zconf_init_buffer
		#define yy_flush_buffer zconf_flush_buffer
		#define yy_load_buffer_state zconf_load_buffer_state
		#define yy_switch_to_buffer zconf_switch_to_buffer
		#define yyin zconfin
		#define yyleng zconfleng
		#define yylex zconflex
		#define yylineno zconflineno
		#define yyout zconfout
		#define yyrestart zconfrestart
		#define yytext zconftext
		#define yywrap zconfwrap
		#define yyalloc zconfalloc
		#define yyrealloc zconfrealloc
		#define yyfree zconffree

		#define FLEX_SCANNER
		#define YY_FLEX_MAJOR_VERSION 2
		#define YY_FLEX_MINOR_VERSION 5
		@@ -354,7 +335,7 @@ void zconffree (void * );

		/* Begin user sect3 */

		#define zconfwrap(n) 1
		#define zconfwrap() 1
		#define YY_SKIP_YYWRAP

		typedef unsigned char YY_CHAR;
		@@ -1535,7 +1516,7 @@ static int yy_get_next_buffer (void)

		/* Read in more data. */
		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
		(yy_n_chars), num_to_read );
		(yy_n_chars), (size_t) num_to_read );

		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
		}
		@@ -2007,7 +1988,7 @@ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size )

		/** Setup the input buffer state to scan a string. The next call to zconflex() will
		* scan from a @e copy of @a str.
		* @param str a NUL-terminated string to scan
		* @param yystr a NUL-terminated string to scan
		*
		* @return the newly allocated buffer state object.
		* @note If you want to scan bytes that may contain NUL values, then use

scripts/kconfig/lkc_proto.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ P(menu_get_help,const char ,(struct menu menu));
		/* symbol.c */
		P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);

		P(sym_lookup,struct symbol ,(const char name, int isconst));
		P(sym_lookup,struct symbol ,(const char name, int flags));
		P(sym_find,struct symbol ,(const char name));
		P(sym_re_search,struct symbol *,(const char pattern));
		P(sym_type_name,const char *,(enum symbol_type type));

scripts/kconfig/menu.c

+27 −37

Original line number	Diff line number	Diff line
		@@ -235,18 +235,22 @@ void menu_finalize(struct menu *parent)
		sym = parent->sym;
		if (parent->list) {
		if (sym && sym_is_choice(sym)) {
		/* find the first choice value and find out choice type */
		for (menu = parent->list; menu; menu = menu->next) {
		if (menu->sym) {
		if (sym->type == S_UNKNOWN) {
		/* find the first choice value to find out choice type */
		current_entry = parent;
		if (sym->type == S_UNKNOWN)
		for (menu = parent->list; menu; menu = menu->next) {
		if (menu->sym && menu->sym->type != S_UNKNOWN) {
		menu_set_type(menu->sym->type);
		current_entry = menu;
		if (menu->sym->type == S_UNKNOWN)
		menu_set_type(sym->type);
		break;
		}
		}
		}
		/* set the type of the remaining choice values */
		for (menu = parent->list; menu; menu = menu->next) {
		current_entry = menu;
		if (menu->sym && menu->sym->type == S_UNKNOWN)
		menu_set_type(sym->type);
		}
		parentdep = expr_alloc_symbol(sym);
		} else if (parent->prompt)
		parentdep = parent->prompt->visible.expr;
		@@ -313,50 +317,36 @@ void menu_finalize(struct menu *parent)
		}
		}
		for (menu = parent->list; menu; menu = menu->next) {
		if (sym && sym_is_choice(sym) && menu->sym) {
		if (sym && sym_is_choice(sym) &&
		menu->sym && !sym_is_choice_value(menu->sym)) {
		current_entry = menu;
		menu->sym->flags \|= SYMBOL_CHOICEVAL;
		if (!menu->prompt)
		menu_warn(menu, "choice value must have a prompt");
		for (prop = menu->sym->prop; prop; prop = prop->next) {
		if (prop->type == P_PROMPT && prop->menu != menu) {
		prop_warn(prop, "choice values "
		"currently only support a "
		"single prompt");
		}
		if (prop->type == P_DEFAULT)
		prop_warn(prop, "defaults for choice "
		"values not supported");
		if (prop->menu == menu)
		continue;
		if (prop->type == P_PROMPT &&
		prop->menu->parent->sym != sym)
		prop_warn(prop, "choice value used outside its choice group");
		}
		current_entry = menu;
		if (menu->sym->type == S_UNKNOWN)
		menu_set_type(sym->type);
		/* Non-tristate choice values of tristate choices must
		* depend on the choice being set to Y. The choice
		* values' dependencies were propagated to their
		* properties above, so the change here must be re-
		* propagated. */
		* propagated.
		*/
		if (sym->type == S_TRISTATE && menu->sym->type != S_TRISTATE) {
		basedep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
		basedep = expr_alloc_and(basedep, menu->dep);
		basedep = expr_eliminate_dups(basedep);
		menu->dep = basedep;
		menu->dep = expr_alloc_and(basedep, menu->dep);
		for (prop = menu->sym->prop; prop; prop = prop->next) {
		if (prop->menu != menu)
		continue;
		dep = expr_alloc_and(expr_copy(basedep),
		prop->visible.expr = expr_alloc_and(expr_copy(basedep),
		prop->visible.expr);
		dep = expr_eliminate_dups(dep);
		dep = expr_trans_bool(dep);
		prop->visible.expr = dep;
		if (prop->type == P_SELECT) {
		struct symbol *es = prop_get_symbol(prop);
		dep2 = expr_alloc_symbol(menu->sym);
		dep = expr_alloc_and(dep2,
		expr_copy(dep));
		dep = expr_alloc_or(es->rev_dep.expr, dep);
		dep = expr_eliminate_dups(dep);
		es->rev_dep.expr = dep;
		}
		}
		}
		menu_add_symbol(P_CHOICE, sym, NULL);

scripts/kconfig/symbol.c

+11 −13

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ void sym_add_default(struct symbol sym, const char def)
		{
		struct property *prop = prop_alloc(P_DEFAULT, sym);

		prop->expr = expr_alloc_symbol(sym_lookup(def, 1));
		prop->expr = expr_alloc_symbol(sym_lookup(def, SYMBOL_CONST));
		}

		void sym_init(void)
		@@ -350,9 +350,6 @@ void sym_calc_value(struct symbol *sym)
		;
		}

		if (sym->flags & SYMBOL_AUTO)
		sym->flags &= ~SYMBOL_WRITE;

		sym->curr = newval;
		if (sym_is_choice(sym) && newval.tri == yes)
		sym->curr.val = sym_calc_choice(sym);
		@@ -377,6 +374,9 @@ void sym_calc_value(struct symbol *sym)
		sym_set_changed(choice_sym);
		}
		}

		if (sym->flags & SYMBOL_AUTO)
		sym->flags &= ~SYMBOL_WRITE;
		}

		void sym_clear_all_valid(void)
		@@ -651,7 +651,7 @@ bool sym_is_changable(struct symbol *sym)
		return sym->visible > sym->rev_dep.tri;
		}

		struct symbol sym_lookup(const char name, int isconst)
		struct symbol sym_lookup(const char name, int flags)
		{
		struct symbol *symbol;
		const char *ptr;
		@@ -671,12 +671,11 @@ struct symbol sym_lookup(const char name, int isconst)
		hash &= 0xff;

		for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
		if (!strcmp(symbol->name, name)) {
		if ((isconst && symbol->flags & SYMBOL_CONST) \|\|
		(!isconst && !(symbol->flags & SYMBOL_CONST)))
		if (!strcmp(symbol->name, name) &&
		(flags ? symbol->flags & flags
		: !(symbol->flags & (SYMBOL_CONST\|SYMBOL_CHOICE))))
		return symbol;
		}
		}
		new_name = strdup(name);
		} else {
		new_name = NULL;
		@@ -687,8 +686,7 @@ struct symbol sym_lookup(const char name, int isconst)
		memset(symbol, 0, sizeof(*symbol));
		symbol->name = new_name;
		symbol->type = S_UNKNOWN;
		if (isconst)
		symbol->flags \|= SYMBOL_CONST;
		symbol->flags \|= flags;

		symbol->next = symbol_hash[hash];
		symbol_hash[hash] = symbol;
		@@ -962,7 +960,7 @@ void prop_add_env(const char *env)
		}

		prop = prop_alloc(P_ENV, sym);
		prop->expr = expr_alloc_symbol(sym_lookup(env, 1));
		prop->expr = expr_alloc_symbol(sym_lookup(env, SYMBOL_CONST));

		sym_env_list = expr_alloc_one(E_LIST, sym_env_list);
		sym_env_list->right.sym = sym;

scripts/kconfig/zconf.tab.c_shipped

+156 −145

File changed.

Preview size limit exceeded, changes collapsed.

Admin message