lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Be more aggressive in hiding repeated values

Browse source 
We now memoize on Bindings / list element vectors rather than Values,
so that e.g. two Values that point to the same Bindings will be
printed only once.
This commit is contained in:
Eelco Dolstra 2022-03-03 13:29:14 +01:00
parent ecff9d969a
commit e9c04c3351
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/libexpr/eval.cc
View file

@ -86,7 +86,7 @@ RootValue allocRootValue(Value * v)
} }
void printValue(std::ostream & str, std::set<const Value *> & seen, const Value & v) void printValue(std::ostream & str, std::set<const void *> & seen, const Value & v)
{ {
checkInterrupt(); checkInterrupt();
@ -115,32 +115,32 @@ void printValue(std::ostream & str, std::set<const Value *> & seen, const Value
str << "null"; str << "null";
break; break;
case tAttrs: { case tAttrs: {
seen.insert(&v); if (!v.attrs->empty() && !seen.insert(v.attrs).second)
str << "{ "; str << "<REPEAT>";
for (auto & i : v.attrs->lexicographicOrder()) { else {
str << i->name << " = "; str << "{ ";
if (seen.count(i->value)) for (auto & i : v.attrs->lexicographicOrder()) {
str << "<REPEAT>"; str << i->name << " = ";
else
printValue(str, seen, *i->value); printValue(str, seen, *i->value);
str << "; "; str << "; ";
}
str << "}";
} }
str << "}";
break; break;
} }
case tList1: case tList1:
case tList2: case tList2:
case tListN: case tListN:
seen.insert(&v); if (v.listSize() && !seen.insert(v.listElems()).second)
str << "[ "; str << "<REPEAT>";
for (auto v2 : v.listItems()) { else {
if (seen.count(v2)) str << "[ ";
str << "<REPEAT>"; for (auto v2 : v.listItems()) {
else
printValue(str, seen, *v2); printValue(str, seen, *v2);
str << " "; str << " ";
}
str << "]";
} }
str << "]";
break; break;
case tThunk: case tThunk:
case tApp: case tApp:
@ -169,7 +169,7 @@ void printValue(std::ostream & str, std::set<const Value *> & seen, const Value
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 void *> seen;
printValue(str, seen, v); printValue(str, seen, v);
return str; return str;
} }

2
src/libexpr/value.hh
View file

@ -115,7 +115,7 @@ private:
InternalType internalType; InternalType internalType;
friend std::string showType(const Value & v); friend std::string showType(const Value & v);
friend void printValue(std::ostream & str, std::set<const Value *> & seen, const Value & v); friend void printValue(std::ostream & str, std::set<const void *> & seen, const Value & v);
public: public: