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

kconfig: refactor end token rules 



T_ENDMENU, T_ENDCHOICE, T_ENDIF are the last users of kconf_id
associated with yylval. Refactor them to not use it.

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

scripts/kconfig/zconf.y

+15 −28
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ int yylex(void); 
static void yyerror(const char *err);

static void zconfprint(const char *err, ...);

static void zconf_error(const char *err, ...);

static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);

static bool zconf_endtoken(const char *tokenname,

			   const char *expected_tokenname);



struct symbol *symbol_hash[SYMBOL_HASHSIZE];
@@ -98,7 +99,7 @@ static struct menu *current_menu, *current_entry; 
%type <type> type logic_type default

%type <expr> expr

%type <expr> if_expr

%type <id> end

%type <string> end

%type <menu> if_entry menu_entry choice_entry

%type <string> word_opt assign_val

%type <flavor> assign_op
@@ -256,7 +257,7 @@ choice_entry: choice choice_option_list 


choice_end: end

{

	if (zconf_endtoken($1, T_CHOICE, T_ENDCHOICE)) {

	if (zconf_endtoken($1, "choice")) {

		menu_end_menu();

		printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());

	}
@@ -330,7 +331,7 @@ if_entry: T_IF expr T_EOL 


if_end: end

{

	if (zconf_endtoken($1, T_IF, T_ENDIF)) {

	if (zconf_endtoken($1, "if")) {

		menu_end_menu();

		printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());

	}
@@ -355,7 +356,7 @@ menu_entry: menu menu_option_list 


menu_end: end

{

	if (zconf_endtoken($1, T_MENU, T_ENDMENU)) {

	if (zconf_endtoken($1, "menu")) {

		menu_end_menu();

		printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());

	}
@@ -445,9 +446,9 @@ prompt: T_WORD 
	| T_WORD_QUOTE

;



end:	  T_ENDMENU T_EOL	{ $$ = $1; }

	| T_ENDCHOICE T_EOL	{ $$ = $1; }

	| T_ENDIF T_EOL		{ $$ = $1; }

end:	  T_ENDMENU T_EOL	{ $$ = "menu"; }

	| T_ENDCHOICE T_EOL	{ $$ = "choice"; }

	| T_ENDIF T_EOL		{ $$ = "if"; }

;



if_expr:  /* empty */			{ $$ = NULL; }
@@ -530,35 +531,21 @@ void conf_parse(const char *name) 
	sym_set_change_count(1);

}



static const char *zconf_tokenname(int token)

{

	switch (token) {

	case T_MENU:		return "menu";

	case T_ENDMENU:		return "endmenu";

	case T_CHOICE:		return "choice";

	case T_ENDCHOICE:	return "endchoice";

	case T_IF:		return "if";

	case T_ENDIF:		return "endif";

	case T_DEPENDS:		return "depends";

	case T_VISIBLE:		return "visible";

	}

	return "<token>";

}



static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)

static bool zconf_endtoken(const char *tokenname,

			   const char *expected_tokenname)

{

	if (id->token != endtoken) {

	if (strcmp(tokenname, expected_tokenname)) {

		zconf_error("unexpected '%s' within %s block",

			id->name, zconf_tokenname(starttoken));

			    tokenname, expected_tokenname);

		yynerrs++;

		return false;

	}

	if (current_menu->file != current_file) {

		zconf_error("'%s' in different file than '%s'",

			id->name, zconf_tokenname(starttoken));

			    tokenname, expected_tokenname);

		fprintf(stderr, "%s:%d: location of the '%s'\n",

			current_menu->file->name, current_menu->lineno,

			zconf_tokenname(starttoken));

			expected_tokenname);

		yynerrs++;

		return false;

	}