-/* $Id: chars.c,v 1.19 2010/06/01 11:47:28 kristaps Exp $ */
+/* $Id: chars.c,v 1.49 2011/07/22 14:15:15 kristaps Exp $ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#endif
#include <assert.h>
-#include <stdio.h>
+#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include "mandoc.h"
-#include "chars.h"
+#include "libmandoc.h"
#define PRINT_HI 126
#define PRINT_LO 32
struct ln *next;
const char *code;
const char *ascii;
- const char *html;
- size_t codesz;
- size_t asciisz;
- size_t htmlsz;
- int type;
-#define CHARS_CHAR (1 << 0)
-#define CHARS_STRING (1 << 1)
-#define CHARS_BOTH (CHARS_CHAR | CHARS_STRING)
+ int unicode;
};
-#define LINES_MAX 370
+#define LINES_MAX 328
-#define CHAR(w, x, y, z, a, b) \
- { NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR },
-#define STRING(w, x, y, z, a, b) \
- { NULL, (w), (y), (a), (x), (z), (b), CHARS_STRING },
-#define BOTH(w, x, y, z, a, b) \
- { NULL, (w), (y), (a), (x), (z), (b), CHARS_BOTH },
+#define CHAR(in, ch, code) \
+ { NULL, (in), (ch), (code) },
#define CHAR_TBL_START static struct ln lines[LINES_MAX] = {
#define CHAR_TBL_END };
#include "chars.in"
-struct tbl {
- enum chars type;
+struct mchars {
struct ln **htab;
};
-static inline int match(const struct ln *,
- const char *, size_t, int);
-static const char *find(struct tbl *, const char *,
- size_t, size_t *, int);
-
+static const struct ln *find(struct mchars *, const char *, size_t);
void
-chars_free(void *arg)
+mchars_free(struct mchars *arg)
{
- struct tbl *tab;
-
- tab = (struct tbl *)arg;
- free(tab->htab);
- free(tab);
+ free(arg->htab);
+ free(arg);
}
-
-void *
-chars_init(enum chars type)
+struct mchars *
+mchars_alloc(void)
{
- struct tbl *tab;
+ struct mchars *tab;
struct ln **htab;
struct ln *pp;
int i, hash;
/*
* Constructs a very basic chaining hashtable. The hash routine
* is simply the integral value of the first character.
- * Subsequent entries are chained in the order they're processed
- * (they're in-line re-ordered during lookup).
+ * Subsequent entries are chained in the order they're processed.
*/
- tab = malloc(sizeof(struct tbl));
- if (NULL == tab) {
- perror(NULL);
- exit(EXIT_FAILURE);
- }
-
- htab = calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
- if (NULL == htab) {
- perror(NULL);
- exit(EXIT_FAILURE);
- }
+ tab = mandoc_malloc(sizeof(struct mchars));
+ htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
for (i = 0; i < LINES_MAX; i++) {
hash = (int)lines[i].code[0] - PRINT_LO;
}
tab->htab = htab;
- tab->type = type;
return(tab);
}
+int
+mchars_spec2cp(struct mchars *arg, const char *p, size_t sz)
+{
+ const struct ln *ln;
-const char *
-chars_a2ascii(void *arg, const char *p, size_t sz, size_t *rsz)
+ ln = find(arg, p, sz);
+ if (NULL == ln)
+ return(-1);
+ return(ln->unicode);
+}
+
+char
+mchars_num2char(const char *p, size_t sz)
{
+ int i;
- return(find((struct tbl *)arg, p, sz, rsz, CHARS_CHAR));
+ if ((i = mandoc_strntoi(p, sz, 10)) < 0)
+ return('\0');
+ return(isprint(i) ? i : '\0');
}
+int
+mchars_num2uc(const char *p, size_t sz)
+{
+ int i;
+
+ if ((i = mandoc_strntoi(p, sz, 16)) < 0)
+ return('\0');
+ /* FIXME: make sure we're not in a bogus range. */
+ return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
+}
const char *
-chars_a2res(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;
- return(find((struct tbl *)arg, p, sz, rsz, CHARS_STRING));
-}
+ ln = find(arg, p, sz);
+ if (NULL == ln)
+ return(NULL);
+ *rsz = strlen(ln->ascii);
+ return(ln->ascii);
+}
-static const char *
-find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type)
+static const struct ln *
+find(struct mchars *tab, const char *p, size_t sz)
{
- struct ln *pp, *prev;
- struct ln **htab;
+ struct ln *pp;
int hash;
assert(p);
- assert(sz > 0);
- if (p[0] < PRINT_LO || p[0] > PRINT_HI)
+ if (0 == sz || p[0] < PRINT_LO || p[0] > PRINT_HI)
return(NULL);
- /*
- * Lookup the symbol in the symbol hash. See ascii2htab for the
- * hashtable specs. This dynamically re-orders the hash chain
- * to optimise for repeat hits.
- */
-
hash = (int)p[0] - PRINT_LO;
- htab = tab->htab;
-
- if (NULL == (pp = htab[hash]))
- return(NULL);
- for (prev = NULL; pp; pp = pp->next) {
- if ( ! match(pp, p, sz, type)) {
- prev = pp;
- continue;
- }
-
- if (prev) {
- prev->next = pp->next;
- pp->next = htab[hash];
- htab[hash] = pp;
- }
-
- if (CHARS_HTML == tab->type) {
- *rsz = pp->htmlsz;
- return(pp->html);
- }
- *rsz = pp->asciisz;
- return(pp->ascii);
- }
+ for (pp = tab->htab[hash]; pp; pp = pp->next)
+ if (0 == strncmp(pp->code, p, sz) &&
+ '\0' == pp->code[(int)sz])
+ return(pp);
return(NULL);
}
-
-
-static inline int
-match(const struct ln *ln, const char *p, size_t sz, int type)
-{
-
- if ( ! (ln->type & type))
- return(0);
- if (ln->codesz != sz)
- return(0);
- return(0 == strncmp(ln->code, p, sz));
-}
git.ckatri.com / mandoc.git / blobdiff