AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement alternative month names (bug 10871).

Browse Source 
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name.  From now it is specified that nl_langinfo(MON_1)
series (up to MON_12) and strftime("%B") generate the month names in
the grammatical form used when the month is a part of a complete date.
If the grammatical form used when the month is named by itself is needed,
the new values nl_langinfo(ALTMON_1) (up to ALTMON_12) and
strftime("%OB") are supported.  This new feature is optional so the
languages which do not need it or do not yet provide the updated
locales simply do not use it and their behaviour is unchanged.

	[BZ #10871]
	* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
	define them as the same as primary full month names explicitly.
	* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
	* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
	__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
	__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
	_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
	_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
	_NL_WALTMON_12): New enum constants.
	[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
	ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
	macros.
	* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
	walt_mon, and alt_mon_defined members.
	(time_output): Output alt_mon and walt_mon members.
	(time_read): Read them, initialize them as copies of mon and wmon
	respectively if they are missing, initialize alt_mon_defined.
	* locale/programs/locfile-kw.gperf (alt_mon): Define.
	* locale/programs/locfile-kw.h: Regenerate.
	* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
	* localedata/tst-langinfo.c (map): Add tests for the new constants
	ALTMON_1 .. ALTMON_12.
	* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
	and pl_PL.UTF-8.
	* time/strftime_l.c (f_altmonth): New macro.
	(__strftime_internal): Handle %OB format.
	* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
	(__strptime_internal): Handle %OB format.
	* time/tst-strptime.c (day_tests): Add tests to parse different forms
	of month names including the new %OB format specifier.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Rafal Luzynski 2017-11-14 02:19:35 +01:00
parent 4612268a0a
commit 95cb863a1e
13 changed files with 251 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ChangeLog
View File

@ -1,3 +1,37 @@
2018-01-22 Rafal Luzynski <digitalfreak@lingonborough.com>
[BZ #10871]
* locale/C-time.c (_nl_C_LC_TIME): Add alternative month names,
define them as the same as primary full month names explicitly.
* locale/categories.def (LC_TIME): Add alt_mon and wide-alt_mon.
* locale/langinfo.h (__ALTMON_1, __ALTMON_2, __ALTMON_3, __ALTMON_4,
__ALTMON_5, __ALTMON_6, __ALTMON_7, __ALTMON_8, __ALTMON_9, __ALTMON_10,
__ALTMON_11, __ALTMON_12, _NL_WALTMON_1, _NL_WALTMON_2, _NL_WALTMON_3,
_NL_WALTMON_4, _NL_WALTMON_5, _NL_WALTMON_6, _NL_WALTMON_7,
_NL_WALTMON_8, _NL_WALTMON_9, _NL_WALTMON_10, _NL_WALTMON_11,
_NL_WALTMON_12): New enum constants.
[__USE_GNU] (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6,
ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): New
macros.
* locale/programs/ld-time.c (struct locale_time_t): Add alt_mon,
walt_mon, and alt_mon_defined members.
(time_output): Output alt_mon and walt_mon members.
(time_read): Read them, initialize them as copies of mon and wmon
respectively if they are missing, initialize alt_mon_defined.
* locale/programs/locfile-kw.gperf (alt_mon): Define.
* locale/programs/locfile-kw.h: Regenerate.
* locale/programs/locfile-token.h (tok_alt_mon): New enum constant.
* localedata/tst-langinfo.c (map): Add tests for the new constants
ALTMON_1 .. ALTMON_12.
* time/Makefile [$(run-built-tests) = yes] (LOCALES): Add fr_FR.UTF-8
and pl_PL.UTF-8.
* time/strftime_l.c (f_altmonth): New macro.
(__strftime_internal): Handle %OB format.
* time/strptime_l.c [_LIBC] (alt_month_name): New macro.
(__strptime_internal): Handle %OB format.
* time/tst-strptime.c (day_tests): Add tests to parse different forms
of month names including the new %OB format specifier.
2018-01-19 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> 2018-01-19 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
[BZ #22685] [BZ #22685]

28
locale/C-time.c
View File

@ -30,7 +30,7 @@ const struct __locale_data _nl_C_LC_TIME attribute_hidden =
{ NULL, }, /* no cached data */ { NULL, }, /* no cached data */
UNDELETABLE, UNDELETABLE,
0, 0,
111, 135,
{ {
{ .string = "Sun" }, { .string = "Sun" },
{ .string = "Mon" }, { .string = "Mon" },
@ -142,6 +142,30 @@ const struct __locale_data _nl_C_LC_TIME attribute_hidden =
{ .string = "" }, { .string = "" },
{ .string = "%a %b %e %H:%M:%S %Z %Y" }, { .string = "%a %b %e %H:%M:%S %Z %Y" },
{ .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" }, { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
{ .string = _nl_C_codeset } { .string = _nl_C_codeset },
{ .string = "January" },
{ .string = "February" },
{ .string = "March" },
{ .string = "April" },
{ .string = "May" },
{ .string = "June" },
{ .string = "July" },
{ .string = "August" },
{ .string = "September" },
{ .string = "October" },
{ .string = "November" },
{ .string = "December" },
{ .wstr = (const uint32_t *) L"January" },
{ .wstr = (const uint32_t *) L"February" },
{ .wstr = (const uint32_t *) L"March" },
{ .wstr = (const uint32_t *) L"April" },
{ .wstr = (const uint32_t *) L"May" },
{ .wstr = (const uint32_t *) L"June" },
{ .wstr = (const uint32_t *) L"July" },
{ .wstr = (const uint32_t *) L"August" },
{ .wstr = (const uint32_t *) L"September" },
{ .wstr = (const uint32_t *) L"October" },
{ .wstr = (const uint32_t *) L"November" },
{ .wstr = (const uint32_t *) L"December" }
} }
}; };

2
locale/categories.def
View File

@ -249,6 +249,8 @@ DEFINE_CATEGORY
DEFINE_ELEMENT (_DATE_FMT, "date_fmt", opt, string) DEFINE_ELEMENT (_DATE_FMT, "date_fmt", opt, string)
DEFINE_ELEMENT (_NL_W_DATE_FMT, "wide-date_fmt", opt, wstring) DEFINE_ELEMENT (_NL_W_DATE_FMT, "wide-date_fmt", opt, wstring)
DEFINE_ELEMENT (_NL_TIME_CODESET, "time-codeset", std, string) DEFINE_ELEMENT (_NL_TIME_CODESET, "time-codeset", std, string)
DEFINE_ELEMENT (ALTMON_1, "alt_mon", opt, stringarray, 12, 12)
DEFINE_ELEMENT (_NL_WALTMON_1, "wide-alt_mon", opt, wstringarray, 12, 12)
), NO_POSTLOAD) ), NO_POSTLOAD)

50
locale/langinfo.h
View File

@ -100,7 +100,8 @@ enum
ABMON_12, ABMON_12,
#define ABMON_12 ABMON_12 #define ABMON_12 ABMON_12
/* Long month names. */ /* Long month names, in the grammatical form used when the month
is a part of a complete date. */
MON_1, /* January */ MON_1, /* January */
#define MON_1 MON_1 #define MON_1 MON_1
MON_2, MON_2,
@ -189,7 +190,8 @@ enum
_NL_WABMON_11, _NL_WABMON_11,
_NL_WABMON_12, _NL_WABMON_12,
/* Long month names. */ /* Long month names, in the grammatical form used when the month
is a part of a complete date. */
_NL_WMON_1, /* January */ _NL_WMON_1, /* January */
_NL_WMON_2, _NL_WMON_2,
_NL_WMON_3, _NL_WMON_3,
@ -231,6 +233,50 @@ enum
_NL_TIME_CODESET, _NL_TIME_CODESET,
/* Long month names, in the grammatical form used when the month
is named by itself. */
__ALTMON_1, /* January */
__ALTMON_2,
__ALTMON_3,
__ALTMON_4,
__ALTMON_5,
__ALTMON_6,
__ALTMON_7,
__ALTMON_8,
__ALTMON_9,
__ALTMON_10,
__ALTMON_11,
__ALTMON_12,
#ifdef __USE_GNU
# define ALTMON_1 __ALTMON_1
# define ALTMON_2 __ALTMON_2
# define ALTMON_3 __ALTMON_3
# define ALTMON_4 __ALTMON_4
# define ALTMON_5 __ALTMON_5
# define ALTMON_6 __ALTMON_6
# define ALTMON_7 __ALTMON_7
# define ALTMON_8 __ALTMON_8
# define ALTMON_9 __ALTMON_9
# define ALTMON_10 __ALTMON_10
# define ALTMON_11 __ALTMON_11
# define ALTMON_12 __ALTMON_12
#endif
/* Long month names, in the grammatical form used when the month
is named by itself. */
_NL_WALTMON_1, /* January */
_NL_WALTMON_2,
_NL_WALTMON_3,
_NL_WALTMON_4,
_NL_WALTMON_5,
_NL_WALTMON_6,
_NL_WALTMON_7,
_NL_WALTMON_8,
_NL_WALTMON_9,
_NL_WALTMON_10,
_NL_WALTMON_11,
_NL_WALTMON_12,
_NL_NUM_LC_TIME, /* Number of indices in LC_TIME category. */ _NL_NUM_LC_TIME, /* Number of indices in LC_TIME category. */
/* LC_COLLATE category: text sorting. /* LC_COLLATE category: text sorting.

21
locale/programs/ld-time.c
View File

@ -91,6 +91,9 @@ struct locale_time_t
const char *date_fmt; const char *date_fmt;
const uint32_t *wdate_fmt; const uint32_t *wdate_fmt;
int alt_digits_defined; int alt_digits_defined;
const char *alt_mon[12];
const uint32_t *walt_mon[12];
int alt_mon_defined;
unsigned char week_ndays; unsigned char week_ndays;
uint32_t week_1stday; uint32_t week_1stday;
unsigned char week_1stweek; unsigned char week_1stweek;
@ -639,6 +642,15 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap,
add_locale_string (&file, time->date_fmt); add_locale_string (&file, time->date_fmt);
add_locale_wstring (&file, time->wdate_fmt); add_locale_wstring (&file, time->wdate_fmt);
add_locale_string (&file, charmap->code_set_name); add_locale_string (&file, charmap->code_set_name);
/* The alt'mons. */
for (n = 0; n < 12; ++n)
add_locale_string (&file, time->alt_mon[n] ?: "");
/* The wide character alt'mons. */
for (n = 0; n < 12; ++n)
add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr);
write_locale_data (output_path, LC_TIME, "LC_TIME", &file); write_locale_data (output_path, LC_TIME, "LC_TIME", &file);
} }
@ -782,6 +794,7 @@ time_read (struct linereader *ldfile, struct localedef_t *result,
STRARR_ELEM (mon, 12, 12); STRARR_ELEM (mon, 12, 12);
STRARR_ELEM (am_pm, 2, 2); STRARR_ELEM (am_pm, 2, 2);
STRARR_ELEM (alt_digits, 0, 100); STRARR_ELEM (alt_digits, 0, 100);
STRARR_ELEM (alt_mon, 12, 12);
case tok_era: case tok_era:
/* Ignore the rest of the line if we don't need the input of /* Ignore the rest of the line if we don't need the input of
@ -934,6 +947,14 @@ time_read (struct linereader *ldfile, struct localedef_t *result,
lr_error (ldfile, _("\ lr_error (ldfile, _("\
%1$s: definition does not end with `END %1$s'"), "LC_TIME"); %1$s: definition does not end with `END %1$s'"), "LC_TIME");
lr_ignore_rest (ldfile, now->tok == tok_lc_time); lr_ignore_rest (ldfile, now->tok == tok_lc_time);
/* If alt_mon was not specified, make it a copy of mon. */
if (!ignore_content && !time->alt_mon_defined)
{
memcpy (time->alt_mon, time->mon, sizeof (time->mon));
memcpy (time->walt_mon, time->wmon, sizeof (time->wmon));
time->alt_mon_defined = 1;
}
return; return;
default: default:

1
locale/programs/locfile-kw.gperf
View File

@ -148,6 +148,7 @@ first_workday, tok_first_workday, 0
cal_direction, tok_cal_direction, 0 cal_direction, tok_cal_direction, 0
timezone, tok_timezone, 0 timezone, tok_timezone, 0
date_fmt, tok_date_fmt, 0 date_fmt, tok_date_fmt, 0
alt_mon, tok_alt_mon, 0
LC_MESSAGES, tok_lc_messages, 0 LC_MESSAGES, tok_lc_messages, 0
yesexpr, tok_yesexpr, 0 yesexpr, tok_yesexpr, 0
noexpr, tok_noexpr, 0 noexpr, tok_noexpr, 0

108
locale/programs/locfile-kw.h
View File

@ -54,7 +54,7 @@
#line 24 "locfile-kw.gperf" #line 24 "locfile-kw.gperf"
struct keyword_t ; struct keyword_t ;
#define TOTAL_KEYWORDS 176 #define TOTAL_KEYWORDS 177
#define MIN_WORD_LENGTH 3 #define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 22 #define MAX_WORD_LENGTH 22
#define MIN_HASH_VALUE 3 #define MIN_HASH_VALUE 3
@ -147,22 +147,22 @@ locfile_hash (register const char *str, register unsigned int len)
#line 30 "locfile-kw.gperf" #line 30 "locfile-kw.gperf"
{"LC_CTYPE", tok_lc_ctype, 0}, {"LC_CTYPE", tok_lc_ctype, 0},
{""}, {""},
#line 166 "locfile-kw.gperf" #line 167 "locfile-kw.gperf"
{"LC_ADDRESS", tok_lc_address, 0}, {"LC_ADDRESS", tok_lc_address, 0},
#line 151 "locfile-kw.gperf" #line 152 "locfile-kw.gperf"
{"LC_MESSAGES", tok_lc_messages, 0}, {"LC_MESSAGES", tok_lc_messages, 0},
#line 159 "locfile-kw.gperf" #line 160 "locfile-kw.gperf"
{"LC_NAME", tok_lc_name, 0}, {"LC_NAME", tok_lc_name, 0},
#line 156 "locfile-kw.gperf" #line 157 "locfile-kw.gperf"
{"LC_PAPER", tok_lc_paper, 0}, {"LC_PAPER", tok_lc_paper, 0},
#line 184 "locfile-kw.gperf" #line 185 "locfile-kw.gperf"
{"LC_MEASUREMENT", tok_lc_measurement, 0}, {"LC_MEASUREMENT", tok_lc_measurement, 0},
#line 56 "locfile-kw.gperf" #line 56 "locfile-kw.gperf"
{"LC_COLLATE", tok_lc_collate, 0}, {"LC_COLLATE", tok_lc_collate, 0},
{""}, {""},
#line 186 "locfile-kw.gperf" #line 187 "locfile-kw.gperf"
{"LC_IDENTIFICATION", tok_lc_identification, 0}, {"LC_IDENTIFICATION", tok_lc_identification, 0},
#line 199 "locfile-kw.gperf" #line 200 "locfile-kw.gperf"
{"revision", tok_revision, 0}, {"revision", tok_revision, 0},
#line 69 "locfile-kw.gperf" #line 69 "locfile-kw.gperf"
{"UNDEFINED", tok_undefined, 0}, {"UNDEFINED", tok_undefined, 0},
@ -170,19 +170,19 @@ locfile_hash (register const char *str, register unsigned int len)
{"LC_NUMERIC", tok_lc_numeric, 0}, {"LC_NUMERIC", tok_lc_numeric, 0},
#line 82 "locfile-kw.gperf" #line 82 "locfile-kw.gperf"
{"LC_MONETARY", tok_lc_monetary, 0}, {"LC_MONETARY", tok_lc_monetary, 0},
#line 179 "locfile-kw.gperf" #line 180 "locfile-kw.gperf"
{"LC_TELEPHONE", tok_lc_telephone, 0}, {"LC_TELEPHONE", tok_lc_telephone, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 75 "locfile-kw.gperf" #line 75 "locfile-kw.gperf"
{"define", tok_define, 0}, {"define", tok_define, 0},
#line 152 "locfile-kw.gperf" #line 153 "locfile-kw.gperf"
{"yesexpr", tok_yesexpr, 0}, {"yesexpr", tok_yesexpr, 0},
#line 141 "locfile-kw.gperf" #line 141 "locfile-kw.gperf"
{"era_year", tok_era_year, 0}, {"era_year", tok_era_year, 0},
{""}, {""},
#line 54 "locfile-kw.gperf" #line 54 "locfile-kw.gperf"
{"translit_ignore", tok_translit_ignore, 0}, {"translit_ignore", tok_translit_ignore, 0},
#line 154 "locfile-kw.gperf" #line 155 "locfile-kw.gperf"
{"yesstr", tok_yesstr, 0}, {"yesstr", tok_yesstr, 0},
{""}, {""},
#line 89 "locfile-kw.gperf" #line 89 "locfile-kw.gperf"
@ -190,7 +190,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""},
#line 137 "locfile-kw.gperf" #line 137 "locfile-kw.gperf"
{"t_fmt", tok_t_fmt, 0}, {"t_fmt", tok_t_fmt, 0},
#line 157 "locfile-kw.gperf" #line 158 "locfile-kw.gperf"
{"height", tok_height, 0}, {"height", tok_height, 0},
{""}, {""}, {""}, {""},
#line 52 "locfile-kw.gperf" #line 52 "locfile-kw.gperf"
@ -213,7 +213,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""},
#line 142 "locfile-kw.gperf" #line 142 "locfile-kw.gperf"
{"era_d_fmt", tok_era_d_fmt, 0}, {"era_d_fmt", tok_era_d_fmt, 0},
#line 187 "locfile-kw.gperf" #line 188 "locfile-kw.gperf"
{"title", tok_title, 0}, {"title", tok_title, 0},
{""}, {""}, {""}, {""},
#line 149 "locfile-kw.gperf" #line 149 "locfile-kw.gperf"
@ -243,7 +243,7 @@ locfile_hash (register const char *str, register unsigned int len)
{"duo_n_cs_precedes", tok_duo_n_cs_precedes, 0}, {"duo_n_cs_precedes", tok_duo_n_cs_precedes, 0},
#line 127 "locfile-kw.gperf" #line 127 "locfile-kw.gperf"
{"thousands_sep", tok_thousands_sep, 0}, {"thousands_sep", tok_thousands_sep, 0},
#line 195 "locfile-kw.gperf" #line 196 "locfile-kw.gperf"
{"territory", tok_territory, 0}, {"territory", tok_territory, 0},
#line 36 "locfile-kw.gperf" #line 36 "locfile-kw.gperf"
{"digit", tok_digit, 0}, {"digit", tok_digit, 0},
@ -258,7 +258,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""},
#line 78 "locfile-kw.gperf" #line 78 "locfile-kw.gperf"
{"else", tok_else, 0}, {"else", tok_else, 0},
#line 182 "locfile-kw.gperf" #line 183 "locfile-kw.gperf"
{"int_select", tok_int_select, 0}, {"int_select", tok_int_select, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 132 "locfile-kw.gperf" #line 132 "locfile-kw.gperf"
@ -266,11 +266,11 @@ locfile_hash (register const char *str, register unsigned int len)
#line 33 "locfile-kw.gperf" #line 33 "locfile-kw.gperf"
{"upper", tok_upper, 0}, {"upper", tok_upper, 0},
{""}, {""}, {""}, {""},
#line 192 "locfile-kw.gperf" #line 193 "locfile-kw.gperf"
{"tel", tok_tel, 0}, {"tel", tok_tel, 0},
#line 93 "locfile-kw.gperf" #line 93 "locfile-kw.gperf"
{"p_sep_by_space", tok_p_sep_by_space, 0}, {"p_sep_by_space", tok_p_sep_by_space, 0},
#line 158 "locfile-kw.gperf" #line 159 "locfile-kw.gperf"
{"width", tok_width, 0}, {"width", tok_width, 0},
{""}, {""},
#line 98 "locfile-kw.gperf" #line 98 "locfile-kw.gperf"
@ -301,7 +301,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 58 "locfile-kw.gperf" #line 58 "locfile-kw.gperf"
{"section-symbol", tok_section_symbol, 0}, {"section-symbol", tok_section_symbol, 0},
#line 183 "locfile-kw.gperf" #line 184 "locfile-kw.gperf"
{"int_prefix", tok_int_prefix, 0}, {"int_prefix", tok_int_prefix, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 42 "locfile-kw.gperf" #line 42 "locfile-kw.gperf"
@ -318,7 +318,7 @@ locfile_hash (register const char *str, register unsigned int len)
{"duo_p_sep_by_space", tok_duo_p_sep_by_space, 0}, {"duo_p_sep_by_space", tok_duo_p_sep_by_space, 0},
#line 118 "locfile-kw.gperf" #line 118 "locfile-kw.gperf"
{"duo_int_p_sign_posn", tok_duo_int_p_sign_posn, 0}, {"duo_int_p_sign_posn", tok_duo_int_p_sign_posn, 0},
#line 155 "locfile-kw.gperf" #line 156 "locfile-kw.gperf"
{"nostr", tok_nostr, 0}, {"nostr", tok_nostr, 0},
{""}, {""}, {""}, {""},
#line 140 "locfile-kw.gperf" #line 140 "locfile-kw.gperf"
@ -327,26 +327,26 @@ locfile_hash (register const char *str, register unsigned int len)
#line 84 "locfile-kw.gperf" #line 84 "locfile-kw.gperf"
{"currency_symbol", tok_currency_symbol, 0}, {"currency_symbol", tok_currency_symbol, 0},
{""}, {""},
#line 165 "locfile-kw.gperf" #line 166 "locfile-kw.gperf"
{"name_ms", tok_name_ms, 0}, {"name_ms", tok_name_ms, 0},
#line 163 "locfile-kw.gperf"
{"name_mrs", tok_name_mrs, 0},
#line 164 "locfile-kw.gperf" #line 164 "locfile-kw.gperf"
{"name_mrs", tok_name_mrs, 0},
#line 165 "locfile-kw.gperf"
{"name_miss", tok_name_miss, 0}, {"name_miss", tok_name_miss, 0},
#line 83 "locfile-kw.gperf" #line 83 "locfile-kw.gperf"
{"int_curr_symbol", tok_int_curr_symbol, 0}, {"int_curr_symbol", tok_int_curr_symbol, 0},
#line 188 "locfile-kw.gperf" #line 189 "locfile-kw.gperf"
{"source", tok_source, 0}, {"source", tok_source, 0},
#line 162 "locfile-kw.gperf" #line 163 "locfile-kw.gperf"
{"name_mr", tok_name_mr, 0}, {"name_mr", tok_name_mr, 0},
#line 161 "locfile-kw.gperf" #line 162 "locfile-kw.gperf"
{"name_gen", tok_name_gen, 0}, {"name_gen", tok_name_gen, 0},
#line 200 "locfile-kw.gperf" #line 201 "locfile-kw.gperf"
{"date", tok_date, 0}, {"date", tok_date, 0},
{""}, {""}, {""}, {""},
#line 189 "locfile-kw.gperf" #line 190 "locfile-kw.gperf"
{"address", tok_address, 0}, {"address", tok_address, 0},
#line 160 "locfile-kw.gperf" #line 161 "locfile-kw.gperf"
{"name_fmt", tok_name_fmt, 0}, {"name_fmt", tok_name_fmt, 0},
#line 32 "locfile-kw.gperf" #line 32 "locfile-kw.gperf"
{"copy", tok_copy, 0}, {"copy", tok_copy, 0},
@ -365,16 +365,16 @@ locfile_hash (register const char *str, register unsigned int len)
#line 117 "locfile-kw.gperf" #line 117 "locfile-kw.gperf"
{"duo_n_sign_posn", tok_duo_n_sign_posn, 0}, {"duo_n_sign_posn", tok_duo_n_sign_posn, 0},
{""}, {""},
#line 168 "locfile-kw.gperf" #line 169 "locfile-kw.gperf"
{"country_name", tok_country_name, 0}, {"country_name", tok_country_name, 0},
#line 71 "locfile-kw.gperf" #line 71 "locfile-kw.gperf"
{"reorder-after", tok_reorder_after, 0}, {"reorder-after", tok_reorder_after, 0},
{""}, {""}, {""}, {""},
#line 153 "locfile-kw.gperf" #line 154 "locfile-kw.gperf"
{"noexpr", tok_noexpr, 0}, {"noexpr", tok_noexpr, 0},
#line 50 "locfile-kw.gperf" #line 50 "locfile-kw.gperf"
{"tolower", tok_tolower, 0}, {"tolower", tok_tolower, 0},
#line 196 "locfile-kw.gperf" #line 197 "locfile-kw.gperf"
{"audience", tok_audience, 0}, {"audience", tok_audience, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 49 "locfile-kw.gperf" #line 49 "locfile-kw.gperf"
@ -395,7 +395,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""},
#line 102 "locfile-kw.gperf" #line 102 "locfile-kw.gperf"
{"int_p_sign_posn", tok_int_p_sign_posn, 0}, {"int_p_sign_posn", tok_int_p_sign_posn, 0},
#line 173 "locfile-kw.gperf" #line 174 "locfile-kw.gperf"
{"country_car", tok_country_car, 0}, {"country_car", tok_country_car, 0},
{""}, {""}, {""}, {""},
#line 104 "locfile-kw.gperf" #line 104 "locfile-kw.gperf"
@ -406,9 +406,9 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""},
#line 116 "locfile-kw.gperf" #line 116 "locfile-kw.gperf"
{"duo_p_sign_posn", tok_duo_p_sign_posn, 0}, {"duo_p_sign_posn", tok_duo_p_sign_posn, 0},
#line 185 "locfile-kw.gperf" #line 186 "locfile-kw.gperf"
{"measurement", tok_measurement, 0}, {"measurement", tok_measurement, 0},
#line 174 "locfile-kw.gperf" #line 175 "locfile-kw.gperf"
{"country_isbn", tok_country_isbn, 0}, {"country_isbn", tok_country_isbn, 0},
#line 37 "locfile-kw.gperf" #line 37 "locfile-kw.gperf"
{"outdigit", tok_outdigit, 0}, {"outdigit", tok_outdigit, 0},
@ -418,9 +418,9 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""}, {""}, {""},
#line 34 "locfile-kw.gperf" #line 34 "locfile-kw.gperf"
{"lower", tok_lower, 0}, {"lower", tok_lower, 0},
#line 181 "locfile-kw.gperf" #line 182 "locfile-kw.gperf"
{"tel_dom_fmt", tok_tel_dom_fmt, 0}, {"tel_dom_fmt", tok_tel_dom_fmt, 0},
#line 169 "locfile-kw.gperf" #line 170 "locfile-kw.gperf"
{"country_post", tok_country_post, 0}, {"country_post", tok_country_post, 0},
#line 148 "locfile-kw.gperf" #line 148 "locfile-kw.gperf"
{"cal_direction", tok_cal_direction, 0}, {"cal_direction", tok_cal_direction, 0},
@ -430,7 +430,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 91 "locfile-kw.gperf" #line 91 "locfile-kw.gperf"
{"frac_digits", tok_frac_digits, 0}, {"frac_digits", tok_frac_digits, 0},
{""}, {""}, {""}, {""},
#line 175 "locfile-kw.gperf" #line 176 "locfile-kw.gperf"
{"lang_name", tok_lang_name, 0}, {"lang_name", tok_lang_name, 0},
#line 90 "locfile-kw.gperf" #line 90 "locfile-kw.gperf"
{"int_frac_digits", tok_int_frac_digits, 0}, {"int_frac_digits", tok_int_frac_digits, 0},
@ -445,7 +445,7 @@ locfile_hash (register const char *str, register unsigned int len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 107 "locfile-kw.gperf" #line 107 "locfile-kw.gperf"
{"duo_frac_digits", tok_duo_frac_digits, 0}, {"duo_frac_digits", tok_duo_frac_digits, 0},
#line 180 "locfile-kw.gperf" #line 181 "locfile-kw.gperf"
{"tel_int_fmt", tok_tel_int_fmt, 0}, {"tel_int_fmt", tok_tel_int_fmt, 0},
#line 123 "locfile-kw.gperf" #line 123 "locfile-kw.gperf"
{"duo_valid_to", tok_duo_valid_to, 0}, {"duo_valid_to", tok_duo_valid_to, 0},
@ -455,7 +455,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 130 "locfile-kw.gperf" #line 130 "locfile-kw.gperf"
{"abday", tok_abday, 0}, {"abday", tok_abday, 0},
{""}, {""},
#line 198 "locfile-kw.gperf" #line 199 "locfile-kw.gperf"
{"abbreviation", tok_abbreviation, 0}, {"abbreviation", tok_abbreviation, 0},
#line 147 "locfile-kw.gperf" #line 147 "locfile-kw.gperf"
{"first_workday", tok_first_workday, 0}, {"first_workday", tok_first_workday, 0},
@ -472,12 +472,12 @@ locfile_hash (register const char *str, register unsigned int len)
#line 45 "locfile-kw.gperf" #line 45 "locfile-kw.gperf"
{"blank", tok_blank, 0}, {"blank", tok_blank, 0},
{""}, {""}, {""}, {""},
#line 194 "locfile-kw.gperf" #line 195 "locfile-kw.gperf"
{"language", tok_language, 0}, {"language", tok_language, 0},
#line 120 "locfile-kw.gperf" #line 120 "locfile-kw.gperf"
{"uno_valid_from", tok_uno_valid_from, 0}, {"uno_valid_from", tok_uno_valid_from, 0},
{""}, {""},
#line 197 "locfile-kw.gperf" #line 198 "locfile-kw.gperf"
{"application", tok_application, 0}, {"application", tok_application, 0},
{""}, {""},
#line 80 "locfile-kw.gperf" #line 80 "locfile-kw.gperf"
@ -498,7 +498,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 96 "locfile-kw.gperf" #line 96 "locfile-kw.gperf"
{"p_sign_posn", tok_p_sign_posn, 0}, {"p_sign_posn", tok_p_sign_posn, 0},
{""}, {""},
#line 201 "locfile-kw.gperf" #line 202 "locfile-kw.gperf"
{"category", tok_category, 0}, {"category", tok_category, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 134 "locfile-kw.gperf" #line 134 "locfile-kw.gperf"
@ -510,29 +510,29 @@ locfile_hash (register const char *str, register unsigned int len)
#line 63 "locfile-kw.gperf" #line 63 "locfile-kw.gperf"
{"order_start", tok_order_start, 0}, {"order_start", tok_order_start, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 176 "locfile-kw.gperf" #line 177 "locfile-kw.gperf"
{"lang_ab", tok_lang_ab, 0}, {"lang_ab", tok_lang_ab, 0},
#line 178 "locfile-kw.gperf" #line 179 "locfile-kw.gperf"
{"lang_lib", tok_lang_lib, 0}, {"lang_lib", tok_lang_lib, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 190 "locfile-kw.gperf" #line 191 "locfile-kw.gperf"
{"contact", tok_contact, 0}, {"contact", tok_contact, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 171 "locfile-kw.gperf" #line 172 "locfile-kw.gperf"
{"country_ab3", tok_country_ab3, 0}, {"country_ab3", tok_country_ab3, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 191 "locfile-kw.gperf" #line 192 "locfile-kw.gperf"
{"email", tok_email, 0}, {"email", tok_email, 0},
#line 170 "locfile-kw.gperf" #line 171 "locfile-kw.gperf"
{"country_ab2", tok_country_ab2, 0}, {"country_ab2", tok_country_ab2, 0},
{""}, {""}, {""}, {""}, {""}, {""},
#line 55 "locfile-kw.gperf" #line 55 "locfile-kw.gperf"
{"default_missing", tok_default_missing, 0}, {"default_missing", tok_default_missing, 0},
{""}, {""}, {""}, {""},
#line 193 "locfile-kw.gperf" #line 194 "locfile-kw.gperf"
{"fax", tok_fax, 0}, {"fax", tok_fax, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 172 "locfile-kw.gperf" #line 173 "locfile-kw.gperf"
{"country_num", tok_country_num, 0}, {"country_num", tok_country_num, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 51 "locfile-kw.gperf" #line 51 "locfile-kw.gperf"
@ -548,7 +548,9 @@ locfile_hash (register const char *str, register unsigned int len)
{"endif", tok_endif, 0}, {"endif", tok_endif, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 151 "locfile-kw.gperf"
{"alt_mon", tok_alt_mon, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 76 "locfile-kw.gperf" #line 76 "locfile-kw.gperf"
{"undef", tok_undef, 0}, {"undef", tok_undef, 0},
@ -569,7 +571,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 85 "locfile-kw.gperf" #line 85 "locfile-kw.gperf"
{"mon_decimal_point", tok_mon_decimal_point, 0}, {"mon_decimal_point", tok_mon_decimal_point, 0},
{""}, {""}, {""}, {""},
#line 167 "locfile-kw.gperf" #line 168 "locfile-kw.gperf"
{"postal_fmt", tok_postal_fmt, 0}, {"postal_fmt", tok_postal_fmt, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 60 "locfile-kw.gperf" #line 60 "locfile-kw.gperf"
@ -588,7 +590,7 @@ locfile_hash (register const char *str, register unsigned int len)
#line 87 "locfile-kw.gperf" #line 87 "locfile-kw.gperf"
{"mon_grouping", tok_mon_grouping, 0}, {"mon_grouping", tok_mon_grouping, 0},
{""}, {""},
#line 177 "locfile-kw.gperf" #line 178 "locfile-kw.gperf"
{"lang_term", tok_lang_term, 0}, {"lang_term", tok_lang_term, 0},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},

1
locale/programs/locfile-token.h
View File

@ -186,6 +186,7 @@ enum token_t
tok_cal_direction, tok_cal_direction,
tok_timezone, tok_timezone,
tok_date_fmt, tok_date_fmt,
tok_alt_mon,
tok_lc_messages, tok_lc_messages,
tok_yesexpr, tok_yesexpr,
tok_noexpr, tok_noexpr,

12
localedata/tst-langinfo.c
View File

@ -50,6 +50,18 @@ struct map
VAL (ABMON_8), VAL (ABMON_8),
VAL (ABMON_9), VAL (ABMON_9),
VAL (ALT_DIGITS), VAL (ALT_DIGITS),
VAL (ALTMON_1),
VAL (ALTMON_10),
VAL (ALTMON_11),
VAL (ALTMON_12),
VAL (ALTMON_2),
VAL (ALTMON_3),
VAL (ALTMON_4),
VAL (ALTMON_5),
VAL (ALTMON_6),
VAL (ALTMON_7),
VAL (ALTMON_8),
VAL (ALTMON_9),
VAL (AM_STR), VAL (AM_STR),
VAL (CRNCYSTR), VAL (CRNCYSTR),
VAL (CURRENCY_SYMBOL), VAL (CURRENCY_SYMBOL),

3
time/Makefile
View File

@ -48,7 +48,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
include ../Rules include ../Rules
ifeq ($(run-built-tests),yes) ifeq ($(run-built-tests),yes)
LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP fr_FR.UTF-8 \
pl_PL.UTF-8
include ../gen-locales.mk include ../gen-locales.mk
$(objpfx)tst-ftime_l.out: $(gen-locales) $(objpfx)tst-ftime_l.out: $(gen-locales)

11
time/strftime_l.c
View File

@ -492,6 +492,9 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
# define f_month \ # define f_month \
((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \ ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))) ? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)))
# define f_altmonth \
((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
? "?" : _NL_CURRENT (LC_TIME, NLW(ALTMON_1) + tp->tm_mon)))
# define ampm \ # define ampm \
((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \
? NLW(PM_STR) : NLW(AM_STR))) ? NLW(PM_STR) : NLW(AM_STR)))
@ -507,6 +510,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
? "?" : month_name[tp->tm_mon]) ? "?" : month_name[tp->tm_mon])
# define a_wkday f_wkday # define a_wkday f_wkday
# define a_month f_month # define a_month f_month
# define f_altmonth f_month
# define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11)) # define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11))
size_t aw_len = 3; size_t aw_len = 3;
@ -785,7 +789,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
#endif #endif
case L_('B'): case L_('B'):
if (modifier != 0) if (modifier == L_('E'))
goto bad_format; goto bad_format;
if (change_case) if (change_case)
{ {
@ -793,7 +797,10 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
to_lowcase = 0; to_lowcase = 0;
} }
#if defined _NL_CURRENT || !HAVE_STRFTIME #if defined _NL_CURRENT || !HAVE_STRFTIME
cpy (STRLEN (f_month), f_month); if (modifier == L_('O'))
cpy (STRLEN (f_altmonth), f_altmonth);
else
cpy (STRLEN (f_month), f_month);
break; break;
#else #else
goto underlying_strftime; goto underlying_strftime;

32
time/strptime_l.c
View File

@ -124,6 +124,8 @@ extern const struct __locale_data _nl_C_LC_TIME attribute_hidden;
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string) (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string)
# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string) # define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string)
# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string) # define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string)
# define alt_month_name \
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ALTMON_1)].string)
# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string) # define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string)
# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string) # define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string)
# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string) # define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string)
@ -319,10 +321,9 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
while (*fmt >= '0' && *fmt <= '9') while (*fmt >= '0' && *fmt <= '9')
++fmt; ++fmt;
#ifndef _NL_CURRENT /* In some cases, modifiers are handled by adjusting state and
/* We need this for handling the `E' modifier. */ then restarting the switch statement below. */
start_over: start_over:
#endif
/* Make back up of current processing pointer. */ /* Make back up of current processing pointer. */
rp_backup = rp; rp_backup = rp;
@ -423,13 +424,32 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
ab_month_name[cnt])) ab_month_name[cnt]))
decided_longest = loc; decided_longest = loc;
} }
#ifdef _LIBC
/* Now check the alt month. */
trp = rp;
if (match_string (_NL_CURRENT (LC_TIME, ALTMON_1 + cnt), trp)
&& trp > rp_longest)
{
rp_longest = trp;
cnt_longest = cnt;
if (s.decided == not
&& strcmp (_NL_CURRENT (LC_TIME, ALTMON_1 + cnt),
alt_month_name[cnt]))
decided_longest = loc;
}
#endif
} }
#endif #endif
if (s.decided != loc if (s.decided != loc
&& (((trp = rp, match_string (month_name[cnt], trp)) && (((trp = rp, match_string (month_name[cnt], trp))
&& trp > rp_longest) && trp > rp_longest)
|| ((trp = rp, match_string (ab_month_name[cnt], trp)) || ((trp = rp, match_string (ab_month_name[cnt], trp))
&& trp > rp_longest))) && trp > rp_longest)
#ifdef _LIBC
|| ((trp = rp, match_string (alt_month_name[cnt], trp))
&& trp > rp_longest)
#endif
))
{ {
rp_longest = trp; rp_longest = trp;
cnt_longest = cnt; cnt_longest = cnt;
@ -1015,6 +1035,10 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
case 'O': case 'O':
switch (*fmt++) switch (*fmt++)
{ {
case 'B':
/* Match month name. Reprocess as plain 'B'. */
fmt--;
goto start_over;
case 'd': case 'd':
case 'e': case 'e':
/* Match day of month using alternate numeric symbols. */ /* Match day of month using alternate numeric symbols. */

12
time/tst-strptime.c
View File

@ -51,6 +51,18 @@ static const struct
6, 0, 0, 1 }, 6, 0, 0, 1 },
{ "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 }, { "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 },
{ "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 }, { "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 },
/* Most of the languages do not need the declension of the month names
and do not distinguish between %B and %OB. */
{ "en_US.ISO-8859-1", "November 17, 2017", "%B %e, %Y", 5, 320, 10, 17 },
{ "de_DE.ISO-8859-1", "18. Nov 2017", "%d. %b %Y", 6, 321, 10, 18 },
{ "fr_FR.UTF-8", "19 novembre 2017", "%d %OB %Y", 0, 322, 10, 19 },
/* Some languages do need the declension of the month names. */
{ "pl_PL.UTF-8", "21 lis 2017", "%d %b %Y", 2, 324, 10, 21 },
{ "pl_PL.UTF-8", "22 LIS 2017", "%d %B %Y", 3, 325, 10, 22 },
/* TODO: Use the genitive case here as soon as it is added to localedata. */
{ "pl_PL.UTF-8", "23 listopad 2017", "%d %B %Y", 4, 326, 10, 23 },
/* The nominative case is incorrect here but it is parseable. */
{ "pl_PL.UTF-8", "24 listopad 2017", "%d %OB %Y", 5, 327, 10, 24 },
}; };