mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-21 03:00:19 +02:00
Code Activity

i18n: Always use locale-dependent string collation.

Browse source 
* libguile/i18n.c (compare_u32_strings, compare_u32_strings_ci): Always
  use locale-dependent string collation.

* test-suite/tests/i18n.test: Recoded in UTF-8.
  (%french-utf8-locale-name): New.
  (under-locale-or-unresolved): New.  Don't catch errors on GNU systems.
  (under-french-locale-or-unresolved): Use it.
  (under-french-utf8-locale-or-unresolved): New.
  ("text collation (French)")["string-locale-ci=? (2 args, wide
  strings)", "string-locale-ci=? (3 args, wide strings)",
  "string-locale-ci<>? (wide strings)", "string-locale-ci<>? (wide and
  narrow strings)", "char-locale-ci<>? (wide)"]: New tests.
This commit is contained in:
Ludovic Courtès 2009-09-18 12:32:09 +02:00
parent df047aa2b1
commit cdf52ff020
2 changed files with 81 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libguile/i18n.c
View file

@ -766,8 +766,8 @@ compare_u32_strings (SCM s1, SCM s2, SCM locale, const char *func_name)
result = u32_strcoll ((const scm_t_uint32 *) c_s1,
(const scm_t_uint32 *) c_s2));
else
result = u32_strcmp ((const scm_t_uint32 *) c_s1,
(const scm_t_uint32 *) c_s2);
result = u32_strcoll ((const scm_t_uint32 *) c_s1,
(const scm_t_uint32 *) c_s2);
scm_remember_upto_here_2 (s1, s2);
scm_remember_upto_here (locale);
@ -796,7 +796,7 @@ static inline int
compare_u32_strings_ci (SCM s1, SCM s2, SCM locale, const char *func_name)
#define FUNC_NAME func_name
{
int ret, result;
int result;
scm_t_locale c_locale;
scm_t_wchar *c_s1, *c_s2;
SCM_VALIDATE_OPTIONAL_LOCALE_COPY (3, locale, c_locale);
@ -805,24 +805,15 @@ compare_u32_strings_ci (SCM s1, SCM s2, SCM locale, const char *func_name)
SCM_STRING_TO_U32_BUF (s2, c_s2);
if (c_locale)
RUN_IN_LOCALE_SECTION
(c_locale,
result = u32_locale_casecoll (func_name,
(const scm_t_uint32 *) c_s1,
(const scm_t_uint32 *) c_s2)
);
RUN_IN_LOCALE_SECTION
(c_locale,
result = u32_locale_casecoll (func_name,
(const scm_t_uint32 *) c_s1,
(const scm_t_uint32 *) c_s2);
else
{
/* Passing NULL to u32_casecmp to do the default,
language-independent case folding. */
ret = u32_casecmp ((const scm_t_uint32 *) c_s1,
u32_strlen ((const scm_t_uint32 *) c_s1),
(const scm_t_uint32 *) c_s2,
u32_strlen ((const scm_t_uint32 *) c_s2),
NULL, UNINORM_NFC, &result);
if (ret != 0)
scm_syserror (func_name);
}
result = u32_locale_casecoll (func_name,
(const scm_t_uint32 *) c_s1,
(const scm_t_uint32 *) c_s2);
scm_remember_upto_here_2 (s1, s2);
scm_remember_upto_here (locale);