2001-08-17 Benjamin Kosnik <bkoz@redhat.com>

	Implement std::collate.
	* config/locale/collate_specializations_gnu.cc: Add here, implement in
	MT-safe way.
	* config/locale/collate_specializations_generic.cc: Add here, but
	in a less sophisticated manner.
	* include/bits/locale_facets.tcc (collate): Add generic definition.
	* include/bits/locale_facets.h (~collate): Mark virtual.
	(collate::_M_compare_helper): New.
	(collate::_M_transform_helper): New.
	* src/locale.cc: Remove unnecessary specializations.
	* src/string-inst.cc: Tweak instantiation of ctors.

	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Do configury for collate.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* src/Makefile.am (sources): Add collate.cc.
	* src/Makefile.in: Regenerate.

	* testsuite/22_locale/collate_byname.cc: New.
	* testsuite/22_locale/collate.cc: New file.
	* testsuite/22_locale/collate_char_members.cc: New file.
	* testsuite/22_locale/collate_wchar_t_members.cc: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44996 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 157 insertions, 1 deletions

diff --git a/libstdc++-v3/config/locale/c_locale_gnu.cc b/libstdc++-v3/config/locale/c_locale_gnu.cc
index a003c330687..e81a52c1750 100644
--- a/libstdc++-v3/config/locale/c_locale_gnu.cc
+++ b/libstdc++-v3/config/locale/c_locale_gnu.cc
@@ -1,3 +1,4 @@
+
 // Wrapper for underlying C-language localization -*- C++ -*-
 
 // Copyright (C) 2001 Free Software Foundation, Inc.
@@ -46,7 +47,7 @@ namespace std
     // perhaps locale::categories could be made equivalent to LC_*_MASK
     //    _M_c_locale = __newlocale(1 << LC_ALL, __str.c_str(), NULL);
     //    _M_c_locale = __newlocale(locale::all, __str.c_str(), NULL);
-    __cloc = __newlocale(LC_ALL, __s, NULL);
+    __cloc = __newlocale(1 << LC_ALL, __s, 0);
     if (!__cloc)
       {
 	// This named locale is not supported by the underlying OS.
diff --git a/libstdc++-v3/config/locale/collate_specializations_generic.cc b/libstdc++-v3/config/locale/collate_specializations_generic.cc
new file mode 100644
index 00000000000..0abd784378a
--- /dev/null
+++ b/libstdc++-v3/config/locale/collate_specializations_generic.cc
@@ -0,0 +1,67 @@
+// std::collate implementation details, generic version -*- C++ -*-
+
+// Copyright (C) 2001 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 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.4.1.2  collate virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+
+namespace std
+{
+  // These are basically extensions to char_traits, and perhaps should
+  // be put there instead of here.
+  template<>
+    int 
+    collate<char>::_M_compare_helper(const char* __one, 
+				     const char* __two) const
+    { return strcoll(__one, __two); }
+  
+  template<>
+    size_t
+    collate<char>::_M_transform_helper(char* __to, const char* __from, 
+				       size_t __n) const
+    { return strxfrm(__to, __from, __n); }
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<>
+    int 
+    collate<wchar_t>::_M_compare_helper(const wchar_t* __one, 
+					const wchar_t* __two) const
+    { return wcscoll(__one, __two); }
+  
+  template<>
+    size_t
+    collate<wchar_t>::_M_transform_helper(wchar_t* __to, const wchar_t* __from,
+					  size_t __n) const
+    { return wcsxfrm(__to, __from, __n); }
+#endif
+}
diff --git a/libstdc++-v3/config/locale/collate_specializations_gnu.cc b/libstdc++-v3/config/locale/collate_specializations_gnu.cc
new file mode 100644
index 00000000000..a77adbf3518
--- /dev/null
+++ b/libstdc++-v3/config/locale/collate_specializations_gnu.cc
@@ -0,0 +1,88 @@
+// std::collate implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001 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 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.4.1.2  collate virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+
+namespace std
+{
+  // These are basically extensions to char_traits, and perhaps should
+  // be put there instead of here.
+  template<>
+    int 
+    collate<char>::_M_compare_helper(const char* __one, 
+				     const char* __two) const
+    {
+      if (_M_c_locale_collate)
+	return __strcoll_l(__one, __two, _M_c_locale_collate);
+      else
+	return strcoll(__one, __two);      
+    }
+  
+  template<>
+    size_t
+    collate<char>::_M_transform_helper(char* __to, const char* __from, 
+				       size_t __n) const
+    {
+      if (_M_c_locale_collate)
+	return __strxfrm_l(__to, __from, __n, _M_c_locale_collate);
+      else
+	return strxfrm(__to, __from, __n);      
+    }
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<>
+    int 
+    collate<wchar_t>::_M_compare_helper(const wchar_t* __one, 
+					const wchar_t* __two) const
+    {
+      if (_M_c_locale_collate)
+	return __wcscoll_l(__one, __two, _M_c_locale_collate);
+      else
+	return wcscoll(__one, __two);      
+    }
+  
+  template<>
+    size_t
+    collate<wchar_t>::_M_transform_helper(wchar_t* __to, 
+					  const wchar_t* __from, 
+					  size_t __n) const
+    {
+      if (_M_c_locale_collate)
+	return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate);
+      else
+	return wcsxfrm(__to, __from, __n);      
+    }
+#endif
+}