Remove function calls to res() and so forth in term_word(). These were

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index ba4de8daf071218232386c3b288ea442c824deac..06a2a923f691958889c9142fdfbea4028c03c735 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*     $Id: chars.c,v 1.33 2011/03/17 08:49:34 kristaps Exp $ */
+/*     $Id: chars.c,v 1.43 2011/05/15 22:29:50 kristaps Exp $ */

 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -20,12 +20,13 @@
 #endif
 
 #include <assert.h>
 #endif
 
 #include <assert.h>

+#include <ctype.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"

-#include "chars.h"
+#include "libmandoc.h"

 
 #define        PRINT_HI         126
 #define        PRINT_LO         32
 
 #define        PRINT_HI         126
 #define        PRINT_LO         32


@@ -41,7 +42,7 @@ struct        ln {
 #define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 
 #define CHARS_BOTH      (CHARS_CHAR | CHARS_STRING)
 };
 

-#define        LINES_MAX         351
+#define        LINES_MAX         353

 
 #define CHAR(in, ch, code) \
        { NULL, (in), (ch), (code), CHARS_CHAR },
 
 #define CHAR(in, ch, code) \
        { NULL, (in), (ch), (code), CHARS_CHAR },


@@ -55,32 +56,26 @@ struct      ln {
 
 #include "chars.in"
 
 
 #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);
        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 const struct ln  *find(struct mchars *, const char *, size_t, int);

 
 void
 
 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;
        struct ln       **htab;
        struct ln        *pp;
        int               i, hash;


@@ -92,7 +87,7 @@ chars_init(enum chars type)
         * (they're in-line re-ordered during lookup).
         */
 
         * (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++) {
        htab = mandoc_calloc(PRINT_HI - PRINT_LO + 1, sizeof(struct ln **));
 
        for (i = 0; i < LINES_MAX; i++) {


@@ -109,7 +104,6 @@ chars_init(enum chars type)
        }
 
        tab->htab = htab;
        }
 
        tab->htab = htab;

-       tab->type = type;

        return(tab);
 }
 
        return(tab);
 }
 


@@ -118,11 +112,11 @@ chars_init(enum chars type)
  * Special character to Unicode codepoint.
  */
 int
  * 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;
 
 {
        const struct ln *ln;
 

-       ln = find((struct ctab *)arg, p, sz, CHARS_CHAR);
+       ln = find(arg, p, sz, CHARS_CHAR);

        if (NULL == ln)
                return(-1);
        return(ln->unicode);
        if (NULL == ln)
                return(-1);
        return(ln->unicode);


@@ -133,47 +127,43 @@ chars_spec2cp(void *arg, const char *p, size_t sz)
  * Reserved word to Unicode codepoint.
  */
 int
  * Reserved word to Unicode codepoint.
  */
 int

-chars_res2cp(void *arg, const char *p, size_t sz)
+mchars_res2cp(struct mchars *arg, const char *p, size_t sz)

 {
        const struct ln *ln;
 
 {
        const struct ln *ln;
 

-       ln = find((struct ctab *)arg, p, sz, CHARS_STRING);
+       ln = find(arg, p, sz, CHARS_STRING);

        if (NULL == ln)
                return(-1);
        return(ln->unicode);
 }
 
        if (NULL == ln)
                return(-1);
        return(ln->unicode);
 }
 

-

 /*
 /*

- * Numbered character to literal character,
- * represented as a null-terminated string for additional safety.
+ * Numbered character to literal character.
+ * 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'.

  */
  */

-const char *
-chars_num2char(const char *p, size_t sz)
+char
+mchars_num2char(const char *p, size_t sz)

 {
        int               i;
 {
        int               i;

-       static char       c[2];

 
 

-       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, 10)) < 0)
+               return('\0');

 
 

+       return(isprint(i) ? i : '\0');
+}

 
 /* 
  * Special character to string array.
  */
 const char *
 
 /* 
  * 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;
 
 {
        const struct ln *ln;
 

-       ln = find((struct ctab *)arg, p, sz, CHARS_CHAR);
+       ln = find(arg, p, sz, CHARS_CHAR);

        if (NULL == ln)
                return(NULL);
 
        if (NULL == ln)
                return(NULL);
 


@@ -181,16 +171,15 @@ chars_spec2str(void *arg, const char *p, size_t sz, size_t *rsz)
        return(ln->ascii);
 }
 
        return(ln->ascii);
 }
 

-

 /* 
  * Reserved word to string array.
  */
 const char *
 /* 
  * Reserved word to string array.
  */
 const char *

-chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz)
+mchars_res2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz)

 {
        const struct ln *ln;
 
 {
        const struct ln *ln;
 

-       ln = find((struct ctab *)arg, p, sz, CHARS_STRING);
+       ln = find(arg, p, sz, CHARS_STRING);

        if (NULL == ln)
                return(NULL);
 
        if (NULL == ln)
                return(NULL);
 


@@ -198,9 +187,8 @@ chars_res2str(void *arg, const char *p, size_t sz, size_t *rsz)
        return(ln->ascii);
 }
 
        return(ln->ascii);
 }
 

-

 static const struct ln *
 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, int type)

 {
        struct ln        *pp, *prev;
        struct ln       **htab;
 {
        struct ln        *pp, *prev;
        struct ln       **htab;


@@ -243,7 +231,6 @@ find(struct ctab *tab, const char *p, size_t sz, int type)
        return(NULL);
 }
 
        return(NULL);
 }
 

-

 static inline int
 match(const struct ln *ln, const char *p, size_t sz, int type)
 {
 static inline int
 match(const struct ln *ln, const char *p, size_t sz, int type)
 {