philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #5969 from edolstra/curpos-fix

Browse source 
Fix parsing of variable names that are a prefix of '__curPos'
This commit is contained in:
Eelco Dolstra 2022-01-24 16:30:13 +01:00 committed by GitHub
parent 7afbdf2545 bed8270c0c
commit e66550c917
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/nixexpr.cc
View file

@ -191,7 +191,7 @@ void ExprConcatStrings::show(std::ostream & str) const
str << "("; str << "(";
for (auto & i : *es) { for (auto & i : *es) {
if (first) first = false; else str << " + "; if (first) first = false; else str << " + ";
str << i.second; str << *i.second;
} }
str << ")"; str << ")";
} }

3
src/libexpr/parser.y
View file

@ -404,7 +404,8 @@ expr_select
expr_simple expr_simple
: ID { : ID {
if (strncmp($1.p, "__curPos", $1.l) == 0) std::string_view s = "__curPos";
if (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-20220122.exp Normal file
View file

@ -0,0 +1 @@
3

1
tests/lang/eval-okay-regression-20220122.nix Normal file
View file

@ -0,0 +1 @@
((_: _) 1) + ((__: __) 2)

4
tests/user-envs.nix
View file

@ -9,7 +9,8 @@ assert foo == "foo";
let let
makeDrv = name: progName: (mkDerivation { makeDrv = name: progName: (mkDerivation {
inherit name progName system; name = assert progName != "fail"; name;
inherit progName system;
builder = ./user-envs.builder.sh; builder = ./user-envs.builder.sh;
} // { } // {
meta = { meta = {
@ -26,4 +27,5 @@ in
(makeDrv "foo-2.0" "foo") (makeDrv "foo-2.0" "foo")
(makeDrv "bar-0.1.1" "bar") (makeDrv "bar-0.1.1" "bar")
(makeDrv "foo-0.1" "foo" // { meta.priority = 10; }) (makeDrv "foo-0.1" "foo" // { meta.priority = 10; })
(makeDrv "fail-0.1" "fail")
] ]