=================================================================== RCS file: /cvs/mandoc/Attic/macro.c,v retrieving revision 1.24 retrieving revision 1.27 diff -u -p -r1.24 -r1.27 --- mandoc/Attic/macro.c 2009/01/06 15:49:44 1.24 +++ mandoc/Attic/macro.c 2009/01/07 16:11:40 1.27 @@ -1,4 +1,4 @@ -/* $Id: macro.c,v 1.24 2009/01/06 15:49:44 kristaps Exp $ */ +/* $Id: macro.c,v 1.27 2009/01/07 16:11:40 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -34,7 +34,9 @@ static int rewind_impblock(struct mdoc *, int, int); static int rewind_expblock(struct mdoc *, int, int, int); static int rewind_head(struct mdoc *, int, int); static int rewind_body(struct mdoc *, int, int, int); -static int append_delims(struct mdoc *, int, int *, char *); +static int rewind_last(struct mdoc *, int, struct mdoc_node *); +static int append_delims(struct mdoc *, + int, int, int *, char *); static int lookup(struct mdoc *, int, const char *); @@ -49,6 +51,26 @@ lookup(struct mdoc *mdoc, int from, const char *p) static int +rewind_last(struct mdoc *mdoc, int ppos, struct mdoc_node *to) +{ + + assert(to); + while (mdoc->last != to) { + if ( ! mdoc_valid_post(mdoc, ppos)) + return(0); + if ( ! mdoc_action(mdoc, ppos)) + return(0); + mdoc->last = mdoc->last->parent; + assert(mdoc->last); + } + mdoc->next = MDOC_NEXT_SIBLING; + if ( ! mdoc_valid_post(mdoc, ppos)) + return(0); + return(mdoc_action(mdoc, ppos)); +} + + +static int rewind_elem(struct mdoc *mdoc, int ppos, int tok) { struct mdoc_node *n; @@ -59,11 +81,7 @@ rewind_elem(struct mdoc *mdoc, int ppos, int tok) assert(MDOC_ELEM == n->type); assert(tok == n->data.elem.tok); - mdoc->last = n; - mdoc->next = MDOC_NEXT_SIBLING; - if ( ! mdoc_valid_post(mdoc, tok, ppos)) - return(0); - return(mdoc_action(mdoc, tok, ppos)); + return(rewind_last(mdoc, ppos, n)); } @@ -71,22 +89,21 @@ static int rewind_body(struct mdoc *mdoc, int ppos, int tok, int tt) { struct mdoc_node *n; + int t; /* LINTED */ for (n = mdoc->last; n; n = n->parent) { if (MDOC_BODY != n->type) continue; - if (tt == n->data.head.tok) + if (tt == (t = n->data.head.tok)) break; - if ( ! (MDOC_EXPLICIT & mdoc_macros[tt].flags)) + if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags)) continue; return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); } - mdoc->last = n ? n : mdoc->last; - mdoc->next = MDOC_NEXT_SIBLING; - /* XXX - no validation, we do this only for blocks/elements. */ - return(1); + assert(n); + return(rewind_last(mdoc, ppos, n)); } @@ -107,10 +124,8 @@ rewind_head(struct mdoc *mdoc, int ppos, int tok) return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); } - mdoc->last = n ? n : mdoc->last; - mdoc->next = MDOC_NEXT_SIBLING; - /* XXX - no validation, we do this only for blocks/elements. */ - return(1); + assert(n); + return(rewind_last(mdoc, ppos, n)); } @@ -133,13 +148,9 @@ rewind_expblock(struct mdoc *mdoc, int ppos, int tok, return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); } - if (NULL == (mdoc->last = n)) + if (NULL == n) return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX)); - - mdoc->next = MDOC_NEXT_SIBLING; - if ( ! mdoc_valid_post(mdoc, tok, ppos)) - return(0); - return(mdoc_action(mdoc, tok, ppos)); + return(rewind_last(mdoc, ppos, n)); } @@ -166,17 +177,13 @@ rewind_impblock(struct mdoc *mdoc, int ppos, int tok) if (NULL == n) return(1); - - mdoc->next = MDOC_NEXT_SIBLING; - mdoc->last = n; - if ( ! mdoc_valid_post(mdoc, tok, ppos)) - return(0); - return(mdoc_action(mdoc, tok, ppos)); + return(rewind_last(mdoc, ppos, n)); } static int -append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf) +append_delims(struct mdoc *mdoc, int tok, + int line, int *pos, char *buf) { int c, lastarg; char *p; @@ -192,7 +199,7 @@ append_delims(struct mdoc *mdoc, int tok, int *pos, ch else if (ARGS_EOLN == c) break; assert(mdoc_isdelim(p)); - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; } @@ -282,7 +289,7 @@ macro_close_explicit(MACRO_PROT_ARGS) flushed = 0; if (maxargs > 0) { - mdoc_tail_alloc(mdoc, ppos, tt); + mdoc_tail_alloc(mdoc, line, ppos, tt); mdoc->next = MDOC_NEXT_CHILD; } @@ -309,12 +316,12 @@ macro_close_explicit(MACRO_PROT_ARGS) return(0); flushed = 1; } - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) return(0); break; } - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; } @@ -327,7 +334,7 @@ macro_close_explicit(MACRO_PROT_ARGS) if (ppos > 1) return(1); - return(append_delims(mdoc, tok, pos, buf)); + return(append_delims(mdoc, tok, line, pos, buf)); } @@ -371,14 +378,14 @@ macro_text(MACRO_PROT_ARGS) if (MDOC_QUOTABLE & mdoc_macros[tok].flags) fl |= ARGS_QUOTED; - mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv); + mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv); mdoc->next = MDOC_NEXT_CHILD; for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { lastarg = *pos; if (lastpunct) { - mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv); + mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv); mdoc->next = MDOC_NEXT_CHILD; lastpunct = 0; } @@ -400,11 +407,11 @@ macro_text(MACRO_PROT_ARGS) return(0); } mdoc_argv_free(argc, argv); - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) return(0); if (ppos > 1) return(1); - return(append_delims(mdoc, tok, pos, buf)); + return(append_delims(mdoc, tok, line, pos, buf)); } if (mdoc_isdelim(p)) { @@ -414,7 +421,7 @@ macro_text(MACRO_PROT_ARGS) } lastpunct = 1; } - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; } @@ -427,7 +434,7 @@ macro_text(MACRO_PROT_ARGS) return(0); if (ppos > 1) return(1); - return(append_delims(mdoc, tok, pos, buf)); + return(append_delims(mdoc, tok, line, pos, buf)); } @@ -465,18 +472,21 @@ macro_scoped(MACRO_PROT_ARGS) return(0); } - mdoc_block_alloc(mdoc, ppos, tok, (size_t)argc, argv); + mdoc_block_alloc(mdoc, line, ppos, tok, (size_t)argc, argv); mdoc->next = MDOC_NEXT_CHILD; mdoc_argv_free(argc, argv); if (0 == buf[*pos]) { - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_head_alloc(mdoc, line, ppos, tok); + if ( ! rewind_head(mdoc, ppos, tok)) + return(0); + mdoc_body_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; return(1); } - mdoc_head_alloc(mdoc, ppos, tok); + mdoc_head_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; for (j = 0; j < MDOC_LINEARG_MAX; j++) { @@ -491,12 +501,12 @@ macro_scoped(MACRO_PROT_ARGS) break; if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; continue; } - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) return(0); break; } @@ -506,10 +516,10 @@ macro_scoped(MACRO_PROT_ARGS) if ( ! rewind_head(mdoc, ppos, tok)) return(0); - if (1 == ppos && ! append_delims(mdoc, tok, pos, buf)) + if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf)) return(0); - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_body_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; return(1); @@ -527,10 +537,10 @@ macro_scoped_line(MACRO_PROT_ARGS) int lastarg, c, j; char *p; - mdoc_block_alloc(mdoc, ppos, tok, 0, NULL); + mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL); mdoc->next = MDOC_NEXT_CHILD; - mdoc_head_alloc(mdoc, ppos, tok); + mdoc_head_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; /* XXX - no known argument macros. */ @@ -552,12 +562,12 @@ macro_scoped_line(MACRO_PROT_ARGS) break; if (MDOC_MAX == (c = lookup(mdoc, tok, p))) { - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; continue; } - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) return(0); break; } @@ -568,7 +578,7 @@ macro_scoped_line(MACRO_PROT_ARGS) if (1 == ppos) { if ( ! rewind_head(mdoc, ppos, tok)) return(0); - if ( ! append_delims(mdoc, tok, pos, buf)) + if ( ! append_delims(mdoc, tok, line, pos, buf)) return(0); } return(rewind_impblock(mdoc, ppos, tok)); @@ -596,14 +606,17 @@ macro_constant_scoped(MACRO_PROT_ARGS) if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL)) return(0); - mdoc_block_alloc(mdoc, ppos, tok, 0, NULL); + mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL); mdoc->next = MDOC_NEXT_CHILD; if (0 == maxargs) { - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_head_alloc(mdoc, line, ppos, tok); + if ( ! rewind_head(mdoc, ppos, tok)) + return(0); + mdoc_body_alloc(mdoc, line, ppos, tok); flushed = 1; } else - mdoc_head_alloc(mdoc, ppos, tok); + mdoc_head_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; @@ -614,7 +627,7 @@ macro_constant_scoped(MACRO_PROT_ARGS) if ( ! rewind_head(mdoc, ppos, tok)) return(0); flushed = 1; - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_body_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; } @@ -631,10 +644,10 @@ macro_constant_scoped(MACRO_PROT_ARGS) if ( ! rewind_head(mdoc, ppos, tok)) return(0); flushed = 1; - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_body_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; } - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) return(0); break; } @@ -643,11 +656,11 @@ macro_constant_scoped(MACRO_PROT_ARGS) if ( ! rewind_head(mdoc, ppos, tok)) return(0); flushed = 1; - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_body_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; } - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; } @@ -657,13 +670,13 @@ macro_constant_scoped(MACRO_PROT_ARGS) if ( ! flushed) { if ( ! rewind_head(mdoc, ppos, tok)) return(0); - mdoc_body_alloc(mdoc, ppos, tok); + mdoc_body_alloc(mdoc, line, ppos, tok); mdoc->next = MDOC_NEXT_CHILD; } if (ppos > 1) return(1); - return(append_delims(mdoc, tok, pos, buf)); + return(append_delims(mdoc, tok, line, pos, buf)); } @@ -714,7 +727,7 @@ macro_constant_delimited(MACRO_PROT_ARGS) return(0); } - mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv); + mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv); mdoc->next = MDOC_NEXT_CHILD; mdoc_argv_free(argc, argv); @@ -740,7 +753,7 @@ macro_constant_delimited(MACRO_PROT_ARGS) if ( ! flushed && ! rewind_elem(mdoc, ppos, tok)) return(0); flushed = 1; - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) return(0); break; } @@ -751,7 +764,7 @@ macro_constant_delimited(MACRO_PROT_ARGS) flushed = 1; } - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; } @@ -763,7 +776,7 @@ macro_constant_delimited(MACRO_PROT_ARGS) if (ppos > 1) return(1); - return(append_delims(mdoc, tok, pos, buf)); + return(append_delims(mdoc, tok, line, pos, buf)); } @@ -804,7 +817,7 @@ macro_constant(MACRO_PROT_ARGS) return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); } - mdoc_elem_alloc(mdoc, ppos, tok, argc, argv); + mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv); mdoc->next = MDOC_NEXT_CHILD; mdoc_argv_free(argc, argv); @@ -817,7 +830,7 @@ macro_constant(MACRO_PROT_ARGS) if (ARGS_EOLN == c) break; - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, line, lastarg, p); mdoc->next = MDOC_NEXT_SIBLING; } @@ -834,4 +847,14 @@ macro_obsolete(MACRO_PROT_ARGS) { return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE)); +} + + +int +macro_end(struct mdoc *mdoc) +{ + + assert(mdoc->first); + assert(mdoc->last); + return(rewind_last(mdoc, -1, mdoc->first)); }