Moved prologue-pruning into action.c.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index e1df0b7389d3b69befddcc6b9a11c5685dfc3cb8..247f759347d252ea3409955b4a88f692800f52c3 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.35 2009/01/17 20:10:36 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.39 2009/01/20 12:51:28 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -205,7 +205,6 @@ static      void              argfree(size_t, struct mdoc_arg *);
 static void              argcpy(struct mdoc_arg *, 
                                const struct mdoc_arg *);
 
-static void              mdoc_node_freelist(struct mdoc_node *);
 static int               mdoc_node_append(struct mdoc *, 
                                struct mdoc_node *);
 static void              mdoc_elem_free(struct mdoc_elem *);
@@ -213,23 +212,18 @@ static    void              mdoc_text_free(struct mdoc_text *);
 
 
 const struct mdoc_node *
-mdoc_result(struct mdoc *mdoc)
+mdoc_node(struct mdoc *mdoc)
 {
 
        return(mdoc->first);
 }
 
 
-void
-mdoc_meta_free(struct mdoc *mdoc)
+const struct mdoc_meta *
+mdoc_meta(struct mdoc *mdoc)
 {
 
-       if (mdoc->meta.title)
-               free(mdoc->meta.title);
-       if (mdoc->meta.os)
-               free(mdoc->meta.os);
-       if (mdoc->meta.name)
-               free(mdoc->meta.name);
+       return(&mdoc->meta);
 }
 
 
@@ -241,7 +235,13 @@ mdoc_free(struct mdoc *mdoc)
                mdoc_node_freelist(mdoc->first);
        if (mdoc->htab)
                mdoc_tokhash_free(mdoc->htab);
-       
+       if (mdoc->meta.title)
+               free(mdoc->meta.title);
+       if (mdoc->meta.os)
+               free(mdoc->meta.os);
+       if (mdoc->meta.name)
+               free(mdoc->meta.name);
+
        free(mdoc);
 }
 
@@ -295,14 +295,15 @@ mdoc_parseln(struct mdoc *mdoc, int line, char *buf)
        if (MDOC_HALT & mdoc->flags)
                return(0);
 
+       mdoc->linetok = 0;
+
        if ('.' != *buf) {
-               if (SEC_PROLOGUE != mdoc->sec_lastn) {
-                       if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
-                               return(0);
-                       mdoc->next = MDOC_NEXT_SIBLING;
-                       return(1);
-               }
-               return(mdoc_perr(mdoc, line, 0, "text disallowed"));
+               if ( ! (MDOC_BODYPARSE & mdoc->flags))
+                       return(mdoc_perr(mdoc, line, 0, "text disallowed"));
+               if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;
+               return(1);
        }
 
        if (buf[1] && '\\' == buf[1])
@@ -400,8 +401,8 @@ mdoc_macro(struct mdoc *mdoc, int tok,
        assert(mdoc_macros[tok].fp);
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
-                       SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_perr(mdoc, ln, ppos, "macro disallowed in document prologue"));
+                       ! (MDOC_BODYPARSE & mdoc->flags))
+               return(mdoc_perr(mdoc, ln, ppos, "macro disallowed: not in document body"));
        if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
                return(mdoc_perr(mdoc, ln, ppos, "macro not callable"));
        return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf));
@@ -417,6 +418,26 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
        assert(mdoc->first);
        assert(MDOC_ROOT != p->type);
 
+       /* See if we exceed the suggest line-max. */
+
+       switch (p->type) {
+       case (MDOC_TEXT):
+               /* FALLTHROUGH */
+       case (MDOC_ELEM):
+               /* FALLTHROUGH */
+       case (MDOC_BLOCK):
+               mdoc->linetok++;
+               break;
+       default:
+               break;
+       }
+
+       if (mdoc->linetok > MDOC_LINEARG_SOFTMAX) 
+               if ( ! mdoc_nwarn(mdoc, p, WARN_COMPAT, 
+                                       "suggested %d tokens per line exceeded (has %d)",
+                                       MDOC_LINEARG_SOFTMAX, mdoc->linetok))
+                       return(0);
+
        if (MDOC_TEXT == mdoc->last->type)
                on = "<text>";
        else if (MDOC_ROOT == mdoc->last->type)
@@ -671,7 +692,7 @@ mdoc_node_free(struct mdoc_node *p)
 }
 
 
-static void
+void
 mdoc_node_freelist(struct mdoc_node *p)
 {
 
@@ -725,6 +746,7 @@ argdup(size_t argsz, const struct mdoc_arg *args)
 }
 
 
+/* FIXME: deprecate. */
 char *
 mdoc_node2a(struct mdoc_node *node)
 {
@@ -741,6 +763,7 @@ mdoc_node2a(struct mdoc_node *node)
                (void)xstrlcat(buf, node->data.text.string, 64);
        else
                (void)xstrlcat(buf, mdoc_macronames[node->tok], 64);
+       (void)xstrlcat(buf, "'", 64);
 
        return(buf);
 }