lix-project/lix
20
55
Fork 31
Code Issues 346 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #5984 from NixOS/5982-correctly-parse-__curPosFoo

Browse source 
Fix parsing of variable names that are a suffix of '__curPos'
This commit is contained in:
Eelco Dolstra 2022-01-25 11:54:04 +01:00 committed by GitHub
parent 0a70b37b56 f113ea6c73
commit a9a90b3c1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/parser.y
View file

@ -405,7 +405,7 @@ expr_select
expr_simple expr_simple
: ID { : ID {
std::string_view s = "__curPos"; std::string_view s = "__curPos";
if (strncmp($1.p, s.data(), s.size()) == 0) if ($1.l == s.size() && strncmp($1.p, s.data(), s.size()) == 0)
$$ = new ExprPos(CUR_POS); $$ = new ExprPos(CUR_POS);
else else
$$ = new ExprVar(CUR_POS, data->symbols.create($1)); $$ = new ExprVar(CUR_POS, data->symbols.create($1));

1
tests/lang/eval-okay-regression-20220125.exp Normal file
View file

@ -0,0 +1 @@
3

2
tests/lang/eval-okay-regression-20220125.nix Normal file
View file

@ -0,0 +1,2 @@
((__curPosFoo: __curPosFoo) 1) + ((__curPosBar: __curPosBar) 2)