View | Details | Raw Unified | Return to bug 10871 | Differences between
and this patch

Collapse All | Expand All

(-)a/conform/data/langinfo.h-data (+12 lines)
Lines 49-54 constant ERA_D_FMT Link Here
49
constant ERA_D_T_FMT
49
constant ERA_D_T_FMT
50
constant ERA_T_FMT
50
constant ERA_T_FMT
51
constant ALT_DIGITS
51
constant ALT_DIGITS
52
constant ALTMON_1
53
constant ALTMON_2
54
constant ALTMON_3
55
constant ALTMON_4
56
constant ALTMON_5
57
constant ALTMON_6
58
constant ALTMON_7
59
constant ALTMON_8
60
constant ALTMON_9
61
constant ALTMON_10
62
constant ALTMON_11
63
constant ALTMON_12
52
constant RADIXCHAR
64
constant RADIXCHAR
53
constant THOUSEP
65
constant THOUSEP
54
constant YESEXPR
66
constant YESEXPR
(-)a/locale/C-time.c (-2 / +26 lines)
Lines 30-36 const struct __locale_data _nl_C_LC_TIME attribute_hidden = Link Here
30
  { NULL, },			/* no cached data */
30
  { NULL, },			/* no cached data */
31
  UNDELETABLE,
31
  UNDELETABLE,
32
  0,
32
  0,
33
  111,
33
  135,
34
  {
34
  {
35
    { .string = "Sun" },
35
    { .string = "Sun" },
36
    { .string = "Mon" },
36
    { .string = "Mon" },
Lines 142-147 const struct __locale_data _nl_C_LC_TIME attribute_hidden = Link Here
142
    { .string = "" },
142
    { .string = "" },
143
    { .string = "%a %b %e %H:%M:%S %Z %Y" },
143
    { .string = "%a %b %e %H:%M:%S %Z %Y" },
144
    { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
144
    { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
145
    { .string = _nl_C_codeset }
145
    { .string = _nl_C_codeset },
146
    { .string = "" },
147
    { .string = "" },
148
    { .string = "" },
149
    { .string = "" },
150
    { .string = "" },
151
    { .string = "" },
152
    { .string = "" },
153
    { .string = "" },
154
    { .string = "" },
155
    { .string = "" },
156
    { .string = "" },
157
    { .string = "" },
158
    { .wstr = (const uint32_t *) L"" },
159
    { .wstr = (const uint32_t *) L"" },
160
    { .wstr = (const uint32_t *) L"" },
161
    { .wstr = (const uint32_t *) L"" },
162
    { .wstr = (const uint32_t *) L"" },
163
    { .wstr = (const uint32_t *) L"" },
164
    { .wstr = (const uint32_t *) L"" },
165
    { .wstr = (const uint32_t *) L"" },
166
    { .wstr = (const uint32_t *) L"" },
167
    { .wstr = (const uint32_t *) L"" },
168
    { .wstr = (const uint32_t *) L"" },
169
    { .wstr = (const uint32_t *) L"" }
146
  }
170
  }
147
};
171
};
(-)a/locale/categories.def (+2 lines)
Lines 249-254 DEFINE_CATEGORY Link Here
249
  DEFINE_ELEMENT (_DATE_FMT,                "date_fmt",            opt, string)
249
  DEFINE_ELEMENT (_DATE_FMT,                "date_fmt",            opt, string)
250
  DEFINE_ELEMENT (_NL_W_DATE_FMT,           "wide-date_fmt",       opt, wstring)
250
  DEFINE_ELEMENT (_NL_W_DATE_FMT,           "wide-date_fmt",       opt, wstring)
251
  DEFINE_ELEMENT (_NL_TIME_CODESET,	    "time-codeset",	   std, string)
251
  DEFINE_ELEMENT (_NL_TIME_CODESET,	    "time-codeset",	   std, string)
252
  DEFINE_ELEMENT (ALTMON_1,       "alt_mon",       opt, stringarray, 12, 12)
253
  DEFINE_ELEMENT (_NL_WALTMON_1,  "wide-alt_mon",    opt, wstringarray, 12, 12)
252
  ), NO_POSTLOAD)
254
  ), NO_POSTLOAD)
253
255
254
256
(-)a/locale/langinfo.h (-2 / +50 lines)
Lines 101-107 enum Link Here
101
#define ABMON_12		ABMON_12
101
#define ABMON_12		ABMON_12
102
102
103
  /* Long month names.  */
103
  /* Long month names.  */
104
  MON_1,			/* January */
104
  /* For languages which need both a nominative and a genitive case,
105
     this is the genitive.  */
106
  MON_1,			/* January (or "of January") */
105
#define MON_1			MON_1
107
#define MON_1			MON_1
106
  MON_2,
108
  MON_2,
107
#define MON_2			MON_2
109
#define MON_2			MON_2
Lines 190-196 enum Link Here
190
  _NL_WABMON_12,
192
  _NL_WABMON_12,
191
193
192
  /* Long month names.  */
194
  /* Long month names.  */
193
  _NL_WMON_1,		/* January */
195
  /* For languages which need both a nominative and a genitive case,
196
     this is the genitive.  */
197
  _NL_WMON_1,		/* January (or "of January") */
194
  _NL_WMON_2,
198
  _NL_WMON_2,
195
  _NL_WMON_3,
199
  _NL_WMON_3,
196
  _NL_WMON_4,
200
  _NL_WMON_4,
Lines 231-236 enum Link Here
231
235
232
  _NL_TIME_CODESET,
236
  _NL_TIME_CODESET,
233
237
238
  /* Alternative (nominative, standalone only) month names.  */
239
  /* Languages which do not need nominative and genitive month names
240
     can ignore this feature.  */
241
  ALTMON_1,			/* January */
242
#define ALTMON_1		ALTMON_1
243
  ALTMON_2,
244
#define ALTMON_2		ALTMON_2
245
  ALTMON_3,
246
#define ALTMON_3		ALTMON_3
247
  ALTMON_4,
248
#define ALTMON_4		ALTMON_4
249
  ALTMON_5,
250
#define ALTMON_5		ALTMON_5
251
  ALTMON_6,
252
#define ALTMON_6		ALTMON_6
253
  ALTMON_7,
254
#define ALTMON_7		ALTMON_7
255
  ALTMON_8,
256
#define ALTMON_8		ALTMON_8
257
  ALTMON_9,
258
#define ALTMON_9		ALTMON_9
259
  ALTMON_10,
260
#define ALTMON_10		ALTMON_10
261
  ALTMON_11,
262
#define ALTMON_11		ALTMON_11
263
  ALTMON_12,
264
#define ALTMON_12		ALTMON_12
265
266
  /* Alternative (nominative, standalone only) month names.  */
267
  /* Languages which do not need nominative and genitive month names
268
     can ignore this feature.  */
269
  _NL_WALTMON_1,			/* January */
270
  _NL_WALTMON_2,
271
  _NL_WALTMON_3,
272
  _NL_WALTMON_4,
273
  _NL_WALTMON_5,
274
  _NL_WALTMON_6,
275
  _NL_WALTMON_7,
276
  _NL_WALTMON_8,
277
  _NL_WALTMON_9,
278
  _NL_WALTMON_10,
279
  _NL_WALTMON_11,
280
  _NL_WALTMON_12,
281
234
  _NL_NUM_LC_TIME,	/* Number of indices in LC_TIME category.  */
282
  _NL_NUM_LC_TIME,	/* Number of indices in LC_TIME category.  */
235
283
236
  /* LC_COLLATE category: text sorting.
284
  /* LC_COLLATE category: text sorting.
(-)a/locale/loadlocale.c (-1 / +2 lines)
Lines 45-51 static const size_t _nl_category_num_items[] = Link Here
45
#define NO_PAREN(arg, rest...) arg, ##rest
45
#define NO_PAREN(arg, rest...) arg, ##rest
46
46
47
#define DEFINE_CATEGORY(category, category_name, items, a) \
47
#define DEFINE_CATEGORY(category, category_name, items, a) \
48
static const enum value_type _nl_value_type_##category[] = { NO_PAREN items };
48
static const enum value_type _nl_value_type_##category     \
49
  [_NL_ITEM_INDEX (_NL_NUM_##category)] = { NO_PAREN items };
49
#define DEFINE_ELEMENT(element, element_name, optstd, type, rest...) \
50
#define DEFINE_ELEMENT(element, element_name, optstd, type, rest...) \
50
  [_NL_ITEM_INDEX (element)] = type,
51
  [_NL_ITEM_INDEX (element)] = type,
51
#include "categories.def"
52
#include "categories.def"
(-)a/locale/programs/ld-time.c (+13 lines)
Lines 91-96 struct locale_time_t Link Here
91
  const char *date_fmt;
91
  const char *date_fmt;
92
  const uint32_t *wdate_fmt;
92
  const uint32_t *wdate_fmt;
93
  int alt_digits_defined;
93
  int alt_digits_defined;
94
  const char *alt_mon[12];
95
  const uint32_t *walt_mon[12];
96
  int alt_mon_defined;
94
  unsigned char week_ndays;
97
  unsigned char week_ndays;
95
  uint32_t week_1stday;
98
  uint32_t week_1stday;
96
  unsigned char week_1stweek;
99
  unsigned char week_1stweek;
Lines 648-653 time_output (struct localedef_t *locale, const struct charmap_t *charmap, Link Here
648
  add_locale_string (&file, time->date_fmt);
651
  add_locale_string (&file, time->date_fmt);
649
  add_locale_wstring (&file, time->wdate_fmt);
652
  add_locale_wstring (&file, time->wdate_fmt);
650
  add_locale_string (&file, charmap->code_set_name);
653
  add_locale_string (&file, charmap->code_set_name);
654
655
  /* The alt'mons.  */
656
  for (n = 0; n < 12; ++n)
657
    add_locale_string (&file, time->alt_mon[n] ?: "");
658
659
  /* The wide character alt'mons.  */
660
  for (n = 0; n < 12; ++n)
661
    add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr);
662
651
  write_locale_data (output_path, LC_TIME, "LC_TIME", &file);
663
  write_locale_data (output_path, LC_TIME, "LC_TIME", &file);
652
}
664
}
653
665
Lines 791-796 time_read (struct linereader *ldfile, struct localedef_t *result, Link Here
791
	  STRARR_ELEM (mon, 12, 12);
803
	  STRARR_ELEM (mon, 12, 12);
792
	  STRARR_ELEM (am_pm, 2, 2);
804
	  STRARR_ELEM (am_pm, 2, 2);
793
	  STRARR_ELEM (alt_digits, 0, 100);
805
	  STRARR_ELEM (alt_digits, 0, 100);
806
	  STRARR_ELEM (alt_mon, 12, 12);
794
807
795
	case tok_era:
808
	case tok_era:
796
	  /* Ignore the rest of the line if we don't need the input of
809
	  /* Ignore the rest of the line if we don't need the input of
(-)a/locale/programs/locfile-kw.gperf (+1 lines)
Lines 148-153 first_workday, tok_first_workday, 0 Link Here
148
cal_direction,          tok_cal_direction,          0
148
cal_direction,          tok_cal_direction,          0
149
timezone,               tok_timezone,               0
149
timezone,               tok_timezone,               0
150
date_fmt,               tok_date_fmt,               0
150
date_fmt,               tok_date_fmt,               0
151
alt_mon,                tok_alt_mon,                0
151
LC_MESSAGES,            tok_lc_messages,            0
152
LC_MESSAGES,            tok_lc_messages,            0
152
yesexpr,                tok_yesexpr,                0
153
yesexpr,                tok_yesexpr,                0
153
noexpr,                 tok_noexpr,                 0
154
noexpr,                 tok_noexpr,                 0
(-)a/locale/programs/locfile-kw.h (-53 / +55 lines)
Lines 54-60 Link Here
54
#line 24 "locfile-kw.gperf"
54
#line 24 "locfile-kw.gperf"
55
struct keyword_t ;
55
struct keyword_t ;
56
56
57
#define TOTAL_KEYWORDS 176
57
#define TOTAL_KEYWORDS 177
58
#define MIN_WORD_LENGTH 3
58
#define MIN_WORD_LENGTH 3
59
#define MAX_WORD_LENGTH 22
59
#define MAX_WORD_LENGTH 22
60
#define MIN_HASH_VALUE 3
60
#define MIN_HASH_VALUE 3
Lines 147-168 locfile_hash (register const char *str, register unsigned int len) Link Here
147
#line 30 "locfile-kw.gperf"
147
#line 30 "locfile-kw.gperf"
148
      {"LC_CTYPE",               tok_lc_ctype,               0},
148
      {"LC_CTYPE",               tok_lc_ctype,               0},
149
      {""},
149
      {""},
150
#line 166 "locfile-kw.gperf"
150
#line 167 "locfile-kw.gperf"
151
      {"LC_ADDRESS",             tok_lc_address,             0},
151
      {"LC_ADDRESS",             tok_lc_address,             0},
152
#line 151 "locfile-kw.gperf"
152
#line 152 "locfile-kw.gperf"
153
      {"LC_MESSAGES",            tok_lc_messages,            0},
153
      {"LC_MESSAGES",            tok_lc_messages,            0},
154
#line 159 "locfile-kw.gperf"
154
#line 160 "locfile-kw.gperf"
155
      {"LC_NAME",                tok_lc_name,                0},
155
      {"LC_NAME",                tok_lc_name,                0},
156
#line 156 "locfile-kw.gperf"
156
#line 157 "locfile-kw.gperf"
157
      {"LC_PAPER",               tok_lc_paper,               0},
157
      {"LC_PAPER",               tok_lc_paper,               0},
158
#line 184 "locfile-kw.gperf"
158
#line 185 "locfile-kw.gperf"
159
      {"LC_MEASUREMENT",         tok_lc_measurement,         0},
159
      {"LC_MEASUREMENT",         tok_lc_measurement,         0},
160
#line 56 "locfile-kw.gperf"
160
#line 56 "locfile-kw.gperf"
161
      {"LC_COLLATE",             tok_lc_collate,             0},
161
      {"LC_COLLATE",             tok_lc_collate,             0},
162
      {""},
162
      {""},
163
#line 186 "locfile-kw.gperf"
163
#line 187 "locfile-kw.gperf"
164
      {"LC_IDENTIFICATION",      tok_lc_identification,      0},
164
      {"LC_IDENTIFICATION",      tok_lc_identification,      0},
165
#line 199 "locfile-kw.gperf"
165
#line 200 "locfile-kw.gperf"
166
      {"revision",               tok_revision,               0},
166
      {"revision",               tok_revision,               0},
167
#line 69 "locfile-kw.gperf"
167
#line 69 "locfile-kw.gperf"
168
      {"UNDEFINED",              tok_undefined,              0},
168
      {"UNDEFINED",              tok_undefined,              0},
Lines 170-188 locfile_hash (register const char *str, register unsigned int len) Link Here
170
      {"LC_NUMERIC",             tok_lc_numeric,             0},
170
      {"LC_NUMERIC",             tok_lc_numeric,             0},
171
#line 82 "locfile-kw.gperf"
171
#line 82 "locfile-kw.gperf"
172
      {"LC_MONETARY",            tok_lc_monetary,            0},
172
      {"LC_MONETARY",            tok_lc_monetary,            0},
173
#line 179 "locfile-kw.gperf"
173
#line 180 "locfile-kw.gperf"
174
      {"LC_TELEPHONE",           tok_lc_telephone,           0},
174
      {"LC_TELEPHONE",           tok_lc_telephone,           0},
175
      {""}, {""}, {""},
175
      {""}, {""}, {""},
176
#line 75 "locfile-kw.gperf"
176
#line 75 "locfile-kw.gperf"
177
      {"define",                 tok_define,                 0},
177
      {"define",                 tok_define,                 0},
178
#line 152 "locfile-kw.gperf"
178
#line 153 "locfile-kw.gperf"
179
      {"yesexpr",                tok_yesexpr,                0},
179
      {"yesexpr",                tok_yesexpr,                0},
180
#line 141 "locfile-kw.gperf"
180
#line 141 "locfile-kw.gperf"
181
      {"era_year",               tok_era_year,               0},
181
      {"era_year",               tok_era_year,               0},
182
      {""},
182
      {""},
183
#line 54 "locfile-kw.gperf"
183
#line 54 "locfile-kw.gperf"
184
      {"translit_ignore",        tok_translit_ignore,        0},
184
      {"translit_ignore",        tok_translit_ignore,        0},
185
#line 154 "locfile-kw.gperf"
185
#line 155 "locfile-kw.gperf"
186
      {"yesstr",                 tok_yesstr,                 0},
186
      {"yesstr",                 tok_yesstr,                 0},
187
      {""},
187
      {""},
188
#line 89 "locfile-kw.gperf"
188
#line 89 "locfile-kw.gperf"
Lines 190-196 locfile_hash (register const char *str, register unsigned int len) Link Here
190
      {""},
190
      {""},
191
#line 137 "locfile-kw.gperf"
191
#line 137 "locfile-kw.gperf"
192
      {"t_fmt",                  tok_t_fmt,                  0},
192
      {"t_fmt",                  tok_t_fmt,                  0},
193
#line 157 "locfile-kw.gperf"
193
#line 158 "locfile-kw.gperf"
194
      {"height",                 tok_height,                 0},
194
      {"height",                 tok_height,                 0},
195
      {""}, {""},
195
      {""}, {""},
196
#line 52 "locfile-kw.gperf"
196
#line 52 "locfile-kw.gperf"
Lines 213-219 locfile_hash (register const char *str, register unsigned int len) Link Here
213
      {""},
213
      {""},
214
#line 142 "locfile-kw.gperf"
214
#line 142 "locfile-kw.gperf"
215
      {"era_d_fmt",              tok_era_d_fmt,              0},
215
      {"era_d_fmt",              tok_era_d_fmt,              0},
216
#line 187 "locfile-kw.gperf"
216
#line 188 "locfile-kw.gperf"
217
      {"title",                  tok_title,                  0},
217
      {"title",                  tok_title,                  0},
218
      {""}, {""},
218
      {""}, {""},
219
#line 149 "locfile-kw.gperf"
219
#line 149 "locfile-kw.gperf"
Lines 243-249 locfile_hash (register const char *str, register unsigned int len) Link Here
243
      {"duo_n_cs_precedes",      tok_duo_n_cs_precedes,      0},
243
      {"duo_n_cs_precedes",      tok_duo_n_cs_precedes,      0},
244
#line 127 "locfile-kw.gperf"
244
#line 127 "locfile-kw.gperf"
245
      {"thousands_sep",          tok_thousands_sep,          0},
245
      {"thousands_sep",          tok_thousands_sep,          0},
246
#line 195 "locfile-kw.gperf"
246
#line 196 "locfile-kw.gperf"
247
      {"territory",              tok_territory,              0},
247
      {"territory",              tok_territory,              0},
248
#line 36 "locfile-kw.gperf"
248
#line 36 "locfile-kw.gperf"
249
      {"digit",                  tok_digit,                  0},
249
      {"digit",                  tok_digit,                  0},
Lines 258-264 locfile_hash (register const char *str, register unsigned int len) Link Here
258
      {""},
258
      {""},
259
#line 78 "locfile-kw.gperf"
259
#line 78 "locfile-kw.gperf"
260
      {"else",                   tok_else,                   0},
260
      {"else",                   tok_else,                   0},
261
#line 182 "locfile-kw.gperf"
261
#line 183 "locfile-kw.gperf"
262
      {"int_select",             tok_int_select,             0},
262
      {"int_select",             tok_int_select,             0},
263
      {""}, {""}, {""},
263
      {""}, {""}, {""},
264
#line 132 "locfile-kw.gperf"
264
#line 132 "locfile-kw.gperf"
Lines 266-276 locfile_hash (register const char *str, register unsigned int len) Link Here
266
#line 33 "locfile-kw.gperf"
266
#line 33 "locfile-kw.gperf"
267
      {"upper",                  tok_upper,                  0},
267
      {"upper",                  tok_upper,                  0},
268
      {""}, {""},
268
      {""}, {""},
269
#line 192 "locfile-kw.gperf"
269
#line 193 "locfile-kw.gperf"
270
      {"tel",                    tok_tel,                    0},
270
      {"tel",                    tok_tel,                    0},
271
#line 93 "locfile-kw.gperf"
271
#line 93 "locfile-kw.gperf"
272
      {"p_sep_by_space",         tok_p_sep_by_space,         0},
272
      {"p_sep_by_space",         tok_p_sep_by_space,         0},
273
#line 158 "locfile-kw.gperf"
273
#line 159 "locfile-kw.gperf"
274
      {"width",                  tok_width,                  0},
274
      {"width",                  tok_width,                  0},
275
      {""},
275
      {""},
276
#line 98 "locfile-kw.gperf"
276
#line 98 "locfile-kw.gperf"
Lines 301-307 locfile_hash (register const char *str, register unsigned int len) Link Here
301
      {""}, {""}, {""}, {""}, {""},
301
      {""}, {""}, {""}, {""}, {""},
302
#line 58 "locfile-kw.gperf"
302
#line 58 "locfile-kw.gperf"
303
      {"section-symbol",         tok_section_symbol,         0},
303
      {"section-symbol",         tok_section_symbol,         0},
304
#line 183 "locfile-kw.gperf"
304
#line 184 "locfile-kw.gperf"
305
      {"int_prefix",             tok_int_prefix,             0},
305
      {"int_prefix",             tok_int_prefix,             0},
306
      {""}, {""}, {""}, {""},
306
      {""}, {""}, {""}, {""},
307
#line 42 "locfile-kw.gperf"
307
#line 42 "locfile-kw.gperf"
Lines 318-324 locfile_hash (register const char *str, register unsigned int len) Link Here
318
      {"duo_p_sep_by_space",     tok_duo_p_sep_by_space,     0},
318
      {"duo_p_sep_by_space",     tok_duo_p_sep_by_space,     0},
319
#line 118 "locfile-kw.gperf"
319
#line 118 "locfile-kw.gperf"
320
      {"duo_int_p_sign_posn",    tok_duo_int_p_sign_posn,    0},
320
      {"duo_int_p_sign_posn",    tok_duo_int_p_sign_posn,    0},
321
#line 155 "locfile-kw.gperf"
321
#line 156 "locfile-kw.gperf"
322
      {"nostr",                  tok_nostr,                  0},
322
      {"nostr",                  tok_nostr,                  0},
323
      {""}, {""},
323
      {""}, {""},
324
#line 140 "locfile-kw.gperf"
324
#line 140 "locfile-kw.gperf"
Lines 327-352 locfile_hash (register const char *str, register unsigned int len) Link Here
327
#line 84 "locfile-kw.gperf"
327
#line 84 "locfile-kw.gperf"
328
      {"currency_symbol",        tok_currency_symbol,        0},
328
      {"currency_symbol",        tok_currency_symbol,        0},
329
      {""},
329
      {""},
330
#line 165 "locfile-kw.gperf"
330
#line 166 "locfile-kw.gperf"
331
      {"name_ms",                tok_name_ms,                0},
331
      {"name_ms",                tok_name_ms,                0},
332
#line 163 "locfile-kw.gperf"
333
      {"name_mrs",               tok_name_mrs,               0},
334
#line 164 "locfile-kw.gperf"
332
#line 164 "locfile-kw.gperf"
333
      {"name_mrs",               tok_name_mrs,               0},
334
#line 165 "locfile-kw.gperf"
335
      {"name_miss",              tok_name_miss,              0},
335
      {"name_miss",              tok_name_miss,              0},
336
#line 83 "locfile-kw.gperf"
336
#line 83 "locfile-kw.gperf"
337
      {"int_curr_symbol",        tok_int_curr_symbol,        0},
337
      {"int_curr_symbol",        tok_int_curr_symbol,        0},
338
#line 188 "locfile-kw.gperf"
338
#line 189 "locfile-kw.gperf"
339
      {"source",                 tok_source,                 0},
339
      {"source",                 tok_source,                 0},
340
#line 162 "locfile-kw.gperf"
340
#line 163 "locfile-kw.gperf"
341
      {"name_mr",                tok_name_mr,                0},
341
      {"name_mr",                tok_name_mr,                0},
342
#line 161 "locfile-kw.gperf"
342
#line 162 "locfile-kw.gperf"
343
      {"name_gen",               tok_name_gen,               0},
343
      {"name_gen",               tok_name_gen,               0},
344
#line 200 "locfile-kw.gperf"
344
#line 201 "locfile-kw.gperf"
345
      {"date",                   tok_date,                   0},
345
      {"date",                   tok_date,                   0},
346
      {""}, {""},
346
      {""}, {""},
347
#line 189 "locfile-kw.gperf"
347
#line 190 "locfile-kw.gperf"
348
      {"address",                tok_address,                0},
348
      {"address",                tok_address,                0},
349
#line 160 "locfile-kw.gperf"
349
#line 161 "locfile-kw.gperf"
350
      {"name_fmt",               tok_name_fmt,               0},
350
      {"name_fmt",               tok_name_fmt,               0},
351
#line 32 "locfile-kw.gperf"
351
#line 32 "locfile-kw.gperf"
352
      {"copy",                   tok_copy,                   0},
352
      {"copy",                   tok_copy,                   0},
Lines 365-380 locfile_hash (register const char *str, register unsigned int len) Link Here
365
#line 117 "locfile-kw.gperf"
365
#line 117 "locfile-kw.gperf"
366
      {"duo_n_sign_posn",        tok_duo_n_sign_posn,        0},
366
      {"duo_n_sign_posn",        tok_duo_n_sign_posn,        0},
367
      {""},
367
      {""},
368
#line 168 "locfile-kw.gperf"
368
#line 169 "locfile-kw.gperf"
369
      {"country_name",           tok_country_name,           0},
369
      {"country_name",           tok_country_name,           0},
370
#line 71 "locfile-kw.gperf"
370
#line 71 "locfile-kw.gperf"
371
      {"reorder-after",          tok_reorder_after,          0},
371
      {"reorder-after",          tok_reorder_after,          0},
372
      {""}, {""},
372
      {""}, {""},
373
#line 153 "locfile-kw.gperf"
373
#line 154 "locfile-kw.gperf"
374
      {"noexpr",                 tok_noexpr,                 0},
374
      {"noexpr",                 tok_noexpr,                 0},
375
#line 50 "locfile-kw.gperf"
375
#line 50 "locfile-kw.gperf"
376
      {"tolower",                tok_tolower,                0},
376
      {"tolower",                tok_tolower,                0},
377
#line 196 "locfile-kw.gperf"
377
#line 197 "locfile-kw.gperf"
378
      {"audience",               tok_audience,               0},
378
      {"audience",               tok_audience,               0},
379
      {""}, {""}, {""},
379
      {""}, {""}, {""},
380
#line 49 "locfile-kw.gperf"
380
#line 49 "locfile-kw.gperf"
Lines 395-401 locfile_hash (register const char *str, register unsigned int len) Link Here
395
      {""},
395
      {""},
396
#line 102 "locfile-kw.gperf"
396
#line 102 "locfile-kw.gperf"
397
      {"int_p_sign_posn",        tok_int_p_sign_posn,        0},
397
      {"int_p_sign_posn",        tok_int_p_sign_posn,        0},
398
#line 173 "locfile-kw.gperf"
398
#line 174 "locfile-kw.gperf"
399
      {"country_car",            tok_country_car,            0},
399
      {"country_car",            tok_country_car,            0},
400
      {""}, {""},
400
      {""}, {""},
401
#line 104 "locfile-kw.gperf"
401
#line 104 "locfile-kw.gperf"
Lines 406-414 locfile_hash (register const char *str, register unsigned int len) Link Here
406
      {""}, {""},
406
      {""}, {""},
407
#line 116 "locfile-kw.gperf"
407
#line 116 "locfile-kw.gperf"
408
      {"duo_p_sign_posn",        tok_duo_p_sign_posn,        0},
408
      {"duo_p_sign_posn",        tok_duo_p_sign_posn,        0},
409
#line 185 "locfile-kw.gperf"
409
#line 186 "locfile-kw.gperf"
410
      {"measurement",            tok_measurement,            0},
410
      {"measurement",            tok_measurement,            0},
411
#line 174 "locfile-kw.gperf"
411
#line 175 "locfile-kw.gperf"
412
      {"country_isbn",           tok_country_isbn,           0},
412
      {"country_isbn",           tok_country_isbn,           0},
413
#line 37 "locfile-kw.gperf"
413
#line 37 "locfile-kw.gperf"
414
      {"outdigit",               tok_outdigit,               0},
414
      {"outdigit",               tok_outdigit,               0},
Lines 418-426 locfile_hash (register const char *str, register unsigned int len) Link Here
418
      {""}, {""}, {""},
418
      {""}, {""}, {""},
419
#line 34 "locfile-kw.gperf"
419
#line 34 "locfile-kw.gperf"
420
      {"lower",                  tok_lower,                  0},
420
      {"lower",                  tok_lower,                  0},
421
#line 181 "locfile-kw.gperf"
421
#line 182 "locfile-kw.gperf"
422
      {"tel_dom_fmt",            tok_tel_dom_fmt,            0},
422
      {"tel_dom_fmt",            tok_tel_dom_fmt,            0},
423
#line 169 "locfile-kw.gperf"
423
#line 170 "locfile-kw.gperf"
424
      {"country_post",           tok_country_post,           0},
424
      {"country_post",           tok_country_post,           0},
425
#line 148 "locfile-kw.gperf"
425
#line 148 "locfile-kw.gperf"
426
      {"cal_direction",          tok_cal_direction,          0},
426
      {"cal_direction",          tok_cal_direction,          0},
Lines 430-436 locfile_hash (register const char *str, register unsigned int len) Link Here
430
#line 91 "locfile-kw.gperf"
430
#line 91 "locfile-kw.gperf"
431
      {"frac_digits",            tok_frac_digits,            0},
431
      {"frac_digits",            tok_frac_digits,            0},
432
      {""}, {""},
432
      {""}, {""},
433
#line 175 "locfile-kw.gperf"
433
#line 176 "locfile-kw.gperf"
434
      {"lang_name",              tok_lang_name,              0},
434
      {"lang_name",              tok_lang_name,              0},
435
#line 90 "locfile-kw.gperf"
435
#line 90 "locfile-kw.gperf"
436
      {"int_frac_digits",        tok_int_frac_digits,        0},
436
      {"int_frac_digits",        tok_int_frac_digits,        0},
Lines 445-451 locfile_hash (register const char *str, register unsigned int len) Link Here
445
      {""}, {""}, {""}, {""},
445
      {""}, {""}, {""}, {""},
446
#line 107 "locfile-kw.gperf"
446
#line 107 "locfile-kw.gperf"
447
      {"duo_frac_digits",        tok_duo_frac_digits,        0},
447
      {"duo_frac_digits",        tok_duo_frac_digits,        0},
448
#line 180 "locfile-kw.gperf"
448
#line 181 "locfile-kw.gperf"
449
      {"tel_int_fmt",            tok_tel_int_fmt,            0},
449
      {"tel_int_fmt",            tok_tel_int_fmt,            0},
450
#line 123 "locfile-kw.gperf"
450
#line 123 "locfile-kw.gperf"
451
      {"duo_valid_to",           tok_duo_valid_to,           0},
451
      {"duo_valid_to",           tok_duo_valid_to,           0},
Lines 455-461 locfile_hash (register const char *str, register unsigned int len) Link Here
455
#line 130 "locfile-kw.gperf"
455
#line 130 "locfile-kw.gperf"
456
      {"abday",                  tok_abday,                  0},
456
      {"abday",                  tok_abday,                  0},
457
      {""},
457
      {""},
458
#line 198 "locfile-kw.gperf"
458
#line 199 "locfile-kw.gperf"
459
      {"abbreviation",           tok_abbreviation,           0},
459
      {"abbreviation",           tok_abbreviation,           0},
460
#line 147 "locfile-kw.gperf"
460
#line 147 "locfile-kw.gperf"
461
      {"first_workday",          tok_first_workday,          0},
461
      {"first_workday",          tok_first_workday,          0},
Lines 472-483 locfile_hash (register const char *str, register unsigned int len) Link Here
472
#line 45 "locfile-kw.gperf"
472
#line 45 "locfile-kw.gperf"
473
      {"blank",                  tok_blank,                  0},
473
      {"blank",                  tok_blank,                  0},
474
      {""}, {""},
474
      {""}, {""},
475
#line 194 "locfile-kw.gperf"
475
#line 195 "locfile-kw.gperf"
476
      {"language",               tok_language,               0},
476
      {"language",               tok_language,               0},
477
#line 120 "locfile-kw.gperf"
477
#line 120 "locfile-kw.gperf"
478
      {"uno_valid_from",         tok_uno_valid_from,         0},
478
      {"uno_valid_from",         tok_uno_valid_from,         0},
479
      {""},
479
      {""},
480
#line 197 "locfile-kw.gperf"
480
#line 198 "locfile-kw.gperf"
481
      {"application",            tok_application,            0},
481
      {"application",            tok_application,            0},
482
      {""},
482
      {""},
483
#line 80 "locfile-kw.gperf"
483
#line 80 "locfile-kw.gperf"
Lines 498-504 locfile_hash (register const char *str, register unsigned int len) Link Here
498
#line 96 "locfile-kw.gperf"
498
#line 96 "locfile-kw.gperf"
499
      {"p_sign_posn",            tok_p_sign_posn,            0},
499
      {"p_sign_posn",            tok_p_sign_posn,            0},
500
      {""},
500
      {""},
501
#line 201 "locfile-kw.gperf"
501
#line 202 "locfile-kw.gperf"
502
      {"category",               tok_category,               0},
502
      {"category",               tok_category,               0},
503
      {""}, {""}, {""}, {""},
503
      {""}, {""}, {""}, {""},
504
#line 134 "locfile-kw.gperf"
504
#line 134 "locfile-kw.gperf"
Lines 510-538 locfile_hash (register const char *str, register unsigned int len) Link Here
510
#line 63 "locfile-kw.gperf"
510
#line 63 "locfile-kw.gperf"
511
      {"order_start",            tok_order_start,            0},
511
      {"order_start",            tok_order_start,            0},
512
      {""}, {""}, {""}, {""}, {""},
512
      {""}, {""}, {""}, {""}, {""},
513
#line 176 "locfile-kw.gperf"
513
#line 177 "locfile-kw.gperf"
514
      {"lang_ab",                tok_lang_ab,                0},
514
      {"lang_ab",                tok_lang_ab,                0},
515
#line 178 "locfile-kw.gperf"
515
#line 179 "locfile-kw.gperf"
516
      {"lang_lib",               tok_lang_lib,               0},
516
      {"lang_lib",               tok_lang_lib,               0},
517
      {""}, {""}, {""},
517
      {""}, {""}, {""},
518
#line 190 "locfile-kw.gperf"
518
#line 191 "locfile-kw.gperf"
519
      {"contact",                tok_contact,                0},
519
      {"contact",                tok_contact,                0},
520
      {""}, {""}, {""},
520
      {""}, {""}, {""},
521
#line 171 "locfile-kw.gperf"
521
#line 172 "locfile-kw.gperf"
522
      {"country_ab3",            tok_country_ab3,            0},
522
      {"country_ab3",            tok_country_ab3,            0},
523
      {""}, {""}, {""},
523
      {""}, {""}, {""},
524
#line 191 "locfile-kw.gperf"
524
#line 192 "locfile-kw.gperf"
525
      {"email",                  tok_email,                  0},
525
      {"email",                  tok_email,                  0},
526
#line 170 "locfile-kw.gperf"
526
#line 171 "locfile-kw.gperf"
527
      {"country_ab2",            tok_country_ab2,            0},
527
      {"country_ab2",            tok_country_ab2,            0},
528
      {""}, {""}, {""},
528
      {""}, {""}, {""},
529
#line 55 "locfile-kw.gperf"
529
#line 55 "locfile-kw.gperf"
530
      {"default_missing",        tok_default_missing,        0},
530
      {"default_missing",        tok_default_missing,        0},
531
      {""}, {""},
531
      {""}, {""},
532
#line 193 "locfile-kw.gperf"
532
#line 194 "locfile-kw.gperf"
533
      {"fax",                    tok_fax,                    0},
533
      {"fax",                    tok_fax,                    0},
534
      {""}, {""}, {""}, {""}, {""}, {""}, {""},
534
      {""}, {""}, {""}, {""}, {""}, {""}, {""},
535
#line 172 "locfile-kw.gperf"
535
#line 173 "locfile-kw.gperf"
536
      {"country_num",            tok_country_num,            0},
536
      {"country_num",            tok_country_num,            0},
537
      {""}, {""}, {""}, {""}, {""}, {""},
537
      {""}, {""}, {""}, {""}, {""}, {""},
538
#line 51 "locfile-kw.gperf"
538
#line 51 "locfile-kw.gperf"
Lines 548-554 locfile_hash (register const char *str, register unsigned int len) Link Here
548
      {"endif",                  tok_endif,                  0},
548
      {"endif",                  tok_endif,                  0},
549
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
549
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
550
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
550
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
551
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
551
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
552
#line 151 "locfile-kw.gperf"
553
      {"alt_mon",                tok_alt_mon,                0},
552
      {""}, {""}, {""}, {""}, {""}, {""}, {""},
554
      {""}, {""}, {""}, {""}, {""}, {""}, {""},
553
#line 76 "locfile-kw.gperf"
555
#line 76 "locfile-kw.gperf"
554
      {"undef",                  tok_undef,                  0},
556
      {"undef",                  tok_undef,                  0},
Lines 569-575 locfile_hash (register const char *str, register unsigned int len) Link Here
569
#line 85 "locfile-kw.gperf"
571
#line 85 "locfile-kw.gperf"
570
      {"mon_decimal_point",      tok_mon_decimal_point,      0},
572
      {"mon_decimal_point",      tok_mon_decimal_point,      0},
571
      {""}, {""},
573
      {""}, {""},
572
#line 167 "locfile-kw.gperf"
574
#line 168 "locfile-kw.gperf"
573
      {"postal_fmt",             tok_postal_fmt,             0},
575
      {"postal_fmt",             tok_postal_fmt,             0},
574
      {""}, {""}, {""}, {""}, {""},
576
      {""}, {""}, {""}, {""}, {""},
575
#line 60 "locfile-kw.gperf"
577
#line 60 "locfile-kw.gperf"
Lines 588-594 locfile_hash (register const char *str, register unsigned int len) Link Here
588
#line 87 "locfile-kw.gperf"
590
#line 87 "locfile-kw.gperf"
589
      {"mon_grouping",           tok_mon_grouping,           0},
591
      {"mon_grouping",           tok_mon_grouping,           0},
590
      {""},
592
      {""},
591
#line 177 "locfile-kw.gperf"
593
#line 178 "locfile-kw.gperf"
592
      {"lang_term",              tok_lang_term,              0},
594
      {"lang_term",              tok_lang_term,              0},
593
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
595
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
594
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
596
      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
(-)a/locale/programs/locfile-token.h (-1 / +1 lines)
Lines 186-191 enum token_t Link Here
186
  tok_cal_direction,
186
  tok_cal_direction,
187
  tok_timezone,
187
  tok_timezone,
188
  tok_date_fmt,
188
  tok_date_fmt,
189
  tok_alt_mon,
189
  tok_lc_messages,
190
  tok_lc_messages,
190
  tok_yesexpr,
191
  tok_yesexpr,
191
  tok_noexpr,
192
  tok_noexpr,
192
- 

Return to bug 10871