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

printValue(): Don't print <CYCLE> for repeated values

Browse source
This commit is contained in:
Eelco Dolstra 2014-10-01 15:54:40 +02:00
parent d61853430a
commit a17c23426e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libexpr/eval.cc
View file

@ -38,13 +38,13 @@ void Bindings::sort()
} }
static void printValue(std::ostream & str, std::set<const Value *> & seen, const Value & v) static void printValue(std::ostream & str, std::set<const Value *> & active, const Value & v)
{ {
if (seen.find(&v) != seen.end()) { if (active.find(&v) != active.end()) {
str << "<CYCLE>"; str << "<CYCLE>";
return; return;
} }
seen.insert(&v); active.insert(&v);
switch (v.type) { switch (v.type) {
case tInt: case tInt:
@ -77,7 +77,7 @@ static void printValue(std::ostream & str, std::set<const Value *> & seen, const
sorted[i->name] = i->value; sorted[i->name] = i->value;
for (auto & i : sorted) { for (auto & i : sorted) {
str << i.first << " = "; str << i.first << " = ";
printValue(str, seen, *i.second); printValue(str, active, *i.second);
str << "; "; str << "; ";
} }
str << "}"; str << "}";
@ -86,7 +86,7 @@ static void printValue(std::ostream & str, std::set<const Value *> & seen, const
case tList: case tList:
str << "[ "; str << "[ ";
for (unsigned int n = 0; n < v.list.length; ++n) { for (unsigned int n = 0; n < v.list.length; ++n) {
printValue(str, seen, *v.list.elems[n]); printValue(str, active, *v.list.elems[n]);
str << " "; str << " ";
} }
str << "]"; str << "]";
@ -107,13 +107,15 @@ static void printValue(std::ostream & str, std::set<const Value *> & seen, const
default: default:
throw Error("invalid value"); throw Error("invalid value");
} }
active.erase(&v);
} }
std::ostream & operator << (std::ostream & str, const Value & v) std::ostream & operator << (std::ostream & str, const Value & v)
{ {
std::set<const Value *> seen; std::set<const Value *> active;
printValue(str, seen, v); printValue(str, active, v);
return str; return str;
} }