starter: Explicitly allow @# at the beginning of strings

Since we treat everything after # as comment identities of type
ID_KEY_ID couldn't be parsed otherwise, unless quoted.

diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l
index 22ad6177e27721b8144b2542f9a8849a072be649..a88cbe8097ac72043598f384b153dfca4a1f012e 100644 (file)
--- a/src/starter/parser/lexer.l
+++ b/src/starter/parser/lexer.l
@@ -79,7 +79,7 @@ static void include_files(parser_helper_t *ctx);
        yy_push_state(str, yyscanner);
 }
 
-[^\"#= \t\n]+                  {
+(@#)?[^\"#= \t\n]+                     {
        yylval->s = strdup(yytext);
        return STRING;
 }

diff --git a/src/starter/tests/suites/test_parser.c b/src/starter/tests/suites/test_parser.c
index 84b5eedc85f45ce57e6f10cc306867a9da64c256..684bc2a273b7ac5825750b3c0d021bdb7c6fe1c8 100644 (file)
--- a/src/starter/tests/suites/test_parser.c
+++ b/src/starter/tests/suites/test_parser.c
@@ -224,6 +224,9 @@ static struct {
        { "conn foo # asdf\n\tkey=val", TRUE, "val" },
        { "conn foo # asdf\n#\tkey=val", TRUE, NULL },
        { "conn foo # asdf\n\t#key=val", TRUE, NULL },
+       { "conn foo # asdf\n\tkey=@#keyid", TRUE, "@#keyid" },
+       { "conn foo # asdf\n\tkey=\"@#keyid\"", TRUE, "@#keyid" },
+       { "conn foo # asdf\n\tkey=asdf@#keyid", TRUE, "asdf@" },
        { "conn foo # asdf\n\tkey=#val", TRUE, NULL },
        { "conn foo # asdf\n\tkey=val#asdf", TRUE, "val" },
        { "conn foo # asdf\n\tkey=\"val#asdf\"", TRUE, "val#asdf" },