Commit b2d00d7c authored Jun 21, 2018 by Dirk Gouders Committed by Masahiro Yamada Jun 25, 2018

kconfig: fix line numbers for if-entries in menu tree



The line numers for if-entries in the menu tree are off by one or more
lines which is confusing when debugging for correctness of unrelated changes.

According to the git log, commit a02f0570 (kconfig: improve
error handling in the parser) was the last one that changed that part
of the parser and replaced

	"if_entry: T_IF expr T_EOL"
by
	"if_entry: T_IF expr nl"

but the commit message does not state why this has been done.

When reverting that part of the commit, only the line numers are
corrected (checked with cdebug = DEBUG_PARSE in zconf.y), otherwise
the menu tree remains unchanged (checked with zconfdump() enabled in
conf.c).

An example for the corrected line numbers:

drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig
drivers/soc/tegra/Kconfig:4:if
drivers/soc/tegra/Kconfig:6:if

changes to:

drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig
drivers/soc/tegra/Kconfig:1:if
drivers/soc/tegra/Kconfig:4:if

Signed-off-by: Dirk Gouders <dirk@gouders.net>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent 5391e536

scripts/kconfig/zconf.y

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
		static struct menu current_menu, current_entry;

		%}
		%expect 32
		%expect 31

		%union
		{
		@@ -337,7 +337,7 @@ choice_block:

		/* if entry */

		if_entry: T_IF expr nl
		if_entry: T_IF expr T_EOL
		{
		printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
		menu_add_entry(NULL);

Admin message