kconfig: do not delay the cur_filename update

Currently, cur_filename is updated at the first token of each statement.
However, this seems unnecessary based on my understanding; the parser
can use the same variable as the lexer tracks.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index 35ad1b256470791419ae1bd55b8a344b48a3472e..28e279cd5a2242b4b26629fb71c35d2de335affd 100644 (file)
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -274,24 +274,17 @@ repeat:
        token = yylex1();
 
        if (prev_token == T_EOL || prev_token == T_HELPTEXT) {
-               if (token == T_EOL) {
+               if (token == T_EOL)
                        /* Do not pass unneeded T_EOL to the parser. */
                        goto repeat;
-               } else {
+               else
                        /*
-                        * For the parser, update file/lineno at the first token
+                        * For the parser, update lineno at the first token
                         * of each statement. Generally, \n is a statement
                         * terminator in Kconfig, but it is not always true
                         * because \n could be escaped by a backslash.
-                        *
-                        * FIXME:
-                        * cur_filename and cur_lineno are used even after
-                        * yyparse(); menu_finalize() calls menu_add_symbol().
-                        * This should be fixed.
                         */
-                       cur_filename = current_file ? current_file->name : "<none>";
                        cur_lineno = yylineno;
-               }
        }
 
        if (prev_prev_token == T_EOL && prev_token == T_WORD &&
@@ -407,6 +400,7 @@ void zconf_initscan(const char *name)
        }
 
        current_file = file_lookup(name);
+       cur_filename = current_file->name;
        yylineno = 1;
 }
 
@@ -448,6 +442,7 @@ void zconf_nextfile(const char *name)
        }
 
        yylineno = 1;
+       cur_filename = file->name;
        current_file = file;
 }
 
@@ -456,6 +451,8 @@ static void zconf_endfile(void)
        struct buffer *tmp;
 
        current_file = current_file->parent;
+       if (current_file)
+               cur_filename = current_file->name;
 
        if (!current_buf)
                return;

diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index d1d05c8cd89dbfca9dd05aea4047d0d436ee38ac..e58c24d2e5abe6acc46671ce10a3d48209ddd8ee 100644 (file)
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -488,6 +488,14 @@ void conf_parse(const char *name)
                yydebug = 1;
        yyparse();
 
+       /*
+        * FIXME:
+        * cur_filename and cur_lineno are used even after yyparse();
+        * menu_finalize() calls menu_add_symbol(). This should be fixed.
+        */
+       cur_filename = "<none>";
+       cur_lineno = 0;
+
        str_printf(&autoconf_cmd,
                   "\n"
                   "$(autoconfig): $(deps_config)\n"