nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 13:06:01 +01:00
Code Activity

Fix parsing of variable names that are a suffix of '__curPos'

Browse source 
Follow-up from #5969
Fix #5982
This commit is contained in:
regnat 2022-01-25 10:49:27 +01:00
parent 0a70b37b56
commit f113ea6c73
3 changed files with 4 additions and 1 deletions
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)