about summary refs log tree commit diff
path: root/locale/monetary.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-03-28 08:30:38 +0000
committerRoland McGrath <roland@gnu.org>1996-03-28 08:30:38 +0000
commit19bc17a90548ee427035994bbc4b14395723ff1f (patch)
treee7a17eda196c2610ca4be26c9e7985815162eafb /locale/monetary.c
parent53f770e0f9d405ea8d1888254c6f7ce431b04c6e (diff)
downloadglibc-19bc17a90548ee427035994bbc4b14395723ff1f.tar.gz
glibc-19bc17a90548ee427035994bbc4b14395723ff1f.tar.xz
glibc-19bc17a90548ee427035994bbc4b14395723ff1f.zip
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.
Diffstat (limited to 'locale/monetary.c')
-rw-r--r--locale/monetary.c132
1 files changed, 0 insertions, 132 deletions
diff --git a/locale/monetary.c b/locale/monetary.c
deleted file mode 100644
index 2683eb2bf0..0000000000
--- a/locale/monetary.c
+++ /dev/null
@@ -1,132 +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 <stdlib.h>
-#include <string.h>
-
-#include "localedef.h"
-#include "token.h"
-
-
-/* The content iof the field int_curr_symbol has to be taken from
-   ISO-4217.  We test for correct values.  */
-#define DEFINE_INT_CURR(str) str,
-static const char *const valid_int_curr[] =
-  {
-#   include "iso-4217.def"
-  };
-#define NVALID_INT_CURR ((sizeof (valid_int_curr) \
-			 / sizeof (valid_int_curr[0])))
-#undef DEFINE_INT_CURR
-
-
-/* These are defined in locfile-parse.c.  */
-extern struct cat_item LC_MONETARY_desc[];
-extern char *LC_MONETARY_values[];
-
-static int _curr_strcmp(const char *s1, const char **s2);
-
-
-
-void
-monetary_check(void)
-{
-  int item_no, val;
-
-  for (item_no = 0; LC_MONETARY_desc[item_no].item_id != 0; ++item_no)
-    /* Test whether the entry has been defined.  Byte values are simply
-       stored.  */
-    if (LC_MONETARY_values[item_no] == NULL)
-      {
-	int errcode;
-
-	errcode = LC_MONETARY_desc[item_no].status = std ? 5 : 0;
-
-	error (errcode, 0, gettext ("item `%s' of category `%s' undefined"),
-	       LC_MONETARY_desc[item_no].name, "LC_MONETARY");
-      }
-    else
-      switch (LC_MONETARY_desc[item_no].item_id)
-	{
-	case INT_CURR_SYMBOL:
-	  if (strlen (LC_MONETARY_values[item_no]) != 4)
-	    error (0, 0,
-		   gettext ("item `%s' of category `%s' has wrong length"),
-		   LC_MONETARY_desc[item_no].name, "LC_MONETARY");
-	  else if (bsearch (LC_MONETARY_values[item_no], valid_int_curr,
-		       NVALID_INT_CURR, sizeof (char *),
-		       (comparison_fn_t) _curr_strcmp) == NULL)
-	    error (0, 0, gettext ("item `%s' does not correspond to any "
-				  "valid name in ISO-4217"),
-		   LC_MONETARY_desc[item_no].name);
-	  break;
-	case P_CS_PRECEDES:
-	case P_SEP_BY_SPACE:
-	case N_CS_PRECEDES:
-	case N_SEP_BY_SPACE:
-	case  P_SIGN_POSN:
-	case N_SIGN_POSN:
-	  val = (int) *(char *) LC_MONETARY_values[item_no];
-	  if (val < LC_MONETARY_desc[item_no].min
-	      || val > LC_MONETARY_desc[item_no].max)
-	    error (0, 0, gettext ("value for item `%s' in category `%s' "
-				  "must be in range %d...%d"),
-		   LC_MONETARY_desc[item_no].name, "LC_MONETARY",
-		   LC_MONETARY_desc[item_no].min,
-		   LC_MONETARY_desc[item_no].max);
-	  break;
-	case MON_DECIMAL_POINT:
-	  /* The decimal point must not be empty.  This is not said
-	     explicitly in POSIX but ANSI C (ISO/IEC 9899) says in
-	     4.4.2.1 it has to be != "".  */
-	  if (LC_MONETARY_values[item_no][0] == '\0')
-	    error (0, 0,
-		   gettext ("item `%s' in category `%s' must not be empty"),
-		   LC_MONETARY_desc[item_no].name, "LC_MONETARY");
-	  break;
-	case CURRENCY_SYMBOL:
-	case MON_THOUSANDS_SEP:
-	case MON_GROUPING:
-	case POSITIVE_SIGN:
-	case NEGATIVE_SIGN:
-	case INT_FRAC_DIGITS:
-	case FRAC_DIGITS:
-	  /* Everything is ok for these values.  */
-	  break;
-	default:
-	  error (5, 0, gettext ("Internal error in %s, line %u"),
-		 __FUNCTION__, __LINE__);
-	  /* NOTREACHED */
-	}
-
-}
-
-
-static int
-_curr_strcmp(const char *s1, const char **s2)
-{
-  return strcmp (s1, *s2);
-}
-
-/*
- * Local Variables:
- *  mode:c
- *  c-basic-offset:2
- * End:
- */