mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +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.
169 lines
3.6 KiB
C
169 lines
3.6 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>.
|
|
|
|
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. */
|
|
|
|
#ifndef _LINEREADER_H
|
|
#define _LINEREADER_H 1
|
|
|
|
#include <ctype.h>
|
|
#include <libintl.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
|
|
#include "charmap.h"
|
|
#include "error.h"
|
|
#include "locfile-token.h"
|
|
#include "repertoire.h"
|
|
|
|
|
|
typedef const struct keyword_t *(*kw_hash_fct_t) (const char *, unsigned int);
|
|
struct charset_t;
|
|
|
|
|
|
struct token
|
|
{
|
|
enum token_t tok;
|
|
union
|
|
{
|
|
struct
|
|
{
|
|
char *startmb;
|
|
size_t lenmb;
|
|
uint32_t *startwc;
|
|
size_t lenwc;
|
|
} str;
|
|
unsigned long int num;
|
|
struct
|
|
{
|
|
/* This element is sized on the safe expectation that no single
|
|
character in any character set uses more then 16 bytes. */
|
|
unsigned char bytes[16];
|
|
int nbytes;
|
|
} charcode;
|
|
uint32_t ucs4;
|
|
} val;
|
|
};
|
|
|
|
|
|
struct linereader
|
|
{
|
|
FILE *fp;
|
|
const char *fname;
|
|
char *buf;
|
|
size_t bufsize;
|
|
size_t bufact;
|
|
size_t lineno;
|
|
|
|
size_t idx;
|
|
|
|
char comment_char;
|
|
char escape_char;
|
|
|
|
struct token token;
|
|
|
|
int translate_strings;
|
|
int return_widestr;
|
|
|
|
kw_hash_fct_t hash_fct;
|
|
};
|
|
|
|
|
|
/* Functions defined in linereader.c. */
|
|
extern struct linereader *lr_open (const char *fname, kw_hash_fct_t hf);
|
|
extern int lr_eof (struct linereader *lr);
|
|
extern void lr_close (struct linereader *lr);
|
|
extern int lr_next (struct linereader *lr);
|
|
extern struct token *lr_token (struct linereader *lr,
|
|
const struct charmap_t *charmap,
|
|
const struct repertoire_t *repertoire);
|
|
|
|
|
|
#define lr_error(lr, fmt, args...) \
|
|
error_at_line (0, 0, lr->fname, lr->lineno, fmt, ## args)
|
|
|
|
|
|
|
|
static inline int
|
|
lr_getc (struct linereader *lr)
|
|
{
|
|
if (lr->idx == lr->bufact)
|
|
{
|
|
if (lr->bufact != 0)
|
|
if (lr_next (lr) < 0)
|
|
return EOF;
|
|
|
|
if (lr->bufact == 0)
|
|
return EOF;
|
|
}
|
|
|
|
return lr->buf[lr->idx] == '\32' ? EOF : lr->buf[lr->idx++];
|
|
}
|
|
|
|
|
|
static inline int
|
|
lr_ungetc (struct linereader *lr, int ch)
|
|
{
|
|
if (lr->idx == 0)
|
|
return -1;
|
|
|
|
lr->buf[--lr->idx] = ch;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static inline int
|
|
lr_ungetn (struct linereader *lr, size_t n)
|
|
{
|
|
if (lr->idx < n)
|
|
return -1;
|
|
|
|
lr->idx -= n;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static inline void
|
|
lr_ignore_rest (struct linereader *lr, int verbose)
|
|
{
|
|
if (verbose)
|
|
{
|
|
while (isspace (lr->buf[lr->idx]) && lr->buf[lr->idx] != '\n'
|
|
&& lr->buf[lr->idx] != lr->comment_char)
|
|
if (lr->buf[lr->idx] == '\0')
|
|
{
|
|
if (lr_next (lr) < 0)
|
|
return;
|
|
}
|
|
else
|
|
++lr->idx;
|
|
|
|
if (lr->buf[lr->idx] != '\n' &&lr->buf[lr->idx] != lr->comment_char)
|
|
lr_error (lr, _("trailing garbage at end of line"));
|
|
}
|
|
|
|
/* Ignore continued line. */
|
|
while (lr->bufact > 0 && lr->buf[lr->bufact - 1] != '\n')
|
|
if (lr_next (lr) < 0)
|
|
break;
|
|
|
|
lr->idx = lr->bufact;
|
|
}
|
|
|
|
|
|
#endif /* linereader.h */
|