projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: use T_WORD instead of T_VARIABLE for variables
[carl9170fw.git]
/
config
/
zconf.l
diff --git
a/config/zconf.l
b/config/zconf.l
index bbbef0c9072c7ff185a6146c83a60b3bff5e489f..eec4a5a97639d509104da10d367e95fa9039eadd 100644
(file)
--- a/
config/zconf.l
+++ b/
config/zconf.l
@@
-109,18
+109,18
@@
n [A-Za-z0-9_-]
}
alloc_string(yytext, yyleng);
yylval.string = text;
}
alloc_string(yytext, yyleng);
yylval.string = text;
- return T_
VARIABLE
;
+ return T_
WORD
;
}
({n}|$)+ {
/* this token includes at least one '$' */
yylval.string = expand_token(yytext, yyleng);
if (strlen(yylval.string))
}
({n}|$)+ {
/* this token includes at least one '$' */
yylval.string = expand_token(yytext, yyleng);
if (strlen(yylval.string))
- return T_
VARIABLE
;
+ return T_
WORD
;
free(yylval.string);
}
free(yylval.string);
}
- "=" { BEGIN(ASSIGN_VAL);
yylval.flavor = VAR_RECURSIVE; return T_ASSIGN
; }
- ":=" { BEGIN(ASSIGN_VAL);
yylval.flavor = VAR_SIMPLE; return T_ASSIGN
; }
- "+=" { BEGIN(ASSIGN_VAL);
yylval.flavor = VAR_APPEND; return T_ASSIGN
; }
+ "=" { BEGIN(ASSIGN_VAL);
return T_EQUAL
; }
+ ":=" { BEGIN(ASSIGN_VAL);
return T_COLON_EQUAL
; }
+ "+=" { BEGIN(ASSIGN_VAL);
return T_PLUS_EQUAL
; }
[[:blank:]]+
. warn_ignored_character(*yytext);
\n {
[[:blank:]]+
. warn_ignored_character(*yytext);
\n {
@@
-140,6
+140,9
@@
n [A-Za-z0-9_-]
}
<PARAM>{
}
<PARAM>{
+ "modules" return T_MODULES;
+ "defconfig_list" return T_DEFCONFIG_LIST;
+ "allnoconfig_y" return T_ALLNOCONFIG_Y;
"&&" return T_AND;
"||" return T_OR;
"(" return T_OPEN_PAREN;
"&&" return T_AND;
"||" return T_OR;
"(" return T_OPEN_PAREN;
@@
-178,9
+181,6
@@
n [A-Za-z0-9_-]
\\\n ;
[[:blank:]]+
. warn_ignored_character(*yytext);
\\\n ;
[[:blank:]]+
. warn_ignored_character(*yytext);
- <<EOF>> {
- BEGIN(INITIAL);
- }
}
<STRING>{
}
<STRING>{
@@
-262,6
+262,12
@@
n [A-Za-z0-9_-]
}
<<EOF>> {
}
<<EOF>> {
+ BEGIN(INITIAL);
+
+ if (prev_token != T_EOL && prev_token != T_HELPTEXT)
+ fprintf(stderr, "%s:%d:warning: no new line at end of file\n",
+ current_file->name, yylineno);
+
if (current_file) {
zconf_endfile();
return T_EOL;
if (current_file) {
zconf_endfile();
return T_EOL;