=================================================================== RCS file: /cvs/mandoc/Attic/macro.c,v retrieving revision 1.35 retrieving revision 1.40 diff -u -p -r1.35 -r1.40 --- mandoc/Attic/macro.c 2009/01/14 11:58:24 1.35 +++ mandoc/Attic/macro.c 2009/01/17 16:15:27 1.40 @@ -1,4 +1,4 @@ -/* $Id: macro.c,v 1.35 2009/01/14 11:58:24 kristaps Exp $ */ +/* $Id: macro.c,v 1.40 2009/01/17 16:15:27 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -40,11 +40,11 @@ static int rewind_dobreak(int, enum mdoc_type, static int rewind_elem(struct mdoc *, int); -static int rewind_impblock(struct mdoc *, int); -static int rewind_expblock(struct mdoc *, int); -static int rewind_head(struct mdoc *, int); -static int rewind_body(struct mdoc *, int); -static int rewind_last(struct mdoc *, struct mdoc_node *); +static int rewind_impblock(struct mdoc *, int, int, int); +static int rewind_expblock(struct mdoc *, int, int, int); +static int rewind_subblock(enum mdoc_type, struct mdoc *, int); +static int rewind_last(int, int, + struct mdoc *, struct mdoc_node *); static int append_delims(struct mdoc *, int, int, int *, char *); static int lookup(struct mdoc *, int, int, int, const char *); @@ -61,14 +61,14 @@ lookup(struct mdoc *mdoc, int line, int pos, int from, if (MDOC_MAX == res) return(res); - if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX_MACLIKE)) + if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter")) return(-1); return(MDOC_MAX); } static int -rewind_last(struct mdoc *mdoc, struct mdoc_node *to) +rewind_last(int tok, int type, struct mdoc *mdoc, struct mdoc_node *to) { assert(to); @@ -78,7 +78,9 @@ rewind_last(struct mdoc *mdoc, struct mdoc_node *to) return(0); if ( ! mdoc_action_post(mdoc)) return(0); - mdoc_msg(mdoc, "rewound to %s %s", + mdoc_msg(mdoc, "rewound %s %s to %s %s", + mdoc_type2a(type), + mdoc_macronames[tok], mdoc_type2a(mdoc->last->type), mdoc_macronames[mdoc->last->tok]); return(1); @@ -91,7 +93,9 @@ rewind_last(struct mdoc *mdoc, struct mdoc_node *to) return(0); if ( ! mdoc_action_post(mdoc)) return(0); - mdoc_msg(mdoc, "rewound to %s %s", + mdoc_msg(mdoc, "rewound %s %s to %s %s", + mdoc_type2a(type), + mdoc_macronames[tok], mdoc_type2a(mdoc->last->type), mdoc_macronames[mdoc->last->tok]); } while (mdoc->last != to); @@ -185,15 +189,19 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru assert(MDOC_TAIL != type); if (type == p->type && tok == p->tok) return(REWIND_REWIND); - if (MDOC_BLOCK == type && MDOC_BODY == p->type && - MDOC_Bl == p->tok) + if (MDOC_BODY == p->type && MDOC_Bl == p->tok) return(REWIND_HALT); break; case (MDOC_Sh): - /* FALLTHROUGH */ + if (type == p->type && tok == p->tok) + return(REWIND_REWIND); + break; case (MDOC_Ss): + assert(MDOC_TAIL != type); if (type == p->type && tok == p->tok) return(REWIND_REWIND); + if (MDOC_BODY == p->type && MDOC_Sh == p->tok) + return(REWIND_HALT); break; /* Multi-line explicit scope start. */ @@ -283,6 +291,7 @@ rewind_dobreak(int tok, enum mdoc_type type, const str return(1); switch (tok) { + /* Implicit rules. */ case (MDOC_It): return(MDOC_It == p->tok); case (MDOC_Ss): @@ -291,6 +300,14 @@ rewind_dobreak(int tok, enum mdoc_type type, const str if (MDOC_Ss == p->tok) return(1); return(MDOC_Sh == p->tok); + + /* Extra scope rules. */ + case (MDOC_El): + if (MDOC_It == p->tok) + return(1); + break; + default: + break; } if (MDOC_EXPLICIT & mdoc_macros[tok].flags) @@ -313,87 +330,82 @@ rewind_elem(struct mdoc *mdoc, int tok) assert(MDOC_ELEM == n->type); assert(tok == n->tok); - return(rewind_last(mdoc, n)); + return(rewind_last(tok, MDOC_ELEM, mdoc, n)); } static int -rewind_body(struct mdoc *mdoc, int tok) +rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, int tok) { struct mdoc_node *n; int c; - /* LINTED */ - for (n = mdoc->last; n; n = n->parent) { - c = rewind_dohalt(tok, MDOC_BODY, n); - if (REWIND_HALT == c) - return(1); - if (REWIND_REWIND == c) - break; - else if (rewind_dobreak(tok, MDOC_BODY, n)) - continue; - return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); - } + c = rewind_dohalt(tok, type, mdoc->last); + if (REWIND_HALT == c) + return(1); + if (REWIND_REWIND == c) + return(rewind_last(tok, type, mdoc, mdoc->last)); - assert(n); - return(rewind_last(mdoc, n)); -} - - -static int -rewind_head(struct mdoc *mdoc, int tok) -{ - struct mdoc_node *n; - int c; - /* LINTED */ - for (n = mdoc->last; n; n = n->parent) { - c = rewind_dohalt(tok, MDOC_HEAD, n); + for (n = mdoc->last->parent; n; n = n->parent) { + c = rewind_dohalt(tok, type, n); if (REWIND_HALT == c) return(1); if (REWIND_REWIND == c) break; - else if (rewind_dobreak(tok, MDOC_HEAD, n)) + else if (rewind_dobreak(tok, type, n)) continue; - return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); + return(mdoc_nerr(mdoc, n, "body scope broken")); } assert(n); - return(rewind_last(mdoc, n)); + return(rewind_last(tok, type, mdoc, n)); } static int -rewind_expblock(struct mdoc *mdoc, int tok) +rewind_expblock(struct mdoc *mdoc, int tok, int line, int ppos) { struct mdoc_node *n; int c; + c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); + if (REWIND_HALT == c) + return(mdoc_perr(mdoc, line, ppos, "closing macro has no context")); + if (REWIND_REWIND == c) + return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); + /* LINTED */ - for (n = mdoc->last; n; n = n->parent) { + for (n = mdoc->last->parent; n; n = n->parent) { c = rewind_dohalt(tok, MDOC_BLOCK, n); if (REWIND_HALT == c) - return(mdoc_err(mdoc, ERR_SCOPE_NOCTX)); + return(mdoc_perr(mdoc, line, ppos, "closing macro has no context")); if (REWIND_REWIND == c) break; else if (rewind_dobreak(tok, MDOC_BLOCK, n)) continue; - return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); + return(mdoc_nerr(mdoc, n, "block scope broken")); } assert(n); - return(rewind_last(mdoc, n)); + return(rewind_last(tok, MDOC_BLOCK, mdoc, n)); } static int -rewind_impblock(struct mdoc *mdoc, int tok) +rewind_impblock(struct mdoc *mdoc, int tok, int line, int ppos) { struct mdoc_node *n; int c; + c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); + if (REWIND_HALT == c) + return(1); + if (REWIND_REWIND == c) + return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); + /* LINTED */ - for (n = mdoc->last; n; n = n->parent) { + for (n = mdoc->last->parent; n; n = n->parent) { c = rewind_dohalt(tok, MDOC_BLOCK, n); if (REWIND_HALT == c) return(1); @@ -401,11 +413,11 @@ rewind_impblock(struct mdoc *mdoc, int tok) break; else if (rewind_dobreak(tok, MDOC_BLOCK, n)) continue; - return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK)); + return(mdoc_nerr(mdoc, n, "block scope broken")); } assert(n); - return(rewind_last(mdoc, n)); + return(rewind_last(tok, MDOC_BLOCK, mdoc, n)); } @@ -454,16 +466,19 @@ macro_scoped_close(MACRO_PROT_ARGS) tt = rewind_alt(tok); + mdoc_msg(mdoc, "parse-quiet: %s closing %s", + mdoc_macronames[tok], mdoc_macronames[tt]); + if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { if (0 == buf[*pos]) { - if ( ! rewind_body(mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) return(0); - return(rewind_expblock(mdoc, tok)); + return(rewind_expblock(mdoc, tok, line, ppos)); } - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0)); + return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters")); } - if ( ! rewind_body(mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) return(0); lastarg = ppos; @@ -479,7 +494,7 @@ macro_scoped_close(MACRO_PROT_ARGS) lastarg = *pos; if (j == maxargs && ! flushed) { - if ( ! rewind_expblock(mdoc, tok)) + if ( ! rewind_expblock(mdoc, tok, line, ppos)) return(0); flushed = 1; } @@ -496,7 +511,7 @@ macro_scoped_close(MACRO_PROT_ARGS) return(0); else if (MDOC_MAX != c) { if ( ! flushed) { - if ( ! rewind_expblock(mdoc, tok)) + if ( ! rewind_expblock(mdoc, tok, line, ppos)) return(0); flushed = 1; } @@ -511,9 +526,9 @@ macro_scoped_close(MACRO_PROT_ARGS) } if (MDOC_LINEARG_MAX == j) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if ( ! flushed && ! rewind_expblock(mdoc, tok)) + if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos)) return(0); if (ppos > 1) @@ -545,20 +560,24 @@ macro_text(MACRO_PROT_ARGS) la = *pos; c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); - if (ARGV_EOLN == c || ARGV_WORD == c) + if (ARGV_EOLN == c) break; - else if (ARGV_ARG == c) + if (ARGV_WORD == c) { + *pos = la; + break; + } else if (ARGV_ARG == c) continue; + mdoc_argv_free(argc, argv); return(0); } if (MDOC_LINEARG_MAX == argc) { mdoc_argv_free(argc, argv); - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); } - c = mdoc_elem_alloc(mdoc, line, la, tok, argc, argv); + c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv); if (0 == c) { mdoc_argv_free(argc, argv); @@ -574,17 +593,6 @@ macro_text(MACRO_PROT_ARGS) for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { la = *pos; - if (lastpunct) { - c = mdoc_elem_alloc(mdoc, line, - la, tok, argc, argv); - if (0 == c) { - mdoc_argv_free(argc, argv); - return(0); - } - mdoc->next = MDOC_NEXT_CHILD; - lastpunct = 0; - } - c = mdoc_args(mdoc, line, pos, buf, fl, &p); if (ARGS_ERROR == c) { mdoc_argv_free(argc, argv); @@ -599,7 +607,7 @@ macro_text(MACRO_PROT_ARGS) if (-1 == (c = lookup(mdoc, line, la, tok, p))) return(0); else if (MDOC_MAX != c) { - if ( ! rewind_elem(mdoc, tok)) { + if (0 == lastpunct && ! rewind_elem(mdoc, tok)) { mdoc_argv_free(argc, argv); return(0); } @@ -614,12 +622,22 @@ macro_text(MACRO_PROT_ARGS) } if (mdoc_isdelim(p)) { - if ( ! rewind_elem(mdoc, tok)) { + if (0 == lastpunct && ! rewind_elem(mdoc, tok)) { mdoc_argv_free(argc, argv); return(0); } lastpunct = 1; + } else if (lastpunct) { + c = mdoc_elem_alloc(mdoc, line, + ppos, tok, argc, argv); + if (0 == c) { + mdoc_argv_free(argc, argv); + return(0); + } + mdoc->next = MDOC_NEXT_CHILD; + lastpunct = 0; } + if ( ! mdoc_word_alloc(mdoc, line, la, p)) return(0); mdoc->next = MDOC_NEXT_SIBLING; @@ -628,9 +646,9 @@ macro_text(MACRO_PROT_ARGS) mdoc_argv_free(argc, argv); if (sz == MDOC_LINEARG_MAX) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if ( ! rewind_elem(mdoc, tok)) + if (0 == lastpunct && ! rewind_elem(mdoc, tok)) return(0); if (ppos > 1) return(1); @@ -651,18 +669,21 @@ macro_scoped(MACRO_PROT_ARGS) assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { - if ( ! rewind_body(mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) return(0); - if ( ! rewind_impblock(mdoc, tok)) + if ( ! rewind_impblock(mdoc, tok, line, ppos)) return(0); } for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { lastarg = *pos; c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); - if (ARGV_EOLN == c || ARGV_WORD == c) + if (ARGV_EOLN == c) break; - else if (ARGV_ARG == c) + if (ARGV_WORD == c) { + *pos = lastarg; + break; + } else if (ARGV_ARG == c) continue; mdoc_argv_free(argc, argv); return(0); @@ -670,7 +691,7 @@ macro_scoped(MACRO_PROT_ARGS) if (MDOC_LINEARG_MAX == argc) { mdoc_argv_free(argc, argv); - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); } c = mdoc_block_alloc(mdoc, line, ppos, @@ -685,7 +706,7 @@ macro_scoped(MACRO_PROT_ARGS) if (0 == buf[*pos]) { if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) return(0); - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) return(0); @@ -727,9 +748,9 @@ macro_scoped(MACRO_PROT_ARGS) } if (j == MDOC_LINEARG_MAX) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf)) return(0); @@ -789,17 +810,16 @@ macro_scoped_line(MACRO_PROT_ARGS) } if (j == MDOC_LINEARG_MAX) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); if (1 == ppos) { - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); if ( ! append_delims(mdoc, tok, line, pos, buf)) return(0); - } - if ( ! rewind_head(mdoc, tok)) + } else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); - return(rewind_impblock(mdoc, tok)); + return(rewind_impblock(mdoc, tok, line, ppos)); } @@ -832,7 +852,7 @@ macro_constant_scoped(MACRO_PROT_ARGS) if (0 == maxargs) { if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) return(0); - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) return(0); @@ -846,7 +866,7 @@ macro_constant_scoped(MACRO_PROT_ARGS) lastarg = *pos; if (j == maxargs && ! flushed) { - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); flushed = 1; if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) @@ -866,7 +886,7 @@ macro_constant_scoped(MACRO_PROT_ARGS) return(0); else if (MDOC_MAX != c) { if ( ! flushed) { - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); flushed = 1; if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) @@ -879,7 +899,7 @@ macro_constant_scoped(MACRO_PROT_ARGS) } if ( ! flushed && mdoc_isdelim(p)) { - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); flushed = 1; if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) @@ -893,10 +913,10 @@ macro_constant_scoped(MACRO_PROT_ARGS) } if (MDOC_LINEARG_MAX == j) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); if ( ! flushed) { - if ( ! rewind_head(mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) return(0); @@ -930,6 +950,8 @@ macro_constant_delimited(MACRO_PROT_ARGS) /* FALLTHROUGH */ case (MDOC_Ns): /* FALLTHROUGH */ + case (MDOC_Pf): + /* FALLTHROUGH */ case (MDOC_Ux): /* FALLTHROUGH */ case (MDOC_St): @@ -943,15 +965,18 @@ macro_constant_delimited(MACRO_PROT_ARGS) for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { lastarg = *pos; c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); - if (ARGV_EOLN == c || ARGV_WORD == c) + if (ARGV_EOLN == c) break; - else if (ARGV_ARG == c) + if (ARGV_WORD == c) { + *pos = lastarg; + break; + } else if (ARGV_ARG == c) continue; mdoc_argv_free(argc, argv); return(0); } - c = mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv); + c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv); mdoc_argv_free(argc, argv); if (0 == c) @@ -999,7 +1024,7 @@ macro_constant_delimited(MACRO_PROT_ARGS) } if (MDOC_LINEARG_MAX == j) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); if ( ! flushed && rewind_elem(mdoc, tok)) return(0); @@ -1021,8 +1046,6 @@ macro_constant(MACRO_PROT_ARGS) struct mdoc_arg argv[MDOC_LINEARG_MAX]; char *p; - /* FIXME: parsing macros! */ - fl = 0; if (MDOC_QUOTABLE & mdoc_macros[tok].flags) fl = ARGS_QUOTED; @@ -1032,10 +1055,11 @@ macro_constant(MACRO_PROT_ARGS) c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); if (ARGV_EOLN == c) break; - else if (ARGV_ARG == c) - continue; - else if (ARGV_WORD == c) + if (ARGV_WORD == c) { + *pos = lastarg; break; + } else if (ARGV_ARG == c) + continue; mdoc_argv_free(argc, argv); return(0); @@ -1050,7 +1074,7 @@ macro_constant(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_CHILD; if (MDOC_LINEARG_MAX == argc) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { lastarg = *pos; @@ -1060,13 +1084,22 @@ macro_constant(MACRO_PROT_ARGS) if (ARGS_EOLN == c) break; + if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) + return(0); + else if (MDOC_MAX != c) { + if ( ! rewind_elem(mdoc, tok)) + return(0); + return(mdoc_macro(mdoc, c, line, + lastarg, pos, buf)); + } + if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) return(0); mdoc->next = MDOC_NEXT_SIBLING; } if (MDOC_LINEARG_MAX == sz + argc) - return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY)); + return(mdoc_perr(mdoc, line, ppos, "too many arguments")); return(rewind_elem(mdoc, tok)); } @@ -1077,7 +1110,7 @@ int macro_obsolete(MACRO_PROT_ARGS) { - return(mdoc_pwarn(mdoc, line, ppos, WARN_IGN_OBSOLETE)); + return(mdoc_pwarn(mdoc, line, ppos, WARN_SYNTAX, "macro is obsolete")); } @@ -1087,5 +1120,6 @@ macro_end(struct mdoc *mdoc) assert(mdoc->first); assert(mdoc->last); - return(rewind_last(mdoc, mdoc->first)); + return(rewind_last(mdoc->last->tok, mdoc->last->type, + mdoc, mdoc->first)); }