=================================================================== RCS file: /cvs/mandoc/chars.c,v retrieving revision 1.33 retrieving revision 1.46 diff -u -p -r1.33 -r1.46 --- mandoc/chars.c 2011/03/17 08:49:34 1.33 +++ mandoc/chars.c 2011/05/24 21:31:23 1.46 @@ -1,4 +1,4 @@ -/* $Id: chars.c,v 1.33 2011/03/17 08:49:34 kristaps Exp $ */ +/* $Id: chars.c,v 1.46 2011/05/24 21:31:23 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -20,12 +20,13 @@ #endif #include +#include #include #include #include #include "mandoc.h" -#include "chars.h" +#include "libmandoc.h" #define PRINT_HI 126 #define PRINT_LO 32 @@ -35,52 +36,37 @@ struct ln { const char *code; const char *ascii; int unicode; - int type; -#define CHARS_CHAR (1 << 0) -#define CHARS_STRING (1 << 1) -#define CHARS_BOTH (CHARS_CHAR | CHARS_STRING) }; -#define LINES_MAX 351 +#define LINES_MAX 325 #define CHAR(in, ch, code) \ - { NULL, (in), (ch), (code), CHARS_CHAR }, -#define STRING(in, ch, code) \ - { NULL, (in), (ch), (code), CHARS_STRING }, -#define BOTH(in, ch, code) \ - { NULL, (in), (ch), (code), CHARS_BOTH }, + { NULL, (in), (ch), (code) }, #define CHAR_TBL_START static struct ln lines[LINES_MAX] = { #define CHAR_TBL_END }; #include "chars.in" -struct ctab { - enum chars type; +struct mchars { struct ln **htab; }; -static inline int match(const struct ln *, - const char *, size_t, int); -static const struct ln *find(struct ctab *, const char *, size_t, int); +static inline int match(const struct ln *, const char *, size_t); +static const struct ln *find(struct mchars *, const char *, size_t); - void -chars_free(void *arg) +mchars_free(struct mchars *arg) { - struct ctab *tab; - tab = (struct ctab *)arg; - - free(tab->htab); - free(tab); + free(arg->htab); + free(arg); } - -void * -chars_init(enum chars type) +struct mchars * +mchars_alloc(void) { - struct ctab *tab; + struct mchars *tab; struct ln **htab; struct ln *pp; int i, hash; @@ -92,7 +78,7 @@ chars_init(enum chars type) * (they're in-line re-ordered during lookup). */ - tab = mandoc_malloc(sizeof(struct ctab)); + tab = mandoc_malloc(sizeof(struct mchars)); htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **)); for (i = 0; i < LINES_MAX; i++) { @@ -109,7 +95,6 @@ chars_init(enum chars type) } tab->htab = htab; - tab->type = type; return(tab); } @@ -118,62 +103,57 @@ chars_init(enum chars type) * Special character to Unicode codepoint. */ int -chars_spec2cp(void *arg, const char *p, size_t sz) +mchars_spec2cp(struct mchars *arg, const char *p, size_t sz) { const struct ln *ln; - ln = find((struct ctab *)arg, p, sz, CHARS_CHAR); + ln = find(arg, p, sz); if (NULL == ln) return(-1); return(ln->unicode); } - -/* - * Reserved word to Unicode codepoint. +/* + * Numbered character string to ASCII codepoint. + * This can only be a printable character (i.e., alnum, punct, space) so + * prevent the character from ruining our state (backspace, newline, and + * so on). + * If the character is illegal, returns '\0'. */ -int -chars_res2cp(void *arg, const char *p, size_t sz) +char +mchars_num2char(const char *p, size_t sz) { - const struct ln *ln; + int i; - ln = find((struct ctab *)arg, p, sz, CHARS_STRING); - if (NULL == ln) - return(-1); - return(ln->unicode); + if ((i = mandoc_strntou(p, sz, 10)) < 0) + return('\0'); + return(isprint(i) ? i : '\0'); } - /* - * Numbered character to literal character, - * represented as a null-terminated string for additional safety. + * Hex character string to Unicode codepoint. + * If the character is illegal, returns '\0'. */ -const char * -chars_num2char(const char *p, size_t sz) +int +mchars_num2uc(const char *p, size_t sz) { - int i; - static char c[2]; + int i; - if (sz > 3) - return(NULL); - i = atoi(p); - if (i < 0 || i > 255) - return(NULL); - c[0] = (char)i; - c[1] = '\0'; - return(c); + if ((i = mandoc_strntou(p, sz, 16)) < 0) + return('\0'); + /* FIXME: make sure we're not in a bogus range. */ + return(i > 0x80 && i <= 0x10FFFF ? i : '\0'); } - /* * Special character to string array. */ const char * -chars_spec2str(void *arg, const char *p, size_t sz, size_t *rsz) +mchars_spec2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz) { const struct ln *ln; - ln = find((struct ctab *)arg, p, sz, CHARS_CHAR); + ln = find(arg, p, sz); if (NULL == ln) return(NULL); @@ -181,26 +161,8 @@ chars_spec2str(void *arg, const char *p, size_t sz, si return(ln->ascii); } - -/* - * Reserved word to string array. - */ -const char * -chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz) -{ - const struct ln *ln; - - ln = find((struct ctab *)arg, p, sz, CHARS_STRING); - if (NULL == ln) - return(NULL); - - *rsz = strlen(ln->ascii); - return(ln->ascii); -} - - static const struct ln * -find(struct ctab *tab, const char *p, size_t sz, int type) +find(struct mchars *tab, const char *p, size_t sz) { struct ln *pp, *prev; struct ln **htab; @@ -226,7 +188,7 @@ find(struct ctab *tab, const char *p, size_t sz, int t return(NULL); for (prev = NULL; pp; pp = pp->next) { - if ( ! match(pp, p, sz, type)) { + if ( ! match(pp, p, sz)) { prev = pp; continue; } @@ -243,13 +205,10 @@ find(struct ctab *tab, const char *p, size_t sz, int t return(NULL); } - static inline int -match(const struct ln *ln, const char *p, size_t sz, int type) +match(const struct ln *ln, const char *p, size_t sz) { - if ( ! (ln->type & type)) - return(0); if (strncmp(ln->code, p, sz)) return(0); return('\0' == ln->code[(int)sz]);