vstring.h (operator+(__versa_string<>&&, const __versa_string<>&), [...]): Add.

2010-12-15  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/ext/vstring.h (operator+(__versa_string<>&&,
	const __versa_string<>&), operator+(const __versa_string<>&,
	__versa_string<>&&), operator+(__versa_string<>&&,
	__versa_string<>&&), operator+(const _CharT*,
	__versa_string<>&&), operator+(_CharT, __versa_string<>&&),
	operator+(__versa_string<>&&, const _CharT*),
	operator+(__versa_string<>&&, _CharT)): Add.
	* testsuite/ext/vstring/operators/1.cc: New.

From-SVN: r167853

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4070c2a043236620576355dd9a1058bd5645abfd..08fdfa369ed72c573d6ab4ad5974847f6cad5c4c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/ext/vstring.h (operator+(__versa_string<>&&,
+       const __versa_string<>&), operator+(const __versa_string<>&,
+       __versa_string<>&&), operator+(__versa_string<>&&,
+       __versa_string<>&&), operator+(const _CharT*,
+       __versa_string<>&&), operator+(_CharT, __versa_string<>&&),
+       operator+(__versa_string<>&&, const _CharT*),
+       operator+(__versa_string<>&&, _CharT)): Add.
+       * testsuite/ext/vstring/operators/1.cc: New.
+
 2010-12-15  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        PR libstdc++/46951

diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h
index fab546dfdf518e4033e88aa8b08710c608f6460f..faca91be5098fa790c04d90b2ed64a79a321ec98 100644 (file)
--- a/libstdc++-v3/include/ext/vstring.h
+++ b/libstdc++-v3/include/ext/vstring.h
@@ -2098,6 +2098,57 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
              _CharT __rhs);
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
+             const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs)
+    { return std::move(__lhs.append(__rhs)); }
+
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs,
+             __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
+    { return std::move(__rhs.insert(0, __lhs)); }
+
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
+             __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
+    { return std::move(__lhs.append(__rhs)); }
+
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(const _CharT* __lhs,
+             __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
+    { return std::move(__rhs.insert(0, __lhs)); }
+
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(_CharT __lhs,
+             __versa_string<_CharT, _Traits, _Alloc, _Base>&& __rhs)
+    { return std::move(__rhs.insert(0, 1, __lhs)); }
+
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
+             const _CharT* __rhs)
+    { return std::move(__lhs.append(__rhs)); }
+
+  template<typename _CharT, typename _Traits, typename _Alloc,
+          template <typename, typename, typename> class _Base>
+    inline __versa_string<_CharT, _Traits, _Alloc, _Base>
+    operator+(__versa_string<_CharT, _Traits, _Alloc, _Base>&& __lhs,
+             _CharT __rhs)
+    { return std::move(__lhs.append(1, __rhs)); }
+#endif
+
   // operator ==
   /**
    *  @brief  Test equivalence of two strings.

diff --git a/libstdc++-v3/testsuite/ext/vstring/operators/1.cc b/libstdc++-v3/testsuite/ext/vstring/operators/1.cc
new file mode 100644 (file)
index 0000000..f7cb799
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/vstring/operators/1.cc
@@ -0,0 +1,93 @@
+// 2010-12-15  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+// { dg-options "-std=gnu++0x" }
+// { dg-require-string-conversions "" }
+
+#include <ext/vstring.h>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_cxx::__vstring;
+
+  VERIFY( (__vstring("abc") + __vstring("def")
+          == __vstring("abcdef")) );
+  __vstring s1("abc");
+  VERIFY( s1 + __vstring("def") == __vstring("abcdef") );
+  __vstring s2("def");
+  VERIFY( __vstring("abc") + s2 == __vstring("abcdef") );
+  VERIFY( __vstring("abc") + 'd' == __vstring("abcd") );
+  VERIFY( __vstring("abc") + "def" == __vstring("abcdef") );
+  VERIFY( 'a' + __vstring("bcd") == __vstring("abcd") );
+  VERIFY( "abc" + __vstring("def") == __vstring("abcdef") );
+
+  VERIFY( (__vstring("abcdefghij") + __vstring("klmnopqrst")
+          == __vstring("abcdefghijklmnopqrst")) );
+  __vstring s1l("abcdefghij");
+  VERIFY( (s1l + __vstring("klmnopqrst")
+          == __vstring("abcdefghijklmnopqrst")) );
+  __vstring s2l("klmnopqrst");
+  VERIFY( (__vstring("abcdefghij") + s2l
+          == __vstring("abcdefghijklmnopqrst")) );
+  VERIFY( (__vstring("abcdefghijklmno") + 'p'
+          == __vstring("abcdefghijklmnop")) );
+  VERIFY( (__vstring("abcdefghijklmno") + "pqrst"
+          == __vstring("abcdefghijklmnopqrst")) );
+  VERIFY( ('a' + __vstring("bcdefghijklmnop")
+          == __vstring("abcdefghijklmnop")) );
+  VERIFY( ("abcde" + __vstring("fghijklmnopqrst")
+          == __vstring("abcdefghijklmnopqrst")) );
+
+  VERIFY( (__vstring("abcdefghijklmnopqrst") + __vstring("uvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  VERIFY( (__vstring("abcde") + __vstring("fghijklmnopqrstuvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  __vstring s1ll1("abcdefghijklmnopqrst");
+  VERIFY( (s1ll1 + __vstring("uvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  __vstring s1ll2("abcde");
+  VERIFY( (s1ll2 + __vstring("fghijklmnopqrstuvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  __vstring s2ll1("fghijklmnopqrstuvwxy");
+  VERIFY( (__vstring("abcde") + s2ll1
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  __vstring s2ll2("uvwxy");
+  VERIFY( (__vstring("abcdefghijklmnopqrst") + s2ll2
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  VERIFY( (__vstring("abcdefghijklmnopqrst") + 'u'
+          == __vstring("abcdefghijklmnopqrstu")) );
+  VERIFY( (__vstring("abcdefghijklmnopqrst") + "uvwxy"
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  VERIFY( (__vstring("abcde") + "fghijklmnopqrstuvwxy"
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  VERIFY( ('a' + __vstring("bcdefghijklmnopqrstuvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  VERIFY( ("abcde" + __vstring("fghijklmnopqrstuvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+  VERIFY( ("abcdefghijklmnopqrst" + __vstring("uvwxy")
+          == __vstring("abcdefghijklmnopqrstuvwxy")) );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}