Re: [PATCH] tristate choices with mixed tristate and boolean values

["Jan Beulich" <jbeulich@novell.com>]

>>> Roman Zippel <zippel@linux-m68k.org> 16.09.07 19:29 >>>
>On Mon, 10 Sep 2007, Jan Beulich wrote:
>
>> --- linux-2.6.23-rc5/scripts/kconfig/menu.c	2007-09-07 16:48:23.000000000 +0200
>> +++ 2.6.23-rc5-tristate-choices/scripts/kconfig/menu.c	2007-09-03 10:29:41.000000000 +0200
>> @@ -235,16 +235,23 @@ 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 */
>> +			/* find out choice type */
>> +			enum symbol_type type = S_UNKNOWN;
>> +
>>  			for (menu = parent->list; menu; menu = menu->next) {
>> -				if (menu->sym) {
>> -					current_entry = parent;
>> -					menu_set_type(menu->sym->type);
>> -					current_entry = menu;
>> -					menu_set_type(sym->type);
>> -					break;
>> +				if (menu->sym && menu->sym->type != S_UNKNOWN) {
>> +					if (type == S_UNKNOWN)
>> +						type = menu->sym->type;
>> +					if (type != S_BOOLEAN)
>> +						break;
>> +					if (menu->sym->type == S_TRISTATE) {
>> +						type = S_TRISTATE;
>> +						break;
>> +					}
>>  				}
>>  			}
>> +			current_entry = parent;
>> +			menu_set_type(type);
>>  			parentdep = expr_alloc_symbol(sym);
>>  		} else if (parent->prompt)
>>  			parentdep = parent->prompt->visible.expr;
>
>If I understand it correctly this makes possible to override the type of 
>choice symbol, so this loop should only be done if the type is not 
>S_UNKNOWN.

I think it is better to do it this way, as it results in a (correct) warning from
menu_set_type() if the choice type is inconsistently being overridden.

>> @@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)
>>  
>>  		for (menu = parent->list; menu; menu = menu->next) {
>>  			basedep = expr_transform(menu->dep);
>> -			basedep = expr_alloc_and(expr_copy(parentdep), basedep);
>> +			dep = parentdep;
>> +			if (sym && sym_is_choice(sym) && menu->sym) {
>> +				enum symbol_type type = menu->sym->type;
>> +
>> +				if (type == S_UNKNOWN)
>> +					type = sym->type;
>> +			     if (type != S_TRISTATE)
>> +					dep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes);
>> +			}
>> +			basedep = expr_alloc_and(expr_copy(dep), basedep);
>>  			basedep = expr_eliminate_dups(basedep);
>>  			menu->dep = basedep;
>>  			if (menu->sym)
>
>Hmm, if you want to do it this way, I'd prefer you add a parentdep_bool 
>and simply do:
>
>	dep = (menu->sym && menu->sym->type != S_TRISTATE) ? 
>		parentdep_bool : parentdep;

That would lose the S_UNKNOWN compare (menu->sym->type may not be set
at this point, yet, and would later get defaulted to tristate if the choice is such).

>Otherwise it looks ok.

Jan

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/