Tiny edit required after MDOC_HALT change.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index d4f8b49c040e07479559dd3c6c18479114d66376..af3952172099b7f2e85ae05c1c40905cdd5d276f 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.174 2011/01/01 10:51:30 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.177 2011/01/03 11:27:33 kristaps Exp $ */

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


@@ -98,13 +98,16 @@ static      int               node_append(struct mdoc *,
                                struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
                                struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);

+static int               mdoc_span_alloc(struct mdoc *, 
+                               const struct tbl_span *);

 
 
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
 {
 
 
 
 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 +115,8 @@ const struct mdoc_meta *
 mdoc_meta(const struct mdoc *m)
 {
 
 mdoc_meta(const struct mdoc *m)
 {
 

-       return(MDOC_HALT & m->flags ? NULL : &m->meta);
+       assert( ! (MDOC_HALT & m->flags));
+       return(&m->meta);

 }
 
 
 }
 
 


@@ -213,14 +217,30 @@ int
 mdoc_endparse(struct mdoc *m)
 {
 
 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);
 }
 
                return(1);
        m->flags |= MDOC_HALT;
        return(0);
 }
 

+int
+mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
+{
+
+       assert( ! (MDOC_HALT & m->flags));
+
+       /* No text before an initial macro. */
+
+       if (SEC_NONE == m->lastnamed) {
+               /* FIXME: grab from span. */
+               mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT);
+               return(1);
+       }
+
+       return(mdoc_span_alloc(m, sp));
+}
+

 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to


@@ -230,8 +250,7 @@ int
 mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
 {
 
 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;
 
 
        m->flags |= MDOC_NEWLINE;
 


@@ -371,6 +390,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        mdoc->last = p;
 
        switch (p->type) {
        mdoc->last = p;
 
        switch (p->type) {

+       case (MDOC_TBL):
+               /* FALLTHROUGH */

        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);


@@ -525,6 +546,22 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
        return(1);
 }
 
        return(1);
 }
 

+static int
+mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp)
+{
+       struct mdoc_node *n;
+
+       /* FIXME: grab from tbl_span. */
+       n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL);
+       n->span = sp;
+
+       if ( ! node_append(m, n))
+               return(0);
+
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}
+

 
 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 
 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)