From patchwork Wed Oct 28 02:50:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 7506261 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D67D59F37F for ; Wed, 28 Oct 2015 02:50:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D49ED205E7 for ; Wed, 28 Oct 2015 02:50:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43B30205E9 for ; Wed, 28 Oct 2015 02:50:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755251AbbJ1Cur (ORCPT ); Tue, 27 Oct 2015 22:50:47 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:33590 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755171AbbJ1Cuq (ORCPT ); Tue, 27 Oct 2015 22:50:46 -0400 Received: by wijp11 with SMTP id p11so239079798wij.0 for ; Tue, 27 Oct 2015 19:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=bGzb6fl0zazwubF1/chSnffRYnNPzh7xpWnKxXSM+7k=; b=OHqiagUBc5Bi7A9Q9xw1YCXlmpEjfiGG2WpdnuZ/vKuf88HWhSgng7E7H2Shwm5dzT F2/H7ihrKFKxFfTN9WZUshVCQFy1WH3/MM/68Y2nXkbX9XwwU1mrTGd6zD+AdYFkHAXz 252gMhv+XhF7A2pw5J9xzOkg4YawU8OR2w/ptJ+x8cqs7K+YA/R3sLz2Tz4Bpb/VvXQN j/Z0TkA1anC3lUUd6Ak9LgJ7EGvpnDMOGDvRa2y4PnfKxIykKoVzcikJpQjK1HG6ULSG KDAJyng5ADcNYTi8UdQgy1R0kU9RJhNXMmoBBtCIhb2K+YrQOT3LwwnaUPEubVbPndha LV6A== X-Received: by 10.194.2.5 with SMTP id 5mr58516128wjq.153.1446000645019; Tue, 27 Oct 2015 19:50:45 -0700 (PDT) Received: from t61.jablocom.intra ([85.119.94.121]) by smtp.gmail.com with ESMTPSA id gd11sm19748236wic.20.2015.10.27.19.50.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Oct 2015 19:50:44 -0700 (PDT) From: Petr Vorel To: linux-kbuild@vger.kernel.org Cc: Petr Vorel , Paul Bolle Subject: [PATCH v3] kconfig: menuconfig make "selected by:" readable Date: Wed, 28 Oct 2015 03:50:30 +0100 Message-Id: <1446000630-30233-1-git-send-email-petr.vorel@gmail.com> X-Mailer: git-send-email 2.6.1 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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. Cc: Paul Bolle Signed-off-by: Petr Vorel --- Changes v2->v3: * Actually Signed-off-by: * Cleanup commit message. Changes v1->v2: * Rewrote Paul Bolle's original implementation: removed use of expr_gstr_print()'s output from rev_dep_gstr_print(). I admit that adding revdep variable and wrapper function isn't a nice solution, but it works directly with struct expr :-). --- scripts/kconfig/expr.c | 36 ++++++++++++++++++++++++++++++++---- scripts/kconfig/expr.h | 1 + scripts/kconfig/menu.c | 4 ++-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index cbf4996..caf89af 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -1070,7 +1070,7 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2) return expr_get_leftmost_symbol(ret); } -void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) +static void expr_print_impl(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep) { if (!e) { fn(data, NULL, "y"); @@ -1125,9 +1125,12 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char * fn(data, e->right.sym, e->right.sym->name); break; case E_OR: - expr_print(e->left.expr, fn, data, E_OR); - fn(data, NULL, " || "); - expr_print(e->right.expr, fn, data, E_OR); + expr_print_impl(e->left.expr, fn, data, E_OR, revdep); + if (revdep) + fn(data, NULL, "\n - "); + else + fn(data, NULL, " || "); + expr_print_impl(e->right.expr, fn, data, E_OR, revdep); break; case E_AND: expr_print(e->left.expr, fn, data, E_AND); @@ -1160,6 +1163,11 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char * fn(data, NULL, ")"); } +void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) +{ + expr_print_impl(e, fn, data, prevtoken, false); +} + static void expr_print_file_helper(void *data, struct symbol *sym, const char *str) { xfwrite(str, strlen(str), 1, data); @@ -1204,3 +1212,23 @@ void expr_gstr_print(struct expr *e, struct gstr *gs) { expr_print(e, expr_print_gstr_helper, gs, E_NONE); } + +/* + * 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. + */ +void rev_dep_gstr_print(struct expr *e, struct gstr *gs) +{ + expr_print_impl(e, expr_print_gstr_helper, gs, E_NONE, true); +} diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 973b6f7..f3bf88d 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -220,6 +220,7 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2); void expr_fprint(struct expr *e, FILE *out); struct gstr; /* forward */ void expr_gstr_print(struct expr *e, struct gstr *gs); +void rev_dep_gstr_print(struct expr *e, struct gstr *gs); static inline int expr_is_yes(struct expr *e) { diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index b05cc3d..b6b383e 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -661,8 +661,8 @@ static 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"); + str_append(r, "\n - "); + rev_dep_gstr_print(sym->rev_dep.expr, r); } str_append(r, "\n\n"); }