Adding initial options processing (not hooked into parse yet). This is

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 7d0ee3274d4566f55d3874ab9acd2efa0b5819f4..1c97f88c95079915e63a9d59c45278ead8a64b47 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_macro.c,v 1.90 2010/07/01 22:35:54 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.99 2010/12/15 23:39:40 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 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


@@ -33,8 +34,9 @@ enum  rew {   /* see rew_dohalt() */
        REWIND_NONE,
        REWIND_THIS,
        REWIND_MORE,
        REWIND_NONE,
        REWIND_THIS,
        REWIND_MORE,

+       REWIND_FORCE,

        REWIND_LATER,
        REWIND_LATER,

-       REWIND_ERROR,
+       REWIND_ERROR

 };
 
 static int             blk_full(MACRO_PROT_ARGS);
 };
 
 static int             blk_full(MACRO_PROT_ARGS);


@@ -137,8 +139,8 @@ const       struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */

-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */
-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* No */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Ns */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */
        { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */
        { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */


@@ -206,14 +208,10 @@ mdoc_macroend(struct mdoc *m)
 
        n = MDOC_VALID & m->last->flags ?  m->last->parent : m->last;
 
 
        n = MDOC_VALID & m->last->flags ?  m->last->parent : m->last;
 

-       for ( ; n; n = n->parent) {
-               if (MDOC_BLOCK != n->type)
-                       continue;
-               if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
-                       continue;
-               mdoc_nmsg(m, n, MANDOCERR_SYNTSCOPE);
-               return(0);
-       }
+       for ( ; n; n = n->parent)
+               if (MDOC_BLOCK == n->type &&
+                   MDOC_EXPLICIT & mdoc_macros[n->tok].flags)
+                       mdoc_nmsg(m, n, MANDOCERR_SCOPEEXIT);

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


@@ -254,6 +252,7 @@ lookup_raw(const char *p)
 static int
 rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
 {
 static int
 rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
 {

+       struct mdoc_node *n;

 
        assert(to);
        mdoc->next = MDOC_NEXT_SIBLING;
 
        assert(to);
        mdoc->next = MDOC_NEXT_SIBLING;


@@ -262,15 +261,13 @@ rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
        while (mdoc->last != to) {
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
        while (mdoc->last != to) {
                if ( ! mdoc_valid_post(mdoc))
                        return(0);

-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
+               n = mdoc->last;

                mdoc->last = mdoc->last->parent;
                assert(mdoc->last);
                mdoc->last = mdoc->last->parent;
                assert(mdoc->last);

+               mdoc->last->last = n;

        }
 
        }
 

-       if ( ! mdoc_valid_post(mdoc))
-               return(0);
-       return(mdoc_action_post(mdoc));
+       return(mdoc_valid_post(mdoc));

 }
 
 
 }
 
 


@@ -327,6 +324,7 @@ rew_alt(enum mdoct tok)
  *   inside *p, so there is no need to rewind anything at all.
  * REWIND_THIS: *p matches tok, so rewind *p and nothing else.
  * REWIND_MORE: *p is implicit, rewind it and keep searching for tok.
  *   inside *p, so there is no need to rewind anything at all.
  * REWIND_THIS: *p matches tok, so rewind *p and nothing else.
  * REWIND_MORE: *p is implicit, rewind it and keep searching for tok.

+ * REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.

  * REWIND_LATER: *p is explicit and still open, postpone rewinding.
  * REWIND_ERROR: No tok block is open at all.
  */
  * REWIND_LATER: *p is explicit and still open, postpone rewinding.
  * REWIND_ERROR: No tok block is open at all.
  */


@@ -420,16 +418,13 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type,
                return(REWIND_MORE);
 
        /*
                return(REWIND_MORE);
 
        /*

-        * Partial blocks allow delayed rewinding by default.
-        */
-       if (&blk_full != mdoc_macros[tok].fp)
-               return (REWIND_LATER);
-
-       /*
-        * Full blocks can only be rewound when matching
-        * or when there is an explicit rule.
+        * By default, closing out full blocks
+        * forces closing of broken explicit blocks,
+        * while closing out partial blocks
+        * allows delayed rewinding by default.

         */
         */

-       return(REWIND_ERROR);
+       return (&blk_full == mdoc_macros[tok].fp ?
+           REWIND_FORCE : REWIND_LATER);

 }
 
 
 }
 
 


@@ -520,9 +515,7 @@ make_pending(struct mdoc_node *broken, enum mdoct tok,
        /*
         * Found no matching block for tok.
         * Are you trying to close a block that is not open?
        /*
         * Found no matching block for tok.
         * Are you trying to close a block that is not open?

-        * XXX Make this non-fatal.

         */
         */

-       mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE);

        return(0);
 }
 
        return(0);
 }
 


@@ -540,17 +533,22 @@ rew_sub(enum mdoc_type t, struct mdoc *m,
                        return(1);
                case (REWIND_THIS):
                        break;
                        return(1);
                case (REWIND_THIS):
                        break;

+               case (REWIND_FORCE):
+                       mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos,
+                           "%s breaks %s", mdoc_macronames[tok],
+                           mdoc_macronames[n->tok]);
+                       /* FALLTHROUGH */

                case (REWIND_MORE):
                        n = n->parent;
                        continue;
                case (REWIND_LATER):
                case (REWIND_MORE):
                        n = n->parent;
                        continue;
                case (REWIND_LATER):

-                       return(make_pending(n, tok, m, line, ppos));
+                       if (make_pending(n, tok, m, line, ppos) ||
+                           MDOC_BLOCK != t)
+                               return(1);
+                       /* FALLTHROUGH */

                case (REWIND_ERROR):
                case (REWIND_ERROR):

-                       /* XXX Make this non-fatal. */
-                       mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos,
-                           "%s cannot break %s", mdoc_macronames[tok],
-                           mdoc_macronames[n->tok]);
-                       return 0;
+                       mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
+                       return(1);

                }
                break;
        }
                }
                break;
        }


@@ -609,7 +607,7 @@ append_delims(struct mdoc *m, int line, int *pos, char *buf)
                 * knowing which symbols break this behaviour, for
                 * example, `.  ;' shouldn't propogate the double-space.
                 */
                 * knowing which symbols break this behaviour, for
                 * example, `.  ;' shouldn't propogate the double-space.
                 */

-               if (mandoc_eos(p, strlen(p)))
+               if (mandoc_eos(p, strlen(p), 0))

                        m->last->flags |= MDOC_EOS;
        }
 
                        m->last->flags |= MDOC_EOS;
        }
 


@@ -678,8 +676,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * postpone closing out the current block
                         * until the rew_sub() closing out the sub-block.
                         */
                         * postpone closing out the current block
                         * until the rew_sub() closing out the sub-block.
                         */

-                       if ( ! make_pending(later, tok, m, line, ppos))
-                               return(0);
+                       make_pending(later, tok, m, line, ppos);

 
                        /*
                         * Mark the place where the formatting - but not
 
                        /*
                         * Mark the place where the formatting - but not


@@ -699,10 +696,8 @@ blk_exp_close(MACRO_PROT_ARGS)
                if (later &&
                    MDOC_EXPLICIT & mdoc_macros[later->tok].flags)
                        continue;
                if (later &&
                    MDOC_EXPLICIT & mdoc_macros[later->tok].flags)
                        continue;

-               if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) {
-                       assert( ! (MDOC_ACTED & n->flags));
+               if (MDOC_CALLABLE & mdoc_macros[n->tok].flags)

                        later = n;
                        later = n;

-               }

        }
 
        if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
        }
 
        if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {


@@ -793,7 +788,7 @@ in_line(MACRO_PROT_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Fl):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Fl):
                /* FALLTHROUGH */

-       case (MDOC_Lk):
+       case (MDOC_Mt):

                /* FALLTHROUGH */
        case (MDOC_Nm):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Nm):
                /* FALLTHROUGH */


@@ -1146,7 +1141,6 @@ blk_full(MACRO_PROT_ARGS)
                if (MDOC_BLOCK == n->type && 
                                MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
                                ! (MDOC_VALID & n->flags)) {
                if (MDOC_BLOCK == n->type && 
                                MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
                                ! (MDOC_VALID & n->flags)) {

-                       assert( ! (MDOC_ACTED & n->flags));

                        n->pending = head;
                        return(1);
                }
                        n->pending = head;
                        return(1);
                }


@@ -1265,7 +1259,7 @@ blk_part_imp(MACRO_PROT_ARGS)
         */
 
        if (n && MDOC_TEXT == n->type && n->string)
         */
 
        if (n && MDOC_TEXT == n->type && n->string)

-               if (mandoc_eos(n->string, strlen(n->string)))
+               if (mandoc_eos(n->string, strlen(n->string), 1))

                        n->flags |= MDOC_EOS;
 
        /* Up-propogate the end-of-space flag. */
                        n->flags |= MDOC_EOS;
 
        /* Up-propogate the end-of-space flag. */


@@ -1284,9 +1278,7 @@ blk_part_imp(MACRO_PROT_ARGS)
                if (MDOC_BLOCK == n->type &&
                    MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
                    ! (MDOC_VALID & n->flags)) {
                if (MDOC_BLOCK == n->type &&
                    MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
                    ! (MDOC_VALID & n->flags)) {

-                       assert( ! (MDOC_ACTED & n->flags));
-                       if ( ! make_pending(n, tok, m, line, ppos))
-                               return(0);
+                       make_pending(n, tok, m, line, ppos);

                        if ( ! mdoc_endbody_alloc(m, line, ppos,
                            tok, body, ENDBODY_NOSPACE))
                                return(0);
                        if ( ! mdoc_endbody_alloc(m, line, ppos,
                            tok, body, ENDBODY_NOSPACE))
                                return(0);