linux-toradex.git/scripts/kconfig/lexer.l, branch v6.9

kconfig: change file_lookup() to return the file name

2024-02-19T09:20:41+00:00

Currently, file_lookup() returns a pointer to (struct file), but the
callers use only file->name.

Make it return the ->name member directly.

This adjustment encapsulates struct file and file_list as internal
implementation.

Signed-off-by: Masahiro Yamada

kconfig: move the file and lineno in struct file to struct buffer

2024-02-19T09:20:40+00:00

struct file has two link nodes, 'next' and 'parent'.

The former is used to link files in the 'file_list' linked list,
which manages the list of Kconfig files seen so far.

The latter is used to link files in the 'current_file' linked list,
which manages the inclusion ("source") tree.

The latter should be tracked together with the lexer state.

Signed-off-by: Masahiro Yamada

kconfig: replace remaining current_file->name with cur_filename

2024-02-19T09:20:40+00:00

Replace the remaining current_file->name in the lexer context.

Signed-off-by: Masahiro Yamada

kconfig: do not delay the cur_filename update

2024-02-19T09:20:40+00:00

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

kconfig: replace file->name with name in zconf_nextfile()

2024-02-19T09:20:40+00:00

The 'file->name' and 'name' are the same in this function.

Signed-off-by: Masahiro Yamada

kconfig: remove zconf_curname() and zconf_lineno()

2024-02-19T09:20:40+00:00

Now zconf_curname() and zconf_lineno() are so simple that they just
return cur_filename, cur_lineno, respectively.

Remove these functions, and then use cur_filename and cur_lineno
directly.

Signed-off-by: Masahiro Yamada

kconfig: replace current_pos with separate cur_{filename,lineno}

2024-02-19T09:20:40+00:00

Replace current_pos with separate variables representing the file name
and the line number, respectively.

No functional change is intended.

By the way, you might wonder why the "" fallback exists in
zconf_curname(). menu_add_symbol() saves the current file and the line
number. It is intended to be called only during the yyparse() time.
However, menu_finalize() calls it, where there is no file being parsed.
This is a long-standing hack that should be fixed later. I left a FIXME
comment.

Signed-off-by: Masahiro Yamada

kconfig: split preprocessor prototypes into preprocess.h

2024-02-19T09:20:40+00:00

These are needed only for the parse stage. Move the prototypes into
a separate header to make sure they are not used after that.

Signed-off-by: Masahiro Yamada

kconfig: fix infinite loop when expanding a macro at the end of file

2024-02-19T09:20:40+00:00

A macro placed at the end of a file with no newline causes an infinite
loop.

[Test Kconfig]
  $(info,hello)
  \ No newline at end of file

I realized that flex-provided input() returns 0 instead of EOF when it
reaches the end of a file.

Fixes: 104daea149c4 ("kconfig: reference environment variables directly and remove 'option env='")
Signed-off-by: Masahiro Yamada

kconfig: fix line number in recursive inclusion detection

2024-02-19T09:20:39+00:00

The error message shows a wrong line number if the 'source' directive
is wrapped to the following line.

[Test Code]

  source \
  "Kconfig"

This results in the following error message:

  Recursive inclusion detected.
  Inclusion path:
    current file : Kconfig
    included from: Kconfig:2

The correct message should be as follows:

  Recursive inclusion detected.
  Inclusion path:
    current file : Kconfig
    included from: Kconfig:1

Signed-off-by: Masahiro Yamada