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

Changes from arch/CVS synchronization

Browse source
This commit is contained in:
Ludovic Courtès 2007-03-27 08:03:33 +00:00
parent 29d8c12436
commit afb49959b0
2 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
2007-03-12 Ludovic Courtès <ludovic.courtes@laas.fr>
* i18n.c (scm_nl_langinfo): `#ifdef'd uses of `GROUPING',
`FRAC_DIGITS', etc., which are GNU extensions. Reported by
Steven Wu.
2007-03-08 Kevin Ryde <user42@zip.com.au> 2007-03-08 Kevin Ryde <user42@zip.com.au>
* struct.c, struct.h (scm_make_vtable): New function, providing * struct.c, struct.h (scm_make_vtable): New function, providing

52
libguile/i18n.c
View file

@ -1442,35 +1442,40 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
result = SCM_BOOL_F; result = SCM_BOOL_F;
else else
{ {
char *p;
switch (c_item) switch (c_item)
{ {
#if (defined GROUPING) && (defined MON_GROUPING)
case GROUPING: case GROUPING:
case MON_GROUPING: case MON_GROUPING:
/* In this cases, the result is to be interpreted as a list of
numbers. If the last item is `CHARS_MAX', it has the special
meaning "no more grouping". */
result = SCM_EOL;
for (p = c_result; (*p != '\0') && (*p != CHAR_MAX); p++)
result = scm_cons (SCM_I_MAKINUM ((int) *p), result);
{ {
SCM last_pair = result; char *p;
result = scm_reverse_x (result, SCM_EOL); /* In this cases, the result is to be interpreted as a list of
numbers. If the last item is `CHARS_MAX', it has the special
meaning "no more grouping". */
result = SCM_EOL;
for (p = c_result; (*p != '\0') && (*p != CHAR_MAX); p++)
result = scm_cons (SCM_I_MAKINUM ((int) *p), result);
if (*p != CHAR_MAX) {
{ SCM last_pair = result;
/* Cyclic grouping information. */
if (last_pair != SCM_EOL) result = scm_reverse_x (result, SCM_EOL);
SCM_SETCDR (last_pair, result);
} if (*p != CHAR_MAX)
{
/* Cyclic grouping information. */
if (last_pair != SCM_EOL)
SCM_SETCDR (last_pair, result);
}
}
free (c_result);
break;
} }
#endif
free (c_result); #if (defined FRAC_DIGITS) && (defined INT_FRAC_DIGITS)
break;
case FRAC_DIGITS: case FRAC_DIGITS:
case INT_FRAC_DIGITS: case INT_FRAC_DIGITS:
/* This is to be interpreted as a single integer. */ /* This is to be interpreted as a single integer. */
@ -1482,19 +1487,25 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
free (c_result); free (c_result);
break; break;
#endif
#if (defined P_CS_PRECEDES) && (defined INT_N_CS_PRECEDES)
case P_CS_PRECEDES: case P_CS_PRECEDES:
case N_CS_PRECEDES: case N_CS_PRECEDES:
case INT_P_CS_PRECEDES: case INT_P_CS_PRECEDES:
case INT_N_CS_PRECEDES: case INT_N_CS_PRECEDES:
#if (defined P_SEP_BY_SPACE) && (defined N_SEP_BY_SPACE)
case P_SEP_BY_SPACE: case P_SEP_BY_SPACE:
case N_SEP_BY_SPACE: case N_SEP_BY_SPACE:
#endif
/* This is to be interpreted as a boolean. */ /* This is to be interpreted as a boolean. */
result = scm_from_bool (*c_result); result = scm_from_bool (*c_result);
free (c_result); free (c_result);
break; break;
#endif
#if (defined P_SIGN_POSN) && (defined INT_N_SIGN_POSN)
case P_SIGN_POSN: case P_SIGN_POSN:
case N_SIGN_POSN: case N_SIGN_POSN:
case INT_P_SIGN_POSN: case INT_P_SIGN_POSN:
@ -1527,6 +1538,7 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
result = scm_from_locale_symbol ("unspecified"); result = scm_from_locale_symbol ("unspecified");
} }
break; break;
#endif
default: default:
/* FIXME: `locale_string ()' is not appropriate here because of /* FIXME: `locale_string ()' is not appropriate here because of