From patchwork Wed Jan 21 23:00:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 5680771 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6D32DC058D for ; Wed, 21 Jan 2015 23:00:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70E0220480 for ; Wed, 21 Jan 2015 23:00:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 418D52047D for ; Wed, 21 Jan 2015 23:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753451AbbAUXAx (ORCPT ); Wed, 21 Jan 2015 18:00:53 -0500 Received: from cpsmtpb-ews08.kpnxchange.com ([213.75.39.13]:62117 "EHLO cpsmtpb-ews08.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753369AbbAUXAx (ORCPT ); Wed, 21 Jan 2015 18:00:53 -0500 Received: from cpsps-ews04.kpnxchange.com ([10.94.84.171]) by cpsmtpb-ews08.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 22 Jan 2015 00:00:51 +0100 Received: from CPSMTPM-TLF101.kpnxchange.com ([195.121.3.4]) by cpsps-ews04.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 22 Jan 2015 00:00:51 +0100 Received: from [192.168.10.103] ([77.173.140.92]) by CPSMTPM-TLF101.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 22 Jan 2015 00:00:51 +0100 Message-ID: <1421881250.13638.10.camel@x220> Subject: [PATCH] [RFC] kconfig: menuconfig make "Selected by:" readable From: Paul Bolle To: Michal Marek Cc: linux-kbuild@vger.kernel.org Date: Thu, 22 Jan 2015 00:00:50 +0100 X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 21 Jan 2015 23:00:51.0152 (UTC) FILETIME=[1A1F0500:01D035CE] X-RcptDomain: vger.kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP rev_dep expressions can get rather unwieldy, especially if a symbol is selected by more than a handful of other symbols. Ie, it's possible to have near endless expressions like: A && B && !C || D || F && (G || H) || [...] Chop these expressions into actually readable chunks: - A && B && !C - D - F && (G || H) - [...] Ie, transform the top level "||" tokens into newlines and prepend each line with a minus. This makes the "Selected by:" blurb much easier to read. Not-yet-signed-off-by: Paul Bolle --- Today I found myself wondering why a certain Kconfig was selected. Currently menuconfig's help is of no use in complicated cases. Please look at the help of USB or CRYPTO to see what I mean. This is a _hack_ to show what might be a better way to do this. It parses a stringified version of the reverse dependency, and not the actual reverse dependecy expression. But that was easier to cobble together. One cool improvement would be to change to minus in front of the subexpressions to Y or M for those that actually set the symbol. Anyhow, other suggestions and feedback is welcome. scripts/kconfig/menu.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 72c9dba84c5d..eb73fe77513e 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -613,6 +613,86 @@ static struct property *get_symbol_prop(struct symbol *sym) } /* + * Assuming we're just past an opening parenthesis in a NUL terminated string, + * find it's closing parenthesis and return its postion. Die otherwise. + */ +static const char *matching_paren(const char *s) +{ + int lvl = 1; + + while (1) { + if (*s == '(') + lvl++; + else if (*s == ')') + lvl--; + if (lvl == 0) + break; + if (*s == '\0') + /* huh? */ + exit(1); + s++; + } + + return s; +} + +/* + * rev_dep expressions can get rather unwieldy, especially if a symbol is + * selected by more than a handful of other symbols. Ie, it's possible to + * have near endless expressions like: + * A && B && !C || D || F && (G || H) || [...] + * + * Chop these expressions into actually readable chunks: + * - A && B && !C + * - D + * - F && (G || H) + * - [...] + * + * Ie, transform the top level "||" tokens into newlines and prepend each line + * with a minus. This makes the "Selected by:" blurb much easier to read. + */ +static void rev_dep_gstr_print(struct gstr *gs, struct expr *e) +{ + struct gstr tmp = str_new(); + const char *prev, *start; + char *beam; + + expr_gstr_print(e, &tmp); + prev = start = str_get(&tmp); + + str_append(gs, "\n - "); + + while ((beam = index(start, '|'))) { + char *lparen = index(start, '('); + + /* don't split "(I || J)" */ + if (lparen && (lparen < beam)) { + const char *rparen = matching_paren(++lparen); + + /* skip the expression inside parentheses */ + start = ++rparen; + continue; + } + + /* we can assume we're fed a sane string, so the space before + * the beam gets turned into a NUL */ + *(beam - 1) = '\0'; + str_append(gs, prev); + str_append(gs, "\n - "); + /* assume sane string, so skip the second beam */ + beam++; + /* trim */ + while (*++beam == ' ') + ; + prev = start = beam; + } + + str_append(gs, prev); + + str_free(&tmp); +} + +/* * head is optional and may be NULL */ void get_symbol_str(struct gstr *r, struct symbol *sym, @@ -661,8 +741,7 @@ void get_symbol_str(struct gstr *r, struct symbol *sym, str_append(r, "\n"); if (sym->rev_dep.expr) { str_append(r, _(" Selected by: ")); - expr_gstr_print(sym->rev_dep.expr, r); - str_append(r, "\n"); + rev_dep_gstr_print(sym->rev_dep.expr, r); } str_append(r, "\n\n"); }