Merge pull request #6201 from edolstra/print-value

printValue(): Don't show repeated values

src/libexpr/eval.cc

@@ -86,15 +86,10 @@ RootValue allocRootValue(Value * v)
 }
 
 
-void printValue(std::ostream & str, std::set<const Value *> & active, const Value & v)
+void printValue(std::ostream & str, std::set<const void *> & seen, const Value & v)
 {
     checkInterrupt();
 
-    if (!active.insert(&v).second) {
-        str << "<CYCLE>";
-        return;
-    }
-
     switch (v.internalType) {
     case tInt:
         str << v.integer;
@@ -120,24 +115,32 @@ void printValue(std::ostream & str, std::set<const Value *> & active, const Valu
         str << "null";
         break;
     case tAttrs: {
+        if (!v.attrs->empty() && !seen.insert(v.attrs).second)
+            str << "<REPEAT>";
+        else {
             str << "{ ";
             for (auto & i : v.attrs->lexicographicOrder()) {
                 str << i->name << " = ";
-            printValue(str, active, *i->value);
+                printValue(str, seen, *i->value);
                 str << "; ";
             }
             str << "}";
+        }
         break;
     }
     case tList1:
     case tList2:
     case tListN:
+        if (v.listSize() && !seen.insert(v.listElems()).second)
+            str << "<REPEAT>";
+        else {
             str << "[ ";
             for (auto v2 : v.listItems()) {
-            printValue(str, active, *v2);
+                printValue(str, seen, *v2);
                 str << " ";
             }
             str << "]";
+        }
         break;
     case tThunk:
     case tApp:
@@ -161,15 +164,13 @@ void printValue(std::ostream & str, std::set<const Value *> & active, const Valu
     default:
         abort();
     }
-
-    active.erase(&v);
 }
 
 
 std::ostream & operator << (std::ostream & str, const Value & v)
 {
-    std::set<const Value *> active;
+    std::set<const void *> seen;
-    printValue(str, active, v);
+    printValue(str, seen, v);
     return str;
 }
 

src/libexpr/value.hh

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

src/nix/repl.cc

@@ -800,7 +800,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
                 else
                     printStringValue(str, i.first.c_str());
                 str << " = ";
-                if (seen.find(i.second) != seen.end())
+                if (seen.count(i.second))
                     str << "«repeated»";
                 else
                     try {