* Allow function argument default values to refer to other arguments

  of the function.  Implements NIX-45.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/libutil/aterm-map.cc b/src/libutil/aterm-map.cc
index 60092382a2f3..f400464378f5 100644
--- a/src/libutil/aterm-map.cc
+++ b/src/libutil/aterm-map.cc
@@ -217,17 +217,17 @@ unsigned int ATermMap::size()
 
 void printATermMapStats()
 {
-    cout << "RESIZES: " << nrResizes << " "
+    cerr << "RESIZES: " << nrResizes << " "
          << sizeTotalAlloc << " "
          << sizeCurAlloc << " "
          << sizeMaxAlloc << endl;
         
-    cout << "SET: "
+    cerr << "SET: "
          << nrItemsSet << " "
          << nrSetProbes << " "
          << (double) nrSetProbes / nrItemsSet << endl;
 
-    cout << "GET: "
+    cerr << "GET: "
          << nrItemsGet << " "
          << nrGetProbes << " "
          << (double) nrGetProbes / nrItemsGet << endl;
diff --git a/src/libutil/aterm-map.hh b/src/libutil/aterm-map.hh
index 6d13d7f9e0d1..078617a7d673 100644
--- a/src/libutil/aterm-map.hh
+++ b/src/libutil/aterm-map.hh
@@ -50,6 +50,11 @@ public:
 
     ATerm get(ATerm key) const;
 
+    ATerm operator [](ATerm key) const
+    {
+        return get(key);
+    }
+
     void remove(ATerm key);
 
     unsigned int size();