* Print attributes in sorted order.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 69632eb37ef1..26739faf69e8 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -41,12 +41,17 @@ std::ostream & operator << (std::ostream & str, Value & v)
     case tNull:
         str << "true";
         break;
-    case tAttrs:
+    case tAttrs: {
         str << "{ ";
+        typedef std::map<string, Value *> Sorted;
+        Sorted sorted;
         foreach (Bindings::iterator, i, *v.attrs)
-            str << (string) i->first << " = " << i->second.value << "; ";
+            sorted[i->first] = &i->second.value;
+        foreach (Sorted::iterator, i, sorted)
+            str << i->first << " = " << *i->second << "; ";
         str << "}";
         break;
+    }
     case tList:
         str << "[ ";
         for (unsigned int n = 0; n < v.list.length; ++n)
diff --git a/tests/lang/eval-okay-tryeval.exp b/tests/lang/eval-okay-tryeval.exp
index c2788b412288..2b2e6fa711f4 100644
--- a/tests/lang/eval-okay-tryeval.exp
+++ b/tests/lang/eval-okay-tryeval.exp
@@ -1 +1 @@
-{ x = { value = "x"; success = true; }; y = { value = false; success = false; }; z = { value = false; success = false; }; }
+{ x = { success = true; value = "x"; }; y = { success = false; value = false; }; z = { success = false; value = false; }; }