From patchwork Thu Jan 25 09:46:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 10183805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8BEAD60233 for ; Thu, 25 Jan 2018 09:46:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F1D628A6A for ; Thu, 25 Jan 2018 09:46:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72FD028A6E; Thu, 25 Jan 2018 09:46:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFFEC28A6A for ; Thu, 25 Jan 2018 09:46:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751111AbeAYJqr (ORCPT ); Thu, 25 Jan 2018 04:46:47 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:42041 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbeAYJqp (ORCPT ); Thu, 25 Jan 2018 04:46:45 -0500 Received: by mail-wm0-f65.google.com with SMTP id r71so13514597wmd.1 for ; Thu, 25 Jan 2018 01:46:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=epKpF588sjN2thD5S9ptk0tRJaSnunS/wCx0VtXTjNg=; b=jkrRYHr9FGBEkvDDjs6Si4aQZ1LbsMTgL8QlbSJwLVANu0N2enJRhTAcB0vBerK1af uRDfgMQKNteQuFRjvhJUMWO6K1igxk1vpmplqXcQQx5H934zobgjNNfJ1C7pvwxUeBwI wr+z9LCKCK83vcdIeASbFSm1RX7/euK+0cqZqiBJuEX/Yyr0pXi5yUR//sUdyXExsEpj /b3JA57IN0a0auOT8D/rnwj3y4p6iCHRoMYJKzJL70B+YHJU4GA17mle8AselIWk4JNv MNsMZOfp0D7p+hMFpmhCztuDoW+3hpAvOHO8mmQlHcLmv21MjJor2cCRCVxQqHPbRHIK gc/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=epKpF588sjN2thD5S9ptk0tRJaSnunS/wCx0VtXTjNg=; b=Y/1RG9b87LWSk/SONDimYulUkzDuu3R6I84N0rRIhgA9iVFOe2uVKUgdT1Q8LlDWzR FkwD3ncr6SBVkbDef13plBu4M5Ox7DtyPqolKZeeNk8RhhA+iHyELyhtjndU+L6koTvO plmB31g8cFRGHdImjJkTSeqsVejs0Z+nAq7dQwzKeZEn2H3L5sDi/Q/qZ/0JtJ15LhGd i0pchPzcDgPnF2NMmJxutSVteNXPbAwFBKGYER29jX1r8HuU88Zg40U6T8yAbINhND6z loSu1KfGuEv3PHi6oPjvlilxp3plPVtce+NhK7q/xRlnda8+S8NVegHfpXVWPXuv3UaW eNHQ== X-Gm-Message-State: AKwxytdlgJ5fi4RgK8UKGcoietNq+XOkHKjSCjERDvNTmZbT8CkVnFcM FjHRjVkYnoq3h7RJsqrBzXFZUQ== X-Google-Smtp-Source: AH8x226uC88yQ59Di35SIP6aYSDgh0kk/23d8Rha8M9MIlryjciu79BZlHGA9hvFIPy0t9Ql6eAVBA== X-Received: by 10.28.140.1 with SMTP id o1mr6437858wmd.141.1516873604109; Thu, 25 Jan 2018 01:46:44 -0800 (PST) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id i1sm4769824wrh.96.2018.01.25.01.46.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 01:46:43 -0800 (PST) From: Petr Vorel To: linux-kbuild@vger.kernel.org Cc: Petr Vorel , Masahiro Yamada , Randy Dunlap , Paul Bolle Subject: [PATCH v6 1/1] kconfig: make "Selected by:" and "Implied by:" readable Date: Thu, 25 Jan 2018 10:46:35 +0100 Message-Id: <20180125094635.456-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.16.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reverse dependency expressions can get rather unwieldy, especially if a symbol is selected by more than a handful of other symbols. I.e. 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) - [...] I.e. transform the top level OR tokens into newlines and prepend each line with a minus. This makes the "Selected by:" and "Implied by:" blurb much easier to read. This is done only if there is more than one top level OR. "Depends on:" and "Range :" were deliberately left as they are. Based on idea from Paul Bolle. Reported-by: Paul Bolle Signed-off-by: Petr Vorel --- Hi Masahiro, thank you for your notes (accepted both) and explanations! Changes v5->v6: * Move first new line with dash into __expr_print(). * Remove menuconfig from patch subject. --- scripts/kconfig/expr.c | 28 ++++++++++++++++++++++++---- scripts/kconfig/expr.h | 1 + scripts/kconfig/menu.c | 4 ++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index fd8a416ceab7..04fa71e058b7 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -1176,7 +1176,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(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep) { if (!e) { fn(data, NULL, "y"); @@ -1231,9 +1231,14 @@ 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); + if (revdep && e->left.expr->type != E_OR) + fn(data, NULL, "\n - "); + __expr_print(e->left.expr, fn, data, E_OR, revdep); + if (revdep) + fn(data, NULL, "\n - "); + else + fn(data, NULL, " || "); + __expr_print(e->right.expr, fn, data, E_OR, revdep); break; case E_AND: expr_print(e->left.expr, fn, data, E_AND); @@ -1266,6 +1271,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(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); @@ -1310,3 +1320,13 @@ void expr_gstr_print(struct expr *e, struct gstr *gs) { expr_print(e, expr_print_gstr_helper, gs, E_NONE); } + +/* + * Transform the top level "||" tokens into newlines and prepend each + * line with a minus. This makes expressions much easier to read. + * Suitable for reverse dependency expressions. + */ +void expr_gstr_print_revdep(struct expr *e, struct gstr *gs) +{ + __expr_print(e, expr_print_gstr_helper, gs, E_NONE, true); +} diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index e7d7a5e3da68..c16e82e302a2 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -310,6 +310,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 expr_gstr_print_revdep(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 d365fc9513c5..99222855544c 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -828,14 +828,14 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym, get_symbol_props_str(r, sym, P_SELECT, _(" Selects: ")); if (sym->rev_dep.expr) { str_append(r, _(" Selected by: ")); - expr_gstr_print(sym->rev_dep.expr, r); + expr_gstr_print_revdep(sym->rev_dep.expr, r); str_append(r, "\n"); } get_symbol_props_str(r, sym, P_IMPLY, _(" Implies: ")); if (sym->implied.expr) { str_append(r, _(" Implied by: ")); - expr_gstr_print(sym->implied.expr, r); + expr_gstr_print_revdep(sym->implied.expr, r); str_append(r, "\n"); }