projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: stop supporting '.' and '/' in unquoted words
[carl9170fw.git]
/
config
/
zconf.l
diff --git
a/config/zconf.l
b/config/zconf.l
index 112a0ee1b0a0c2c6c33354aa24f1ed708066a700..3d8d8619153c966458eaa44dcf9363a0a6448955 100644
(file)
--- a/
config/zconf.l
+++ b/
config/zconf.l
@@
-16,6
+16,8
@@
#include "lkc.h"
#include "lkc.h"
+#define YY_DECL static int yylex1(void)
+
#define START_STRSIZE 16
static struct {
#define START_STRSIZE 16
static struct {
@@
-23,6
+25,7
@@
static struct {
int lineno;
} current_pos;
int lineno;
} current_pos;
+static int prev_token = T_EOL;
static char *text;
static int text_size, text_asize;
static char *text;
static int text_size, text_asize;
@@
-88,12
+91,6
@@
n [A-Za-z0-9_-]
return T_EOL;
}
[ \t]*#.*
return T_EOL;
}
[ \t]*#.*
-
-
-[ \t]+ {
- BEGIN(COMMAND);
-}
-
. {
unput(yytext[0]);
BEGIN(COMMAND);
. {
unput(yytext[0]);
BEGIN(COMMAND);
@@
-112,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 {
@@
-143,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;
@@
-160,7
+160,7
@@
n [A-Za-z0-9_-]
BEGIN(STRING);
}
\n BEGIN(INITIAL); return T_EOL;
BEGIN(STRING);
}
\n BEGIN(INITIAL); return T_EOL;
-
({n}|[/.])+
{
+
{n}+
{
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
if (id && id->flags & TF_PARAM) {
yylval.id = id;
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
if (id && id->flags & TF_PARAM) {
yylval.id = id;
@@
-170,7
+170,7
@@
n [A-Za-z0-9_-]
yylval.string = text;
return T_WORD;
}
yylval.string = text;
return T_WORD;
}
- ({n}|
[/.$])+
{
+ ({n}|
$)+
{
/* this token includes at least one '$' */
yylval.string = expand_token(yytext, yyleng);
if (strlen(yylval.string))
/* this token includes at least one '$' */
yylval.string = expand_token(yytext, yyleng);
if (strlen(yylval.string))
@@
-181,26
+181,13
@@
n [A-Za-z0-9_-]
\\\n ;
[[:blank:]]+
. warn_ignored_character(*yytext);
\\\n ;
[[:blank:]]+
. warn_ignored_character(*yytext);
- <<EOF>> {
- BEGIN(INITIAL);
- }
}
<STRING>{
"$".* append_expanded_string(yytext);
}
<STRING>{
"$".* append_expanded_string(yytext);
- [^$'"\\\n]+/\n {
- append_string(yytext, yyleng);
- yylval.string = text;
- return T_WORD_QUOTE;
- }
[^$'"\\\n]+ {
append_string(yytext, yyleng);
}
[^$'"\\\n]+ {
append_string(yytext, yyleng);
}
- \\.?/\n {
- append_string(yytext + 1, yyleng - 1);
- yylval.string = text;
- return T_WORD_QUOTE;
- }
\\.? {
append_string(yytext + 1, yyleng - 1);
}
\\.? {
append_string(yytext + 1, yyleng - 1);
}
@@
-216,11
+203,15
@@
n [A-Za-z0-9_-]
fprintf(stderr,
"%s:%d:warning: multi-line strings not supported\n",
zconf_curname(), zconf_lineno());
fprintf(stderr,
"%s:%d:warning: multi-line strings not supported\n",
zconf_curname(), zconf_lineno());
+ unput('\n');
BEGIN(INITIAL);
BEGIN(INITIAL);
- return T_EOL;
+ yylval.string = text;
+ return T_WORD_QUOTE;
}
<<EOF>> {
BEGIN(INITIAL);
}
<<EOF>> {
BEGIN(INITIAL);
+ yylval.string = text;
+ return T_WORD_QUOTE;
}
}
}
}
@@
-271,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;
@@
-280,6
+277,24
@@
n [A-Za-z0-9_-]
}
%%
}
%%
+
+/* second stage lexer */
+int yylex(void)
+{
+ int token;
+
+repeat:
+ token = yylex1();
+
+ /* Do not pass unneeded T_EOL to the parser. */
+ if ((prev_token == T_EOL || prev_token == T_HELPTEXT) && token == T_EOL)
+ goto repeat;
+
+ prev_token = token;
+
+ return token;
+}
+
static char *expand_token(const char *in, size_t n)
{
char *out;
static char *expand_token(const char *in, size_t n)
{
char *out;