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

printValue: Show assertion errors inline

Browse source
This commit is contained in:
Eelco Dolstra 2013-09-09 11:34:54 +02:00
parent e587aec123
commit 8e765b8876
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nix-repl.cc
View file

@ -390,13 +390,20 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
} }
} }
foreach (Sorted::iterator, i, sorted) foreach (Sorted::iterator, i, sorted) {
str << i->first << " = ";
if (hidden.find(i->first) != hidden.end()) if (hidden.find(i->first) != hidden.end())
str << i->first << " = «...»; "; str << "«...»";
else if (seen.find(i->second) != seen.end()) else if (seen.find(i->second) != seen.end())
str << i->first << " = «repeated»; "; str << "«repeated»";
else else
printValue(str << i->first << " = ", *i->second, maxDepth - 1, seen) << "; "; try {
printValue(str, *i->second, maxDepth - 1, seen);
} catch (AssertionError & e) {
str << "«error: " << e.msg() << "»";
}
str << "; ";
}
} else } else
str << "... "; str << "... ";
@ -415,7 +422,12 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
if (seen.find(v.list.elems[n]) != seen.end()) if (seen.find(v.list.elems[n]) != seen.end())
str << "«repeated»"; str << "«repeated»";
else else
printValue(str, *v.list.elems[n], maxDepth - 1, seen) << " "; try {
printValue(str, *v.list.elems[n], maxDepth - 1, seen);
} catch (AssertionError & e) {
str << "«error: " << e.msg() << "»";
}
str << " ";
} }
else else
str << "... "; str << "... ";