Commit b3d1d9d3 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: stop associating kconf_id with yylval 



The lexer has conventionally associated kconf_id data with yylval
to carry additional information to the parser.

No token is relying on this any more.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent caaebb3c

scripts/kconfig/zconf.l

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ n [A-Za-z0-9_-] 
		current_pos.lineno = yylineno;

		if (id && id->flags & TF_COMMAND) {

			BEGIN(PARAM);

			yylval.id = id;

			return id->token;

		}

		alloc_string(yytext, yyleng);
@@ -163,7 +162,6 @@ n [A-Za-z0-9_-] 
	{n}+	{

		const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);

		if (id && id->flags & TF_PARAM) {

			yylval.id = id;

			return id->token;

		}

		alloc_string(yytext, yyleng);

scripts/kconfig/zconf.y

+20 −21
Original line number Diff line number Diff line
@@ -40,50 +40,49 @@ static struct menu *current_menu, *current_entry; 
	struct symbol *symbol;

	struct expr *expr;

	struct menu *menu;

	const struct kconf_id *id;

	enum symbol_type type;

	enum variable_flavor flavor;

}



%token <id>T_MAINMENU

%token <id>T_MENU

%token <id>T_ENDMENU

%token <id>T_SOURCE

%token <id>T_CHOICE

%token <id>T_ENDCHOICE

%token <id>T_COMMENT

%token <id>T_CONFIG

%token <id>T_MENUCONFIG

%token <id>T_HELP

%token <string> T_HELPTEXT

%token <id>T_IF

%token <id>T_ENDIF

%token <id>T_DEPENDS

%token <id>T_OPTIONAL

%token <id>T_PROMPT

%token <id>T_SELECT

%token <id>T_IMPLY

%token <id>T_RANGE

%token <id>T_VISIBLE

%token <id>T_ON

%token <string> T_WORD

%token <string> T_WORD_QUOTE

%token T_ALLNOCONFIG_Y

%token T_BOOL

%token T_CHOICE

%token T_CLOSE_PAREN

%token T_COLON_EQUAL

%token T_COMMENT

%token T_CONFIG

%token T_DEFAULT

%token T_DEFCONFIG_LIST

%token T_DEF_BOOL

%token T_DEF_TRISTATE

%token T_DEPENDS

%token T_ENDCHOICE

%token T_ENDIF

%token T_ENDMENU

%token T_HELP

%token T_HEX

%token T_IF

%token T_IMPLY

%token T_INT

%token T_MAINMENU

%token T_MENU

%token T_MENUCONFIG

%token T_MODULES

%token T_ON

%token T_OPEN_PAREN

%token T_OPTION

%token T_OPTIONAL

%token T_PLUS_EQUAL

%token T_PROMPT

%token T_RANGE

%token T_SELECT

%token T_SOURCE

%token T_STRING

%token T_TRISTATE

%token T_VISIBLE

%token T_EOL

%token <string> T_ASSIGN_VAL