This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

switching to the new LC_CTYPE locale format



Hi,

The new LC_CTYPE locale format has proven faster than the old one. Therefore
here is a patch to change also the builtin "C" locale to this format.

The patch also fixes a bug (only observable through nl_langinfo): The
'nstrings' value in the C locale was 66 but should have been 70.

When this patch is in, the code for the old LC_CTYPE locale format can
go away. Shall I send a patch to that effect?


2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	* locale/C-ctype.c: Switch to new locale format.
	(_nl_C_LC_CTYPE_names): Remove array.
	(STRUCT_CTYPE_CLASS): New macro.
	(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
	graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
	New three-level tables.
	(_nl_C_LC_CTYPE_width): Change from array to three-level table.
	(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
	to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
	12 class tables and 2 map tables at the end.
	* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
	(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
	graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
	New declarations.
	(b): Remove trailing semicolon.
	(__ctype_names, __ctype_width): Don't initialize.
	(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.

*** glibc-20000826/locale/C-ctype.c.bak	Sat Jul 29 04:22:48 2000
--- glibc-20000826/locale/C-ctype.c	Sun Aug 27 19:43:55 2000
***************
*** 286,344 ****
    /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
    /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
  };
! const uint32_t _nl_C_LC_CTYPE_names[256] =
  {
!   /* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
!   /* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
!   /* 0x10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
!   /* 0x18 */ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
!   /* 0x20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
!   /* 0x28 */ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
!   /* 0x30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
!   /* 0x38 */ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
!   /* 0x40 */ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
!   /* 0x48 */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
!   /* 0x50 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
!   /* 0x58 */ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
!   /* 0x60 */ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
!   /* 0x68 */ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
!   /* 0x70 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
!   /* 0x78 */ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
!   /* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
!   /* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
!   /* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
!   /* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
!   /* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
!   /* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
!   /* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
!   /* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
!   /* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
!   /* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
!   /* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
!   /* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
!   /* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
!   /* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
!   /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
!   /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
! };
! const char _nl_C_LC_CTYPE_width[256] =
!   /* 0x00 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x10 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x20 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x30 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x40 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x50 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x60 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x70 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x80 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0x90 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0xa0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0xb0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0xc0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0xd0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0xe0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
!   /* 0xf0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
! ;
  
  const struct locale_data _nl_C_LC_CTYPE =
  {
--- 286,533 ----
    /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
    /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
  };
! 
! #define STRUCT_CTYPE_CLASS(p, q) \
!   struct                                                                      \
!     {                                                                         \
!       uint32_t isctype_data[8];                                               \
!       uint32_t header[5];                                                     \
!       uint32_t level1[1];                                                     \
!       uint32_t level2[1 << q];                                                \
!       uint32_t level3[1 << p];                                                \
!     }
! 
! const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_upper =
! {
!   { 0x00000000, 0x00000000, 0x07fffffe, 0x00000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 6, 1, 1 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 0, 8 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x07fffffe, 0x00000000 }
! };
! const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_lower =
! {
!   { 0x00000000, 0x00000000, 0x00000000, 0x07fffffe,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 6, 1, 1 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 0, 8 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0x07fffffe }
! };
! const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_alpha =
! {
!   { 0x00000000, 0x00000000, 0x07fffffe, 0x07fffffe,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 6, 1, 1 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 0, 8 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x07fffffe, 0x07fffffe }
! };
! const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_digit =
! {
!   { 0x00000000, 0x03ff0000, 0x00000000, 0x00000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 6, 1, 6, 0, 1 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0x03ff0000 }
! };
! const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_xdigit =
! {
!   { 0x00000000, 0x03ff0000, 0x0000007e, 0x0000007e,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 7, 0, 3 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0x03ff0000, 0x0000007e, 0x0000007e }
! };
! const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_space =
! {
!   { 0x00003e00, 0x00000001, 0x00000000, 0x00000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 6, 1, 6, 0, 1 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00003e00, 0x00000001 }
! };
! const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_print =
! {
!   { 0x00000000, 0xffffffff, 0xffffffff, 0x7fffffff,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 7, 0, 3 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0xffffffff, 0xffffffff, 0x7fffffff }
! };
! const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_graph =
! {
!   { 0x00000000, 0xfffffffe, 0xffffffff, 0x7fffffff,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 7, 0, 3 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0xfffffffe, 0xffffffff, 0x7fffffff }
! };
! const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_blank =
! {
!   { 0x00000200, 0x00000001, 0x00000000, 0x00000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 6, 1, 6, 0, 1 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000200, 0x00000001 }
! };
! const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_cntrl =
! {
!   { 0xffffffff, 0x00000000, 0x00000000, 0x80000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 7, 0, 3 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0xffffffff, 0x00000000, 0x00000000, 0x80000000 }
! };
! const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_punct =
  {
!   { 0x00000000, 0xfc00fffe, 0xf8000001, 0x78000001,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 7, 0, 3 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0xfc00fffe, 0xf8000001, 0x78000001 }
! };
! const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_alnum =
! {
!   { 0x00000000, 0x03ff0000, 0x07fffffe, 0x07fffffe,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   },
!   { 7, 1, 7, 0, 3 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 0x00000000, 0x03ff0000, 0x07fffffe, 0x07fffffe }
! };
! 
! const struct
! {
!   uint32_t header[5];
!   uint32_t level1[1];
!   uint32_t level2[4];
!   int32_t level3[32];
! }
! _nl_C_LC_CTYPE_map_toupper =
! {
!   { 7, 1, 5, 3, 31 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 0, 0, 0, 10 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   {
!     0x00000000, 0xffffffe0, 0xffffffe0, 0xffffffe0,
!     0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
!     0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
!     0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
!     0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
!     0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
!     0xffffffe0, 0xffffffe0, 0xffffffe0, 0x00000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   }
! },
! _nl_C_LC_CTYPE_map_tolower =
! {
!   { 7, 1, 5, 3, 31 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 0, 0, 10 * sizeof (uint32_t), 0 },
!   /* 3rd-level table */
!   {
!     0x00000000, 0x00000020, 0x00000020, 0x00000020,
!     0x00000020, 0x00000020, 0x00000020, 0x00000020,
!     0x00000020, 0x00000020, 0x00000020, 0x00000020,
!     0x00000020, 0x00000020, 0x00000020, 0x00000020,
!     0x00000020, 0x00000020, 0x00000020, 0x00000020,
!     0x00000020, 0x00000020, 0x00000020, 0x00000020,
!     0x00000020, 0x00000020, 0x00000020, 0x00000000,
!     0x00000000, 0x00000000, 0x00000000, 0x00000000
!   }
! };
! 
! const struct
! {
!   uint32_t header[5];
!   uint32_t level1[1];
!   uint32_t level2[1];
!   uint8_t level3[1];
! }
! _nl_C_LC_CTYPE_width =
! {
!   { 7, 1, 0, 0, 0 },
!   /* 1st-level table */
!   { 6 * sizeof (uint32_t) },
!   /* 2nd-level table */
!   { 7 * sizeof (uint32_t) },
!   /* 3rd-level table */
!   { 1 }
! };
! 
! /* Number of fields with fixed meanings, starting at 0.  */
! #define NR_FIXED 70
! /* Number of class fields, starting at CLASS_OFFSET.  */
! #define NR_CLASSES 12
! /* Number of map fields, starting at MAP_OFFSET.  */
! #define NR_MAPS 2
! 
! /* Compile time verification of
!    NR_FIXED == _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1). */
! typedef int assertion1[1 - 2 * (NR_FIXED != _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1))];
  
  const struct locale_data _nl_C_LC_CTYPE =
  {
***************
*** 347,364 ****
    UNDELETABLE,
    1,		/* Enable transliteration by default.  */
    NULL,
!   66,
    {
      { string: _nl_C_LC_CTYPE_class },
      { string: (const char *) _nl_C_LC_CTYPE_toupper },
      { string: NULL },
      { string: (const char *) _nl_C_LC_CTYPE_tolower },
      { string: NULL },
      { string: _nl_C_LC_CTYPE_class32 },
!     { string: (const char *) _nl_C_LC_CTYPE_names },
      { string: NULL },
!     { word: 256 },
!     { word: 1 },
      { string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
  	      "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0"  "alnum\0"
  #ifdef PREDEFINED_CLASSES
--- 536,564 ----
    UNDELETABLE,
    1,		/* Enable transliteration by default.  */
    NULL,
!   NR_FIXED + NR_CLASSES + NR_MAPS,
    {
+     /* _NL_CTYPE_CLASS */
      { string: _nl_C_LC_CTYPE_class },
+     /* _NL_CTYPE_TOUPPER */
      { string: (const char *) _nl_C_LC_CTYPE_toupper },
+     /* _NL_CTYPE_GAP1 */
      { string: NULL },
+     /* _NL_CTYPE_TOLOWER */
      { string: (const char *) _nl_C_LC_CTYPE_tolower },
+     /* _NL_CTYPE_GAP2 */
      { string: NULL },
+     /* _NL_CTYPE_CLASS32 */
      { string: _nl_C_LC_CTYPE_class32 },
!     /* _NL_CTYPE_NAMES */
      { string: NULL },
!     /* _NL_CTYPE_GAP3 */
!     { string: NULL },
!     /* _NL_CTYPE_HASH_SIZE */
!     { word: 0 },
!     /* _NL_CTYPE_HASH_LAYERS */
!     { word: 0 },
!     /* _NL_CTYPE_CLASS_NAMES */
      { string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
  	      "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0"  "alnum\0"
  #ifdef PREDEFINED_CLASSES
***************
*** 370,388 ****
  	      "vowel_connect\0"
  #endif
      },
      { string: "toupper\0" "tolower\0"
  #ifdef PREDEFINED_CLASSES
        "tosymmetric\0"
  #endif
      },
!     { string: _nl_C_LC_CTYPE_width },
      { word: 1 },
      { string: "ANSI_X3.4-1968" },
      { string: (const char *) &_nl_C_LC_CTYPE_toupper[128] },
      { string: (const char *) &_nl_C_LC_CTYPE_tolower[128] },
!     { word: 0 },
!     { word: 0 },
      { word: 1 },
      { string: "0" },
      { string: "1" },
      { string: "2" },
--- 570,598 ----
  	      "vowel_connect\0"
  #endif
      },
+     /* _NL_CTYPE_MAP_NAMES */
      { string: "toupper\0" "tolower\0"
  #ifdef PREDEFINED_CLASSES
        "tosymmetric\0"
  #endif
      },
!     /* _NL_CTYPE_WIDTH */
!     { string: (const char *) _nl_C_LC_CTYPE_width.header },
!     /* _NL_CTYPE_MB_CUR_MAX */
      { word: 1 },
+     /* _NL_CTYPE_CODESET_NAME */
      { string: "ANSI_X3.4-1968" },
+     /* _NL_CTYPE_TOUPPER32 */
      { string: (const char *) &_nl_C_LC_CTYPE_toupper[128] },
+     /* _NL_CTYPE_TOLOWER32 */
      { string: (const char *) &_nl_C_LC_CTYPE_tolower[128] },
!     /* _NL_CTYPE_CLASS_OFFSET */
!     { word: NR_FIXED },
!     /* _NL_CTYPE_MAP_OFFSET */
!     { word: NR_FIXED + NR_CLASSES },
!     /* _NL_CTYPE_INDIGITS_MB_LEN */
      { word: 1 },
+     /* _NL_CTYPE_INDIGITS0_MB .. _NL_CTYPE_INDIGITS9_MB */
      { string: "0" },
      { string: "1" },
      { string: "2" },
***************
*** 393,399 ****
--- 603,611 ----
      { string: "7" },
      { string: "8" },
      { string: "9" },
+     /* _NL_CTYPE_INDIGITS_WC_LEN */
      { word: 1 },
+     /* _NL_CTYPE_INDIGITS0_WC .. _NL_CTYPE_INDIGITS9_WC */
      { wstr: (uint32_t *) L"0" },
      { wstr: (uint32_t *) L"1" },
      { wstr: (uint32_t *) L"2" },
***************
*** 404,409 ****
--- 616,622 ----
      { wstr: (uint32_t *) L"7" },
      { wstr: (uint32_t *) L"8" },
      { wstr: (uint32_t *) L"9" },
+     /* _NL_CTYPE_OUTDIGIT0_MB .. _NL_CTYPE_OUTDIGIT9_MB */
      { string: "0" },
      { string: "1" },
      { string: "2" },
***************
*** 414,419 ****
--- 627,633 ----
      { string: "7" },
      { string: "8" },
      { string: "9" },
+     /* _NL_CTYPE_OUTDIGIT0_WC .. _NL_CTYPE_OUTDIGIT9_WC */
      { word: L'0' },
      { word: L'1' },
      { word: L'2' },
***************
*** 424,437 ****
      { word: L'7' },
      { word: L'8' },
      { word: L'9' },
      { word: NTRANSLIT },
      { wstr: translit_from_idx },
      { wstr: (uint32_t *) translit_from_tbl },
      { wstr: translit_to_idx },
      { wstr: (uint32_t *) translit_to_tbl },
      { word: 1 },
      { wstr: (uint32_t *) L"?" },
      { word: 0 },
!     { wstr: NULL }
    }
  };
--- 638,676 ----
      { word: L'7' },
      { word: L'8' },
      { word: L'9' },
+     /* _NL_CTYPE_TRANSLIT_TAB_SIZE */
      { word: NTRANSLIT },
+     /* _NL_CTYPE_TRANSLIT_FROM_IDX */
      { wstr: translit_from_idx },
+     /* _NL_CTYPE_TRANSLIT_FROM_TBL */
      { wstr: (uint32_t *) translit_from_tbl },
+     /* _NL_CTYPE_TRANSLIT_TO_IDX */
      { wstr: translit_to_idx },
+     /* _NL_CTYPE_TRANSLIT_TO_TBL */
      { wstr: (uint32_t *) translit_to_tbl },
+     /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN */
      { word: 1 },
+     /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING */
      { wstr: (uint32_t *) L"?" },
+     /* _NL_CTYPE_TRANSLIT_IGNORE_LEN */
      { word: 0 },
!     /* _NL_CTYPE_TRANSLIT_IGNORE */
!     { wstr: NULL },
!     /* NR_CLASSES wctype_tables */
!     { string: (const char *) _nl_C_LC_CTYPE_class_upper.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_lower.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_alpha.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_digit.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_xdigit.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_space.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_print.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_graph.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_blank.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_cntrl.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_punct.header },
!     { string: (const char *) _nl_C_LC_CTYPE_class_alnum.header },
!     /* NR_MAPS wctrans_tables */
!     { string: (const char *) _nl_C_LC_CTYPE_map_toupper.header },
!     { string: (const char *) _nl_C_LC_CTYPE_map_tolower.header }
    }
  };
*** glibc-20000826/ctype/ctype-info.c.bak	Tue Jul 25 16:22:12 2000
--- glibc-20000826/ctype/ctype-info.c	Sun Aug 27 18:59:33 2000
***************
*** 24,33 ****
  extern const char _nl_C_LC_CTYPE_class32[];
  extern const char _nl_C_LC_CTYPE_toupper[];
  extern const char _nl_C_LC_CTYPE_tolower[];
! extern const char _nl_C_LC_CTYPE_names[];
  extern const char _nl_C_LC_CTYPE_width[];
  
! #define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o);
  
  const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
  const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
--- 24,46 ----
  extern const char _nl_C_LC_CTYPE_class32[];
  extern const char _nl_C_LC_CTYPE_toupper[];
  extern const char _nl_C_LC_CTYPE_tolower[];
! extern const char _nl_C_LC_CTYPE_class_upper[];
! extern const char _nl_C_LC_CTYPE_class_lower[];
! extern const char _nl_C_LC_CTYPE_class_alpha[];
! extern const char _nl_C_LC_CTYPE_class_digit[];
! extern const char _nl_C_LC_CTYPE_class_xdigit[];
! extern const char _nl_C_LC_CTYPE_class_space[];
! extern const char _nl_C_LC_CTYPE_class_print[];
! extern const char _nl_C_LC_CTYPE_class_graph[];
! extern const char _nl_C_LC_CTYPE_class_blank[];
! extern const char _nl_C_LC_CTYPE_class_cntrl[];
! extern const char _nl_C_LC_CTYPE_class_punct[];
! extern const char _nl_C_LC_CTYPE_class_alnum[];
! extern const char _nl_C_LC_CTYPE_map_toupper[];
! extern const char _nl_C_LC_CTYPE_map_tolower[];
  extern const char _nl_C_LC_CTYPE_width[];
  
! #define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
  
  const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
  const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
***************
*** 35,42 ****
  const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
  const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
  const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
! const __uint32_t *__ctype_names = b (__uint32_t, names, 0);
! const unsigned char *__ctype_width = b (unsigned char, width, 0);
! const char *__ctype32_wctype[12];
! const char *__ctype32_wctrans[2];
! const char *__ctype32_width;
--- 48,73 ----
  const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
  const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
  const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
! const __uint32_t *__ctype_names;
! const unsigned char *__ctype_width;
! const char *__ctype32_wctype[12] =
! {
!   b(char, class_upper, 32),
!   b(char, class_lower, 32),
!   b(char, class_alpha, 32),
!   b(char, class_digit, 32),
!   b(char, class_xdigit, 32),
!   b(char, class_space, 32),
!   b(char, class_print, 32),
!   b(char, class_graph, 32),
!   b(char, class_blank, 32),
!   b(char, class_cntrl, 32),
!   b(char, class_punct, 32),
!   b(char, class_alnum, 32)
! };
! const char *__ctype32_wctrans[2] =
! {
!   b(char, map_toupper, 0),
!   b(char, map_tolower, 0)
! };
! const char *__ctype32_width = b (char, width, 0);

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]