Finished initial parse sequence.

[mandoc.git] / mdocml.c

diff --git a/mdocml.c b/mdocml.c
index 57932a935c74ca126fc135a1ae61150d48c77f5c..7ebd50a0149976835da02ec344c842fdd71d9c0f 100644 (file)
--- a/mdocml.c
+++ b/mdocml.c
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.31 2009/01/01 20:40:16 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.34 2009/01/05 16:11:14 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -206,8 +206,11 @@ print_node(const struct mdoc_node *n, int indent)
                p = mdoc_macronames[n->data.head.tok];
                t = "block-head";
                break;
                p = mdoc_macronames[n->data.head.tok];
                t = "block-head";
                break;

+       case (MDOC_TAIL):
+               p = mdoc_macronames[n->data.tail.tok];
+               t = "block-tail";
+               break;

        case (MDOC_ELEM):
        case (MDOC_ELEM):

-               assert(NULL == n->child);

                p = mdoc_macronames[n->data.elem.tok];
                t = "element";
                argv = n->data.elem.argv;
                p = mdoc_macronames[n->data.elem.tok];
                t = "element";
                argv = n->data.elem.argv;


@@ -398,8 +401,17 @@ msg_err(void *arg, int tok, int col, enum mdoc_err type)
        case (ERR_SYNTAX_ARGMANY):
                lit = "syntax: too many values for macro argument";
                break;
        case (ERR_SYNTAX_ARGMANY):
                lit = "syntax: too many values for macro argument";
                break;

-       case (ERR_CHILD_HEAD):
-               lit = "scope context expects block-header child";
+       case (ERR_SYNTAX_CHILDHEAD):
+               lit = "syntax: expected only block-header section";
+               break;
+       case (ERR_SYNTAX_CHILDBODY):
+               lit = "syntax: expected only a block-body section";
+               break;
+       case (ERR_SYNTAX_EMPTYHEAD):
+               lit = "syntax: block-header section may not be empty";
+               break;
+       case (ERR_SYNTAX_EMPTYBODY):
+               lit = "syntax: block-body section may not be empty";

                break;
        default:
                abort();
                break;
        default:
                abort();


@@ -489,6 +501,9 @@ msg_warn(void *arg, int tok, int col, enum mdoc_warn type)
        case (WARN_SYNTAX_ARGLIKE):
                lit = "syntax: argument-like value";
                break;
        case (WARN_SYNTAX_ARGLIKE):
                lit = "syntax: argument-like value";
                break;

+       case (WARN_SYNTAX_EMPTYBODY):
+               lit = "syntax: empty block-body section";
+               break;

        case (WARN_SEC_OO):
                lit = "section is out of conventional order";
                break;
        case (WARN_SEC_OO):
                lit = "section is out of conventional order";
                break;