From 3f648213cd789e9c307f834875f09da5e1d86ab1 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 17 Sep 2009 07:41:28 +0000 Subject: ascii_xxx -> chars_xxx (intended to hold more than just ascii encoding). More html work. --- Makefile | 12 +-- ascii.c | 217 ------------------------------------------- ascii.in | 299 ----------------------------------------------------------- chars.c | 201 ++++++++++++++++++++++++++++++++++++++++ chars.h | 34 +++++++ chars.in | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ html.c | 34 ++++++- man_hash.c | 9 +- mdoc_hash.c | 9 +- term.c | 13 +-- term.h | 7 +- 11 files changed, 589 insertions(+), 546 deletions(-) delete mode 100644 ascii.c delete mode 100644 ascii.in create mode 100644 chars.c create mode 100644 chars.h create mode 100644 chars.in diff --git a/Makefile b/Makefile index 24cad136..4b2da44c 100644 --- a/Makefile +++ b/Makefile @@ -35,11 +35,11 @@ MANOBJS = man_macro.o man.o man_hash.o man_validate.o \ MANSRCS = man_macro.c man.c man_hash.c man_validate.c \ man_action.c mandoc.c man_argv.c -MAINLNS = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \ +MAINLNS = main.ln mdoc_term.ln chars.ln term.ln tree.ln \ compat.ln man_term.ln html.ln -MAINOBJS = main.o mdoc_term.o ascii.o term.o tree.o compat.o \ +MAINOBJS = main.o mdoc_term.o chars.o term.o tree.o compat.o \ man_term.o html.o -MAINSRCS = main.c mdoc_term.c ascii.c term.c tree.c compat.c \ +MAINSRCS = main.c mdoc_term.c chars.c term.c tree.c compat.c \ man_term.c html.c LLNS = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln @@ -47,7 +47,7 @@ LNS = $(MAINLNS) $(MDOCLNS) $(MANLNS) LIBS = libmdoc.a libman.a OBJS = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) SRCS = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) -DATAS = arch.in att.in lib.in msec.in st.in vol.in ascii.in +DATAS = arch.in att.in lib.in msec.in st.in vol.in chars.in HEADS = mdoc.h libmdoc.h man.h libman.h term.h libmandoc.h SGMLS = index.sgml XSLS = ChangeLog.xsl @@ -117,8 +117,8 @@ arch.o: arch.c arch.in libmdoc.h vol.ln: vol.c vol.in libmdoc.h vol.o: vol.c vol.in libmdoc.h -ascii.ln: ascii.c ascii.in term.h -ascii.o: ascii.c ascii.in term.h +chars.ln: chars.c chars.in chars.h +chars.o: chars.c chars.in chars.h msec.ln: msec.c msec.in libmdoc.h msec.o: msec.c msec.in libmdoc.h diff --git a/ascii.c b/ascii.c deleted file mode 100644 index 60698339..00000000 --- a/ascii.c +++ /dev/null @@ -1,217 +0,0 @@ -/* $Id: ascii.c,v 1.9 2009/07/27 12:02:49 kristaps Exp $ */ -/* - * Copyright (c) 2009 Kristaps Dzonsons - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#include -#include -#include -#include - -#include "term.h" - -#define ASCII_PRINT_HI 126 -#define ASCII_PRINT_LO 32 - -struct line { - const char *code; - const char *out; - size_t codesz; - size_t outsz; - int type; -#define ASCII_CHAR (1 << 0) -#define ASCII_STRING (1 << 1) -#define ASCII_BOTH (0x03) -}; - -struct linep { - const struct line *line; - struct linep *next; -}; - -#define CHAR(w, x, y, z) \ - { (w), (y), (x), (z), ASCII_CHAR }, -#define STRING(w, x, y, z) \ - { (w), (y), (x), (z), ASCII_STRING }, -#define BOTH(w, x, y, z) \ - { (w), (y), (x), (z), ASCII_BOTH }, -static const struct line lines[] = { -#include "ascii.in" -}; - -struct asciitab { - struct linep *lines; - void **htab; -}; - - -static inline int match(const struct line *, - const char *, size_t, int); -static const char * lookup(struct asciitab *, const char *, - size_t, size_t *, int); - - -void -term_asciifree(void *arg) -{ - struct asciitab *tab; - - tab = (struct asciitab *)arg; - - free(tab->lines); - free(tab->htab); - free(tab); -} - - -void * -term_ascii2htab(void) -{ - struct asciitab *tab; - void **htab; - struct linep *pp, *p; - int i, len, 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). - */ - - if (NULL == (tab = malloc(sizeof(struct asciitab)))) - err(1, "malloc"); - - len = sizeof(lines) / sizeof(struct line); - - if (NULL == (p = calloc((size_t)len, sizeof(struct linep)))) - err(1, "malloc"); - - htab = calloc(ASCII_PRINT_HI - ASCII_PRINT_LO + 1, - sizeof(struct linep **)); - - if (NULL == htab) - err(1, "malloc"); - - for (i = 0; i < len; i++) { - assert(lines[i].codesz > 0); - assert(lines[i].code); - assert(lines[i].out); - - p[i].line = &lines[i]; - - hash = (int)lines[i].code[0] - ASCII_PRINT_LO; - - if (NULL == (pp = ((struct linep **)htab)[hash])) { - htab[hash] = &p[i]; - continue; - } - - for ( ; pp->next; pp = pp->next) - /* Scan ahead. */ ; - - pp->next = &p[i]; - } - - tab->htab = htab; - tab->lines = p; - - return(tab); -} - - -const char * -term_a2ascii(void *arg, const char *p, size_t sz, size_t *rsz) -{ - - return(lookup((struct asciitab *)arg, p, - sz, rsz, ASCII_CHAR)); -} - - -const char * -term_a2res(void *arg, const char *p, size_t sz, size_t *rsz) -{ - - return(lookup((struct asciitab *)arg, p, - sz, rsz, ASCII_STRING)); -} - - -static const char * -lookup(struct asciitab *tab, const char *p, - size_t sz, size_t *rsz, int type) -{ - struct linep *pp, *prev; - void **htab; - int hash; - - assert(p); - assert(sz > 0); - - if (p[0] < ASCII_PRINT_LO || p[0] > ASCII_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] - ASCII_PRINT_LO; - htab = tab->htab; - - if (NULL == (pp = ((struct linep **)htab)[hash])) - return(NULL); - - if (NULL == pp->next) { - if ( ! match(pp->line, p, sz, type)) - return(NULL); - *rsz = pp->line->outsz; - return(pp->line->out); - } - - for (prev = NULL; pp; pp = pp->next) { - if ( ! match(pp->line, p, sz, type)) { - prev = pp; - continue; - } - - /* Re-order the hash chain. */ - - if (prev) { - prev->next = pp->next; - pp->next = ((struct linep **)htab)[hash]; - htab[hash] = pp; - } - - *rsz = pp->line->outsz; - return(pp->line->out); - } - - return(NULL); -} - - -static inline int -match(const struct line *line, const char *p, size_t sz, int type) -{ - - if ( ! (line->type & type)) - return(0); - if (line->codesz != sz) - return(0); - return(0 == strncmp(line->code, p, sz)); -} diff --git a/ascii.in b/ascii.in deleted file mode 100644 index 50d17df4..00000000 --- a/ascii.in +++ /dev/null @@ -1,299 +0,0 @@ -/* $Id: ascii.in,v 1.17 2009/07/28 11:59:18 kristaps Exp $ */ -/* - * Copyright (c) 2009 Kristaps Dzonsons - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * The ASCII translation tables. STRING corresponds to predefined - * strings (cf. mdoc_samples.7 and tmac/mdoc/doc-nroff). CHAR - * corresponds to special characters (cf. groff_char.7). BOTH contains - * sequences that are equivalent in both STRING and CHAR. - * - * Either way, the left-hand side corresponds to the input sequence (\x, - * \(xx, \*(xx and so on) whose length is listed second element. The - * right-hand side is what's produced by the front-end, with the fourth - * element being its length. - * - * Be sure to C-escape strings! - */ - -STRING("Am", 2, "&", 1) -STRING("Ba", 2, "|", 1) -STRING("Ge", 2, ">=", 2) -STRING("Gt", 2, ">", 1) -STRING("If", 2, "infinity", 8) -STRING("Le", 2, "<=", 2) -STRING("Lq", 2, "``", 2) -STRING("Lt", 2, "<", 1) -STRING("Na", 2, "NaN", 3) -STRING("Ne", 2, "!=", 2) -STRING("Pi", 2, "pi", 2) -STRING("Pm", 2, "+-", 2) -STRING("R", 1, "(R)", 3) -STRING("Rq", 2, "\'\'", 2) -STRING("Tm", 2, "tm", 2) -STRING("left-bracket", 12, "[", 1) -STRING("left-parenthesis", 16, "(", 1) -STRING("left-singlequote", 16, "`", 1) -STRING("lp", 2, "(", 1) -STRING("q", 1, "\"", 1) -STRING("quote-left", 10, "`", 1) -STRING("quote-right", 11, "\'", 1) -STRING("right-bracket", 13, "]", 1) -STRING("right-parenthesis", 17, ")", 1) -STRING("right-singlequote", 17, "\'", 1) -STRING("rp", 2, ")", 1) - -BOTH("<=", 2, "<=", 2) -BOTH(">=", 2, ">=", 2) -BOTH("aa", 2, "\'", 1) -BOTH("ga", 2, "`", 1) -BOTH("lq", 2, "``", 2) -BOTH("rq", 2, "\'\'", 2) -BOTH("ua", 2, "^", 1) - -CHAR(" ", 1, " ", 1) -CHAR("!=", 2, "!=", 2) -CHAR("%", 1, "", 0) -CHAR("&", 1, "", 0) -CHAR("(=", 2, "(=", 2) -CHAR("**", 2, "*", 1) -CHAR("*A", 2, "A", 1) -CHAR("*B", 2, "B", 1) -CHAR("*C", 2, "H", 1) -CHAR("*D", 2, "/\\", 2) -CHAR("*E", 2, "E", 1) -CHAR("*F", 2, "O_", 1) -CHAR("*G", 2, "|", 1) -CHAR("*H", 2, "O", 1) -CHAR("*I", 2, "I", 1) -CHAR("*K", 2, "K", 1) -CHAR("*L", 2, "/\\", 2) -CHAR("*M", 2, "M", 1) -CHAR("*N", 2, "N", 1) -CHAR("*O", 2, "O", 1) -CHAR("*P", 2, "TT", 2) -CHAR("*Q", 2, "Y", 1) -CHAR("*R", 2, "P", 1) -CHAR("*S", 2, ">", 1) -CHAR("*T", 2, "T", 1) -CHAR("*U", 2, "Y", 1) -CHAR("*W", 2, "O", 1) -CHAR("*X", 2, "X", 1) -CHAR("*Y", 2, "H", 1) -CHAR("*Z", 2, "Z", 1) -CHAR("*a", 2, "a", 1) -CHAR("*b", 2, "B", 1) -CHAR("*c", 2, "E", 1) -CHAR("*d", 2, "d", 1) -CHAR("*e", 2, "e", 1) -CHAR("*f", 2, "o", 1) -CHAR("*g", 2, "y", 1) -CHAR("*h", 2, "0", 1) -CHAR("*i", 2, "i", 1) -CHAR("*k", 2, "k", 1) -CHAR("*l", 2, "\\", 1) -CHAR("*m", 2, "u", 1) -CHAR("*n", 2, "v", 1) -CHAR("*o", 2, "o", 1) -CHAR("*p", 2, "n", 1) -CHAR("*q", 2, "u", 1) -CHAR("*r", 2, "p", 1) -CHAR("*s", 2, "o", 1) -CHAR("*t", 2, "t", 1) -CHAR("*u", 2, "u", 1) -CHAR("*w", 2, "w", 1) -CHAR("*x", 2, "x", 1) -CHAR("*y", 2, "n", 1) -CHAR("*z", 2, "C", 1) -CHAR("+-", 2, "+-", 2) -CHAR("+f", 2, "o", 1) -CHAR("+h", 2, "0", 1) -CHAR("+p", 2, "w", 1) -CHAR(",C", 2, "C", 1) -CHAR(",c", 2, "c", 1) -CHAR("-", 1, "-", 1) -CHAR("->", 2, "->", 2) -CHAR("-D", 2, "D", 1) -CHAR(".", 1, ".", 1) -CHAR("/L", 2, "L", 1) -CHAR("/O", 2, "O", 1) -CHAR("/l", 2, "l", 1) -CHAR("/o", 2, "o", 1) -CHAR("0", 1, " ", 1) -CHAR(":A", 2, "A", 1) -CHAR(":E", 2, "E", 1) -CHAR(":I", 2, "I", 1) -CHAR(":O", 2, "O", 1) -CHAR(":U", 2, "U", 1) -CHAR(":a", 2, "a", 1) -CHAR(":e", 2, "e", 1) -CHAR(":i", 2, "i", 1) -CHAR(":o", 2, "o", 1) -CHAR(":u", 2, "u", 1) -CHAR(":y", 2, "y", 1) -CHAR("<-", 2, "<-", 2) -CHAR("<=", 2, "<=", 2) -CHAR("<>", 2, "<>", 2) -CHAR("=)", 2, "=)", 2) -CHAR("==", 2, "==", 2) -CHAR("=~", 2, "=~", 2) -CHAR(">=", 2, ">=", 2) -CHAR("AE", 2, "AE", 2) -CHAR("AN", 2, "^", 1) -CHAR("Ah", 2, "N", 1) -CHAR("Bq", 2, ",,", 2) -CHAR("Cs", 2, "x", 1) -CHAR("Do", 2, "$", 1) -CHAR("Eu", 2, "EUR", 3) -CHAR("Fc", 2, ">>", 2) -CHAR("Fi", 2, "ffi", 3) -CHAR("Fl", 2, "ffl", 3) -CHAR("Fn", 2, "f", 1) -CHAR("Fo", 2, "<<", 2) -CHAR("Im", 2, "I", 1) -CHAR("OE", 2, "OE", 2) -CHAR("OR", 2, "v", 1) -CHAR("Po", 2, "L", 1) -CHAR("Re", 2, "R", 1) -CHAR("Sd", 2, "o", 1) -CHAR("TP", 2, "b", 1) -CHAR("Tp", 2, "b", 1) -CHAR("Ye", 2, "Y", 1) -CHAR("\'", 1, "\'", 1) -CHAR("\'A", 2, "A", 1) -CHAR("\'E", 2, "E", 1) -CHAR("\'I", 2, "I", 1) -CHAR("\'O", 2, "O", 1) -CHAR("\'U", 2, "U", 1) -CHAR("\'a", 2, "a", 1) -CHAR("\'e", 2, "e", 1) -CHAR("\'i", 2, "i", 1) -CHAR("\'o", 2, "o", 1) -CHAR("\'u", 2, "u", 1) -CHAR("\\", 1, "\\", 1) -CHAR("^", 1, "", 0) -CHAR("^A", 2, "A", 1) -CHAR("^E", 2, "E", 1) -CHAR("^I", 2, "I", 1) -CHAR("^O", 2, "O", 1) -CHAR("^U", 2, "U", 1) -CHAR("^a", 2, "a", 1) -CHAR("^e", 2, "e", 1) -CHAR("^i", 2, "i", 1) -CHAR("^o", 2, "o", 1) -CHAR("^u", 2, "u", 1) -CHAR("`", 1, "`", 1) -CHAR("`A", 2, "A", 1) -CHAR("`E", 2, "E", 1) -CHAR("`I", 2, "I", 1) -CHAR("`O", 2, "O", 1) -CHAR("`U", 2, "U", 1) -CHAR("`a", 2, "a", 1) -CHAR("`e", 2, "e", 1) -CHAR("`i", 2, "i", 1) -CHAR("`o", 2, "o", 1) -CHAR("`u", 2, "u", 1) -CHAR("a-", 2, "-", 1) -CHAR("a\"", 2, "\"", 1) -CHAR("a^", 2, "^", 1) -CHAR("aa", 2, "\'", 1) -CHAR("ab", 2, "`", 1) -CHAR("ac", 2, ",", 1) -CHAR("ad", 2, "\"", 1) -CHAR("ae", 2, "ae", 2) -CHAR("ah", 2, "v", 1) -CHAR("ao", 2, "o", 1) -CHAR("ap", 2, "~", 1) -CHAR("aq", 2, "\'", 1) -CHAR("a~", 2, "~", 1) -CHAR("ba", 2, "|", 1) -CHAR("bb", 2, "|", 1) -CHAR("bq", 2, ",", 1) -CHAR("bu", 2, "o", 1) -CHAR("c", 1, "", 0) -CHAR("ca", 2, "(^)", 3) -CHAR("ci", 2, "O", 1) -CHAR("co", 2, "(C)", 3) -CHAR("ct", 2, "c", 1) -CHAR("cu", 2, "U", 1) -CHAR("dA", 2, "v", 1) -CHAR("da", 2, "v", 1) -CHAR("dd", 2, "=", 1) -CHAR("de", 2, "o", 1) -CHAR("dg", 2, "-", 1) -CHAR("di", 2, "-:-", 3) -CHAR("e", 1, "\\", 1) -CHAR("em", 2, "--", 2) -CHAR("en", 2, "-", 1) -CHAR("eq", 2, "=", 1) -CHAR("es", 2, "{}", 2) -CHAR("eu", 2, "EUR", 3) -CHAR("fa", 2, "V", 1) -CHAR("fc", 2, ">", 1) -CHAR("ff", 2, "ff", 2) -CHAR("fi", 2, "fi", 2) -CHAR("fl", 2, "fl", 2) -CHAR("fo", 2, "<", 1) -CHAR("ga", 2, "`", 1) -CHAR("gr", 2, "V", 1) -CHAR("hA", 2, "<=>", 3) -CHAR("ho", 2, ",", 1) -CHAR("hy", 2, "-", 1) -CHAR("if", 2, "oo", 2) -CHAR("lA", 2, "<=", 2) -CHAR("lB", 2, "[", 1) -CHAR("lC", 2, "{", 1) -CHAR("la", 2, "<", 1) -CHAR("lh", 2, "<=", 2) -CHAR("mo", 2, "E", 1) -CHAR("mu", 2, "x", 1) -CHAR("na", 2, "NaN", 3) -CHAR("nm", 2, "E", 1) -CHAR("no", 2, "~", 1) -CHAR("oA", 2, "A", 1) -CHAR("oa", 2, "a", 1) -CHAR("oe", 2, "oe", 2) -CHAR("oq", 2, "`", 1) -CHAR("pd", 2, "a", 1) -CHAR("pl", 2, "+", 1) -CHAR("ps", 2, "9|", 2) -CHAR("r!", 2, "i", 1) -CHAR("r?", 2, "c", 1) -CHAR("rA", 2, "=>", 2) -CHAR("rB", 2, "]", 1) -CHAR("rC", 2, "}", 1) -CHAR("ra", 2, ">", 1) -CHAR("rg", 2, "(R)", 3) -CHAR("rh", 2, "=>", 2) -CHAR("sc", 2, "S", 1) -CHAR("ss", 2, "ss", 2) -CHAR("st", 2, "-)", 2) -CHAR("te", 2, "3", 1) -CHAR("tf", 2, ".:.", 3) -CHAR("tm", 2, "tm", 2) -CHAR("ts", 2, "s", 1) -CHAR("uA", 2, "^", 1) -CHAR("ua", 2, "^", 1) -CHAR("|", 1, "", 0) -CHAR("~", 1, " ", 1) -CHAR("~=", 2, "~=", 2) -CHAR("~A", 2, "A", 1) -CHAR("~N", 2, "N", 1) -CHAR("~O", 2, "O", 1) -CHAR("~a", 2, "a", 1) -CHAR("~n", 2, "n", 1) -CHAR("~o", 2, "o", 1) -CHAR("~~", 2, "~~", 2) diff --git a/chars.c b/chars.c new file mode 100644 index 00000000..6c2298f0 --- /dev/null +++ b/chars.c @@ -0,0 +1,201 @@ +/* $Id: chars.c,v 1.1 2009/09/17 07:41:28 kristaps Exp $ */ +/* + * Copyright (c) 2009 Kristaps Dzonsons + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +#include +#include +#include +#include + +#include "chars.h" + +#define ASCII_PRINT_HI 126 +#define ASCII_PRINT_LO 32 + +struct ln { + struct ln *next; + const char *code; + const char *out; + size_t codesz; + size_t outsz; + int type; +#define CHARS_CHAR (1 << 0) +#define CHARS_STRING (1 << 1) +#define CHARS_BOTH (0x03) +}; + +#define LINES_MAX 266 + +#define CHAR(w, x, y, z) \ + { NULL, (w), (y), (x), (z), CHARS_CHAR }, +#define STRING(w, x, y, z) \ + { NULL, (w), (y), (x), (z), CHARS_STRING }, +#define BOTH(w, x, y, z) \ + { NULL, (w), (y), (x), (z), CHARS_BOTH }, + +static struct ln lines[LINES_MAX] = { +#include "chars.in" +}; + +struct tbl { + 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); + + +void +chars_free(void *arg) +{ + struct tbl *tab; + + tab = (struct tbl *)arg; + + free(tab->htab); + free(tab); +} + + +/* ARGSUSED */ +void * +chars_init(enum chars type) +{ + struct tbl *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). + */ + + if (NULL == (tab = malloc(sizeof(struct tbl)))) + err(1, "malloc"); + + htab = calloc(ASCII_PRINT_HI - ASCII_PRINT_LO + 1, + sizeof(struct ln **)); + + if (NULL == htab) + err(1, "malloc"); + + for (i = 0; i < LINES_MAX; i++) { + assert(lines[i].codesz > 0); + assert(lines[i].code); + assert(lines[i].out); + + hash = (int)lines[i].code[0] - ASCII_PRINT_LO; + + if (NULL == (pp = htab[hash])) { + htab[hash] = &lines[i]; + continue; + } + + for ( ; pp->next; pp = pp->next) + /* Scan ahead. */ ; + + pp->next = &lines[i]; + } + + tab->htab = htab; + return(tab); +} + + +const char * +chars_a2ascii(void *arg, const char *p, size_t sz, size_t *rsz) +{ + + return(find((struct tbl *)arg, p, sz, rsz, CHARS_CHAR)); +} + + +const char * +chars_a2res(void *arg, const char *p, size_t sz, size_t *rsz) +{ + + return(find((struct tbl *)arg, p, sz, rsz, CHARS_STRING)); +} + + +static const char * +find(struct tbl *tab, const char *p, size_t sz, size_t *rsz, int type) +{ + struct ln *pp, *prev; + struct ln **htab; + int hash; + + assert(p); + assert(sz > 0); + + if (p[0] < ASCII_PRINT_LO || p[0] > ASCII_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] - ASCII_PRINT_LO; + htab = tab->htab; + + if (NULL == (pp = htab[hash])) + return(NULL); + + if (NULL == pp->next) { + if ( ! match(pp, p, sz, type)) + return(NULL); + *rsz = pp->outsz; + return(pp->out); + } + + for (prev = NULL; pp; pp = pp->next) { + if ( ! match(pp, p, sz, type)) { + prev = pp; + continue; + } + + /* Re-order the hash chain. */ + + if (prev) { + prev->next = pp->next; + pp->next = htab[hash]; + htab[hash] = pp; + } + + *rsz = pp->outsz; + return(pp->out); + } + + 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)); +} diff --git a/chars.h b/chars.h new file mode 100644 index 00000000..c3627b53 --- /dev/null +++ b/chars.h @@ -0,0 +1,34 @@ +/* $Id: chars.h,v 1.1 2009/09/17 07:41:28 kristaps Exp $ */ +/* + * Copyright (c) 2008, 2009 Kristaps Dzonsons + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +#ifndef CHARS_H +#define CHARS_H + +__BEGIN_DECLS + +enum chars { + CHARS_ASCII, + CHARS_HTML +}; + +void *chars_init(enum chars); +const char *chars_a2ascii(void *, const char *, size_t, size_t *); +const char *chars_a2res(void *, const char *, size_t, size_t *); +void chars_free(void *); + +__END_DECLS + +#endif /*!CHARS_H*/ diff --git a/chars.in b/chars.in new file mode 100644 index 00000000..4e5b9a10 --- /dev/null +++ b/chars.in @@ -0,0 +1,300 @@ +/* $Id: chars.in,v 1.1 2009/09/17 07:41:28 kristaps Exp $ */ +/* + * Copyright (c) 2009 Kristaps Dzonsons + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * The ASCII translation tables. STRING corresponds to predefined + * strings (cf. mdoc_samples.7 and tmac/mdoc/doc-nroff). CHAR + * corresponds to special characters (cf. groff_char.7). BOTH contains + * sequences that are equivalent in both STRING and CHAR. + * + * Either way, the left-hand side corresponds to the input sequence (\x, + * \(xx, \*(xx and so on) whose length is listed second element. The + * right-hand side is what's produced by the front-end, with the fourth + * element being its length. + * + * XXX - C-escape strings! + * XXX - update LINES_MAX if adding more! + */ + +STRING("Am", 2, "&", 1) +STRING("Ba", 2, "|", 1) +STRING("Ge", 2, ">=", 2) +STRING("Gt", 2, ">", 1) +STRING("If", 2, "infinity", 8) +STRING("Le", 2, "<=", 2) +STRING("Lq", 2, "``", 2) +STRING("Lt", 2, "<", 1) +STRING("Na", 2, "NaN", 3) +STRING("Ne", 2, "!=", 2) +STRING("Pi", 2, "pi", 2) +STRING("Pm", 2, "+-", 2) +STRING("R", 1, "(R)", 3) +STRING("Rq", 2, "\'\'", 2) +STRING("Tm", 2, "tm", 2) +STRING("left-bracket", 12, "[", 1) +STRING("left-parenthesis", 16, "(", 1) +STRING("left-singlequote", 16, "`", 1) +STRING("lp", 2, "(", 1) +STRING("q", 1, "\"", 1) +STRING("quote-left", 10, "`", 1) +STRING("quote-right", 11, "\'", 1) +STRING("right-bracket", 13, "]", 1) +STRING("right-parenthesis", 17, ")", 1) +STRING("right-singlequote", 17, "\'", 1) +STRING("rp", 2, ")", 1) + +BOTH("<=", 2, "<=", 2) +BOTH(">=", 2, ">=", 2) +BOTH("aa", 2, "\'", 1) +BOTH("ga", 2, "`", 1) +BOTH("lq", 2, "``", 2) +BOTH("rq", 2, "\'\'", 2) +BOTH("ua", 2, "^", 1) + +CHAR(" ", 1, " ", 1) +CHAR("!=", 2, "!=", 2) +CHAR("%", 1, "", 0) +CHAR("&", 1, "", 0) +CHAR("(=", 2, "(=", 2) +CHAR("**", 2, "*", 1) +CHAR("*A", 2, "A", 1) +CHAR("*B", 2, "B", 1) +CHAR("*C", 2, "H", 1) +CHAR("*D", 2, "/\\", 2) +CHAR("*E", 2, "E", 1) +CHAR("*F", 2, "O_", 1) +CHAR("*G", 2, "|", 1) +CHAR("*H", 2, "O", 1) +CHAR("*I", 2, "I", 1) +CHAR("*K", 2, "K", 1) +CHAR("*L", 2, "/\\", 2) +CHAR("*M", 2, "M", 1) +CHAR("*N", 2, "N", 1) +CHAR("*O", 2, "O", 1) +CHAR("*P", 2, "TT", 2) +CHAR("*Q", 2, "Y", 1) +CHAR("*R", 2, "P", 1) +CHAR("*S", 2, ">", 1) +CHAR("*T", 2, "T", 1) +CHAR("*U", 2, "Y", 1) +CHAR("*W", 2, "O", 1) +CHAR("*X", 2, "X", 1) +CHAR("*Y", 2, "H", 1) +CHAR("*Z", 2, "Z", 1) +CHAR("*a", 2, "a", 1) +CHAR("*b", 2, "B", 1) +CHAR("*c", 2, "E", 1) +CHAR("*d", 2, "d", 1) +CHAR("*e", 2, "e", 1) +CHAR("*f", 2, "o", 1) +CHAR("*g", 2, "y", 1) +CHAR("*h", 2, "0", 1) +CHAR("*i", 2, "i", 1) +CHAR("*k", 2, "k", 1) +CHAR("*l", 2, "\\", 1) +CHAR("*m", 2, "u", 1) +CHAR("*n", 2, "v", 1) +CHAR("*o", 2, "o", 1) +CHAR("*p", 2, "n", 1) +CHAR("*q", 2, "u", 1) +CHAR("*r", 2, "p", 1) +CHAR("*s", 2, "o", 1) +CHAR("*t", 2, "t", 1) +CHAR("*u", 2, "u", 1) +CHAR("*w", 2, "w", 1) +CHAR("*x", 2, "x", 1) +CHAR("*y", 2, "n", 1) +CHAR("*z", 2, "C", 1) +CHAR("+-", 2, "+-", 2) +CHAR("+f", 2, "o", 1) +CHAR("+h", 2, "0", 1) +CHAR("+p", 2, "w", 1) +CHAR(",C", 2, "C", 1) +CHAR(",c", 2, "c", 1) +CHAR("-", 1, "-", 1) +CHAR("->", 2, "->", 2) +CHAR("-D", 2, "D", 1) +CHAR(".", 1, ".", 1) +CHAR("/L", 2, "L", 1) +CHAR("/O", 2, "O", 1) +CHAR("/l", 2, "l", 1) +CHAR("/o", 2, "o", 1) +CHAR("0", 1, " ", 1) +CHAR(":A", 2, "A", 1) +CHAR(":E", 2, "E", 1) +CHAR(":I", 2, "I", 1) +CHAR(":O", 2, "O", 1) +CHAR(":U", 2, "U", 1) +CHAR(":a", 2, "a", 1) +CHAR(":e", 2, "e", 1) +CHAR(":i", 2, "i", 1) +CHAR(":o", 2, "o", 1) +CHAR(":u", 2, "u", 1) +CHAR(":y", 2, "y", 1) +CHAR("<-", 2, "<-", 2) +CHAR("<=", 2, "<=", 2) +CHAR("<>", 2, "<>", 2) +CHAR("=)", 2, "=)", 2) +CHAR("==", 2, "==", 2) +CHAR("=~", 2, "=~", 2) +CHAR(">=", 2, ">=", 2) +CHAR("AE", 2, "AE", 2) +CHAR("AN", 2, "^", 1) +CHAR("Ah", 2, "N", 1) +CHAR("Bq", 2, ",,", 2) +CHAR("Cs", 2, "x", 1) +CHAR("Do", 2, "$", 1) +CHAR("Eu", 2, "EUR", 3) +CHAR("Fc", 2, ">>", 2) +CHAR("Fi", 2, "ffi", 3) +CHAR("Fl", 2, "ffl", 3) +CHAR("Fn", 2, "f", 1) +CHAR("Fo", 2, "<<", 2) +CHAR("Im", 2, "I", 1) +CHAR("OE", 2, "OE", 2) +CHAR("OR", 2, "v", 1) +CHAR("Po", 2, "L", 1) +CHAR("Re", 2, "R", 1) +CHAR("Sd", 2, "o", 1) +CHAR("TP", 2, "b", 1) +CHAR("Tp", 2, "b", 1) +CHAR("Ye", 2, "Y", 1) +CHAR("\'", 1, "\'", 1) +CHAR("\'A", 2, "A", 1) +CHAR("\'E", 2, "E", 1) +CHAR("\'I", 2, "I", 1) +CHAR("\'O", 2, "O", 1) +CHAR("\'U", 2, "U", 1) +CHAR("\'a", 2, "a", 1) +CHAR("\'e", 2, "e", 1) +CHAR("\'i", 2, "i", 1) +CHAR("\'o", 2, "o", 1) +CHAR("\'u", 2, "u", 1) +CHAR("\\", 1, "\\", 1) +CHAR("^", 1, "", 0) +CHAR("^A", 2, "A", 1) +CHAR("^E", 2, "E", 1) +CHAR("^I", 2, "I", 1) +CHAR("^O", 2, "O", 1) +CHAR("^U", 2, "U", 1) +CHAR("^a", 2, "a", 1) +CHAR("^e", 2, "e", 1) +CHAR("^i", 2, "i", 1) +CHAR("^o", 2, "o", 1) +CHAR("^u", 2, "u", 1) +CHAR("`", 1, "`", 1) +CHAR("`A", 2, "A", 1) +CHAR("`E", 2, "E", 1) +CHAR("`I", 2, "I", 1) +CHAR("`O", 2, "O", 1) +CHAR("`U", 2, "U", 1) +CHAR("`a", 2, "a", 1) +CHAR("`e", 2, "e", 1) +CHAR("`i", 2, "i", 1) +CHAR("`o", 2, "o", 1) +CHAR("`u", 2, "u", 1) +CHAR("a-", 2, "-", 1) +CHAR("a\"", 2, "\"", 1) +CHAR("a^", 2, "^", 1) +CHAR("aa", 2, "\'", 1) +CHAR("ab", 2, "`", 1) +CHAR("ac", 2, ",", 1) +CHAR("ad", 2, "\"", 1) +CHAR("ae", 2, "ae", 2) +CHAR("ah", 2, "v", 1) +CHAR("ao", 2, "o", 1) +CHAR("ap", 2, "~", 1) +CHAR("aq", 2, "\'", 1) +CHAR("a~", 2, "~", 1) +CHAR("ba", 2, "|", 1) +CHAR("bb", 2, "|", 1) +CHAR("bq", 2, ",", 1) +CHAR("bu", 2, "o", 1) +CHAR("c", 1, "", 0) +CHAR("ca", 2, "(^)", 3) +CHAR("ci", 2, "O", 1) +CHAR("co", 2, "(C)", 3) +CHAR("ct", 2, "c", 1) +CHAR("cu", 2, "U", 1) +CHAR("dA", 2, "v", 1) +CHAR("da", 2, "v", 1) +CHAR("dd", 2, "=", 1) +CHAR("de", 2, "o", 1) +CHAR("dg", 2, "-", 1) +CHAR("di", 2, "-:-", 3) +CHAR("e", 1, "\\", 1) +CHAR("em", 2, "--", 2) +CHAR("en", 2, "-", 1) +CHAR("eq", 2, "=", 1) +CHAR("es", 2, "{}", 2) +CHAR("eu", 2, "EUR", 3) +CHAR("fa", 2, "V", 1) +CHAR("fc", 2, ">", 1) +CHAR("ff", 2, "ff", 2) +CHAR("fi", 2, "fi", 2) +CHAR("fl", 2, "fl", 2) +CHAR("fo", 2, "<", 1) +CHAR("ga", 2, "`", 1) +CHAR("gr", 2, "V", 1) +CHAR("hA", 2, "<=>", 3) +CHAR("ho", 2, ",", 1) +CHAR("hy", 2, "-", 1) +CHAR("if", 2, "oo", 2) +CHAR("lA", 2, "<=", 2) +CHAR("lB", 2, "[", 1) +CHAR("lC", 2, "{", 1) +CHAR("la", 2, "<", 1) +CHAR("lh", 2, "<=", 2) +CHAR("mo", 2, "E", 1) +CHAR("mu", 2, "x", 1) +CHAR("na", 2, "NaN", 3) +CHAR("nm", 2, "E", 1) +CHAR("no", 2, "~", 1) +CHAR("oA", 2, "A", 1) +CHAR("oa", 2, "a", 1) +CHAR("oe", 2, "oe", 2) +CHAR("oq", 2, "`", 1) +CHAR("pd", 2, "a", 1) +CHAR("pl", 2, "+", 1) +CHAR("ps", 2, "9|", 2) +CHAR("r!", 2, "i", 1) +CHAR("r?", 2, "c", 1) +CHAR("rA", 2, "=>", 2) +CHAR("rB", 2, "]", 1) +CHAR("rC", 2, "}", 1) +CHAR("ra", 2, ">", 1) +CHAR("rg", 2, "(R)", 3) +CHAR("rh", 2, "=>", 2) +CHAR("sc", 2, "S", 1) +CHAR("ss", 2, "ss", 2) +CHAR("st", 2, "-)", 2) +CHAR("te", 2, "3", 1) +CHAR("tf", 2, ".:.", 3) +CHAR("tm", 2, "tm", 2) +CHAR("ts", 2, "s", 1) +CHAR("uA", 2, "^", 1) +CHAR("ua", 2, "^", 1) +CHAR("|", 1, "", 0) +CHAR("~", 1, " ", 1) +CHAR("~=", 2, "~=", 2) +CHAR("~A", 2, "A", 1) +CHAR("~N", 2, "N", 1) +CHAR("~O", 2, "O", 1) +CHAR("~a", 2, "a", 1) +CHAR("~n", 2, "n", 1) +CHAR("~o", 2, "o", 1) +CHAR("~~", 2, "~~", 2) diff --git a/html.c b/html.c index d9fa90d5..c8a4623c 100644 --- a/html.c +++ b/html.c @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.30 2009/09/16 22:17:27 kristaps Exp $ */ +/* $Id: html.c,v 1.31 2009/09/17 07:41:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -138,9 +138,11 @@ static void print_encode(const char *); static void print_text(struct html *, const char *); static int mdoc_root_pre(MDOC_ARGS); +static int mdoc_ar_pre(MDOC_ARGS); static int mdoc_fl_pre(MDOC_ARGS); static int mdoc_nd_pre(MDOC_ARGS); static int mdoc_nm_pre(MDOC_ARGS); +static int mdoc_ns_pre(MDOC_ARGS); static int mdoc_op_pre(MDOC_ARGS); static void mdoc_op_post(MDOC_ARGS); static int mdoc_pp_pre(MDOC_ARGS); @@ -165,7 +167,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* It */ {NULL, NULL}, /* Ad */ {NULL, NULL}, /* An */ - {NULL, NULL}, /* Ar */ + {mdoc_ar_pre, NULL}, /* Ar */ {NULL, NULL}, /* Cd */ {NULL, NULL}, /* Cm */ {NULL, NULL}, /* Dv */ @@ -222,7 +224,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Fx */ {NULL, NULL}, /* Ms */ {NULL, NULL}, /* No */ - {NULL, NULL}, /* Ns */ + {mdoc_ns_pre, NULL}, /* Ns */ {NULL, NULL}, /* Nx */ {NULL, NULL}, /* Ox */ {NULL, NULL}, /* Pc */ @@ -697,7 +699,7 @@ mdoc_nd_pre(MDOC_ARGS) { if (MDOC_BODY == n->type) - print_text(h, "--"); + print_text(h, "\\(en"); return(1); } @@ -785,3 +787,27 @@ mdoc_xr_pre(MDOC_ARGS) return(0); } + + +/* ARGSUSED */ +static int +mdoc_ns_pre(MDOC_ARGS) +{ + + h->flags |= HTML_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_ar_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + tag.key = ATTR_CLASS; + tag.val = "arg"; + + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} diff --git a/man_hash.c b/man_hash.c index 276320cb..2616b82c 100644 --- a/man_hash.c +++ b/man_hash.c @@ -1,4 +1,4 @@ -/* $Id: man_hash.c,v 1.13 2009/09/16 20:49:06 kristaps Exp $ */ +/* $Id: man_hash.c,v 1.14 2009/09/17 07:41:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -21,10 +21,12 @@ #include "libman.h" - static u_char table[26 * 6]; - +/* + * XXX - this hash has global scope, so if intended for use as a library + * with multiple callers, it will need re-invocation protection. + */ void man_hash_init(void) { @@ -49,7 +51,6 @@ man_hash_init(void) } } - int man_hash_find(const char *tmp) { diff --git a/mdoc_hash.c b/mdoc_hash.c index 757437c0..678ae0e3 100644 --- a/mdoc_hash.c +++ b/mdoc_hash.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_hash.c,v 1.10 2009/09/16 20:49:06 kristaps Exp $ */ +/* $Id: mdoc_hash.c,v 1.11 2009/09/17 07:41:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -27,7 +27,10 @@ static u_char table[27 * 12]; - +/* + * XXX - this hash has global scope, so if intended for use as a library + * with multiple callers, it will need re-invocation protection. + */ void mdoc_hash_init(void) { @@ -54,7 +57,6 @@ mdoc_hash_init(void) } } - int mdoc_hash_find(const char *p) { @@ -84,4 +86,3 @@ mdoc_hash_find(const char *p) return(MDOC_MAX); } - diff --git a/term.c b/term.c index 6bfd373d..d3c37f70 100644 --- a/term.c +++ b/term.c @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.100 2009/09/16 15:08:31 kristaps Exp $ */ +/* $Id: term.c,v 1.101 2009/09/17 07:41:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -20,6 +20,7 @@ #include #include +#include "chars.h" #include "term.h" #include "man.h" #include "mdoc.h" @@ -56,7 +57,7 @@ terminal_man(void *arg, const struct man *man) p = (struct termp *)arg; if (NULL == p->symtab) - p->symtab = term_ascii2htab(); + p->symtab = chars_init(CHARS_ASCII); man_run(p, man); } @@ -69,7 +70,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc) p = (struct termp *)arg; if (NULL == p->symtab) - p->symtab = term_ascii2htab(); + p->symtab = chars_init(CHARS_ASCII); mdoc_run(p, mdoc); } @@ -90,7 +91,7 @@ term_free(struct termp *p) if (p->buf) free(p->buf); if (TERMENC_ASCII == p->enc && p->symtab) - term_asciifree(p->symtab); + chars_free(p->symtab); free(p); } @@ -331,7 +332,7 @@ do_special(struct termp *p, const char *word, size_t len) size_t sz; int i; - rhs = term_a2ascii(p->symtab, word, len, &sz); + rhs = chars_a2ascii(p->symtab, word, len, &sz); if (NULL == rhs) { #if 0 @@ -354,7 +355,7 @@ do_reserved(struct termp *p, const char *word, size_t len) size_t sz; int i; - rhs = term_a2res(p->symtab, word, len, &sz); + rhs = chars_a2res(p->symtab, word, len, &sz); if (NULL == rhs) { #if 0 diff --git a/term.h b/term.h index f646dd53..5824f2a5 100644 --- a/term.h +++ b/term.h @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.46 2009/09/16 09:41:24 kristaps Exp $ */ +/* $Id: term.h,v 1.47 2009/09/17 07:41:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -48,11 +48,6 @@ struct termp { void *symtab; /* Encoded-symbol table. */ }; -void *term_ascii2htab(void); -const char *term_a2ascii(void *, const char *, size_t, size_t *); -const char *term_a2res(void *, const char *, size_t, size_t *); -void term_asciifree(void *); - void term_newln(struct termp *); void term_vspace(struct termp *); void term_word(struct termp *, const char *); -- cgit v1.2.3