From patchwork Tue Dec 11 11:00:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 153446 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp477483ljp; Tue, 11 Dec 2018 03:04:21 -0800 (PST) X-Google-Smtp-Source: AFSGD/W/p+ahDLixqMEc9tt1PMaJ4LfaLgot868G3z+OmxMRQL6QvobpluJFXp6iQmy2CoMuhcAe X-Received: by 2002:a17:902:66e6:: with SMTP id e93mr15250718plk.92.1544526261302; Tue, 11 Dec 2018 03:04:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544526261; cv=none; d=google.com; s=arc-20160816; b=FUF6/MVOiduQL0cZxYReBjfohy990EMr96jV2dlWaO9ce4PyPYf1SmkQk8eEon1PlE feJLGP7wG6liJ8qk7tFwUHO6uc89xzAEF0ZXrciAoueKDGEZktTge2GYTYnNOHy/5qBy 8HKyqYxLE1Sb61b6B5eZcGviM/pHRz5PsfZResue1xqvW3q7pxtVWZUQxx6BHwdOHsNX bQApC2RmbOSB2xqRA39yAhMlEcHvlOYYr8B/A1TAZpVarj51DxvVZ3bx2la3pQMEqrXu awlFxcR2Vm4mL64g5/ooX6Nfov5P5XrmBRq9l3vfURZhVoFsQRsOPic/izTNvdilXgZy jMkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=m3JoEOK4UyUXfBThLu/B9ZmqSbB1lwgoGZ57SfpSYt0=; b=BKNYFFukY21xzyJKZ0MjLcfKiyqhF4rCtQcsoc5qeLMlaL0dFBPLNI/UDtQx5VHcJw goohtTwAra07WRC+YPCOuNEaHld/O9Z82nClqV36I9KC/sRVhg0BrtdqpmAnn4nNYk6k 3F1IlvvorLxqbJl9OBLmgoUZj4PR0oa0AGG78XAYdJPZC0B9jCbeIflyjzw9OQDHNDXO O6cm8n5R6iG4Q3Wd3R99EEkTRo7BVZ1AnJkhbullixqv9qvJ7wA8BquJBeGstcfN8Vyu NqSIuLj20uBsvSpbBrqJKTWVCvRe4wJ80DPKA69BrP4jnl1n7f2Q5AoEnvYh8Vk9roLx zSDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mwktbhaK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si11713692pgd.428.2018.12.11.03.04.21; Tue, 11 Dec 2018 03:04:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mwktbhaK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726858AbeLKLES (ORCPT + 31 others); Tue, 11 Dec 2018 06:04:18 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:36636 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726366AbeLKLBl (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 wBBB1C5m017210; Tue, 11 Dec 2018 20:01:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com wBBB1C5m017210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1544526081; bh=m3JoEOK4UyUXfBThLu/B9ZmqSbB1lwgoGZ57SfpSYt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mwktbhaKxhmw4kY34rRDJAxpw9leZBIb9cARnQonmsiG9nNbnMVN16D0mJR6L1kba TwW5um939Ev7xYqLI4/+Nzzjwh+cAFgVNIzw4fuWesfNe/oN27iu6LjPuClBm+7PbV h/4SL+0Bzz0bQ7aWOCzQLjIsEuEkzviEwA+kEIqNBJJEMcxdU4oQVbLjNpmE+c1uKj X/y9fxXI4mSMrH9kPauyG/cgduRN5p0lJ73mkz218dHkCVCjA2mP/f/+xiXimO/QXd ChCChhfo1FCEl6T2vrxtNs4pi93MxHxuRoKOKpboUqzRm9PnaKMcJUwZIUqlUj8QZD v51cCD6xhP/ZQ== 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 11/27] kconfig: remove redundant if_block rule Date: Tue, 11 Dec 2018 20:00:54 +0900 Message-Id: <1544526070-16690-12-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code block surrounded by "if" ... "endif" is stmt_list. Remove the redundant if_block symbol entirely. Remove "stmt_list: stmt_list end" rule as well since it would obviously cause conflicts. Signed-off-by: Masahiro Yamada --- scripts/kconfig/zconf.y | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index a92f167..dcbf643 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -123,7 +123,6 @@ stmt_list: | stmt_list common_stmt | stmt_list choice_stmt | stmt_list menu_stmt - | stmt_list end { zconf_error("unexpected end statement"); } | stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); } | stmt_list error T_EOL { zconf_error("invalid statement"); } ; @@ -330,14 +329,7 @@ if_end: end } }; -if_stmt: if_entry if_block if_end -; - -if_block: - /* empty */ - | if_block common_stmt - | if_block menu_stmt - | if_block choice_stmt +if_stmt: if_entry stmt_list if_end ; /* menu entry */