Significant overhaul in libman. Macros are now block- and line-scoped (with

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index b156f0bdbb153e00ea7dbd23e79c58ecb579d1b0..0d08438dad2b7c16b817ecd5cf4b754d1644a2ea 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.26 2009/07/24 12:17:25 kristaps Exp $ */
+/*     $Id: mdoc_macro.c,v 1.30 2009/08/13 11:43:24 kristaps Exp $ */

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


@@ -45,9 +45,10 @@ static       int       rew_impblock(struct mdoc *, int, int, int);
 static int       rew_expblock(struct mdoc *, int, int, int);
 static int       rew_subblock(enum mdoc_type, 
                        struct mdoc *, int, int, int);
 static int       rew_expblock(struct mdoc *, int, int, int);
 static int       rew_subblock(enum mdoc_type, 
                        struct mdoc *, int, int, int);

-static int       rew_last(struct mdoc *, struct mdoc_node *);
+static int       rew_last(struct mdoc *, struct mdoc_node *); /* FIXME: make const */

 static int       append_delims(struct mdoc *, int, int *, char *);
 static int       append_delims(struct mdoc *, int, int *, char *);

-static int       lookup(struct mdoc *, int, int, int, const char *);
+static int       lookup(struct mdoc *, int, const char *);
+static int       lookup_raw(struct mdoc *, const char *);

 static int       swarn(struct mdoc *, enum mdoc_type, int, int, 
                        const struct mdoc_node *);
 
 static int       swarn(struct mdoc *, enum mdoc_type, int, int, 
                        const struct mdoc_node *);
 


@@ -253,17 +254,24 @@ mdoc_macroend(struct mdoc *mdoc)
 }
 
 static int
 }
 
 static int

-lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
+lookup(struct mdoc *mdoc, int from, const char *p)
+{
+
+       if ( ! (MDOC_PARSED & mdoc_macros[from].flags))
+               return(MDOC_MAX);
+       return(lookup_raw(mdoc, p));
+}
+
+
+static int
+lookup_raw(struct mdoc *mdoc, const char *p)

 {
        int              res;
 
 {
        int              res;
 

-       res = mdoc_hash_find(mdoc->htab, p);
-       if (MDOC_PARSED & mdoc_macros[from].flags)
+       if (MDOC_MAX == (res = mdoc_hash_find(mdoc->htab, p)))
+               return(MDOC_MAX);
+       if (MDOC_CALLABLE & mdoc_macros[res].flags)

                return(res);
                return(res);

-       if (MDOC_MAX == res)
-               return(res);
-       if ( ! mdoc_pwarn(mdoc, line, pos, EMACPARM))
-               return(-1);

        return(MDOC_MAX);
 }
 
        return(MDOC_MAX);
 }
 


@@ -591,6 +599,7 @@ rew_expblock(struct mdoc *mdoc, int tok, int line, int ppos)
 }
 
 
 }
 
 

+/* FIXME: can this be merged with subblock? */

 static int
 rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
 {
 static int
 rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
 {


@@ -681,7 +690,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                mdoc->next = MDOC_NEXT_CHILD;
        }
 
                mdoc->next = MDOC_NEXT_CHILD;
        }
 

-       for (lastarg = ppos, flushed = j = 0; ; j++) {
+       for (flushed = j = 0; ; j++) {

                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {


@@ -699,9 +708,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 

-               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
-                       return(0);
-               else if (MDOC_MAX != c) {
+               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {

                        if ( ! flushed) {
                                if ( ! rew_expblock(mdoc, tok, 
                                                        line, ppos))
                        if ( ! flushed) {
                                if ( ! rew_expblock(mdoc, tok, 
                                                        line, ppos))


@@ -760,7 +767,7 @@ in_line(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-       for (la = ppos, arg = NULL;; ) {
+       for (arg = NULL;; ) {

                la = *pos;
                c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
                la = *pos;
                c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 


@@ -790,8 +797,7 @@ in_line(MACRO_PROT_ARGS)
 
                /* Quoted words shouldn't be looked-up. */
 
 
                /* Quoted words shouldn't be looked-up. */
 

-               c = ARGS_QWORD == w ? MDOC_MAX :
-                       lookup(mdoc, line, la, tok, p);
+               c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p);

 
                /* 
                 * In this case, we've located a submacro and must
 
                /* 
                 * In this case, we've located a submacro and must


@@ -800,7 +806,7 @@ in_line(MACRO_PROT_ARGS)
                 * or raise a warning.
                 */
 
                 * or raise a warning.
                 */
 

-               if (MDOC_MAX != c && -1 != c) {
+               if (MDOC_MAX != c) {

                        if (0 == lastpunct && ! rew_elem(mdoc, tok))
                                return(0);
                        if (nc && 0 == cnt) {
                        if (0 == lastpunct && ! rew_elem(mdoc, tok))
                                return(0);
                        if (nc && 0 == cnt) {


@@ -820,8 +826,7 @@ in_line(MACRO_PROT_ARGS)
                        if (ppos > 1)
                                return(1);
                        return(append_delims(mdoc, line, pos, buf));
                        if (ppos > 1)
                                return(1);
                        return(append_delims(mdoc, line, pos, buf));

-               } else if (-1 == c)
-                       return(0);
+               } 

 
                /* 
                 * Non-quote-enclosed punctuation.  Set up our scope, if
 
                /* 
                 * Non-quote-enclosed punctuation.  Set up our scope, if


@@ -988,10 +993,7 @@ blk_full(MACRO_PROT_ARGS)
                        continue;
                }
 
                        continue;
                }
 

-               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
-                       return(0);
-
-               if (MDOC_MAX == c) {
+               if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {

                        if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
                                return(0);
                        mdoc->next = MDOC_NEXT_SIBLING;
                        if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
                                return(0);
                        mdoc->next = MDOC_NEXT_SIBLING;


@@ -1046,7 +1048,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 
        /* XXX - no known argument macros. */
 
 
        /* XXX - no known argument macros. */
 

-       for (lastarg = ppos;; ) {
+       for (;;) {

                lastarg = *pos;
                c = mdoc_args(mdoc, line, pos, buf, tok, &p);
                assert(ARGS_PHRASE != c);
                lastarg = *pos;
                c = mdoc_args(mdoc, line, pos, buf, tok, &p);
                assert(ARGS_PHRASE != c);


@@ -1058,9 +1060,7 @@ blk_part_imp(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 

-               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
-                       return(0);
-               else if (MDOC_MAX == c) {
+               if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {

                        if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
                                return(0);
                        mdoc->next = MDOC_NEXT_SIBLING;
                        if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
                                return(0);
                        mdoc->next = MDOC_NEXT_SIBLING;


@@ -1107,7 +1107,6 @@ blk_part_exp(MACRO_PROT_ARGS)
        int               lastarg, flushed, j, c, maxargs;
        char             *p;
 
        int               lastarg, flushed, j, c, maxargs;
        char             *p;
 

-       lastarg = ppos;

        flushed = 0;
 
        /*
        flushed = 0;
 
        /*


@@ -1163,9 +1162,7 @@ blk_part_exp(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 

-               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
-                       return(0);
-               else if (MDOC_MAX != c) {
+               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {

                        if ( ! flushed) {
                                if ( ! rew_subblock(MDOC_HEAD, mdoc, 
                                                        tok, line, ppos))
                        if ( ! flushed) {
                                if ( ! rew_subblock(MDOC_HEAD, mdoc, 
                                                        tok, line, ppos))


@@ -1243,7 +1240,7 @@ in_line_argn(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-       for (lastarg = ppos, arg = NULL;; ) {
+       for (arg = NULL;; ) {

                lastarg = *pos;
                c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
                lastarg = *pos;
                c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 


@@ -1283,9 +1280,7 @@ in_line_argn(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 

-               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
-                       return(0);
-               else if (MDOC_MAX != c) {
+               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {

                        if ( ! flushed && ! rew_elem(mdoc, tok))
                                return(0);
                        flushed = 1;
                        if ( ! flushed && ! rew_elem(mdoc, tok))
                                return(0);
                        flushed = 1;


@@ -1361,15 +1356,13 @@ in_line_eoln(MACRO_PROT_ARGS)
                if (ARGS_EOLN == w)
                        break;
 
                if (ARGS_EOLN == w)
                        break;
 

-               c = ARGS_QWORD == w ? MDOC_MAX :
-                       lookup(mdoc, line, la, tok, p);
+               c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p);

 
 

-               if (MDOC_MAX != c && -1 != c) {
+               if (MDOC_MAX != c) {

                        if ( ! rew_elem(mdoc, tok))
                                return(0);
                        return(mdoc_macro(mdoc, c, line, la, pos, buf));
                        if ( ! rew_elem(mdoc, tok))
                                return(0);
                        return(mdoc_macro(mdoc, c, line, la, pos, buf));

-               } else if (-1 == c)
-                       return(0);
+               } 

 
                if ( ! mdoc_word_alloc(mdoc, line, la, p))
                        return(0);
 
                if ( ! mdoc_word_alloc(mdoc, line, la, p))
                        return(0);


@@ -1411,15 +1404,13 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
                if (ARGS_EOLN == w)
                        break;
 
                if (ARGS_EOLN == w)
                        break;
 

-               c = ARGS_QWORD == w ? MDOC_MAX :
-                       mdoc_hash_find(mdoc->htab, p);
+               c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(mdoc, p);

 
 

-               if (MDOC_MAX != c && -1 != c) {
+               if (MDOC_MAX != c) {

                        if ( ! mdoc_macro(mdoc, c, line, la, &pos, buf))
                                return(0);
                        return(append_delims(mdoc, line, &pos, buf));
                        if ( ! mdoc_macro(mdoc, c, line, la, &pos, buf))
                                return(0);
                        return(append_delims(mdoc, line, &pos, buf));

-               } else if (-1 == c)
-                       return(0);
+               } 

 
                if ( ! mdoc_word_alloc(mdoc, line, la, p))
                        return(0);
 
                if ( ! mdoc_word_alloc(mdoc, line, la, p))
                        return(0);