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, 0 insertions, 212 deletions

diff --git a/locale/collate.c b/locale/collate.c
deleted file mode 100644
index f06964e..0000000
--- a/locale/collate.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
-
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <langinfo.h>
-#include <libintl.h>
-
-#include "localedef.h"
-#include "token.h"
-
-
-/* defined in locfile-lex.c: flag to indicate that unknown element names
-   are allowed.  */
-extern int reject_new_char;
-
-
-#define SYNTAX_ERROR                                                         \
-    error (0, 0, gettext ("%s:%Zd: syntax error in locale definition file"), \
-	   locfile_data.filename, locfile_data.line_no);
-
-void
-collate_input (int token)
-{
-  int read_order_start = 0;
-
-  while (1)
-    {
-      char *ptr;
-      int len;
-
-      if (token == TOK_END)
-	/* This is the end of the category.  */
-	{
-	  token = xlocfile_lex (&ptr, &len);
-
-	  if (token != _NL_NUM_LC_COLLATE)
-	    {
-	      error (0, 0, gettext ("%s:%Zd: category `%s' does not end "
-				    "with `END %s'"), locfile_data.filename,
-			 locfile_data.line_no, "LC_COLLATE", "LC_COLLATE");
-	      ignore_to_eol (0, 0);
-	    }
-	  else
-	    ignore_to_eol (0, 1);
-
-	  /* Start next category.  */
-	  break;
-	}
-
-#if 0
-      /* Process line.  */
-      if (read_order_start == 0)
-	/* We're still in the preambel.  */
-	{
-	  switch (token)
-	    {
-	    case TOK_COLLATING_ELEMENT:
-	      reject_new_char = 0;
-	      token = xlocfile_lex (&ptr, &len);
-	      reject_new_char = 1;
-	      if (token == TOK_CHAR)
-		{
-		  error (0, 0, gettext ("%s:%Zd: symbolic name must not be "
-					"duplicate name in charmap"),
-			 locfile_data.filename, locfile_data.line_no);
-		  ignore_to_eol (0, 0);
-		  break;
-		}
-	      else if (token != TOK_ILL_CHAR)
-		{
-		  SYNTAX_ERROR;
-		  ignore_to_eol (0, 0);
-		  break;
-		}
-	      else
-		{
-		  char elem_name[len + 1];
-		  memcpy (elem_name, ptr, len);
-		  elem_name[len] = '\0';
-
-		  /* Test whether defined in symbol table.  */
-
-		  token = xlocfile_lex (&ptr, &len);
-		  if (token != TOK_FROM)
-		    {
-		      SYNTAX_ERROR;
-		      ignore_to_eol (0, 0);
-		      break;
-		    }
-
-		  token  = xlocfile_lex (&ptr, &len);
-                  if (token != TOK_STRING)
-		    {
-		      SYNTAX_ERROR;
-		      ignore_to_eol (0, 0);
-		      break;
-		    }
-
-		  /* Insert collating element into table.  */
-
-		  /* Rest of the line should be empty.  */
-		  ignore_to_eol (0, 1);
-		}
-	      break;
-	    case TOK_COLLATING_SYMBOL:
-	      reject_new_char = 0;
-	      token = xlocfile_lex (&ptr, &len);
-	      reject_new_char = 1;
-	      if (token == TOK_CHAR)
-		{
-		  error (0, 0, gettext ("%s:%Zd: symbolic name must not "
-					"duplicate name in charmap"),
-			 locfile_data.filename, locfile_data.line_no);
-		  ignore_to_eol (0, 0);
-		  break;
-		}
-	      else if (token != TOK_ILL_CHAR)
-		{
-		  SYNTAX_ERROR;
-		  ignore_to_eol (0, 0);
-		  break;
-		}
-	      else
-		{
-		  /* Test whether defined in element table.  */
-
-		  /* Insert collating symbol into table.  */
-
-		  ignore_to_eol (0, 1);
-		}
-	    case TOK_ORDER_START:
-	      nsort_rules = 0;
-
-	      do
-		{
-		  token = xlocfile_lex (&ptr, &len);
-
-		  if (nsort_rules == 0 && token == ENDOFLINE)
-		    break;
-
-		  if (token != TOK_BACKWARD && token != TOK_FORWARD
-		      && token != TOK_POSITION)
-		    {
-		      SYNTAX_ERROR;
-		      break;
-		    }
-
-		  switch (token)
-		    {
-		    case TOK_BACKWARD:
-		      if ((sort_rule[nsort_rules] & FORWARD_BIT) != 0)
-			error (0, 0, gettext ("%s:%Zd: directives `forward' "
-					      "and `backward' are mutually "
-					      "exclusive"),
-			       locfile_data.filename, locfile_data.lineno);
-		      else
-			sort_rule[nsort_rules] |= BACKWARD_BIT;
-		      break;
-		    case TOK_FORWARD:
-		      if ((sort_rule[nsort_rules] & BACKWARD_BIT) != 0)
-			error (0, 0, gettext ("%s:%Zd: directives `forward' "
-					      "and `backward' are mutually "
-					      "exclusive"),
-			       locfile_data.filename, locfile_data.lineno);
-                      else
-                        sort_rule[nsort_rules] |= FORWARD_BIT;
-		      break;
-		    case TOK_POSITION:
-		      sort_rule[nsort_rules] |= POSITION_BIT;
-		      break;
-		    }
-
-		  ++nsort_rules;
-
-		  
-		}
-	      break;
-	    default:
-	      SYNTAX_ERROR;
-	      ignore_to_eol (token, 0);
-	    }
-	}
-      else
-	{
-	}
-#endif
-
-      ignore_to_eol(token,0);
-      /* Get next token.  */
-      token = xlocfile_lex (&ptr, &len);
-    }
-}
-
-/*
- * Local Variables:
- *  mode:c
- *  c-basic-offset:2
- * End:
- */