Remove asciisz from chars.in. It frees up a nice chunk of memory and at

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 4848b04574db59aeb91cf31037d6ef5216caa5ef..bcc6e4ca8434e9415d817c49f0283a7c79298808 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc.c,v 1.149 2010/06/27 15:52:41 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.159 2010/07/18 17:00:26 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 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
@@ -29,7 +30,6 @@
 #include <time.h>
 
 #include "mandoc.h"
-#include "regs.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 
@@ -192,8 +192,8 @@ mdoc_free(struct mdoc *mdoc)
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *
-mdoc_alloc(const struct regset *regs, 
-               void *data, int pflags, mandocmsg msg)
+mdoc_alloc(struct regset *regs, void *data, 
+               int pflags, mandocmsg msg)
 {
        struct mdoc     *p;
 
@@ -239,6 +239,20 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
                return(0);
 
        m->flags |= MDOC_NEWLINE;
+
+       /*
+        * Let the roff nS register switch SYNOPSIS mode early,
+        * such that the parser knows at all times
+        * whether this mode is on or off.
+        * Note that this mode is also switched by the Sh macro.
+        */
+       if (m->regs->regs[(int)REG_nS].set) {
+               if (m->regs->regs[(int)REG_nS].v.u)
+                       m->flags |= MDOC_SYNOPSIS;
+               else
+                       m->flags &= ~MDOC_SYNOPSIS;
+       }
+
        return(('.' == buf[offs] || '\'' == buf[offs]) ? 
                        mdoc_pmacro(m, ln, buf, offs) :
                        mdoc_ptext(m, ln, buf, offs));
@@ -332,6 +346,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
                p->parent->tail = p;
                break;
        case (MDOC_BODY):
+               if (p->end)
+                       break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->body = p;
                break;
@@ -368,9 +384,17 @@ node_alloc(struct mdoc *m, int line, int pos,
        p->pos = pos;
        p->tok = tok;
        p->type = type;
+
+       /* Flag analysis. */
+
+       if (MDOC_SYNOPSIS & m->flags)
+               p->flags |= MDOC_SYNPRETTY;
+       else
+               p->flags &= ~MDOC_SYNPRETTY;
        if (MDOC_NEWLINE & m->flags)
                p->flags |= MDOC_LINE;
        m->flags &= ~MDOC_NEWLINE;
+
        return(p);
 }
 
@@ -417,6 +441,22 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 }
 
 
+int
+mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok,
+               struct mdoc_node *body, enum mdoc_endbody end)
+{
+       struct mdoc_node *p;
+
+       p = node_alloc(m, line, pos, tok, MDOC_BODY);
+       p->pending = body;
+       p->end = end;
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}
+
+
 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
                enum mdoct tok, struct mdoc_arg *args)
@@ -474,10 +514,26 @@ mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 }
 
 
-void
+static void
 mdoc_node_free(struct mdoc_node *p)
 {
 
+       /*
+        * XXX: if these end up being problematic in terms of memory
+        * management and dereferencing freed blocks, then make them
+        * into reference-counted double-pointers.
+        */
+
+       if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
+               if (p->data.Bd)
+                       free(p->data.Bd);
+       if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
+               if (p->data.Bl)
+                       free(p->data.Bl);
+       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
+               if (p->data.Bf)
+                       free(p->data.Bf);
+
        if (p->string)
                free(p->string);
        if (p->args)
@@ -570,7 +626,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl.type) {
+                       LIST_column == n->data.Bl->type) {
                /* `Bl' is open without any children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -579,7 +635,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl.type) {
+                       LIST_column == n->parent->data.Bl->type) {
                /* `Bl' has block-level `It' children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -665,7 +721,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        assert(buf < end);
 
-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))
                m->last->flags |= MDOC_EOS;
 
        return(1);
@@ -691,7 +747,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
  * Parse a macro line, that is, a line beginning with the control
  * character.
  */
-int
+static int
 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {
        enum mdoct        tok;
@@ -785,7 +841,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl.type) {
+                       LIST_column == n->data.Bl->type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
                        goto err;
@@ -801,7 +857,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl.type) {
+                       LIST_column == n->parent->data.Bl->type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
                        goto err;