hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kconfig: use T_WORD instead of T_VARIABLE for variables 

There is no grammatical ambiguity by using T_WORD for variables.
The parser can distinguish variables from symbols from the context.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-12-11 20:01:02 +09:00
parent c3d228713b
commit 171a515d08
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/kconfig/zconf.l
View File

@ -109,13 +109,13 @@ n [A-Za-z0-9_-]
} }
alloc_string(yytext, yyleng); alloc_string(yytext, yyleng);
yylval.string = text; yylval.string = text;
return T_VARIABLE; return T_WORD;
} }
({n}|$)+ { ({n}|$)+ {
/* this token includes at least one '$' */ /* this token includes at least one '$' */
yylval.string = expand_token(yytext, yyleng); yylval.string = expand_token(yytext, yyleng);
if (strlen(yylval.string)) if (strlen(yylval.string))
return T_VARIABLE; return T_WORD;
free(yylval.string); free(yylval.string);
} }
"=" { BEGIN(ASSIGN_VAL); return T_EQUAL; } "=" { BEGIN(ASSIGN_VAL); return T_EQUAL; }

3
scripts/kconfig/zconf.y
View File

@ -84,7 +84,6 @@ static struct menu *current_menu, *current_entry;
%token T_STRING %token T_STRING
%token T_TRISTATE %token T_TRISTATE
%token T_EOL %token T_EOL
%token <string> T_VARIABLE
%token <string> T_ASSIGN_VAL %token <string> T_ASSIGN_VAL
%left T_OR %left T_OR
@ -480,7 +479,7 @@ word_opt: /* empty */ { $$ = NULL; }
/* assignment statement */ /* assignment statement */
assignment_stmt: T_VARIABLE assign_op assign_val T_EOL { variable_add($1, $3, $2); free($1); free($3); } assignment_stmt: T_WORD assign_op assign_val T_EOL { variable_add($1, $3, $2); free($1); free($3); }
assign_op: assign_op:
T_EQUAL { $$ = VAR_RECURSIVE; } T_EQUAL { $$ = VAR_RECURSIVE; }