diff mbox series

[07/27] kconfig: clean up EOF handling in the lexer

Message ID	1544526070-16690-8-git-send-email-yamada.masahiro@socionext.com
State	Accepted
Commit	0bcc547ec4b03a0b66615694561cce9c5a9a1014
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 07/27] kconfig: clean up EOF handling in the lexer Date: Tue, 11 Dec 2018 20:00:50 +0900 Message-Id: <1544526070-16690-8-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

A new file should always start in the INITIAL state.

When the lexer bumps into EOF, the lexer must get back to the INITIAL
state anyway. Remove the redundant <<EOF>> pattern in the PARAM state.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 scripts/kconfig/zconf.l | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
2.7.4

diff mbox series

Patch

diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 847ba42..9038e97 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -178,9 +178,6 @@  n	[A-Za-z0-9_-]
 	\\\n	;
 	[[:blank:]]+
 	.	warn_ignored_character(*yytext);
-	<<EOF>> {
-		BEGIN(INITIAL);
-	}
 }
 
 <STRING>{
@@ -262,6 +259,8 @@  n	[A-Za-z0-9_-]
 }
 
 <<EOF>>	{
+	BEGIN(INITIAL);
+
 	if (current_file) {
 		zconf_endfile();
 		return T_EOL;