Finished initial parse sequence.

[mandoc.git] / mdocml.c

diff --git a/mdocml.c b/mdocml.c
index 0f3737f1c156e56436dcd0f1a2a68269a649ab58..7ebd50a0149976835da02ec344c842fdd71d9c0f 100644 (file)
--- a/mdocml.c
+++ b/mdocml.c
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.24 2008/12/23 05:30:49 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>
  *


@@ -181,18 +181,21 @@ buf_begin(struct md_parse *p)
 static void
 print_node(const struct mdoc_node *n, int indent)
 {
 static void
 print_node(const struct mdoc_node *n, int indent)
 {

-       const char      *p, *t;
-       int              i, j;
-       size_t           argc;
-       struct mdoc_arg *argv;
+       const char       *p, *t;
+       int               i, j;
+       size_t            argc, sz;
+       char            **params;
+       struct mdoc_arg  *argv;

 
        argv = NULL;
        argc = 0;
 
        argv = NULL;
        argc = 0;

+       params = NULL;
+       sz = 0;

 
        switch (n->type) {
        case (MDOC_TEXT):
                assert(NULL == n->child);
 
        switch (n->type) {
        case (MDOC_TEXT):
                assert(NULL == n->child);

-               p = "<text>";
+               p = n->data.text.string;

                t = "text";
                break;
        case (MDOC_BODY):
                t = "text";
                break;
        case (MDOC_BODY):


@@ -203,12 +206,17 @@ 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;
                argc = n->data.elem.argc;
                p = mdoc_macronames[n->data.elem.tok];
                t = "element";
                argv = n->data.elem.argv;
                argc = n->data.elem.argc;

+               params = n->data.elem.args;
+               sz = n->data.elem.sz;

                break;
        case (MDOC_BLOCK):
                p = mdoc_macronames[n->data.block.tok];
                break;
        case (MDOC_BLOCK):
                p = mdoc_macronames[n->data.block.tok];


@@ -231,6 +239,9 @@ print_node(const struct mdoc_node *n, int indent)
                        (void)printf(" \"%s\"", argv[i].value[j]);
        }
 
                        (void)printf(" \"%s\"", argv[i].value[j]);
        }
 

+       for (i = 0; i < (int)sz; i++)
+               (void)printf(" \"%s\"", params[i]);
+

        (void)printf("\n");
 
        if (n->child)
        (void)printf("\n");
 
        if (n->child)


@@ -326,10 +337,13 @@ msg_err(void *arg, int tok, int col, enum mdoc_err type)
        case (ERR_SYNTAX_WS):
                lit = "syntax: whitespace in argument";
                break;
        case (ERR_SYNTAX_WS):
                lit = "syntax: whitespace in argument";
                break;

-       case (ERR_SYNTAX_ARGS):
+       case (ERR_SYNTAX_ARGFORM):

                fmt = "syntax: macro `%s' arguments malformed";
                break;
                fmt = "syntax: macro `%s' arguments malformed";
                break;

-       case (ERR_SYNTAX_BADARG):
+       case (ERR_SYNTAX_NOPUNCT):
+               fmt = "syntax: macro `%s' doesn't understand punctuation";
+               break;
+       case (ERR_SYNTAX_ARG):

                fmt = "syntax: unknown argument for macro `%s'";
                break;
        case (ERR_SCOPE_BREAK):
                fmt = "syntax: unknown argument for macro `%s'";
                break;
        case (ERR_SCOPE_BREAK):


@@ -339,6 +353,9 @@ msg_err(void *arg, int tok, int col, enum mdoc_err type)
        case (ERR_SCOPE_NOCTX):
                fmt = "scope: closure macro `%s' has no context";
                break;
        case (ERR_SCOPE_NOCTX):
                fmt = "scope: closure macro `%s' has no context";
                break;

+       case (ERR_SCOPE_NONEST):
+               fmt = "scope: macro `%s' may not be nested in the current context";
+               break;

        case (ERR_MACRO_NOTSUP):
                fmt = "macro `%s' not supported";
                break;
        case (ERR_MACRO_NOTSUP):
                fmt = "macro `%s' not supported";
                break;


@@ -351,9 +368,18 @@ msg_err(void *arg, int tok, int col, enum mdoc_err type)
        case (ERR_SEC_NPROLOGUE):
                fmt = "macro `%s' called outside of prologue";
                break;
        case (ERR_SEC_NPROLOGUE):
                fmt = "macro `%s' called outside of prologue";
                break;

+       case (ERR_ARGS_EQ0):
+               fmt = "macro `%s' expects zero arguments";
+               break;
+       case (ERR_ARGS_EQ1):
+               fmt = "macro `%s' expects one argument";
+               break;

        case (ERR_ARGS_GE1):
                fmt = "macro `%s' expects one or more arguments";
                break;
        case (ERR_ARGS_GE1):
                fmt = "macro `%s' expects one or more arguments";
                break;

+       case (ERR_ARGS_LE2):
+               fmt = "macro `%s' expects two or fewer arguments";
+               break;

        case (ERR_ARGS_MANY):
                fmt = "macro `%s' has too many arguments";
                break;
        case (ERR_ARGS_MANY):
                fmt = "macro `%s' has too many arguments";
                break;


@@ -369,9 +395,24 @@ msg_err(void *arg, int tok, int col, enum mdoc_err type)
        case (ERR_SYNTAX_ARGVAL):
                lit = "syntax: expected value for macro argument";
                break;
        case (ERR_SYNTAX_ARGVAL):
                lit = "syntax: expected value for macro argument";
                break;

+       case (ERR_SYNTAX_ARGBAD):
+               lit = "syntax: invalid value for macro argument";
+               break;

        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_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();
                /* NOTREACHED */
        default:
                abort();
                /* NOTREACHED */


@@ -451,18 +492,39 @@ msg_warn(void *arg, int tok, int col, enum mdoc_warn type)
        case (WARN_SYNTAX_WS_EOLN):
                lit = "syntax: whitespace at end-of-line";
                break;
        case (WARN_SYNTAX_WS_EOLN):
                lit = "syntax: whitespace at end-of-line";
                break;

+       case (WARN_SYNTAX_QUOTED):
+               lit = "syntax: quotation mark starting string";
+               break;

        case (WARN_SYNTAX_MACLIKE):
                lit = "syntax: macro-like argument";
                break;
        case (WARN_SYNTAX_ARGLIKE):
                lit = "syntax: argument-like value";
                break;
        case (WARN_SYNTAX_MACLIKE):
                lit = "syntax: macro-like argument";
                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_ARGS_GE1):
                fmt = "macro `%s' suggests one or more arguments";
                break;
        case (WARN_SEC_OO):
                lit = "section is out of conventional order";
                break;
        case (WARN_ARGS_GE1):
                fmt = "macro `%s' suggests one or more arguments";
                break;

+       case (WARN_ARGS_EQ0):
+               fmt = "macro `%s' suggests zero arguments";
+               break;
+       case (WARN_IGN_AFTER_BLK):
+               fmt = "ignore: macro `%s' ignored after block macro";
+               break;
+       case (WARN_IGN_OBSOLETE):
+               fmt = "ignore: macro `%s' is obsolete";
+               break;
+       case (WARN_IGN_BEFORE_BLK):
+               fmt = "ignore: macro before block macro `%s' ignored";
+               break;
+       case (WARN_COMPAT_TROFF):
+               fmt = "compat: macro `%s' behaves differently in troff and nroff";
+               break;

        default:
                abort();
                /* NOTREACHED */
        default:
                abort();
                /* NOTREACHED */