Add to cling value printing capabilities for std::tuple and std::pair.

include/cling/Interpreter/RuntimePrintValue.h

@@ -1,6 +1,7 @@
 //--------------------------------------------------------------------*- C++ -*-
 // CLING - the C++ LLVM-based InterpreterG :)
 // author:  Boris Perovic <[email protected]>
+// author:  Danilo Piparo <[email protected]>
 //
 // This file is dual-licensed: you can choose to license it under the University
 // of Illinois Open Source License or the GNU Lesser General Public License. See
@@ -184,6 +185,83 @@ namespace cling {
 
   }
 
+  // Tuples
+  template <class... ARGS>
+  std::string printValue(std::tuple<ARGS...> *);
+
+  namespace collectionPrinterInternal {
+
+    template <std::size_t N>
+    const char *GetCommaOrEmpty()
+    {
+      static const auto comma = ", ";
+      return comma;
+    }
+
+    template <>
+    const char *GetCommaOrEmpty<0>()
+    {
+      static const auto empty = "";
+      return empty;
+    }
+
+    template <class TUPLE, std::size_t N = 0>
+    struct tuplePrinter {
+      static void print(TUPLE *t, std::ostringstream &ost)
+      {
+        using Element_t = decltype(std::get<N>(*t));
+        ost << GetCommaOrEmpty<N>()
+            << cling::printValue(&std::get<N>(*t));
+        // If N+1 is not smaller than the size of the tuple, 
+        // reroute the call to the printing function to the 
+        // no-op specialisation to stop recursion.
+        constexpr std::size_t Np1 = N + 1;
+        constexpr std::size_t tupleSize = std::tuple_size<TUPLE>::value;
+        constexpr bool isLastEl = Np1<tupleSize;
+        using TupleType =
+          typename std::conditional <isLastEl, TUPLE, std::tuple<>>::type;
+      tuplePrinter<TupleType, Np1>::print((TupleType *)t, ost);
+      }
+    };
+
+    // Special case: no op if last element reached
+    template <class TUPLE>
+    struct tuplePrinter<TUPLE, std::numeric_limits<std::size_t>::max()>
+    {
+      static void print(TUPLE *t, std::ostringstream &ost) {}
+    };
+
+    // Special case: no op if empty tuple
+    template <std::size_t N>
+    struct tuplePrinter<std::tuple<>, N>
+    {
+      static void print(std::tuple<> *t, std::ostringstream &ost) {}
+    };
+
+    template <class T>
+    std::string tuplePairPrintValue(T *val)
+    {
+      std::ostringstream ret;
+      ret << "{ ";
+      collectionPrinterInternal::tuplePrinter<T>::print(val, ret);
+      ret << " }";
+      return ret.str();
+    }
+  }
+
+  template <class... ARGS>
+  std::string printValue(std::tuple<ARGS...> *val)
+  {
+    using T = std::tuple<ARGS...>;
+    return collectionPrinterInternal::tuplePairPrintValue<T>(val);
+  }
+
+  template <class... ARGS>
+  std::string printValue(std::pair<ARGS...> *val)
+  {
+    using T = std::pair<ARGS...>;
+    return collectionPrinterInternal::tuplePairPrintValue<T>(val);
+  }
 }
 
 #endif

test/Prompt/ValuePrinter/TuplesAndPairs.C

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// CLING - the C++ LLVM-based InterpreterG :)
+// author:  Danilo Piparo <[email protected]>
+//
+// This file is dual-licensed: you can choose to license it under the University
+// of Illinois Open Source License or the GNU Lesser General Public License. See
+// LICENSE.TXT for details.
+
+//------------------------------------------------------------------------------
+
+// RUN: cat %s | %cling | FileCheck %s
+
+make_pair("s",10)
+// CHECK: (std::pair<std::{{[a-Z_]+}}<char const (&)[2]>::type, std::{{[a-Z_]+}}<int>::type>) { "s", 10 }
+
+make_pair(4L,'c')
+//CHECK: (std::pair<std::{{[a-Z_]+}}<long>::type, std::{{[a-Z_]+}}<char>::type>) { 4, 'c' }
+
+make_tuple(2)
+//CHECK: (std::tuple<std::{{[a-Z_]+}}<int>::type>) { 2 }
+
+make_tuple(1.2f)
+//CHECK: (std::tuple<std::{{[a-Z_]+}}<float>::type>) { 1.20000f }
+
+make_tuple(1,make_tuple(1, 'c'))
+//CHECK: (std::tuple<std::{{[a-Z_]+}}<int>::type, std::{{[a-Z_]+}}<std::tuple<int, char> >::type>) { 1, { 1, 'c' } }
+
+.q