From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1753433AbXIPR2s@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753433AbXIPR2s (ORCPT <rfc822;w@1wt.eu>);
	Sun, 16 Sep 2007 13:28:48 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751478AbXIPR2l
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sun, 16 Sep 2007 13:28:41 -0400
Received: from scrub.xs4all.nl ([194.109.195.176]:1417 "EHLO scrub.xs4all.nl"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751766AbXIPR2k (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 16 Sep 2007 13:28:40 -0400
Date: Sun, 16 Sep 2007 19:29:04 +0200 (CEST)
From: Roman Zippel <zippel@linux-m68k.org>
X-X-Sender: roman@scrub.home
To: Jan Beulich <jbeulich@novell.com>
cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tristate choices with mixed tristate and boolean values
In-Reply-To: <46E55B7A.76E4.0078.0@novell.com>
Message-ID: <Pine.LNX.4.64.0709161919350.1817@scrub.home>
References: <46E55B7A.76E4.0078.0@novell.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

Hi,

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.

> @@ -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;

Otherwise it looks ok.

bye, Roman