Modernize an example showing antiquated syntax,

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index a1cea0ef3c030302a176362d7e28bcc22846a089..0946ee6eb5788ab17ec0ed63bbc5b86750b5d40a 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_macro.c,v 1.214 2017/02/11 14:11:17 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.223 2017/05/05 15:17:32 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -46,21 +46,21 @@ static      void            phrase_ta(MACRO_PROT_ARGS);
 static void            append_delims(struct roff_man *, int, int *, char *);
 static void            dword(struct roff_man *, int, int, const char *,
                                enum mdelim, int);
 static void            append_delims(struct roff_man *, int, int *, char *);
 static void            dword(struct roff_man *, int, int, const char *,
                                enum mdelim, int);

-static int             find_pending(struct roff_man *, int, int, int,
-                               struct roff_node *);
+static int             find_pending(struct roff_man *, enum roff_tok,
+                               int, int, struct roff_node *);

 static int             lookup(struct roff_man *, int, int, int, const char *);
 static int             macro_or_word(MACRO_PROT_ARGS, int);
 static void            break_intermediate(struct roff_node *,
 static int             lookup(struct roff_man *, int, int, int, const char *);
 static int             macro_or_word(MACRO_PROT_ARGS, int);
 static void            break_intermediate(struct roff_node *,

-                           struct roff_node *);
-static int             parse_rest(struct roff_man *, int, int, int *, char *);
-static int             rew_alt(int);
-static void            rew_elem(struct roff_man *, int);
+                               struct roff_node *);
+static int             parse_rest(struct roff_man *, enum roff_tok,
+                               int, int *, char *);
+static enum roff_tok   rew_alt(enum roff_tok);
+static void            rew_elem(struct roff_man *, enum roff_tok);

 static void            rew_last(struct roff_man *, const struct roff_node *);
 static void            rew_pending(struct roff_man *,
                                const struct roff_node *);
 
 static void            rew_last(struct roff_man *, const struct roff_node *);
 static void            rew_pending(struct roff_man *,
                                const struct roff_node *);
 

-const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */
+const  struct mdoc_macro __mdoc_macros[MDOC_MAX - MDOC_Dd] = {

        { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */


@@ -76,6 +76,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */

+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */


@@ -196,14 +197,10 @@ const     struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
        { in_line_eoln, MDOC_JOIN }, /* %Q */
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
        { in_line_eoln, MDOC_JOIN }, /* %Q */

-       { in_line_eoln, 0 }, /* br */
-       { in_line_eoln, 0 }, /* sp */

        { in_line_eoln, 0 }, /* %U */
        { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */
        { in_line_eoln, 0 }, /* %U */
        { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */

-       { in_line_eoln, MDOC_PROLOGUE }, /* ll */

 };
 };

-
-const  struct mdoc_macro * const mdoc_macros = __mdoc_macros;
+const  struct mdoc_macro *const mdoc_macros = __mdoc_macros - MDOC_Dd;

 
 
 /*
 
 
 /*


@@ -225,7 +222,7 @@ mdoc_endparse(struct roff_man *mdoc)
                if (n->type == ROFFT_BLOCK &&
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT)
                        mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,
                if (n->type == ROFFT_BLOCK &&
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT)
                        mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,

-                           n->line, n->pos, mdoc_macronames[n->tok]);
+                           n->line, n->pos, roff_name[n->tok]);

 
        /* Rewind to the first. */
 
 
        /* Rewind to the first. */
 


@@ -240,20 +237,19 @@ mdoc_endparse(struct roff_man *mdoc)
 static int
 lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 {
 static int
 lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 {

-       int      res;
+       enum roff_tok    res;

 
        if (mdoc->flags & MDOC_PHRASEQF) {
                mdoc->flags &= ~MDOC_PHRASEQF;
                return TOKEN_NONE;
        }
        if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) {
 
        if (mdoc->flags & MDOC_PHRASEQF) {
                mdoc->flags &= ~MDOC_PHRASEQF;
                return TOKEN_NONE;
        }
        if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) {

-               res = mdoc_hash_find(p);
+               res = roffhash_find(mdoc->mdocmac, p, 0);

                if (res != TOKEN_NONE) {
                        if (mdoc_macros[res].flags & MDOC_CALLABLE)
                                return res;
                if (res != TOKEN_NONE) {
                        if (mdoc_macros[res].flags & MDOC_CALLABLE)
                                return res;

-                       if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll)
-                               mandoc_msg(MANDOCERR_MACRO_CALL,
-                                   mdoc->parse, line, ppos, p);
+                       mandoc_msg(MANDOCERR_MACRO_CALL,
+                           mdoc->parse, line, ppos, p);

                }
        }
        return TOKEN_NONE;
                }
        }
        return TOKEN_NONE;


@@ -324,8 +320,8 @@ rew_pending(struct roff_man *mdoc, const struct roff_node *n)
  * For a block closing macro, return the corresponding opening one.
  * Otherwise, return the macro itself.
  */
  * For a block closing macro, return the corresponding opening one.
  * Otherwise, return the macro itself.
  */

-static int
-rew_alt(int tok)
+static enum roff_tok
+rew_alt(enum roff_tok tok)

 {
        switch (tok) {
        case MDOC_Ac:
 {
        switch (tok) {
        case MDOC_Ac:


@@ -366,7 +362,7 @@ rew_alt(int tok)
 }
 
 static void
 }
 
 static void

-rew_elem(struct roff_man *mdoc, int tok)
+rew_elem(struct roff_man *mdoc, enum roff_tok tok)

 {
        struct roff_node *n;
 
 {
        struct roff_node *n;
 


@@ -381,6 +377,10 @@ rew_elem(struct roff_man *mdoc, int tok)
 static void
 break_intermediate(struct roff_node *n, struct roff_node *breaker)
 {
 static void
 break_intermediate(struct roff_node *n, struct roff_node *breaker)
 {

+       if (n != breaker &&
+           n->type != ROFFT_BLOCK && n->type != ROFFT_HEAD &&
+           (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
+               n = n->parent;

        while (n != breaker) {
                if ( ! (n->flags & NODE_VALID))
                        n->flags |= NODE_BROKEN;
        while (n != breaker) {
                if ( ! (n->flags & NODE_VALID))
                        n->flags |= NODE_BROKEN;


@@ -394,12 +394,15 @@ break_intermediate(struct roff_node *n, struct roff_node *breaker)
  * the rew_pending() call closing out the sub-block.
  */
 static int
  * the rew_pending() call closing out the sub-block.
  */
 static int

-find_pending(struct roff_man *mdoc, int tok, int line, int ppos,
+find_pending(struct roff_man *mdoc, enum roff_tok tok, int line, int ppos,

        struct roff_node *target)
 {
        struct roff_node        *n;
        int                      irc;
 
        struct roff_node *target)
 {
        struct roff_node        *n;
        int                      irc;
 

+       if (target->flags & NODE_VALID)
+               return 0;
+

        irc = 0;
        for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
                if (n->flags & NODE_ENDED)
        irc = 0;
        for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
                if (n->flags & NODE_ENDED)


@@ -407,17 +410,16 @@ find_pending(struct roff_man *mdoc, int tok, int line, int ppos,
                if (n->type == ROFFT_BLOCK &&
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
                        irc = 1;
                if (n->type == ROFFT_BLOCK &&
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
                        irc = 1;

-                       break_intermediate(mdoc->last, n);
-                       n->flags |= NODE_BROKEN;
+                       break_intermediate(mdoc->last, target);

                        if (target->type == ROFFT_HEAD)
                                target->flags |= NODE_ENDED;
                        else if ( ! (target->flags & NODE_ENDED)) {
                                mandoc_vmsg(MANDOCERR_BLK_NEST,
                                    mdoc->parse, line, ppos,
                        if (target->type == ROFFT_HEAD)
                                target->flags |= NODE_ENDED;
                        else if ( ! (target->flags & NODE_ENDED)) {
                                mandoc_vmsg(MANDOCERR_BLK_NEST,
                                    mdoc->parse, line, ppos,

-                                   "%s breaks %s", mdoc_macronames[tok],
-                                   mdoc_macronames[n->tok]);
+                                   "%s breaks %s", roff_name[tok],
+                                   roff_name[n->tok]);

                                mdoc_endbody_alloc(mdoc, line, ppos,
                                mdoc_endbody_alloc(mdoc, line, ppos,

-                                   tok, target, ENDBODY_NOSPACE);
+                                   tok, target);

                        }
                }
        }
                        }
                }
        }


@@ -518,7 +520,8 @@ macro_or_word(MACRO_PROT_ARGS, int parsed)
                    mdoc_macros[tok].flags & MDOC_JOIN);
                return 0;
        } else {
                    mdoc_macros[tok].flags & MDOC_JOIN);
                return 0;
        } else {

-               if (mdoc_macros[tok].fp == in_line_eoln)
+               if (tok != TOKEN_NONE &&
+                   mdoc_macros[tok].fp == in_line_eoln)

                        rew_elem(mdoc, tok);
                mdoc_macro(mdoc, ntok, line, ppos, pos, buf);
                if (tok == TOKEN_NONE)
                        rew_elem(mdoc, tok);
                mdoc_macro(mdoc, ntok, line, ppos, pos, buf);
                if (tok == TOKEN_NONE)


@@ -542,7 +545,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 
        int              j, lastarg, maxargs, nl, pending;
        enum margserr    ac;
 
        int              j, lastarg, maxargs, nl, pending;
        enum margserr    ac;

-       int              atok, ntok;
+       enum roff_tok    atok, ntok;

        char            *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
        char            *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;


@@ -627,11 +630,10 @@ blk_exp_close(MACRO_PROT_ARGS)
 
                        mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse,
                            line, ppos, "%s breaks %s",
 
                        mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse,
                            line, ppos, "%s breaks %s",

-                           mdoc_macronames[atok],
-                           mdoc_macronames[later->tok]);
+                           roff_name[atok], roff_name[later->tok]);

 
                        endbody = mdoc_endbody_alloc(mdoc, line, ppos,
 
                        endbody = mdoc_endbody_alloc(mdoc, line, ppos,

-                           atok, body, ENDBODY_SPACE);
+                           atok, body);

 
                        if (tok == MDOC_El)
                                itblk->flags |= NODE_ENDED | NODE_BROKEN;
 
                        if (tok == MDOC_El)
                                itblk->flags |= NODE_ENDED | NODE_BROKEN;


@@ -670,14 +672,14 @@ blk_exp_close(MACRO_PROT_ARGS)
 
        if (body == NULL) {
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse,
 
        if (body == NULL) {
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse,

-                   line, ppos, mdoc_macronames[tok]);
+                   line, ppos, roff_name[tok]);

                if (maxargs && endbody == NULL) {
                        /*
                         * Stray .Ec without previous .Eo:
                         * Break the output line, keep the arguments.
                         */
                if (maxargs && endbody == NULL) {
                        /*
                         * Stray .Ec without previous .Eo:
                         * Break the output line, keep the arguments.
                         */

-                       roff_elem_alloc(mdoc, line, ppos, MDOC_br);
-                       rew_elem(mdoc, MDOC_br);
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);

                }
        } else if (endbody == NULL) {
                rew_last(mdoc, body);
                }
        } else if (endbody == NULL) {
                rew_last(mdoc, body);


@@ -689,7 +691,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                if (buf[*pos] != '\0')
                        mandoc_vmsg(MANDOCERR_ARG_SKIP,
                            mdoc->parse, line, ppos,
                if (buf[*pos] != '\0')
                        mandoc_vmsg(MANDOCERR_ARG_SKIP,
                            mdoc->parse, line, ppos,

-                           "%s %s", mdoc_macronames[tok],
+                           "%s %s", roff_name[tok],

                            buf + *pos);
                if (endbody == NULL && n != NULL)
                        rew_pending(mdoc, n);
                            buf + *pos);
                if (endbody == NULL && n != NULL)
                        rew_pending(mdoc, n);


@@ -733,9 +735,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                        do
                                target = target->parent;
                        while ( ! (target->flags & NODE_ENDED));
                        do
                                target = target->parent;
                        while ( ! (target->flags & NODE_ENDED));

-                       if ( ! (target->flags & NODE_VALID))
-                               pending = find_pending(mdoc, ntok,
-                                   line, ppos, target);
+                       pending = find_pending(mdoc, ntok, line, ppos, target);

                }
                if ( ! pending)
                        rew_pending(mdoc, n);
                }
                if ( ! pending)
                        rew_pending(mdoc, n);


@@ -748,7 +748,7 @@ static void
 in_line(MACRO_PROT_ARGS)
 {
        int              la, scope, cnt, firstarg, mayopen, nc, nl;
 in_line(MACRO_PROT_ARGS)
 {
        int              la, scope, cnt, firstarg, mayopen, nc, nl;

-       int              ntok;
+       enum roff_tok    ntok;

        enum margserr    ac;
        enum mdelim      d;
        struct mdoc_arg *arg;
        enum margserr    ac;
        enum mdelim      d;
        struct mdoc_arg *arg;


@@ -829,7 +829,7 @@ in_line(MACRO_PROT_ARGS)
                                mdoc_argv_free(arg);
                                mandoc_msg(MANDOCERR_MACRO_EMPTY,
                                    mdoc->parse, line, ppos,
                                mdoc_argv_free(arg);
                                mandoc_msg(MANDOCERR_MACRO_EMPTY,
                                    mdoc->parse, line, ppos,

-                                   mdoc_macronames[tok]);
+                                   roff_name[tok]);

                        }
                        mdoc_macro(mdoc, ntok, line, la, pos, buf);
                        if (nl)
                        }
                        mdoc_macro(mdoc, ntok, line, la, pos, buf);
                        if (nl)


@@ -877,7 +877,7 @@ in_line(MACRO_PROT_ARGS)
                }
 
                dword(mdoc, line, la, p, d,
                }
 
                dword(mdoc, line, la, p, d,

-                   MDOC_JOIN & mdoc_macros[tok].flags);
+                   mdoc_macros[tok].flags & MDOC_JOIN);

 
                /*
                 * If the first argument is a closing delimiter,
 
                /*
                 * If the first argument is a closing delimiter,


@@ -899,8 +899,10 @@ in_line(MACRO_PROT_ARGS)
                }
        }
 
                }
        }
 

-       if (scope)
+       if (scope && tok != MDOC_Lk) {

                rew_elem(mdoc, tok);
                rew_elem(mdoc, tok);

+               scope = 0;
+       }

 
        /*
         * If no elements have been collected and we're allowed to have
 
        /*
         * If no elements have been collected and we're allowed to have


@@ -915,11 +917,13 @@ in_line(MACRO_PROT_ARGS)
                } else {
                        mdoc_argv_free(arg);
                        mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
                } else {
                        mdoc_argv_free(arg);
                        mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

-                           line, ppos, mdoc_macronames[tok]);
+                           line, ppos, roff_name[tok]);

                }
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);
                }
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);

+       if (scope)
+               rew_elem(mdoc, tok);

 }
 
 static void
 }
 
 static void


@@ -938,7 +942,7 @@ blk_full(MACRO_PROT_ARGS)
 
        if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
                mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
 
        if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
                mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

-                   line, ppos, mdoc_macronames[tok]);
+                   line, ppos, roff_name[tok]);

                return;
        }
 
                return;
        }
 


@@ -961,7 +965,7 @@ blk_full(MACRO_PROT_ARGS)
                                        mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                            mdoc->parse, line, ppos,
                                            "It breaks %s",
                                        mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                            mdoc->parse, line, ppos,
                                            "It breaks %s",

-                                           mdoc_macronames[blk->tok]);
+                                           roff_name[blk->tok]);

                                        rew_pending(mdoc, blk);
                                }
                                break;
                                        rew_pending(mdoc, blk);
                                }
                                break;


@@ -973,9 +977,8 @@ blk_full(MACRO_PROT_ARGS)
                                case MDOC_Ss:
                                        mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                            mdoc->parse, line, ppos,
                                case MDOC_Ss:
                                        mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                            mdoc->parse, line, ppos,

-                                           "%s breaks %s",
-                                           mdoc_macronames[tok],
-                                           mdoc_macronames[n->tok]);
+                                           "%s breaks %s", roff_name[tok],
+                                           roff_name[n->tok]);

                                        rew_pending(mdoc, n);
                                        n = mdoc->last;
                                        continue;
                                        rew_pending(mdoc, n);
                                        n = mdoc->last;
                                        continue;


@@ -1001,8 +1004,7 @@ blk_full(MACRO_PROT_ARGS)
                        if (blk != NULL) {
                                mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                    mdoc->parse, line, ppos,
                        if (blk != NULL) {
                                mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                    mdoc->parse, line, ppos,

-                                   "It breaks %s",
-                                   mdoc_macronames[blk->tok]);
+                                   "It breaks %s", roff_name[blk->tok]);

                                rew_pending(mdoc, blk);
                                blk = NULL;
                        }
                                rew_pending(mdoc, blk);
                                blk = NULL;
                        }


@@ -1017,8 +1019,8 @@ blk_full(MACRO_PROT_ARGS)
                if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
                        mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
                            line, ppos, "It %s", buf + *pos);
                if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
                        mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
                            line, ppos, "It %s", buf + *pos);

-                       roff_elem_alloc(mdoc, line, ppos, MDOC_br);
-                       rew_elem(mdoc, MDOC_br);
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);

                        return;
                }
        }
                        return;
                }
        }


@@ -1095,7 +1097,7 @@ blk_full(MACRO_PROT_ARGS)
                if (tok == MDOC_Bd || tok == MDOC_Bk) {
                        mandoc_vmsg(MANDOCERR_ARG_EXCESS,
                            mdoc->parse, line, la, "%s ... %s",
                if (tok == MDOC_Bd || tok == MDOC_Bk) {
                        mandoc_vmsg(MANDOCERR_ARG_EXCESS,
                            mdoc->parse, line, la, "%s ... %s",

-                           mdoc_macronames[tok], buf + la);
+                           roff_name[tok], buf + la);

                        break;
                }
                if (tok == MDOC_Rs) {
                        break;
                }
                if (tok == MDOC_Rs) {


@@ -1303,7 +1305,7 @@ in_line_argn(MACRO_PROT_ARGS)
        struct mdoc_arg *arg;
        char            *p;
        enum margserr    ac;
        struct mdoc_arg *arg;
        char            *p;
        enum margserr    ac;

-       int              ntok;
+       enum roff_tok    ntok;

        int              state; /* arg#; -1: not yet open; -2: closed */
        int              la, maxargs, nl;
 
        int              state; /* arg#; -1: not yet open; -2: closed */
        int              la, maxargs, nl;
 


@@ -1393,12 +1395,12 @@ in_line_argn(MACRO_PROT_ARGS)
                }
 
                dword(mdoc, line, la, p, DELIM_MAX,
                }
 
                dword(mdoc, line, la, p, DELIM_MAX,

-                   MDOC_JOIN & mdoc_macros[tok].flags);
+                   mdoc_macros[tok].flags & MDOC_JOIN);

        }
 
        if (state == -1) {
                mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
        }
 
        if (state == -1) {
                mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

-                   line, ppos, mdoc_macronames[tok]);
+                   line, ppos, roff_name[tok]);

                return;
        }
 
                return;
        }
 


@@ -1426,9 +1428,9 @@ in_line_eoln(MACRO_PROT_ARGS)
        }
 
        if (buf[*pos] == '\0' &&
        }
 
        if (buf[*pos] == '\0' &&

-           (tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) {
+           (tok == MDOC_Fd || *roff_name[tok] == '%')) {

                mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
                mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

-                   line, ppos, mdoc_macronames[tok]);
+                   line, ppos, roff_name[tok]);

                return;
        }
 
                return;
        }
 


@@ -1445,7 +1447,8 @@ in_line_eoln(MACRO_PROT_ARGS)
  * or until the next macro, call that macro, and return 1.
  */
 static int
  * or until the next macro, call that macro, and return 1.
  */
 static int

-parse_rest(struct roff_man *mdoc, int tok, int line, int *pos, char *buf)
+parse_rest(struct roff_man *mdoc, enum roff_tok tok,
+    int line, int *pos, char *buf)

 {
        int              la;
 
 {
        int              la;