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

Merge pull request #9926 from 9999years/fix-cycle-detection-in-nix-repl

Browse source 
Fix cycle detection in `nix repl`

(cherry picked from commit e190c20c3394fd1a5cd9be1afc3f30ab32dcd36b)
Change-Id: Ie385e781b9f0b7171ca653bcd53a990bb41f9e4b
This commit is contained in:
eldritch horrors 2024-03-08 06:26:06 +01:00
parent 1bb8fe48a2
commit b6b31d255a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/print.cc
View file

@ -150,7 +150,7 @@ struct ImportantFirstAttrNameCmp
} }
}; };
typedef std::set<Value *> ValuesSeen; typedef std::set<const void *> ValuesSeen;
class Printer class Printer
{ {
@ -260,7 +260,7 @@ private:
void printAttrs(Value & v, size_t depth) void printAttrs(Value & v, size_t depth)
{ {
if (seen && !seen->insert(&v).second) { if (seen && !seen->insert(v.attrs).second) {
printRepeated(); printRepeated();
return; return;
} }

4
tests/functional/repl.sh
View file

@ -161,7 +161,7 @@ testReplResponseNoRegex '
# Same for let expressions # Same for let expressions
testReplResponseNoRegex ' testReplResponseNoRegex '
let x = { y = { a = 1; }; inherit x; }; in x let x = { y = { a = 1; }; inherit x; }; in x
' '{ x = { ... }; y = { ... }; }' ' '{ x = «repeated»; y = { ... }; }'
# The :p command should recursively print sets, but prevent infinite recursion # The :p command should recursively print sets, but prevent infinite recursion
testReplResponseNoRegex ' testReplResponseNoRegex '
@ -176,4 +176,4 @@ testReplResponseNoRegex '
# Same for let expressions # Same for let expressions
testReplResponseNoRegex ' testReplResponseNoRegex '
:p let x = { y = { a = 1; }; inherit x; }; in x :p let x = { y = { a = 1; }; inherit x; }; in x
' '{ x = { x = «repeated»; y = { a = 1; }; }; y = «repeated»; }' ' '{ x = «repeated»; y = { a = 1; }; }'