Add some utility functions for joining strings

[libs/core.git] / source / strings / format.h

diff --git a/source/strings/format.h b/source/strings/format.h
index db74bf9560788f3bbce4b0673cd5f7b3076ba2fc..ea5d5b070090c770671fc7821435a520e333321c 100644 (file)
--- a/source/strings/format.h
+++ b/source/strings/format.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
 #ifndef MSP_STRINGS_FORMAT_H_
 #define MSP_STRINGS_FORMAT_H_
 
@@ -25,26 +18,53 @@ private:
 
 public:
        Formatter(const std::string &);
+       Formatter(const Formatter &);
+       Formatter &operator=(const Formatter &);
 
        /** Extracts the next conversion from the format string and formats the
        given value with it.  Will throw if no more conversions are found. */
        template<typename T>
        Formatter &operator()(const T &a)
        {
-               result += lexical_cast(a, get_conversion());
+               result += lexical_cast<std::string>(a, get_conversion());
                advance();
                return *this;
        }
 
+#if __cplusplus>=201103L
+       template<typename T, typename... Tail>
+       Formatter &operator()(const T &a, const Tail &... tail)
+       {
+               return (*this)(a)(tail...);
+       }
+#endif
+
+       /** Returns the result of the formatting operation.  Will throw if not
+       enough values have been fed to the formatter. */
        const std::string &str() const;
+
 private:
+       /** Advances the iterator to the next conversion, adding literal characters
+       to the result.  The iterator is left at the second character of the
+       conversion (i.e. after the %). */
        void advance();
+
+       /** Reads the next conversion from the format string and returns a
+       corresponding Fmt object. */
        Fmt get_conversion();
 };
 
 inline Formatter format(const std::string &f)
 { return Formatter(f); }
 
+#if __cplusplus >= 201103L
+template<typename... Args>
+inline std::string format(const std::string &f, const Args &... args)
+{
+       return Formatter(f)(args...).str();
+}
+
+#else
 template<typename A1>
 inline std::string format(const std::string &f, const A1 &a1)
 { return Formatter(f)(a1).str(); }
@@ -64,6 +84,7 @@ inline std::string format(const std::string &f, const A1 &a1, const A2 &a2, cons
 template<typename A1, typename A2, typename A3, typename A4, typename A5>
 inline std::string format(const std::string &f, const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5)
 { return Formatter(f)(a1)(a2)(a3)(a4)(a5).str(); }
+#endif
 
 } // namespace Msp