Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>

	* intl/Makefile (copysrc): Add missing > in sed cmd.

Sat Mar 23 17:52:49 1996  Ulrich Drepper  <drepper@gnu.ai.mit.edu>

	* Makeconfig: Rename Makefile variable nlsdir to i18ndir and
	change value to $(datadir)/i18n.  `nls' is not an appropriate
	name.

	* Makefile (subdirs): Add new subdir wctype.

	* ctype/ctype-info.c: Add new global variable __ctype_names
	and initialize from _nl_C_LC_CTYPE.

	* ctype/ctype.h: In P1003.3b/D11 `alnum' is a separate character
        class.  Use bit 11.
	[_ISbit]: Protect definition of bitmasks because they are also
	used in wctype.h.

	* libio/genops.c (_IO_sputbackc, _IO_sungetc): Clear EOF flag
	after successfully pushing back a character.

	Fundamental changes in locale implementation.  Almost nothing
	from the old code is used anymore.
	* locale/charmap.c, locale/collate.c, locale/config.h,
 	locale/ctypedump.c, locale/hash.h, locale/keyword.gperf,
 	locale/keyword.h, locale/loadlocale.c, locale/locale-ctype.c,
 	locale/locale.c locale/localeconv.c, locale/localedef.c,
 	locale/localedef.h, locale/locfile-hash.c, locale/locfile-lex.c,
 	locale/locfile-parse.c, locale/messages.c, locale/monetary.c,
 	locale/numeric.c, locale/setlocale.c, locale/token.h,
 	locale/xmalloc.c: Removed.

	* locale/Makefile: Update for new locale implementation with
	program source code distributed in subdir.

	* locale/categories.def, locale/iso-4217.def: Updated file
        for new locale implementation.

	* locale/langinfo.h: Updated for new locale implementation.
	(ERA_D_T_FMT, ERA_T_FMT): New official values according to
	P1003.2b/D11.
	(_NL_COLLATE_NRULES, _NL_COLLATE_RULES, _NL_COLLATE_HASH_SIZE,
	_NL_COLLATE_HASH_LAYERS, _NL_COLLATE_TABLE_EB,
	_NL_COLLATE_TABLE_EL, _NL_COLLATE_UNDEFINED, _NL_COLLATE_EXTRA_EB,
	_NL_COLLATE_EXTRA_EL, _NL_CTYPE_NAMES_EB, _NL_CTYPE_NAMES_EL,
	_NL_CTYPE_HASH_SIZE, _NL_CTYPE_HASH_LAYERS, _NL_CTYPE_CLASS_NAMES,
	_NL_CTYPE_MAP_NAMES, _NL_CTYPE_WIDTH): New internal values for
	extended LC_CTYPE and LC_COLLATE implementation.

	* locale/simple-hash.c, locale/simple-hash.h, locale/xmalloc.c,
 	locale/xstrdup.c: Helper functions for locale related programs.

	* locale/C-collate.c, locale/C-ctype.c,
        locale/C-messages.c, locale/C-monetary.c,
        locale/C-numeric.c, locale/C-time.c,
        locale/lc-collate.c, locale/lc-ctype.c,
        locale/lc-messages.c, locale/lc-monetary.c,
        locale/lc-numeric.c, locale/lc-time.c: New implementation of locale
        functions, and new generated "C" locale data.

	* locale/loadlocale.c: Now handles word fields in locale binary
        automatically by changing the endianess if necessary.

	* locale/localeinfo.h (LIMAGIC): Changed magic number because
	of incompatible changes.
	(locale_data): Changed definition to allow word as a value type.
	(coll_sort_rule): Values for collation sorting mode.
	(_NL_CURRENT_WORD): New macro to access word value of locale entry.
	(__collate_table, __collate_extra): Declare new global variables
	for collation tables.

	* locale/programs/charmap-kw.gperf, locale/programs/charmap-kw.h,
        locale/programs/charmap.c, locale/programs/charset.c,
        locale/programs/charset.h, locale/programs/config.h,
        locale/programs/ctypedump.c, locale/programs/ld-collate.c,
        locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
        locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
        locale/programs/ld-time.c, locale/programs/linereader.c,
        locale/programs/linereader.h, locale/programs/locale.c,
        locale/programs/localedef.c, locale/programs/locales.h,
        locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
        locale/programs/locfile-token.h, locale/programs/locfile.c,
        locale/programs/locfile.h, locale/programs/stringtrans.c,
        locale/programs/stringtrans.h: Implementation of locale related
        programs.

	* locale/weight.h: Functions to access collation tables.

	* posix/unistd.h: Define _POSIX2_LOCALEDEF.

	* stdio-common/printf_fp.c: Fix bug with printing certain numbers
	< 10^-1.  Reported by Bill Metzenthen.

	* stdio-common/tfformat.c: Add new test for above bug.

	* string/strcoll.c, string/strxfrm.c: Real implementation of
        string collation according to ISO C.

	* wctype/Makefile, wctype/cname-lookup.h, wctype/iswctype.c,
        wctype/test_wctype.c, wctype/towctrans.c, wctype/wcfuncs.c,
        wctype/wctrans.c, wctype/wctype.c, wctype/wctype.h: New files.
        Implementation of wide character classes and mapping.

1 files changed, 171 insertions, 0 deletions

diff --git a/locale/weight.h b/locale/weight.h
new file mode 100644
index 0000000000..5a9bcd7486
--- /dev/null
+++ b/locale/weight.h
@@ -0,0 +1,171 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Written by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#include <alloca.h>
+
+
+#ifndef STRING_TYPE
+# error STRING_TYPE not defined
+#endif
+
+#ifndef USTRING_TYPE
+# error USTRING_TYPE not defined
+#endif
+
+typedef struct weight_t
+{
+  struct weight_t *prev;
+  struct weight_t *next;
+  struct data_pair {
+    size_t number;
+    u32_t *value;
+  } data[0];
+} weight_t;
+
+
+/* The following five macros grant access to the non-byte order
+   dependend values in the collate locale file.  */
+#define collate_nrules \
+  (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES))
+#define collate_hash_size \
+  (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_HASH_SIZE))
+#define collate_hash_layers \
+  (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_HASH_LAYERS))
+#define collate_undefined \
+  (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_UNDEFINED))
+#define collate_rules \
+  (_NL_CURRENT (LC_COLLATE, _NL_COLLATE_RULES))
+
+
+static __inline int get_weight (const STRING_TYPE **str, weight_t *result);
+static __inline int
+get_weight (const STRING_TYPE **str, weight_t *result)
+{
+  unsigned int ch = *((USTRING_TYPE *) (*str))++;
+  size_t slot;
+
+  if (sizeof (STRING_TYPE) == 1)
+    slot = ch * (collate_nrules + 1);
+  else
+    {
+      const size_t level_size = collate_hash_size * (collate_nrules + 1);
+      size_t level;
+
+      slot = (ch * (collate_nrules + 1)) % collate_hash_size;
+
+      level = 0;
+      while (__collate_table[slot] != (u32_t) ch)
+	{
+	  if (__collate_table[slot + 1] == 0
+	      || ++level >= collate_hash_layers)
+	    {
+	      size_t idx = collate_undefined;
+	      size_t cnt;
+
+	      for (cnt = 0; cnt < collate_nrules; ++cnt)
+		{
+		  result->data[cnt].number = __collate_extra[idx++];
+		  result->data[cnt].value = &__collate_extra[idx];
+		  idx += result->data[cnt].number;
+		}
+	      return 0;
+	    }
+	  slot += level_size;
+	}
+    }
+
+  if (__collate_table[slot + 1] != FORWARD_CHAR)
+    {
+      /* We have a simple form.  One one value for each weight.  */
+      size_t cnt;
+
+      for (cnt = 0; cnt < collate_nrules; ++cnt)
+	{
+	  result->data[cnt].number = 1;
+	  result->data[cnt].value = &__collate_table[slot + 1 + cnt];
+	}
+      return ch == 0;
+    }
+
+  /* We now look for any collation element which starts with CH.
+     There might none, but the last list member is a catch-all case
+     because it is simple the character CH.  The value of this entry
+     might be the same as UNDEFINED.  */
+  slot = __collate_table[slot + 2];
+
+  while (1)
+    {
+      size_t idx;
+
+      /* This is a comparison between a u32_t array (aka wchar_t) and
+	 an 8-bit string.  */
+      for (idx = 0; __collate_extra[slot + 2 + idx] != 0; ++idx)
+	if (__collate_extra[slot + 2 + idx] != (u32_t) str[idx])
+	  break;
+
+      /* When the loop finished with all character of the collation
+	 element used, we found the longest prefix.  */
+      if (__collate_extra[slot + 2 + idx] == 0)
+	{
+	  size_t cnt;
+
+	  idx += slot + 3;
+	  for (cnt = 0; cnt < collate_nrules; ++cnt)
+	    {
+	      result->data[cnt].number = __collate_extra[idx++];
+	      result->data[cnt].value = &__collate_extra[idx];
+	      idx += result->data[cnt].number;
+	    }
+	  return 0;
+	}
+
+      /* To next entry in list.  */
+      slot += __collate_extra[slot];
+    }
+  /* NOTREACHED */
+  return 0;	/* To calm down gcc.  */
+}
+
+
+/* To process a string efficiently we retrieve all information about
+   the string at once.  The following macro constructs a double linked
+   list of this information.  It is a macro because we use `alloca'
+   and we use a double linked list because of the backward collation
+   order.  */
+#define get_string(str, forw, backw)					      \
+  do									      \
+    {									      \
+      weight_t *newp;							      \
+      do								      \
+	{								      \
+	  newp = (weight_t *) alloca (sizeof (weight_t)			      \
+				      + (collate_nrules			      \
+					 * sizeof (struct data_pair)));	      \
+									      \
+	  newp->prev = backw;						      \
+	  if (backw == NULL)						      \
+	    forw = newp;						      \
+	  else								      \
+	    backw->next = newp;						      \
+	  newp->next = NULL;						      \
+	  backw = newp;							      \
+	}								      \
+      while (get_weight (&str, newp) == 0);				      \
+    }									      \
+  while (0)