kconfig: switch to ASSIGN_VAL state in the second lexer

[carl9170fw.git] / config / zconf.l

diff --git a/config/zconf.l b/config/zconf.l
index 418ade946405a8dbf01b3c2154edbeeda9f360a7..5341e5431f3b22024865989a0bf565adb3b95ea9 100644 (file)
--- a/config/zconf.l
+++ b/config/zconf.l
@@ -25,6 +25,7 @@ static struct {
        int lineno;
 } current_pos;
 
+static int prev_prev_token = T_EOL;
 static int prev_token = T_EOL;
 static char *text;
 static int text_size, text_asize;
@@ -104,23 +105,22 @@ n [A-Za-z0-9_-]
                current_pos.lineno = yylineno;
                if (id && id->flags & TF_COMMAND) {
                        BEGIN(PARAM);
-                       yylval.id = id;
                        return id->token;
                }
                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))
-                       return T_VARIABLE;
+                       return T_WORD;
                free(yylval.string);
        }
-       "="     { BEGIN(ASSIGN_VAL); return T_EQUAL; }
-       ":="    { BEGIN(ASSIGN_VAL); return T_COLON_EQUAL; }
-       "+="    { BEGIN(ASSIGN_VAL); return T_PLUS_EQUAL; }
+       "="     return T_EQUAL;
+       ":="    return T_COLON_EQUAL;
+       "+="    return T_PLUS_EQUAL;
        [[:blank:]]+
        .       warn_ignored_character(*yytext);
        \n      {
@@ -160,17 +160,16 @@ n [A-Za-z0-9_-]
                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;
                        return id->token;
                }
                alloc_string(yytext, yyleng);
                yylval.string = text;
                return T_WORD;
        }
-       ({n}|[/.$])+    {
+       ({n}|$)+        {
                /* this token includes at least one '$' */
                yylval.string = expand_token(yytext, yyleng);
                if (strlen(yylval.string))
@@ -290,6 +289,11 @@ repeat:
        if ((prev_token == T_EOL || prev_token == T_HELPTEXT) && token == T_EOL)
                goto repeat;
 
+       if (prev_prev_token == T_EOL && prev_token == T_WORD &&
+           (token == T_EQUAL || token == T_COLON_EQUAL || token == T_PLUS_EQUAL))
+               BEGIN(ASSIGN_VAL);
+
+       prev_prev_token = prev_token;
        prev_token = token;
 
        return token;