diff mbox series

[03/27] kconfig: require T_EOL to reduce visible statement

Message ID	1544526070-16690-4-git-send-email-yamada.masahiro@socionext.com
State	Accepted
Commit	413cd19d81fd675c6932abf91fe2b54d5ae72c7d
Headers	show Delivered-To: patch@linaro.org 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; From: Masahiro Yamada <yamada.masahiro@socionext.com> To: linux-kbuild@vger.kernel.org Cc: Ulf Magnusson <ulfalizer@gmail.com>, linux-kernel@vger.kernel.org, Masahiro Yamada <yamada.masahiro@socionext.com> 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> 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
Series	kconfig: remove all reduce/shift conflicts, refactor lexer, fix various issues \| expand [00/27] kconfig: remove all reduce/shift conflicts, refactor lexer, fix various issues [01/27] kconfig: fix file name and line number of warn_ignored_character() [02/27] kconfig: fix memory leak when EOF is encountered in quotation [03/27] kconfig: require T_EOL to reduce visible statement [04/27] kconfig: remove unneeded pattern matching to whitespaces [05/27] kconfig: refactor pattern matching in STRING state [06/27] kconfig: fix ambiguous grammar in terms of new lines [07/27] kconfig: clean up EOF handling in the lexer [08/27] kconfig: warn no new line at end of file [09/27] kconfig: remove grammatically ambiguous "unexpected option" diagnostic [10/27] kconfig: remove grammatically ambiguous option_error [11/27] kconfig: remove redundant if_block rule [12/27] kconfig: remove redundant menu_block rule [13/27] kconfig: loosen the order of "visible" and "depends on" in menu entry [14/27] kconfig: rename depends_list to comment_option_list [15/27] kconfig: remove redundant token defines [16/27] kconfig: use distinct tokens for type and default properties [17/27] kconfig: refactor scanning and parsing "option" properties [18/27] kconfig: use specific tokens instead of T_ASSIGN for assignments [19/27] kconfig: use T_WORD instead of T_VARIABLE for variables [20/27] microblaze: surround string default in Kconfig with double quotes [21/27] treewide: surround file paths in Kconfig files with double quotes [22/27] kconfig: ban the use of '.' and '/' in unquoted words [23/27] kconfig: refactor end token rules [24/27] kconfig: stop associating kconf_id with yylval [25/27] kconfig: switch to ASSIGN_VAL state in the second lexer [26/27] kconfig: update current_pos in the second lexer [27/27] kconfig: remove keyword lookup table entirely

Commit Message

Masahiro Yamada Dec. 11, 2018, 11 a.m. UTC

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 <yamada.masahiro@socionext.com>

---

 scripts/kconfig/zconf.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.7.4

diff mbox series

Patch

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);
 };