Make args_checkpunct() use mdoc_isdelim() instead of mdoc_iscdelim(),

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 32d2584e6d034ab55e9f4ac0dc3a424c39f74ba8..9354d376114d0fda1c0d588abc9fdaa6603a7c13 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc.c,v 1.173 2010/12/25 13:50:37 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.183 2011/03/15 13:23:33 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -99,12 +99,12 @@ static      int               node_append(struct mdoc *,
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 
-
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
 {
 
-       return(MDOC_HALT & m->flags ? NULL : m->first);
+       assert( ! (MDOC_HALT & m->flags));
+       return(m->first);
 }
 
 
@@ -112,7 +112,8 @@ const struct mdoc_meta *
 mdoc_meta(const struct mdoc *m)
 {
 
-       return(MDOC_HALT & m->flags ? NULL : &m->meta);
+       assert( ! (MDOC_HALT & m->flags));
+       return(&m->meta);
 }
 
 
@@ -137,6 +138,8 @@ mdoc_free1(struct mdoc *mdoc)
                free(mdoc->meta.vol);
        if (mdoc->meta.msec)
                free(mdoc->meta.msec);
+       if (mdoc->meta.date)
+               free(mdoc->meta.date);
 }
 
 
@@ -213,14 +216,61 @@ int
 mdoc_endparse(struct mdoc *m)
 {
 
-       if (MDOC_HALT & m->flags)
-               return(0);
-       else if (mdoc_macroend(m))
+       assert( ! (MDOC_HALT & m->flags));
+       if (mdoc_macroend(m))
                return(1);
        m->flags |= MDOC_HALT;
        return(0);
 }
 
+int
+mdoc_addeqn(struct mdoc *m, const struct eqn *ep)
+{
+       struct mdoc_node *n;
+
+       assert( ! (MDOC_HALT & m->flags));
+
+       /* No text before an initial macro. */
+
+       if (SEC_NONE == m->lastnamed) {
+               mdoc_pmsg(m, ep->line, ep->pos, MANDOCERR_NOTEXT);
+               return(1);
+       }
+
+       n = node_alloc(m, ep->line, ep->pos, MDOC_MAX, MDOC_EQN);
+       n->eqn = ep;
+
+       if ( ! node_append(m, n))
+               return(0);
+
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}
+
+int
+mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
+{
+       struct mdoc_node *n;
+
+       assert( ! (MDOC_HALT & m->flags));
+
+       /* No text before an initial macro. */
+
+       if (SEC_NONE == m->lastnamed) {
+               mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT);
+               return(1);
+       }
+
+       n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL);
+       n->span = sp;
+
+       if ( ! node_append(m, n))
+               return(0);
+
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}
+
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
@@ -230,8 +280,7 @@ int
 mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
 {
 
-       if (MDOC_HALT & m->flags)
-               return(0);
+       assert( ! (MDOC_HALT & m->flags));
 
        m->flags |= MDOC_NEWLINE;
 
@@ -277,15 +326,16 @@ mdoc_macro(MACRO_PROT_ARGS)
        /* If we're in the body, deny prologue calls. */
 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-                       MDOC_PBODY & m->flags)
-               return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));
+                       MDOC_PBODY & m->flags) {
+               mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY);
+               return(1);
+       }
 
        /* If we're in the prologue, deny "body" macros.  */
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
                        ! (MDOC_PBODY & m->flags)) {
-               if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
-                       return(0);
+               mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG);
                if (NULL == m->meta.msec)
                        m->meta.msec = mandoc_strdup("1");
                if (NULL == m->meta.title)
@@ -294,8 +344,9 @@ mdoc_macro(MACRO_PROT_ARGS)
                        m->meta.vol = mandoc_strdup("LOCAL");
                if (NULL == m->meta.os)
                        m->meta.os = mandoc_strdup("LOCAL");
-               if (0 == m->meta.date)
-                       m->meta.date = time(NULL);
+               if (NULL == m->meta.date)
+                       m->meta.date = mandoc_normdate(NULL,
+                           m->msg, m->data, line, ppos);
                m->flags |= MDOC_PBODY;
        }
 
@@ -370,6 +421,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        mdoc->last = p;
 
        switch (p->type) {
+       case (MDOC_TBL):
+               /* FALLTHROUGH */
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
@@ -524,7 +577,6 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
        return(1);
 }
 
-
 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 {
@@ -629,13 +681,17 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        if ('\\' == buf[offs] && 
                        '.' == buf[offs + 1] && 
-                       '"' == buf[offs + 2])
-               return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
+                       '"' == buf[offs + 2]) {
+               mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);
+               return(1);
+       }
 
        /* No text before an initial macro. */
 
-       if (SEC_NONE == m->lastnamed)
-               return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));
+       if (SEC_NONE == m->lastnamed) {
+               mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT);
+               return(1);
+       }
 
        assert(m->last);
        n = m->last;
@@ -710,12 +766,10 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
-               if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE))
-                       return(0);
+               mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);
 
        if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {
-               if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN))
-                       return(0);
+               mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN);
 
                /*
                 * Insert a `sp' in the case of a blank line.  Technically,
@@ -815,8 +869,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
         */
 
        if ('\0' == buf[i] && ' ' == buf[i - 1])
-               if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-                       goto err;
+               mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);
 
        /*
         * If an initial macro or a list invocation, divert directly