re PR libstdc++/38196 (num_put<>::do_put(bool) performs 'internal' padding incorrectly when boolalpha==true)

2008-11-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/38196
	* include/bits/locale_facets.tcc (num_put<>::do_put(iter_type,
	ios_base&, char_type, bool)): Fix.
	* testsuite/22_locale/num_put/put/char/38196.cc: New.
	* testsuite/22_locale/num_put/put/wchar_t/38196.cc: Likewise.

From-SVN: r142048

4 files changed, 188 insertions, 4 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 510bb2c..99c108d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR libstdc++/38196
+	* include/bits/locale_facets.tcc (num_put<>::do_put(iter_type,
+	ios_base&, char_type, bool)): Fix.
+	* testsuite/22_locale/num_put/put/char/38196.cc: New.
+	* testsuite/22_locale/num_put/put/wchar_t/38196.cc: Likewise.
+
 2008-11-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/tr1_impl/cinttypes: Remove redundant pragma system_header.
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 9a44007..33e8908 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -1096,11 +1096,25 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
 	  const streamsize __w = __io.width();
 	  if (__w > static_cast<streamsize>(__len))
 	    {
-	      _CharT* __cs
+	      const streamsize __plen = __w - __len;
+	      _CharT* __ps
 		= static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							* __w));
-	      _M_pad(__fill, __w, __io, __cs, __name, __len);
-	      __name = __cs;
+							* __plen));
+
+	      char_traits<_CharT>::assign(__ps, __plen, __fill);
+	      __io.width(0);
+
+	      if ((__flags & ios_base::adjustfield) == ios_base::left)
+		{
+		  __s = std::__write(__s, __name, __len);
+		  __s = std::__write(__s, __ps, __plen);
+		}
+	      else
+		{
+		  __s = std::__write(__s, __ps, __plen);
+		  __s = std::__write(__s, __name, __len);
+		}
+	      return __s;
 	    }
 	  __io.width(0);
 	  __s = std::__write(__s, __name, __len);
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/38196.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/38196.cc
new file mode 100644
index 0000000..69c0c99
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/38196.cc
@@ -0,0 +1,81 @@
+// Copyright (C) 2008 Free Software Foundation
+//
+// 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 22.2.2.2.1  num_put members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+class my_punct : public std::numpunct<char>
+{
+protected:
+  std::string do_falsename() const { return "-no-"; }
+};
+
+// libstdc++/38196
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  ostringstream oss1, oss2, oss3, oss4;
+  string result1, result2, result3, result4;
+
+  oss1.imbue(locale(oss1.getloc(), new my_punct));
+  oss2.imbue(locale(oss2.getloc(), new my_punct));
+  oss3.imbue(locale(oss3.getloc(), new my_punct));
+  oss4.imbue(locale(oss4.getloc(), new my_punct));
+  const num_put<char>& ng1 = use_facet<num_put<char> >(oss1.getloc());
+  const num_put<char>& ng2 = use_facet<num_put<char> >(oss2.getloc());
+  const num_put<char>& ng3 = use_facet<num_put<char> >(oss3.getloc());
+  const num_put<char>& ng4 = use_facet<num_put<char> >(oss4.getloc());
+
+  oss1.width(6);
+  oss1.setf(ios_base::boolalpha);
+  ng1.put(oss1.rdbuf(), oss1, '*', false);
+  result1 = oss1.str();
+  VERIFY( result1 == "**-no-" );
+
+  oss2.width(6);
+  oss2.setf(ios_base::right, ios_base::adjustfield);
+  oss2.setf(ios_base::boolalpha);
+  ng2.put(oss2.rdbuf(), oss2, '*', false);
+  result2 = oss2.str();
+  VERIFY( result2 == "**-no-" );
+
+  oss3.width(6);
+  oss3.setf(ios_base::internal, ios_base::adjustfield);
+  oss3.setf(ios_base::boolalpha);
+  ng3.put(oss3.rdbuf(), oss3, '*', false);
+  result3 = oss3.str();
+  VERIFY( result3 == "**-no-" );
+
+  oss4.width(6);
+  oss4.setf(ios_base::left, ios_base::adjustfield);
+  oss4.setf(ios_base::boolalpha);
+  ng4.put(oss4.rdbuf(), oss4, '*', false);
+  result4 = oss4.str();
+  VERIFY( result4 == "-no-**" );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38196.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38196.cc
new file mode 100644
index 0000000..ac69b6d
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38196.cc
@@ -0,0 +1,81 @@
+// Copyright (C) 2008 Free Software Foundation
+//
+// 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 22.2.2.2.1  num_put members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+class my_punct : public std::numpunct<wchar_t>
+{
+protected:
+  std::wstring do_falsename() const { return L"-no-"; }
+};
+
+// libstdc++/38196
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  wostringstream oss1, oss2, oss3, oss4;
+  wstring result1, result2, result3, result4;
+
+  oss1.imbue(locale(oss1.getloc(), new my_punct));
+  oss2.imbue(locale(oss2.getloc(), new my_punct));
+  oss3.imbue(locale(oss3.getloc(), new my_punct));
+  oss4.imbue(locale(oss4.getloc(), new my_punct));
+  const num_put<wchar_t>& ng1 = use_facet<num_put<wchar_t> >(oss1.getloc());
+  const num_put<wchar_t>& ng2 = use_facet<num_put<wchar_t> >(oss2.getloc());
+  const num_put<wchar_t>& ng3 = use_facet<num_put<wchar_t> >(oss3.getloc());
+  const num_put<wchar_t>& ng4 = use_facet<num_put<wchar_t> >(oss4.getloc());
+
+  oss1.width(6);
+  oss1.setf(ios_base::boolalpha);
+  ng1.put(oss1.rdbuf(), oss1, L'*', false);
+  result1 = oss1.str();
+  VERIFY( result1 == L"**-no-" );
+
+  oss2.width(6);
+  oss2.setf(ios_base::right, ios_base::adjustfield);
+  oss2.setf(ios_base::boolalpha);
+  ng2.put(oss2.rdbuf(), oss2, L'*', false);
+  result2 = oss2.str();
+  VERIFY( result2 == L"**-no-" );
+
+  oss3.width(6);
+  oss3.setf(ios_base::internal, ios_base::adjustfield);
+  oss3.setf(ios_base::boolalpha);
+  ng3.put(oss3.rdbuf(), oss3, L'*', false);
+  result3 = oss3.str();
+  VERIFY( result3 == L"**-no-" );
+
+  oss4.width(6);
+  oss4.setf(ios_base::left, ios_base::adjustfield);
+  oss4.setf(ios_base::boolalpha);
+  ng4.put(oss4.rdbuf(), oss4, L'*', false);
+  result4 = oss4.str();
+  VERIFY( result4 == L"-no-**" );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}