mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
4b10dd6c19
* locale/Makefile (distribute): Add iso-639.def and iso-3166.def. Change charset.h to charmap.h. (categories): Add new categories. Leave out collate for now. Update build rules. * locale/categories.def: Add definitions for new categories. * locale/langinfo.h: Likewise. * locale/locale.h: Likewise. * locale/C-address.c: New file. * locale/C-identification.c: New file. * locale/C-measurement.c: New file. * locale/C-name.c: New file. * locale/C-paper.c: New file. * locale/C-telephone.c: New file. * locale/lc-address.c: Likewise. * locale/lc-identification.c: Likewise. * locale/lc-measurement.c: Likewise. * locale/lc-name.c: Likewise. * locale/lc-paper.c: Likewise. * locale/lc-telephone.c: Likewise. * locale/C-ctype.c: Update for locale rewrite. * locale/C-messages.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-time.c: Likewise. * locale/lc-collate.c: Likewise. * locale/lc-ctype.c: Likewise. * locale/lc-monetary.c: Likewise. * locale/lc-time.c: Likewise. * locale/localeinfo.h: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * locale/weight.h: Likewise. * locale/findlocale.c: Unconditionally use mmap. Handle new categories. * locale/loadlocale.c: Likewise. * locale/iso-3166.def: New file. * locale/iso-639.def: New file. * locale/programs/charmap-kw.gperf: Add new keywords. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/locfile-token.h: Define new tokens. * locale/programs/charmap.c: Rewrite to handle multibyte charsets. * locale/programs/charmap.h: New file. * locale/programs/charset.h: Removed. * locale/programs/config.h: Add __LC_LAST. * locale/programs/lc-address.c: New file. * locale/programs/lc-identification.c: New file. * locale/programs/lc-measurement.c: New file. * locale/programs/lc-name.c: New file. * locale/programs/lc-paper.c: New file. * locale/programs/lc-telephone.c: New file. * locale/programs/lc-collate.c: Update for locale rewrite. * locale/programs/lc-ctype.c: Likewise. * locale/programs/lc-messages.c: Likewise. * locale/programs/lc-monetary.c: Likewise. * locale/programs/lc-numeric.c: Likewise. * locale/programs/lc-time.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/repertoire.h: Likewise. * locale/programs/locfile.c: Update prototypes. Update handle_copy definition. * locale/programs/linereader.c: Add handling of wide char strings and new definition file syntax. * locale/programs/linereader.h (struct token): Add elements for wide character strings. * locale/programs/locale-spec.c: Disable handling of collation elements for now. * locale/programs/simple-hash.h: Cleanup. * locale/programs/stringtrans.h: Handle quite of end of line. * string/strcoll.c: Fall back on strcmp for now. * string/strxfrm.c: Fall back on strncpy/strlen for now. * time/strftime.c: Use new wide character data for wcsftime. * time/strptime.c: Remove _nl_C_LC_TIME declaration. * wctype/cname-lookup.h: Update for new LC_CTYPE data.
905 lines
21 KiB
C
905 lines
21 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
|
|
|
|
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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <libintl.h>
|
|
#include <limits.h>
|
|
#include <obstack.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "error.h"
|
|
#include "linereader.h"
|
|
#include "charmap.h"
|
|
#include "locfile.h"
|
|
#include "repertoire.h"
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
/* Define the lookup function. */
|
|
#include "charmap-kw.h"
|
|
|
|
|
|
extern void *xmalloc (size_t __n);
|
|
|
|
/* Prototypes for local functions. */
|
|
static struct charmap_t *parse_charmap (const char *filename);
|
|
static void new_width (struct linereader *cmfile, struct charmap_t *result,
|
|
const char *from, const char *to,
|
|
unsigned long int width);
|
|
static void charmap_new_char (struct linereader *lr, struct charmap_t *cm,
|
|
int nbytes, char *bytes, const char *from,
|
|
const char *to, int decimal_ellipsis);
|
|
|
|
|
|
struct charmap_t *
|
|
charmap_read (const char *filename)
|
|
{
|
|
const char *pathnfile;
|
|
struct charmap_t *result = NULL;
|
|
|
|
if (filename != NULL)
|
|
{
|
|
if (euidaccess (filename, R_OK) >= 0)
|
|
pathnfile = filename;
|
|
else if (filename[0] != '/')
|
|
{
|
|
char *cp = xmalloc (strlen (filename) + sizeof CHARMAP_PATH + 1);
|
|
stpcpy (stpcpy (stpcpy (cp, CHARMAP_PATH), "/"), filename);
|
|
|
|
pathnfile = (const char *) cp;
|
|
}
|
|
else
|
|
pathnfile = NULL;
|
|
|
|
if (pathnfile != NULL)
|
|
{
|
|
result = parse_charmap (pathnfile);
|
|
|
|
if (result == NULL && !be_quiet)
|
|
error (0, errno, _("character map file `%s' not found"), filename);
|
|
}
|
|
}
|
|
|
|
if (result == NULL)
|
|
{
|
|
/* OK, one more try. We also accept the names given to the
|
|
character sets in the files. Sometimes they differ from the
|
|
file name. */
|
|
DIR *dir;
|
|
struct dirent *dirent;
|
|
|
|
dir = opendir (CHARMAP_PATH);
|
|
if (dir == NULL)
|
|
{
|
|
while ((dirent = readdir (dir)) != NULL)
|
|
if (strcmp (dirent->d_name, ".") != 0
|
|
&& strcmp (dirent->d_name, "..") != 0)
|
|
{
|
|
char buf[sizeof (CHARMAP_PATH)
|
|
+ strlen (dirent->d_name) + 1];
|
|
FILE *fp;
|
|
#ifdef _DIRENT_HAVE_D_TYPE
|
|
if (dirent->d_type != DT_UNKNOWN && dirent->d_type != DT_REG)
|
|
continue;
|
|
#endif
|
|
stpcpy (stpcpy (stpcpy (buf, CHARMAP_PATH), "/"),
|
|
dirent->d_name);
|
|
|
|
fp = fopen (buf, "r");
|
|
if (fp != NULL)
|
|
{
|
|
char *name = NULL;
|
|
|
|
while (!feof (fp))
|
|
{
|
|
char junk[BUFSIZ];
|
|
|
|
if (fscanf (fp, " <code_set_name> %as", &name) == 1
|
|
|| fscanf (fp, "%% alias %as", &name) == 1)
|
|
{
|
|
if (strcasecmp (name, filename) == 0)
|
|
break;
|
|
|
|
free (name);
|
|
name = NULL;
|
|
}
|
|
|
|
if (fgets (junk, sizeof junk, fp) != NULL)
|
|
{
|
|
if (strstr (junk, "CHARMAP") != NULL)
|
|
/* We cannot expect more aliases from now on. */
|
|
break;
|
|
|
|
while (strchr (junk, '\n') == NULL
|
|
&& fgets (junk, sizeof junk, fp) != NULL)
|
|
continue;
|
|
}
|
|
}
|
|
|
|
fclose (fp);
|
|
|
|
if (name != NULL)
|
|
{
|
|
result = parse_charmap (buf);
|
|
|
|
free (buf);
|
|
|
|
if (result)
|
|
return result;
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
closedir (dir);
|
|
}
|
|
}
|
|
|
|
if (result == NULL)
|
|
{
|
|
pathnfile = CHARMAP_PATH "/" DEFAULT_CHARMAP;
|
|
|
|
result = parse_charmap (pathnfile);
|
|
|
|
if (result == NULL)
|
|
error (4, errno, _("default character map file `%s' not found"),
|
|
DEFAULT_CHARMAP);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static struct charmap_t *
|
|
parse_charmap (const char *filename)
|
|
{
|
|
struct linereader *cmfile;
|
|
struct charmap_t *result;
|
|
int state;
|
|
enum token_t expected_tok = tok_error;
|
|
const char *expected_str = NULL;
|
|
char *from_name = NULL;
|
|
char *to_name = NULL;
|
|
enum token_t ellipsis = 0;
|
|
|
|
/* Determine path. */
|
|
cmfile = lr_open (filename, charmap_hash);
|
|
if (cmfile == NULL)
|
|
{
|
|
if (strchr (filename, '/') == NULL)
|
|
{
|
|
/* Look in the systems charmap directory. */
|
|
char *buf = xmalloc (strlen (filename) + 1 + sizeof (CHARMAP_PATH));
|
|
|
|
stpcpy (stpcpy (stpcpy (buf, CHARMAP_PATH), "/"), filename);
|
|
cmfile = lr_open (buf, charmap_hash);
|
|
|
|
if (cmfile == NULL)
|
|
free (buf);
|
|
}
|
|
|
|
if (cmfile == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
/* We don't want symbolic names in string to be translated. */
|
|
cmfile->translate_strings = 0;
|
|
|
|
/* Allocate room for result. */
|
|
result = (struct charmap_t *) xmalloc (sizeof (struct charmap_t));
|
|
memset (result, '\0', sizeof (struct charmap_t));
|
|
/* The default DEFAULT_WIDTH is 1. */
|
|
result->width_default = 1;
|
|
|
|
#define obstack_chunk_alloc malloc
|
|
#define obstack_chunk_free free
|
|
obstack_init (&result->mem_pool);
|
|
|
|
if (init_hash (&result->char_table, 256)
|
|
|| init_hash (&result->byte_table, 256))
|
|
{
|
|
free (result);
|
|
return NULL;
|
|
}
|
|
|
|
/* We use a state machine to describe the charmap description file
|
|
format. */
|
|
state = 1;
|
|
while (1)
|
|
{
|
|
/* What's on? */
|
|
struct token *now = lr_token (cmfile, NULL, NULL);
|
|
enum token_t nowtok = now->tok;
|
|
struct token *arg;
|
|
|
|
if (nowtok == tok_eof)
|
|
break;
|
|
|
|
switch (state)
|
|
{
|
|
case 1:
|
|
/* The beginning. We expect the special declarations, EOL or
|
|
`CHARMAP'. */
|
|
if (nowtok == tok_eol)
|
|
/* Ignore empty lines. */
|
|
continue;
|
|
|
|
if (nowtok == tok_charmap)
|
|
{
|
|
from_name = NULL;
|
|
to_name = NULL;
|
|
|
|
/* We have to set up the real work. Fill in some
|
|
default values. */
|
|
if (result->mb_cur_max == 0)
|
|
result->mb_cur_max = 1;
|
|
if (result->mb_cur_min == 0)
|
|
result->mb_cur_min = result->mb_cur_max;
|
|
if (result->mb_cur_min > result->mb_cur_max)
|
|
{
|
|
if (!be_quiet)
|
|
error (0, 0, _("\
|
|
%s: <mb_cur_max> must be greater than <mb_cur_min>\n"),
|
|
cmfile->fname);
|
|
|
|
result->mb_cur_min = result->mb_cur_max;
|
|
}
|
|
|
|
lr_ignore_rest (cmfile, 1);
|
|
|
|
state = 2;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok != tok_code_set_name && nowtok != tok_mb_cur_max
|
|
&& nowtok != tok_mb_cur_min && nowtok != tok_escape_char
|
|
&& nowtok != tok_comment_char && nowtok != tok_g0esc
|
|
&& nowtok != tok_g1esc && nowtok != tok_g2esc
|
|
&& nowtok != tok_g3esc && nowtok != tok_repertoiremap
|
|
&& nowtok != tok_include)
|
|
{
|
|
lr_error (cmfile, _("syntax error in prolog: %s"),
|
|
_("invalid definition"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
/* We know that we need an argument. */
|
|
arg = lr_token (cmfile, NULL, NULL);
|
|
|
|
switch (nowtok)
|
|
{
|
|
case tok_code_set_name:
|
|
case tok_repertoiremap:
|
|
if (arg->tok != tok_ident)
|
|
{
|
|
badarg:
|
|
lr_error (cmfile, _("syntax error in prolog: %s"),
|
|
_("bad argument"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_code_set_name)
|
|
result->code_set_name = obstack_copy0 (&result->mem_pool,
|
|
arg->val.str.startmb,
|
|
arg->val.str.lenmb);
|
|
else
|
|
result->repertoiremap = obstack_copy0 (&result->mem_pool,
|
|
arg->val.str.startmb,
|
|
arg->val.str.lenmb);
|
|
|
|
lr_ignore_rest (cmfile, 1);
|
|
continue;
|
|
|
|
case tok_mb_cur_max:
|
|
case tok_mb_cur_min:
|
|
if (arg->tok != tok_number)
|
|
goto badarg;
|
|
|
|
if (verbose
|
|
&& ((nowtok == tok_mb_cur_max
|
|
&& result->mb_cur_max != 0)
|
|
|| (nowtok == tok_mb_cur_max
|
|
&& result->mb_cur_max != 0)))
|
|
lr_error (cmfile, _("duplicate definition of <%s>"),
|
|
nowtok == tok_mb_cur_min
|
|
? "mb_cur_min" : "mb_cur_max");
|
|
|
|
if (arg->val.num < 1)
|
|
{
|
|
lr_error (cmfile,
|
|
_("value for <%s> must be 1 or greater"),
|
|
nowtok == tok_mb_cur_min
|
|
? "mb_cur_min" : "mb_cur_max");
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
if ((nowtok == tok_mb_cur_max && result->mb_cur_min != 0
|
|
&& (int) arg->val.num < result->mb_cur_min)
|
|
|| (nowtok == tok_mb_cur_min && result->mb_cur_max != 0
|
|
&& (int) arg->val.num > result->mb_cur_max))
|
|
{
|
|
lr_error (cmfile, _("\
|
|
value of <%s> must be greater or equal than the value of <%s>"),
|
|
"mb_cur_max", "mb_cur_min");
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_mb_cur_max)
|
|
result->mb_cur_max = arg->val.num;
|
|
else
|
|
result->mb_cur_min = arg->val.num;
|
|
|
|
lr_ignore_rest (cmfile, 1);
|
|
continue;
|
|
|
|
case tok_escape_char:
|
|
case tok_comment_char:
|
|
if (arg->tok != tok_ident)
|
|
goto badarg;
|
|
|
|
if (arg->val.str.lenmb != 1)
|
|
{
|
|
lr_error (cmfile, _("\
|
|
argument to <%s> must be a single character"),
|
|
nowtok == tok_escape_char ? "escape_char"
|
|
: "comment_char");
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_escape_char)
|
|
cmfile->escape_char = *arg->val.str.startmb;
|
|
else
|
|
cmfile->comment_char = *arg->val.str.startmb;
|
|
|
|
lr_ignore_rest (cmfile, 1);
|
|
continue;
|
|
|
|
case tok_g0esc:
|
|
case tok_g1esc:
|
|
case tok_g2esc:
|
|
case tok_g3esc:
|
|
case tok_escseq:
|
|
lr_ignore_rest (cmfile, 0); /* XXX */
|
|
continue;
|
|
|
|
case tok_include:
|
|
lr_error (cmfile, _("\
|
|
character sets with locking states are not supported"));
|
|
exit (4);
|
|
|
|
default:
|
|
/* Cannot happen. */
|
|
assert (! "Should not happen");
|
|
}
|
|
break;
|
|
|
|
case 2:
|
|
/* We have seen `CHARMAP' and now are in the body. Each line
|
|
must have the format "%s %s %s\n" or "%s...%s %s %s\n". */
|
|
if (nowtok == tok_eol)
|
|
/* Ignore empty lines. */
|
|
continue;
|
|
|
|
if (nowtok == tok_end)
|
|
{
|
|
expected_tok = tok_charmap;
|
|
expected_str = "CHARMAP";
|
|
state = 90;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok != tok_bsymbol)
|
|
{
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"CHARMAP", _("no symbolic name given"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
/* If the previous line was not completely correct free the
|
|
used memory. */
|
|
if (from_name != NULL)
|
|
obstack_free (&result->mem_pool, from_name);
|
|
|
|
from_name = (char *) obstack_copy0 (&result->mem_pool,
|
|
now->val.str.startmb,
|
|
now->val.str.lenmb);
|
|
to_name = NULL;
|
|
|
|
state = 3;
|
|
continue;
|
|
|
|
case 3:
|
|
/* We have two possibilities: We can see an ellipsis or an
|
|
encoding value. */
|
|
if (nowtok == tok_ellipsis3 || nowtok == tok_ellipsis4
|
|
|| nowtok == tok_ellipsis2)
|
|
{
|
|
ellipsis = nowtok;
|
|
state = 4;
|
|
continue;
|
|
}
|
|
/* FALLTHROUGH */
|
|
|
|
case 5:
|
|
if (nowtok != tok_charcode)
|
|
{
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"CHARMAP", _("invalid encoding given"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
|
|
state = 2;
|
|
continue;
|
|
}
|
|
|
|
if (now->val.charcode.nbytes < result->mb_cur_min)
|
|
lr_error (cmfile, _("too few bytes in character encoding"));
|
|
else if (now->val.charcode.nbytes > result->mb_cur_max)
|
|
lr_error (cmfile, _("too many bytes in character encoding"));
|
|
else
|
|
charmap_new_char (cmfile, result, now->val.charcode.nbytes,
|
|
now->val.charcode.bytes, from_name, to_name,
|
|
ellipsis != tok_ellipsis2);
|
|
|
|
/* Ignore trailing comment silently. */
|
|
lr_ignore_rest (cmfile, 0);
|
|
|
|
from_name = NULL;
|
|
to_name = NULL;
|
|
|
|
state = 2;
|
|
continue;
|
|
|
|
case 4:
|
|
if (nowtok != tok_bsymbol)
|
|
{
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"CHARMAP",
|
|
_("no symbolic name given for end of range"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
/* Copy the to-name in a safe place. */
|
|
to_name = (char *) obstack_copy0 (&result->mem_pool,
|
|
cmfile->token.val.str.startmb,
|
|
cmfile->token.val.str.lenmb);
|
|
|
|
state = 5;
|
|
continue;
|
|
|
|
case 90:
|
|
if (nowtok != expected_tok)
|
|
lr_error (cmfile, _("\
|
|
`%1$s' definition does not end with `END %1$s'"), expected_str);
|
|
|
|
lr_ignore_rest (cmfile, nowtok == expected_tok);
|
|
state = 91;
|
|
continue;
|
|
|
|
case 91:
|
|
/* Waiting for WIDTH... */
|
|
if (nowtok == tok_eol)
|
|
/* Ignore empty lines. */
|
|
continue;
|
|
|
|
if (nowtok == tok_width_default)
|
|
{
|
|
state = 92;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_width)
|
|
{
|
|
lr_ignore_rest (cmfile, 1);
|
|
state = 93;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok == tok_width_variable)
|
|
{
|
|
lr_ignore_rest (cmfile, 1);
|
|
state = 98;
|
|
continue;
|
|
}
|
|
|
|
lr_error (cmfile, _("\
|
|
only WIDTH definitions are allowed to follow the CHARMAP definition"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
|
|
case 92:
|
|
if (nowtok != tok_number)
|
|
lr_error (cmfile, _("value for %s must be an integer"),
|
|
"WIDTH_DEFAULT");
|
|
else
|
|
result->width_default = now->val.num;
|
|
|
|
lr_ignore_rest (cmfile, nowtok == tok_number);
|
|
|
|
state = 91;
|
|
continue;
|
|
|
|
case 93:
|
|
/* We now expect `END WIDTH' or lines of the format "%s %d\n" or
|
|
"%s...%s %d\n". */
|
|
if (nowtok == tok_eol)
|
|
/* ignore empty lines. */
|
|
continue;
|
|
|
|
if (nowtok == tok_end)
|
|
{
|
|
expected_tok = tok_width;
|
|
expected_str = "WIDTH";
|
|
state = 90;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok != tok_bsymbol)
|
|
{
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"WIDTH", _("no symbolic name given"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
continue;
|
|
}
|
|
|
|
if (from_name != NULL)
|
|
obstack_free (&result->mem_pool, from_name);
|
|
|
|
from_name = (char *) obstack_copy0 (&result->mem_pool,
|
|
now->val.str.startmb,
|
|
now->val.str.lenmb);
|
|
to_name = NULL;
|
|
|
|
state = 94;
|
|
continue;
|
|
|
|
case 94:
|
|
if (nowtok == tok_ellipsis3)
|
|
{
|
|
state = 95;
|
|
continue;
|
|
}
|
|
|
|
case 96:
|
|
if (nowtok != tok_number)
|
|
lr_error (cmfile, _("value for %s must be an integer"),
|
|
"WIDTH");
|
|
else
|
|
{
|
|
/* Store width for chars. */
|
|
new_width (cmfile, result, from_name, to_name, now->val.num);
|
|
|
|
from_name = NULL;
|
|
to_name = NULL;
|
|
}
|
|
|
|
lr_ignore_rest (cmfile, nowtok == tok_number);
|
|
|
|
state = 93;
|
|
continue;
|
|
|
|
case 95:
|
|
if (nowtok != tok_bsymbol)
|
|
{
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"WIDTH", _("no symbolic name given for end of range"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
|
|
state = 93;
|
|
continue;
|
|
}
|
|
|
|
to_name = (char *) obstack_copy0 (&result->mem_pool,
|
|
now->val.str.startmb,
|
|
now->val.str.lenmb);
|
|
|
|
state = 96;
|
|
continue;
|
|
|
|
case 98:
|
|
/* We now expect `END WIDTH_VARIABLE' or lines of the format
|
|
"%s\n" or "%s...%s\n". */
|
|
if (nowtok == tok_eol)
|
|
/* ignore empty lines. */
|
|
continue;
|
|
|
|
if (nowtok == tok_end)
|
|
{
|
|
expected_tok = tok_width_variable;
|
|
expected_str = "WIDTH_VARIABLE";
|
|
state = 90;
|
|
continue;
|
|
}
|
|
|
|
if (nowtok != tok_bsymbol)
|
|
{
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"WIDTH_VARIABLE", _("no symbolic name given"));
|
|
|
|
lr_ignore_rest (cmfile, 0);
|
|
|
|
continue;
|
|
}
|
|
|
|
if (from_name != NULL)
|
|
obstack_free (&result->mem_pool, from_name);
|
|
|
|
from_name = (char *) obstack_copy0 (&result->mem_pool,
|
|
now->val.str.startmb,
|
|
now->val.str.lenmb);
|
|
to_name = NULL;
|
|
|
|
state = 99;
|
|
continue;
|
|
|
|
case 99:
|
|
if (nowtok == tok_ellipsis3)
|
|
state = 100;
|
|
|
|
/* Store info. */
|
|
from_name = NULL;
|
|
|
|
/* Warn */
|
|
state = 98;
|
|
continue;
|
|
|
|
case 100:
|
|
if (nowtok != tok_bsymbol)
|
|
lr_error (cmfile, _("syntax error in %s definition: %s"),
|
|
"WIDTH_VARIABLE",
|
|
_("no symbolic name given for end of range"));
|
|
else
|
|
{
|
|
to_name = (char *) obstack_copy0 (&result->mem_pool,
|
|
now->val.str.startmb,
|
|
now->val.str.lenmb);
|
|
/* XXX Enter value into table. */
|
|
}
|
|
|
|
lr_ignore_rest (cmfile, nowtok == tok_bsymbol);
|
|
|
|
state = 98;
|
|
continue;
|
|
|
|
default:
|
|
error (5, 0, _("%s: error in state machine"), __FILE__);
|
|
/* NOTREACHED */
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (state != 91 && !be_quiet)
|
|
error (0, 0, _("%s: premature end of file"), cmfile->fname);
|
|
|
|
lr_close (cmfile);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static void
|
|
new_width (struct linereader *cmfile, struct charmap_t *result,
|
|
const char *from, const char *to, unsigned long int width)
|
|
{
|
|
struct charseq *from_val;
|
|
struct charseq *to_val;
|
|
|
|
from_val = charmap_find_value (result, from, strlen (from));
|
|
if (from_val == NULL)
|
|
{
|
|
lr_error (cmfile, _("unknown character `%s'"), from);
|
|
return;
|
|
}
|
|
|
|
if (to == NULL)
|
|
to_val = from_val;
|
|
else
|
|
{
|
|
to_val = charmap_find_value (result, to, strlen (to));
|
|
if (to_val == NULL)
|
|
{
|
|
lr_error (cmfile, _("unknown character `%s'"), to);
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (result->nwidth_rules >= result->nwidth_rules_max)
|
|
{
|
|
size_t new_size = result->nwidth_rules + 32;
|
|
struct width_rule *new_rules =
|
|
(struct width_rule *) obstack_alloc (&result->mem_pool,
|
|
(new_size
|
|
* sizeof (struct width_rule)));
|
|
|
|
memcpy (new_rules, result->width_rules,
|
|
result->nwidth_rules_max * sizeof (struct width_rule));
|
|
|
|
result->width_rules = new_rules;
|
|
result->nwidth_rules_max = new_size;
|
|
}
|
|
|
|
result->width_rules[result->nwidth_rules].from = from_val;
|
|
result->width_rules[result->nwidth_rules].to = to_val;
|
|
result->width_rules[result->nwidth_rules].width = (unsigned int) width;
|
|
++result->nwidth_rules;
|
|
}
|
|
|
|
|
|
struct charseq *
|
|
charmap_find_value (const struct charmap_t *cm, const char *name, size_t len)
|
|
{
|
|
void *result;
|
|
|
|
return (find_entry ((hash_table *) &cm->char_table, name, len, &result)
|
|
< 0 ? NULL : (struct charseq *) result);
|
|
}
|
|
|
|
|
|
static void
|
|
charmap_new_char (struct linereader *lr, struct charmap_t *cm,
|
|
int nbytes, char *bytes, const char *from, const char *to,
|
|
int decimal_ellipsis)
|
|
{
|
|
hash_table *ht = &cm->char_table;
|
|
hash_table *bt = &cm->byte_table;
|
|
struct obstack *ob = &cm->mem_pool;
|
|
char *from_end;
|
|
char *to_end;
|
|
const char *cp;
|
|
int prefix_len, len1, len2;
|
|
unsigned int from_nr, to_nr, cnt;
|
|
struct charseq *newp;
|
|
|
|
len1 = strlen (from);
|
|
|
|
if (to == NULL)
|
|
{
|
|
newp = (struct charseq *) obstack_alloc (ob, sizeof (*newp) + nbytes);
|
|
newp->nbytes = nbytes;
|
|
memcpy (newp->bytes, bytes, nbytes);
|
|
newp->name = obstack_copy (ob, from, len1 + 1);
|
|
newp->ucs4 = UNINITIALIZED_CHAR_VALUE;
|
|
|
|
insert_entry (ht, from, len1, newp);
|
|
insert_entry (bt, newp->bytes, nbytes, newp);
|
|
/* Please note that it isn't a bug if a symbol is defined more
|
|
than once. All later definitions are simply discarded. */
|
|
return;
|
|
}
|
|
|
|
/* We have a range: the names must have names with equal prefixes
|
|
and an equal number of digits, where the second number is greater
|
|
or equal than the first. */
|
|
len2 = strlen (to);
|
|
|
|
if (len1 != len2)
|
|
{
|
|
illegal_range:
|
|
lr_error (lr, _("invalid names for character range"));
|
|
return;
|
|
}
|
|
|
|
cp = &from[len1 - 1];
|
|
if (decimal_ellipsis)
|
|
while (isdigit (*cp) && cp >= from)
|
|
--cp;
|
|
else
|
|
while (isxdigit (*cp) && cp >= from)
|
|
{
|
|
if (!isdigit (*cp) && !isupper (*cp))
|
|
lr_error (lr, _("\
|
|
hexadecimal range format should use only capital characters"));
|
|
--cp;
|
|
}
|
|
|
|
prefix_len = (cp - from) + 1;
|
|
|
|
if (cp == &from[len1 - 1] || strncmp (from, to, prefix_len) != 0)
|
|
goto illegal_range;
|
|
|
|
errno = 0;
|
|
from_nr = strtoul (&from[prefix_len], &from_end, decimal_ellipsis ? 10 : 16);
|
|
if (*from_end != '\0' || (from_nr == ULONG_MAX && errno == ERANGE)
|
|
|| ((to_nr = strtoul (&to[prefix_len], &to_end,
|
|
decimal_ellipsis ? 10 : 16)) == ULONG_MAX
|
|
&& errno == ERANGE)
|
|
|| *to_end != '\0')
|
|
{
|
|
lr_error (lr, _("<%s> and <%s> are illegal names for range"));
|
|
return;
|
|
}
|
|
|
|
if (from_nr > to_nr)
|
|
{
|
|
lr_error (lr, _("upper limit in range is not higher then lower limit"));
|
|
return;
|
|
}
|
|
|
|
for (cnt = from_nr; cnt <= to_nr; ++cnt)
|
|
{
|
|
char *name_end;
|
|
obstack_printf (ob, decimal_ellipsis ? "%.*s%0*d" : "%.*s%0*X",
|
|
prefix_len, from, len1 - prefix_len, cnt);
|
|
name_end = obstack_finish (ob);
|
|
|
|
newp = (struct charseq *) obstack_alloc (ob, sizeof (*newp) + nbytes);
|
|
newp->nbytes = nbytes;
|
|
memcpy (newp->bytes, bytes, nbytes);
|
|
newp->name = name_end;
|
|
newp->ucs4 = UNINITIALIZED_CHAR_VALUE;
|
|
|
|
insert_entry (ht, name_end, len1, newp);
|
|
insert_entry (bt, newp->bytes, nbytes, newp);
|
|
/* Please note we don't examine the return value since it is no error
|
|
if we have two definitions for a symbol. */
|
|
|
|
/* Increment the value in the byte sequence. */
|
|
if (++bytes[nbytes - 1] == '\0')
|
|
{
|
|
int b = nbytes - 2;
|
|
|
|
do
|
|
if (b < 0)
|
|
{
|
|
lr_error (lr,
|
|
_("resulting bytes for range not representable."));
|
|
return;
|
|
}
|
|
while (++bytes[b--] == 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
struct charseq *
|
|
charmap_find_symbol (const struct charmap_t *cm, const char *bytes,
|
|
size_t nbytes)
|
|
{
|
|
void *result;
|
|
|
|
return (find_entry ((hash_table *) &cm->byte_table, bytes, nbytes, &result)
|
|
< 0 ? NULL : (struct charseq *) result);
|
|
}
|