From patchwork Tue Dec 11 11:00:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10723631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D989B14E2 for ; Tue, 11 Dec 2018 11:03:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C645D2A215 for ; Tue, 11 Dec 2018 11:03:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAAB42A261; Tue, 11 Dec 2018 11:03:47 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 64B9A2A215 for ; Tue, 11 Dec 2018 11:03:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726117AbeLKLDf (ORCPT ); Tue, 11 Dec 2018 06:03:35 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:36644 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726542AbeLKLBl (ORCPT ); Tue, 11 Dec 2018 06:01:41 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id wBBB1C5e017210; Tue, 11 Dec 2018 20:01:15 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com wBBB1C5e017210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544526075; bh=pSsIoFlZj5d5mg6c+vr71NzXFRGXFCZclWcK8cltYHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=untWr3GpnaXWKHOiLx20lIAx1fr7m45U2/IR1ysuZ4TeHec4j70v35Ja58HIVUM9V gGLPewbOoRLGxNp7XV+bJLv8Y0e/wG0MrUdEbsqFjV9ZLJMXv6hEUx1h2rkgnl/fca 94dmE3Xz21hLrOHIQjzdt/a4goOJcPgwYaS1Ov7/AQ5/byAZV61cPaoKuXpPtDGuFI LdgfFDSWTIjliesccDgKjy/NNJZ0E35Nir8VWAw/VeGrxksR9vVnwEQ1Tg36JgmR4p vbvqwtpFg3MbAYcCXR/FO2Tjmv3/nw4/FE0o5E5yMzrkQ5pMk0um+C8cJL/tR4hIh3 ILxNTfTKM6koQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson , linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 03/27] kconfig: require T_EOL to reduce visible statement Date: Tue, 11 Dec 2018 20:00:46 +0900 Message-Id: <1544526070-16690-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544526070-16690-1-git-send-email-yamada.masahiro@socionext.com> References: <1544526070-16690-1-git-send-email-yamada.masahiro@socionext.com> 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 All line-oriented statements should be reduced when seeing a T_EOL token. I guess missing T_EOL for the "visible" statement is just a mistake. This commit decreases one shift/reduce conflict. Signed-off-by: Masahiro Yamada --- scripts/kconfig/zconf.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 22fceb2..c28f1a8 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE]; static struct menu *current_menu, *current_entry; %} -%expect 30 +%expect 29 %union { @@ -461,7 +461,7 @@ visibility_list: | visibility_list T_EOL ; -visible: T_VISIBLE if_expr +visible: T_VISIBLE if_expr T_EOL { menu_add_visibility($2); };