Unify some node handling functions that use TOKEN_NONE.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index d37ab8a4fb467d6ed71d15518124a386bf836389..a397fafcfd64723534ab2fb2fc2d6083f285d4a4 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.247 2015/04/19 13:50:26 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.249 2015/04/19 14:25:41 schwarze Exp $ */

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


@@ -36,6 +36,7 @@
 #include "libmdoc.h"
 
 const  char *const __mdoc_macronames[MDOC_MAX + 1] = {
 #include "libmdoc.h"
 
 const  char *const __mdoc_macronames[MDOC_MAX + 1] = {

+       "text",

        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",


@@ -66,8 +67,8 @@ const char *const __mdoc_macronames[MDOC_MAX + 1] = {
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "br",           "sp",
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "br",           "sp",

-       "%U",           "Ta",           "ll",           "text",
-       };
+       "%U",           "Ta",           "ll",
+};

 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "split",                "nosplit",              "ragged",
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "split",                "nosplit",              "ragged",


@@ -81,7 +82,7 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "symbolic",             "nested",               "centered"
        };
 
        "symbolic",             "nested",               "centered"
        };
 

-const  char * const *mdoc_macronames = __mdoc_macronames;
+const  char * const *mdoc_macronames = __mdoc_macronames + 1;

 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static int               mdoc_ptext(struct roff_man *, int, char *, int);
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static int               mdoc_ptext(struct roff_man *, int, char *, int);


@@ -95,31 +96,6 @@ mdoc_endparse(struct roff_man *mdoc)
        mdoc_macroend(mdoc);
 }
 
        mdoc_macroend(mdoc);
 }
 

-void
-mdoc_addeqn(struct roff_man *mdoc, const struct eqn *ep)
-{
-       struct roff_node *n;
-
-       n = roff_node_alloc(mdoc, ep->ln, ep->pos, ROFFT_EQN, MDOC_MAX);
-       n->eqn = ep;
-       if (ep->ln > mdoc->last->line)
-               n->flags |= MDOC_LINE;
-       roff_node_append(mdoc, n);
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-
-void
-mdoc_addspan(struct roff_man *mdoc, const struct tbl_span *sp)
-{
-       struct roff_node *n;
-
-       n = roff_node_alloc(mdoc, sp->line, 0, ROFFT_TBL, MDOC_MAX);
-       n->span = sp;
-       roff_node_append(mdoc, n);
-       mdoc_valid_post(mdoc);
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-

 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).


@@ -150,7 +126,7 @@ mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs)
 void
 mdoc_macro(MACRO_PROT_ARGS)
 {
 void
 mdoc_macro(MACRO_PROT_ARGS)
 {

-       assert(tok < MDOC_MAX);
+       assert(tok > TOKEN_NONE && tok < MDOC_MAX);

 
        if (mdoc->flags & MDOC_PBODY) {
                if (tok == MDOC_Dt) {
 
        if (mdoc->flags & MDOC_PBODY) {
                if (tok == MDOC_Dt) {


@@ -253,33 +229,6 @@ mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos,
        mdoc->next = ROFF_NEXT_CHILD;
 }
 
        mdoc->next = ROFF_NEXT_CHILD;
 }
 

-void
-mdoc_word_alloc(struct roff_man *mdoc, int line, int pos, const char *p)
-{
-       struct roff_node *n;
-
-       n = roff_node_alloc(mdoc, line, pos, ROFFT_TEXT, MDOC_MAX);
-       n->string = roff_strdup(mdoc->roff, p);
-       roff_node_append(mdoc, n);
-       mdoc_valid_post(mdoc);
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-
-void
-mdoc_word_append(struct roff_man *mdoc, const char *p)
-{
-       struct roff_node        *n;
-       char                    *addstr, *newstr;
-
-       n = mdoc->last;
-       addstr = roff_strdup(mdoc->roff, p);
-       mandoc_asprintf(&newstr, "%s %s", n->string, addstr);
-       free(addstr);
-       free(n->string);
-       n->string = newstr;
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-

 void
 mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)
 {
 void
 mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)
 {


@@ -386,7 +335,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                return(1);
        }
 
                return(1);
        }
 

-       mdoc_word_alloc(mdoc, line, offs, buf+offs);
+       roff_word_alloc(mdoc, line, offs, buf+offs);

 
        if (mdoc->flags & MDOC_LITERAL)
                return(1);
 
        if (mdoc->flags & MDOC_LITERAL)
                return(1);


@@ -430,9 +379,9 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 
        mac[i] = '\0';
 
 
        mac[i] = '\0';
 

-       tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+       tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE;

 
 

-       if (tok == MDOC_MAX) {
+       if (tok == TOKEN_NONE) {

                mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
                    ln, sv, buf + sv - 1);
                return(1);
                mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
                    ln, sv, buf + sv - 1);
                return(1);