Remove predefined strings from the chars.in file, as they're now local

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index aa6de429dd3f72cdbd683648fa13846283397c01..b32c5bbaa261861de2a1550a33c5eddd1c89eac4 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,6 +1,7 @@
-/*     $Id: chars.c,v 1.24 2010/07/26 13:59:00 kristaps Exp $ */
+/*     $Id: chars.c,v 1.45 2011/05/24 21:24:16 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -19,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


@@ -34,52 +36,37 @@ struct      ln {
        const char       *code;
        const char       *ascii;
        int               unicode;
        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         370
+#define        LINES_MAX         325

 
 #define CHAR(in, ch, code) \
 
 #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"
 
 
 #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;
 };
 
        struct ln       **htab;
 };
 

-static inline int        match(const struct ln *,
-                               const char *, size_t, int);
-static const struct ln  *find(struct tbl *, 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
 
 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;
        struct ln       **htab;
        struct ln        *pp;
        int               i, hash;


@@ -91,17 +78,8 @@ chars_init(enum chars type)
         * (they're in-line re-ordered during lookup).
         */
 
         * (they're in-line re-ordered during lookup).
         */
 

-       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;
 
        for (i = 0; i < LINES_MAX; i++) {
                hash = (int)lines[i].code[0] - PRINT_LO;


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

-       tab->type = type;

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


@@ -126,11 +103,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 tbl *)arg, p, sz, CHARS_CHAR);
+       ln = find(arg, p, sz);

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


@@ -141,26 +118,57 @@ 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 tbl *)arg, p, sz, CHARS_STRING);
+       ln = find(arg, p, sz);

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

+/*
+ * 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'.
+ */
+char
+mchars_num2char(const char *p, size_t sz)
+{
+       int               i;
+
+       if ((i = mandoc_strntou(p, sz, 10)) < 0)
+               return('\0');
+       return(isprint(i) ? i : '\0');
+}
+
+/*
+ * Hex character string to Unicode codepoint.
+ * If the character is illegal, returns '\0'.
+ */
+int
+mchars_num2uc(const char *p, size_t sz)
+{
+       int               i;
+
+       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 *
 
 /* 
  * 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 tbl *)arg, p, sz, CHARS_CHAR);
+       ln = find(arg, p, sz);

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


@@ -168,16 +176,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 tbl *)arg, p, sz, CHARS_STRING);
+       ln = find(arg, p, sz);

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


@@ -185,9 +192,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 tbl *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;
 {
        struct ln        *pp, *prev;
        struct ln       **htab;


@@ -213,7 +219,7 @@ find(struct tbl *tab, const char *p, size_t sz, int type)
                return(NULL);
 
        for (prev = NULL; pp; pp = pp->next) {
                return(NULL);
 
        for (prev = NULL; pp; pp = pp->next) {

-               if ( ! match(pp, p, sz, type)) {
+               if ( ! match(pp, p, sz)) {

                        prev = pp;
                        continue;
                }
                        prev = pp;
                        continue;
                }


@@ -230,13 +236,10 @@ find(struct tbl *tab, const char *p, size_t sz, int type)
        return(NULL);
 }
 
        return(NULL);
 }
 

-

 static inline int
 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]);
        if (strncmp(ln->code, p, sz))
                return(0);
        return('\0' == ln->code[(int)sz]);