=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v retrieving revision 1.108 retrieving revision 1.109 diff -c -r1.108 -r1.109 *** src/usr.bin/mandoc/mdoc_macro.c 2014/11/28 23:20:55 1.108 --- src/usr.bin/mandoc/mdoc_macro.c 2014/11/29 03:37:28 1.109 *************** *** 1,4 **** ! /* $OpenBSD: mdoc_macro.c,v 1.108 2014/11/28 23:20:55 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: mdoc_macro.c,v 1.109 2014/11/29 03:37:28 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze *************** *** 52,61 **** enum mdelim, int); static void append_delims(struct mdoc *, int, int *, char *); static enum mdoct lookup(enum mdoct, const char *); ! static enum mdoct lookup_raw(const char *); static int make_pending(struct mdoc_node *, enum mdoct, struct mdoc *, int, int); ! static void phrase(struct mdoc *, int, int, char *); static enum mdoct rew_alt(enum mdoct); static enum rew rew_dohalt(enum mdoct, enum mdoc_type, const struct mdoc_node *); --- 52,61 ---- enum mdelim, int); static void append_delims(struct mdoc *, int, int *, char *); static enum mdoct lookup(enum mdoct, const char *); ! static int macro_or_word(MACRO_PROT_ARGS, int); static int make_pending(struct mdoc_node *, enum mdoct, struct mdoc *, int, int); ! static void phrase(struct mdoc *, int, int *, char *); static enum mdoct rew_alt(enum mdoct); static enum rew rew_dohalt(enum mdoct, enum mdoc_type, const struct mdoc_node *); *************** *** 238,266 **** } /* ! * Look up a macro from within a subsequent context. */ static enum mdoct lookup(enum mdoct from, const char *p) { - - if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) - return(MDOC_MAX); - return(lookup_raw(p)); - } - - /* - * Lookup a macro following the initial line macro. - */ - static enum mdoct - lookup_raw(const char *p) - { enum mdoct res; ! if (MDOC_MAX == (res = mdoc_hash_find(p))) ! return(MDOC_MAX); ! if (MDOC_CALLABLE & mdoc_macros[res].flags) ! return(res); return(MDOC_MAX); } --- 238,256 ---- } /* ! * Look up the macro at *p called by "from", ! * or as a line macro if from == MDOC_MAX. */ static enum mdoct lookup(enum mdoct from, const char *p) { enum mdoct res; ! if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) { ! res = mdoc_hash_find(p); ! if (res != MDOC_MAX && mdoc_macros[res].flags & MDOC_CALLABLE) ! return(res); ! } return(MDOC_MAX); } *************** *** 631,647 **** static void append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) { - int la; - enum margserr ac; char *p; if (buf[*pos] == '\0') return; for (;;) { la = *pos; ! ac = mdoc_zargs(mdoc, line, pos, buf, &p); ! if (ac == ARGS_EOLN) break; dword(mdoc, line, la, p, DELIM_MAX, 1); --- 621,635 ---- static void append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) { char *p; + int la; if (buf[*pos] == '\0') return; for (;;) { la = *pos; ! if (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, &p) == ARGS_EOLN) break; dword(mdoc, line, la, p, DELIM_MAX, 1); *************** *** 663,668 **** --- 651,690 ---- } /* + * Parse one word. + * If it is a macro, call it and return 1. + * Otherwise, allocate it and return 0. + */ + static int + macro_or_word(MACRO_PROT_ARGS, int parsed) + { + char *p; + enum mdoct ntok; + + p = buf + ppos; + ntok = MDOC_MAX; + if (mdoc->flags & MDOC_PHRASELIT) + /* nothing */; + else if (*p == '"') + p++; + else if (parsed) + ntok = lookup(tok, p); + + if (ntok == MDOC_MAX) { + dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX || + mdoc_macros[tok].flags & MDOC_JOIN); + return(0); + } else { + if (mdoc_macros[tok].fp == in_line_eoln) + rew_elem(mdoc, tok); + mdoc_macro(mdoc, ntok, line, ppos, pos, buf); + if (tok == MDOC_MAX) + append_delims(mdoc, line, pos, buf); + return(1); + } + } + + /* * Close out block partial/full explicit. */ static void *************** *** 1023,1034 **** static void blk_full(MACRO_PROT_ARGS) { ! int la, nl, nparsed; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ struct mdoc_node *body; /* save of body macro */ struct mdoc_node *n; - enum mdoct ntok; enum margserr ac, lac; char *p; --- 1045,1055 ---- static void blk_full(MACRO_PROT_ARGS) { ! int la, nl, parsed; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ struct mdoc_node *body; /* save of body macro */ struct mdoc_node *n; enum margserr ac, lac; char *p; *************** *** 1075,1083 **** * parsed, even though `It' macros in general are parsed. */ ! nparsed = tok == MDOC_It && ! mdoc->last->parent->tok == MDOC_Bl && ! mdoc->last->parent->norm->Bl.type == LIST_diag; /* * The `Nd' macro has all arguments in its body: it's a hybrid --- 1096,1104 ---- * parsed, even though `It' macros in general are parsed. */ ! parsed = tok != MDOC_It || ! mdoc->last->parent->tok != MDOC_Bl || ! mdoc->last->parent->norm->Bl.type != LIST_diag; /* * The `Nd' macro has all arguments in its body: it's a hybrid *************** *** 1158,1177 **** mdoc->flags |= MDOC_PPHRASE; if (ac == ARGS_PEND && lac == ARGS_PPHRASE) mdoc->flags |= MDOC_PPHRASE; ! phrase(mdoc, line, la, buf); mdoc->flags &= ~MDOC_PPHRASE; continue; } ! ntok = nparsed || ac == ARGS_QWORD ? ! MDOC_MAX : lookup(tok, p); ! ! if (ntok != MDOC_MAX) { ! mdoc_macro(mdoc, ntok, line, la, pos, buf); break; - } - dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags); } if (head == NULL) --- 1179,1191 ---- mdoc->flags |= MDOC_PPHRASE; if (ac == ARGS_PEND && lac == ARGS_PPHRASE) mdoc->flags |= MDOC_PPHRASE; ! phrase(mdoc, line, &la, buf); mdoc->flags &= ~MDOC_PPHRASE; continue; } ! if (macro_or_word(mdoc, tok, line, la, pos, buf, parsed)) break; } if (head == NULL) *************** *** 1212,1218 **** blk_part_imp(MACRO_PROT_ARGS) { int la, nl; - enum mdoct ntok; enum margserr ac; char *p; struct mdoc_node *blk; /* saved block context */ --- 1226,1231 ---- *************** *** 1255,1268 **** if (body == NULL) body = mdoc_body_alloc(mdoc, line, ppos, tok); ! ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); ! ! if (ntok != MDOC_MAX) { ! mdoc_macro(mdoc, ntok, line, la, pos, buf); break; - } - dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags); } if (body == NULL) body = mdoc_body_alloc(mdoc, line, ppos, tok); --- 1268,1275 ---- if (body == NULL) body = mdoc_body_alloc(mdoc, line, ppos, tok); ! if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) break; } if (body == NULL) body = mdoc_body_alloc(mdoc, line, ppos, tok); *************** *** 1306,1312 **** struct mdoc_node *head; /* keep track of head */ struct mdoc_node *body; /* keep track of body */ char *p; - enum mdoct ntok; nl = MDOC_NEWLINE & mdoc->flags; --- 1313,1318 ---- *************** *** 1354,1366 **** } assert(head != NULL && body != NULL); ! ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); ! if (ntok != MDOC_MAX) { ! mdoc_macro(mdoc, ntok, line, la, pos, buf); break; - } - dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags); } /* Clean-up to leave in a consistent state. */ --- 1360,1367 ---- } assert(head != NULL && body != NULL); ! if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) break; } /* Clean-up to leave in a consistent state. */ *************** *** 1471,1510 **** in_line_eoln(MACRO_PROT_ARGS) { int la; - enum margserr ac; struct mdoc_arg *arg; - char *p; - enum mdoct ntok; - assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); - if (tok == MDOC_Pp) rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); mdoc_argv(mdoc, line, tok, &arg, pos, buf); mdoc_elem_alloc(mdoc, line, ppos, tok, arg); - /* Parse argument terms. */ - for (;;) { la = *pos; ! ac = mdoc_args(mdoc, line, pos, buf, tok, &p); ! if (ac == ARGS_EOLN) break; ! ! ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p); ! ! if (ntok != MDOC_MAX) { ! rew_elem(mdoc, tok); ! mdoc_macro(mdoc, ntok, line, la, pos, buf); return; - } - dword(mdoc, line, la, p, DELIM_MAX, - MDOC_JOIN & mdoc_macros[tok].flags); } - - /* Close out (no delimiters). */ - rew_elem(mdoc, tok); } --- 1472,1492 ---- in_line_eoln(MACRO_PROT_ARGS) { int la; struct mdoc_arg *arg; if (tok == MDOC_Pp) rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos); mdoc_argv(mdoc, line, tok, &arg, pos, buf); mdoc_elem_alloc(mdoc, line, ppos, tok, arg); for (;;) { la = *pos; ! if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN) break; ! if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) return; } rew_elem(mdoc, tok); } *************** *** 1528,1566 **** * macro is encountered. */ static void ! phrase(struct mdoc *mdoc, int line, int ppos, char *buf) { ! int la, pos; ! enum margserr ac; ! enum mdoct ntok; ! char *p; ! for (pos = ppos; ; ) { ! la = pos; ! ! ac = mdoc_zargs(mdoc, line, &pos, buf, &p); ! if (ac == ARGS_EOLN) ! break; ! ! ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p); ! ! if (ntok != MDOC_MAX) { ! mdoc_macro(mdoc, ntok, line, la, &pos, buf); ! append_delims(mdoc, line, &pos, buf); ! return; ! } ! dword(mdoc, line, la, p, DELIM_MAX, 1); ! } } static void phrase_ta(MACRO_PROT_ARGS) { struct mdoc_node *n; - int la; - enum mdoct ntok; - enum margserr ac; - char *p; /* Make sure we are in a column list or ignore this macro. */ --- 1510,1529 ---- * macro is encountered. */ static void ! phrase(struct mdoc *mdoc, int line, int *pos, char *buf) { ! int la; ! do ! la = *pos; ! while (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, NULL) != ARGS_EOLN && ! !macro_or_word(mdoc, MDOC_MAX, line, la, pos, buf, 1)); } static void phrase_ta(MACRO_PROT_ARGS) { struct mdoc_node *n; /* Make sure we are in a column list or ignore this macro. */ *************** *** 1577,1597 **** rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); mdoc_body_alloc(mdoc, line, ppos, MDOC_It); ! ! for (;;) { ! la = *pos; ! ac = mdoc_zargs(mdoc, line, pos, buf, &p); ! if (ac == ARGS_EOLN) ! break; ! ! ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p); ! ! if (ntok != MDOC_MAX) { ! mdoc_macro(mdoc, ntok, line, la, pos, buf); ! append_delims(mdoc, line, pos, buf); ! return; ! } ! dword(mdoc, line, la, p, DELIM_MAX, ! MDOC_JOIN & mdoc_macros[tok].flags); ! } } --- 1540,1544 ---- rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos); mdoc_body_alloc(mdoc, line, ppos, MDOC_It); ! phrase(mdoc, line, pos, buf); }