projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: make "Selected by:" and "Implied by:" readable
[carl9170fw.git]
/
config
/
zconf.l
diff --git
a/config/zconf.l
b/config/zconf.l
index 020c099a3a6568190a5584db7245e8f53a1f3760..3200318fbf49f179c038efc4a20ce5c1025d990d 100644
(file)
--- a/
config/zconf.l
+++ b/
config/zconf.l
@@
-66,9
+66,16
@@
static void alloc_string(const char *str, int size)
memcpy(text, str, size);
text[size] = 0;
}
memcpy(text, str, size);
text[size] = 0;
}
+
+static void warn_ignored_character(char chr)
+{
+ fprintf(stderr,
+ "%s:%d:warning: ignoring unsupported character '%c'\n",
+ zconf_curname(), zconf_lineno(), chr);
+}
%}
%}
-n [A-Za-z0-9_]
+n [A-Za-z0-9_
-
]
%%
int str = 0;
%%
int str = 0;
@@
-99,14
+106,14
@@
n [A-Za-z0-9_]
current_pos.file = current_file;
current_pos.lineno = current_file->lineno;
if (id && id->flags & TF_COMMAND) {
current_pos.file = current_file;
current_pos.lineno = current_file->lineno;
if (id && id->flags & TF_COMMAND) {
-
zconf
lval.id = id;
+
yy
lval.id = id;
return id->token;
}
alloc_string(yytext, yyleng);
return id->token;
}
alloc_string(yytext, yyleng);
-
zconf
lval.string = text;
+
yy
lval.string = text;
return T_WORD;
}
return T_WORD;
}
- .
+ .
warn_ignored_character(*yytext);
\n {
BEGIN(INITIAL);
current_file->lineno++;
\n {
BEGIN(INITIAL);
current_file->lineno++;
@@
-132,25
+139,20
@@
n [A-Za-z0-9_]
BEGIN(STRING);
}
\n BEGIN(INITIAL); current_file->lineno++; return T_EOL;
BEGIN(STRING);
}
\n BEGIN(INITIAL); current_file->lineno++; return T_EOL;
- --- /* ignore */
- ({n}|[-/.])+ {
+ ({n}|[/.])+ {
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
if (id && id->flags & TF_PARAM) {
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
if (id && id->flags & TF_PARAM) {
-
zconf
lval.id = id;
+
yy
lval.id = id;
return id->token;
}
alloc_string(yytext, yyleng);
return id->token;
}
alloc_string(yytext, yyleng);
-
zconf
lval.string = text;
+
yy
lval.string = text;
return T_WORD;
}
#.* /* comment */
\\\n current_file->lineno++;
[[:blank:]]+
return T_WORD;
}
#.* /* comment */
\\\n current_file->lineno++;
[[:blank:]]+
- . {
- fprintf(stderr,
- "%s:%d:warning: ignoring unsupported character '%c'\n",
- zconf_curname(), zconf_lineno(), *yytext);
- }
+ . warn_ignored_character(*yytext);
<<EOF>> {
BEGIN(INITIAL);
}
<<EOF>> {
BEGIN(INITIAL);
}
@@
-159,7
+161,7
@@
n [A-Za-z0-9_]
<STRING>{
[^'"\\\n]+/\n {
append_string(yytext, yyleng);
<STRING>{
[^'"\\\n]+/\n {
append_string(yytext, yyleng);
-
zconf
lval.string = text;
+
yy
lval.string = text;
return T_WORD_QUOTE;
}
[^'"\\\n]+ {
return T_WORD_QUOTE;
}
[^'"\\\n]+ {
@@
-167,7
+169,7
@@
n [A-Za-z0-9_]
}
\\.?/\n {
append_string(yytext + 1, yyleng - 1);
}
\\.?/\n {
append_string(yytext + 1, yyleng - 1);
-
zconf
lval.string = text;
+
yy
lval.string = text;
return T_WORD_QUOTE;
}
\\.? {
return T_WORD_QUOTE;
}
\\.? {
@@
-176,7
+178,7
@@
n [A-Za-z0-9_]
\'|\" {
if (str == yytext[0]) {
BEGIN(PARAM);
\'|\" {
if (str == yytext[0]) {
BEGIN(PARAM);
-
zconf
lval.string = text;
+
yy
lval.string = text;
return T_WORD_QUOTE;
} else
append_string(yytext, 1);
return T_WORD_QUOTE;
} else
append_string(yytext, 1);
@@
-259,7
+261,7
@@
void zconf_starthelp(void)
static void zconf_endhelp(void)
{
static void zconf_endhelp(void)
{
-
zconf
lval.string = text;
+
yy
lval.string = text;
BEGIN(INITIAL);
}
BEGIN(INITIAL);
}