wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Fix the parsing of "$"'s in strings.

Browse source
This commit is contained in:
Guillaume Maudoux 2015-07-02 23:53:04 +02:00
parent 65e4dcd69b
commit 467977f203
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/lexer.l
View file

@ -129,12 +129,11 @@ or { return OR_KW; }
\} { POP_STATE(); return '}'; }
\" { PUSH_STATE(STRING); return '"'; }
<STRING>([^\$\"\\]|\$[^\{\"]|\\.)+ {
/* !!! Not quite right: we want a follow restriction on
"$", it shouldn't be followed by a "{". Right now
"$\"" will be consumed as part of a string, rather
than a "$" followed by the string terminator.
Disallow "$\"" for now. */
<STRING>([^\$\"\\]|\$[^\{\"\\]|\\.|\$\\.)*\$/\" |
<STRING>([^\$\"\\]|\$[^\{\"\\]|\\.|\$\\.)+ {
/* It is impossible to match strings ending with '$' with one
regex because trailing contexts are only valid at the end
of a rule. (A sane but undocumented limitation.) */
yylval->e = unescapeStr(data->symbols, yytext);
return STR;
}