X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=config%2Fzconf.l;h=d2d9d87bea6ea63bcfa6dec6b33b06ce4fad5289;hp=d0f5b132a9b39802680a3f07343d0c36bf83e4ee;hb=0a4078c88712401b4ce8fbbe964ea6a70216d597;hpb=dd88a7e5b482637a26c67ffa1cdf7ebed204161d diff --git a/config/zconf.l b/config/zconf.l index d0f5b13..d2d9d87 100644 --- a/config/zconf.l +++ b/config/zconf.l @@ -114,8 +114,16 @@ n [A-Za-z0-9_-] yylval.string = text; return T_VARIABLE; } + ({n}|$)+ { + /* this token includes at least one '$' */ + yylval.string = expand_token(yytext, yyleng); + if (strlen(yylval.string)) + return T_VARIABLE; + 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; } [[:blank:]]+ . warn_ignored_character(*yytext); \n {