version 1.47, 2010/03/31 07:13:53 |
version 1.70, 2010/05/29 18:47:54 |
|
|
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
|
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
|
#include "libmandoc.h" |
|
|
#define REWIND_REWIND (1 << 0) |
enum rew { |
#define REWIND_NOHALT (1 << 1) |
REWIND_REWIND, |
#define REWIND_HALT (1 << 2) |
REWIND_NOHALT, |
|
REWIND_HALT |
|
}; |
|
|
static int ctx_synopsis(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
static int blk_exp_close(MACRO_PROT_ARGS); |
static int blk_part_exp(MACRO_PROT_ARGS); |
static int blk_part_exp(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
static int in_line_argn(MACRO_PROT_ARGS); |
static int ctx_synopsis(MACRO_PROT_ARGS); |
static int in_line(MACRO_PROT_ARGS); |
static int in_line_eoln(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
static int in_line_argn(MACRO_PROT_ARGS); |
static int blk_exp_close(MACRO_PROT_ARGS); |
static int in_line(MACRO_PROT_ARGS); |
static int blk_part_imp(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
|
|
static int phrase(struct mdoc *, int, int, char *); |
static int append_delims(struct mdoc *, |
static int rew_dohalt(enum mdoct, enum mdoc_type, |
int, int *, char *); |
const struct mdoc_node *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum mdoct lookup_raw(const char *); |
static int rew_dobreak(enum mdoct, const struct mdoc_node *); |
static int phrase(struct mdoc *, int, int, |
static int rew_elem(struct mdoc *, enum mdoct); |
char *, enum margserr); |
static int rew_sub(enum mdoc_type, struct mdoc *, |
static enum mdoct rew_alt(enum mdoct); |
enum mdoct, int, int); |
static int rew_dobreak(enum mdoct, |
static int rew_last(struct mdoc *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static enum rew rew_dohalt(enum mdoct, enum mdoc_type, |
static int append_delims(struct mdoc *, int, int *, char *); |
const struct mdoc_node *); |
static int lookup(int, const char *); |
static int rew_elem(struct mdoc *, enum mdoct); |
static int lookup_raw(const char *); |
static int rew_last(struct mdoc *, |
static int swarn(struct mdoc *, enum mdoc_type, int, int, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static int rew_sub(enum mdoc_type, struct mdoc *, |
|
enum mdoct, int, int); |
|
static int swarn(struct mdoc *, enum mdoc_type, int, |
|
int, const struct mdoc_node *); |
|
|
/* Central table of library: who gets parsed how. */ |
|
|
|
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
Line 137 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 142 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
{ in_line_argn, MDOC_PARSED | MDOC_IGNDELIM }, /* Pf */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Pf */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */ |
Line 166 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 171 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, 0 }, /* Hf */ |
{ in_line_eoln, 0 }, /* Hf */ |
{ obsolete, 0 }, /* Fr */ |
{ obsolete, 0 }, /* Fr */ |
{ in_line_eoln, 0 }, /* Ud */ |
{ in_line_eoln, 0 }, /* Ud */ |
{ in_line_eoln, 0 }, /* Lb */ |
{ in_line, 0 }, /* Lb */ |
{ in_line_eoln, 0 }, /* Lp */ |
{ in_line_eoln, 0 }, /* Lp */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ |
Line 191 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
Line 196 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
int line, int pos, const struct mdoc_node *p) |
int line, int pos, const struct mdoc_node *p) |
{ |
{ |
const char *n, *t, *tt; |
const char *n, *t, *tt; |
|
int rc; |
|
|
n = t = "<root>"; |
n = t = "<root>"; |
tt = "block"; |
tt = "block"; |
Line 223 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
Line 229 swarn(struct mdoc *mdoc, enum mdoc_type type, |
|
break; |
break; |
} |
} |
|
|
if ( ! (MDOC_IGN_SCOPE & mdoc->pflags)) |
rc = mdoc_vmsg(mdoc, MANDOCERR_SCOPE, line, pos, |
return(mdoc_verr(mdoc, line, pos, |
"%s scope breaks %s of %s", tt, t, n); |
"%s scope breaks %s scope of %s", |
|
tt, t, n)); |
/* FIXME: logic should be in driver. */ |
return(mdoc_vwarn(mdoc, line, pos, |
return(MDOC_IGN_SCOPE & mdoc->pflags ? rc : 0); |
"%s scope breaks %s scope of %s", |
|
tt, t, n)); |
|
} |
} |
|
|
|
|
Line 252 mdoc_macroend(struct mdoc *m) |
|
Line 256 mdoc_macroend(struct mdoc *m) |
|
continue; |
continue; |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
continue; |
continue; |
return(mdoc_nerr(m, n, EOPEN)); |
mdoc_nmsg(m, n, MANDOCERR_SYNTSCOPE); |
|
return(0); |
} |
} |
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
Line 264 mdoc_macroend(struct mdoc *m) |
|
Line 269 mdoc_macroend(struct mdoc *m) |
|
/* |
/* |
* Look up a macro from within a subsequent context. |
* Look up a macro from within a subsequent context. |
*/ |
*/ |
static int |
static enum mdoct |
lookup(int from, const char *p) |
lookup(enum mdoct from, const char *p) |
{ |
{ |
/* FIXME: make -diag lists be un-PARSED. */ |
/* FIXME: make -diag lists be un-PARSED. */ |
|
|
Line 278 lookup(int from, const char *p) |
|
Line 283 lookup(int from, const char *p) |
|
/* |
/* |
* Lookup a macro following the initial line macro. |
* Lookup a macro following the initial line macro. |
*/ |
*/ |
static int |
static enum mdoct |
lookup_raw(const char *p) |
lookup_raw(const char *p) |
{ |
{ |
int res; |
enum mdoct res; |
|
|
if (MDOC_MAX == (res = mdoc_hash_find(p))) |
if (MDOC_MAX == (res = mdoc_hash_find(p))) |
return(MDOC_MAX); |
return(MDOC_MAX); |
Line 368 rew_alt(enum mdoct tok) |
|
Line 373 rew_alt(enum mdoct tok) |
|
* close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT). |
* close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT). |
* The scope-closing and so on occurs in the various rew_* routines. |
* The scope-closing and so on occurs in the various rew_* routines. |
*/ |
*/ |
static int |
static enum rew |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
rew_dohalt(enum mdoct tok, enum mdoc_type type, |
const struct mdoc_node *p) |
const struct mdoc_node *p) |
{ |
{ |
Line 538 rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
|
Line 543 rew_dobreak(enum mdoct tok, const struct mdoc_node *p) |
|
return(1); |
return(1); |
break; |
break; |
case (MDOC_Oc): |
case (MDOC_Oc): |
#ifdef UGLY |
|
if (MDOC_Op == p->tok) |
if (MDOC_Op == p->tok) |
return(1); |
return(1); |
#endif |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 576 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 579 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
enum mdoct tok, int line, int ppos) |
enum mdoct tok, int line, int ppos) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
enum rew c; |
|
|
/* LINTED */ |
/* LINTED */ |
for (n = m->last; n; n = n->parent) { |
for (n = m->last; n; n = n->parent) { |
Line 586 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 589 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(1); |
return(1); |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) |
return(1); |
return(1); |
return(mdoc_perr(m, line, ppos, ENOCTX)); |
/* FIXME: shouldn't raise an error */ |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE); |
|
return(0); |
} |
} |
if (REWIND_REWIND == c) |
if (REWIND_REWIND == c) |
break; |
break; |
Line 620 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 625 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
|
|
|
|
static int |
static int |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
{ |
{ |
int c, lastarg; |
int la; |
|
enum margserr ac; |
char *p; |
char *p; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(1); |
return(1); |
|
|
for (;;) { |
for (;;) { |
lastarg = *pos; |
la = *pos; |
c = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p); |
assert(ARGS_PHRASE != c); |
|
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == ac) |
break; |
break; |
assert(mdoc_isdelim(p)); |
|
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) |
assert(DELIM_NONE != mdoc_isdelim(p)); |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
|
|
|
/* |
|
* If we encounter end-of-sentence symbols, then trigger |
|
* the double-space. |
|
* |
|
* XXX: it's easy to allow this to propogate outward to |
|
* the last symbol, such that `. )' will cause the |
|
* correct double-spacing. However, (1) groff isn't |
|
* smart enough to do this and (2) it would require |
|
* knowing which symbols break this behaviour, for |
|
* example, `. ;' shouldn't propogate the double-space. |
|
*/ |
|
if (mandoc_eos(p, strlen(p))) |
|
m->last->flags |= MDOC_EOS; |
} |
} |
|
|
return(1); |
return(1); |
Line 652 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 672 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
static int |
static int |
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
{ |
{ |
int j, c, lastarg, maxargs, flushed; |
int j, lastarg, maxargs, flushed, nl; |
|
enum margserr ac; |
|
enum mdoct ntok; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Ec): |
case (MDOC_Ec): |
maxargs = 1; |
maxargs = 1; |
Line 665 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 689 blk_exp_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
|
/* FIXME: do this in validate */ |
if (buf[*pos]) |
if (buf[*pos]) |
if ( ! mdoc_pwarn(m, line, ppos, ENOLINE)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST)) |
return(0); |
return(0); |
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
Line 690 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 715 blk_exp_close(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
if ( ! flushed) { |
|
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if (MDOC_MAX == ntok) { |
return(0); |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
flushed = 1; |
|
} |
|
if ( ! mdoc_macro(m, c, line, lastarg, pos, buf)) |
|
return(0); |
return(0); |
break; |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
if ( ! flushed) { |
|
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
|
return(0); |
|
flushed = 1; |
|
} |
|
if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf)) |
return(0); |
return(0); |
|
break; |
} |
} |
|
|
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) |
return(0); |
return(0); |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 726 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 754 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, lastpunct, c, w, cnt, d, nc; |
int la, scope, cnt, nc, nl; |
struct mdoc_arg *arg; |
enum margverr av; |
char *p; |
enum mdoct ntok; |
|
enum margserr ac; |
|
enum mdelim d; |
|
struct mdoc_arg *arg; |
|
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* Whether we allow ignored elements (those without content, |
* Whether we allow ignored elements (those without content, |
* usually because of reserved words) to squeak by. |
* usually because of reserved words) to squeak by. |
Line 756 in_line(MACRO_PROT_ARGS) |
|
Line 790 in_line(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
return(0); |
return(0); |
} |
} |
|
|
for (cnt = 0, lastpunct = 1;; ) { |
for (cnt = scope = 0;; ) { |
la = *pos; |
la = *pos; |
w = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == w) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == w) |
if (ARGS_EOLN == ac) |
break; |
break; |
if (ARGS_PUNCT == w) |
if (ARGS_PUNCT == ac) |
break; |
break; |
|
|
/* Quoted words shouldn't be looked-up. */ |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p); |
|
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
* execute it. Close out scope, if open. If no |
* execute it. Close out scope, if open. If no |
Line 793 in_line(MACRO_PROT_ARGS) |
|
Line 825 in_line(MACRO_PROT_ARGS) |
|
* or raise a warning. |
* or raise a warning. |
*/ |
*/ |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != ntok) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(m, tok)) |
return(0); |
return(0); |
if (nc && 0 == cnt) { |
if (nc && 0 == cnt) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
Line 803 in_line(MACRO_PROT_ARGS) |
|
Line 835 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! mdoc_pwarn(m, line, ppos, EIGNE)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
return(0); |
return(0); |
} |
} |
c = mdoc_macro(m, c, line, la, pos, buf); |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if (0 == c) |
|
return(0); |
return(0); |
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 820 in_line(MACRO_PROT_ARGS) |
|
Line 851 in_line(MACRO_PROT_ARGS) |
|
* the word. |
* the word. |
*/ |
*/ |
|
|
d = mdoc_isdelim(p); |
d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p); |
|
|
if (ARGS_QWORD != w && d) { |
if (DELIM_NONE != d) { |
if (0 == lastpunct && ! rew_elem(m, tok)) |
/* |
|
* If we encounter closing punctuation, no word |
|
* has been omitted, no scope is open, and we're |
|
* allowed to have an empty element, then start |
|
* a new scope. `Ar', `Fl', and `Li', only do |
|
* this once per invocation. There may be more |
|
* of these (all of them?). |
|
*/ |
|
if (0 == cnt && (nc || MDOC_Li == tok) && |
|
DELIM_CLOSE == d && ! scope) { |
|
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
|
return(0); |
|
if (MDOC_Ar == tok || MDOC_Li == tok || |
|
MDOC_Fl == tok) |
|
cnt++; |
|
scope = 1; |
|
} |
|
/* |
|
* Close out our scope, if one is open, before |
|
* any punctuation. |
|
*/ |
|
if (scope && ! rew_elem(m, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
scope = 0; |
} else if (lastpunct) { |
} else if ( ! scope) { |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg)) |
return(0); |
return(0); |
lastpunct = 0; |
scope = 1; |
} |
} |
|
|
if ( ! d) |
if (DELIM_NONE == d) |
cnt++; |
cnt++; |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 842 in_line(MACRO_PROT_ARGS) |
|
Line 894 in_line(MACRO_PROT_ARGS) |
|
* word so that the `-' can be added to each one without |
* word so that the `-' can be added to each one without |
* having to parse out spaces. |
* having to parse out spaces. |
*/ |
*/ |
if (0 == lastpunct && MDOC_Fl == tok) { |
if (scope && MDOC_Fl == tok) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
lastpunct = 1; |
scope = 0; |
} |
} |
} |
} |
|
|
if (0 == lastpunct && ! rew_elem(m, tok)) |
if (scope && ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 865 in_line(MACRO_PROT_ARGS) |
|
Line 917 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! mdoc_pwarn(m, line, ppos, EIGNE)) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
return(0); |
return(0); |
} |
} |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 878 in_line(MACRO_PROT_ARGS) |
|
Line 930 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int c, la; |
int la, nl; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *head; /* save of head macro */ |
struct mdoc_node *head; /* save of head macro */ |
|
struct mdoc_node *body; /* save of body macro */ |
|
#ifdef UGLY |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
#endif |
|
enum mdoct ntok; |
|
enum margserr ac, lac; |
|
enum margverr av; |
char *p; |
char *p; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* Close out prior implicit scope. */ |
/* Close out prior implicit scope. */ |
|
|
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { |
Line 904 blk_full(MACRO_PROT_ARGS) |
|
Line 964 blk_full(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL;; ) { |
for (arg = NULL;; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 923 blk_full(MACRO_PROT_ARGS) |
|
Line 983 blk_full(MACRO_PROT_ARGS) |
|
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) |
return(0); |
return(0); |
|
|
head = NULL; |
head = body = NULL; |
|
|
/* |
/* |
* The `Nd' macro has all arguments in its body: it's a hybrid |
* The `Nd' macro has all arguments in its body: it's a hybrid |
Line 938 blk_full(MACRO_PROT_ARGS) |
|
Line 998 blk_full(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
if ( ! mdoc_body_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
body = m->last; |
} |
} |
|
|
for (;;) { |
ac = ARGS_ERROR; |
|
|
|
for ( ; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
lac = ac; |
|
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
|
if (ARGS_PEND == ac) { |
|
if (ARGS_PPHRASE == lac) |
|
ac = ARGS_PPHRASE; |
|
else |
|
ac = ARGS_PHRASE; |
|
} |
|
|
/* Don't emit leading punct. for phrases. */ |
/* Don't emit leading punct. for phrases. */ |
|
|
if (NULL == head && ARGS_PHRASE != c && |
if (NULL == head && |
1 == mdoc_isdelim(p)) { |
ARGS_PHRASE != ac && |
|
ARGS_PPHRASE != ac && |
|
ARGS_QWORD != ac && |
|
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 960 blk_full(MACRO_PROT_ARGS) |
|
Line 1034 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* Always re-open head for phrases. */ |
/* Always re-open head for phrases. */ |
|
|
if (NULL == head || ARGS_PHRASE == c) { |
if (NULL == head || |
|
ARGS_PHRASE == ac || |
|
ARGS_PPHRASE == ac) { |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
head = m->last; |
} |
} |
|
|
if (ARGS_PHRASE == c) { |
if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) { |
if ( ! phrase(m, line, la, buf)) |
if (ARGS_PPHRASE == ac) |
|
m->flags |= MDOC_PPHRASE; |
|
if ( ! phrase(m, line, la, buf, ac)) |
return(0); |
return(0); |
|
m->flags &= ~MDOC_PPHRASE; |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
c = lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
if (MDOC_MAX != c) { |
|
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
if (MDOC_MAX == ntok) { |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
break; |
continue; |
} |
} |
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
|
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
|
return(0); |
|
break; |
} |
} |
|
|
if (NULL == head) { |
if (NULL == head) { |
Line 991 blk_full(MACRO_PROT_ARGS) |
|
Line 1072 blk_full(MACRO_PROT_ARGS) |
|
head = m->last; |
head = m->last; |
} |
} |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* See notes on `Nd' hybrid, above. */ |
/* If we've already opened our body, exit now. */ |
|
|
if (MDOC_Nd == tok) |
if (NULL != body) |
return(1); |
return(1); |
|
|
#ifdef UGLY |
#ifdef UGLY |
/* |
/* |
* If there is an open sub-block requiring explicit close-out, |
* If there is an open (i.e., unvalidated) sub-block requiring |
* postpone switching the current block from head to body until |
* explicit close-out, postpone switching the current block from |
* the rew_sub() call closing out that sub-block. |
* head to body until the rew_sub() call closing out that |
|
* sub-block. |
*/ |
*/ |
for (n = m->last; n && n != head; n = n->parent) { |
for (n = m->last; n && n != head; n = n->parent) { |
if (MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
if (MDOC_BLOCK == n->type && |
MDOC_BLOCK == n->type) { |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
|
! (MDOC_VALID & n->flags)) { |
|
assert( ! (MDOC_ACTED & n->flags)); |
n->pending = head; |
n->pending = head; |
return(1); |
return(1); |
} |
} |
Line 1028 blk_full(MACRO_PROT_ARGS) |
|
Line 1112 blk_full(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_imp(MACRO_PROT_ARGS) |
blk_part_imp(MACRO_PROT_ARGS) |
{ |
{ |
int la, c; |
int la, nl; |
|
enum mdoct ntok; |
|
enum margserr ac; |
char *p; |
char *p; |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *blk; /* saved block context */ |
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *body; /* saved body context */ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* A macro that spans to the end of the line. This is generally |
* A macro that spans to the end of the line. This is generally |
* (but not necessarily) called as the first macro. The block |
* (but not necessarily) called as the first macro. The block |
Line 1061 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1149 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
for (body = NULL; ; ) { |
for (body = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
assert(ARGS_PHRASE != c); |
if (ARGS_ERROR == ac) |
|
|
if (ARGS_ERROR == c) |
|
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
|
|
if (NULL == body && 1 == mdoc_isdelim(p)) { |
if (NULL == body && ARGS_QWORD != ac && |
|
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1084 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1171 blk_part_imp(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
|
|
if (MDOC_MAX == ntok) { |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
break; |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
|
break; |
} |
} |
|
|
/* Clean-ups to leave in a consistent state. */ |
/* Clean-ups to leave in a consistent state. */ |
Line 1102 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1192 blk_part_imp(MACRO_PROT_ARGS) |
|
body = m->last; |
body = m->last; |
} |
} |
|
|
#ifdef UGLY |
for (n = body->child; n && n->next; n = n->next) |
|
/* Do nothing. */ ; |
|
|
/* |
/* |
|
* End of sentence spacing: if the last node is a text node and |
|
* has a trailing period, then mark it as being end-of-sentence. |
|
*/ |
|
|
|
if (n && MDOC_TEXT == n->type && n->string) |
|
if (mandoc_eos(n->string, strlen(n->string))) |
|
n->flags |= MDOC_EOS; |
|
|
|
/* Up-propogate the end-of-space flag. */ |
|
|
|
if (n && (MDOC_EOS & n->flags)) { |
|
body->flags |= MDOC_EOS; |
|
body->parent->flags |= MDOC_EOS; |
|
} |
|
|
|
/* |
* If we can't rewind to our body, then our scope has already |
* If we can't rewind to our body, then our scope has already |
* been closed by another macro (like `Oc' closing `Op'). This |
* been closed by another macro (like `Oc' closing `Op'). This |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* is ugly behaviour nodding its head to OpenBSD's overwhelming |
* crufty use of `Op' breakage. |
* crufty use of `Op' breakage. |
|
* |
|
* FIXME - this should be ifdef'd OpenBSD? |
*/ |
*/ |
for (n = m->last; n; n = n->parent) |
for (n = m->last; n; n = n->parent) |
if (body == n) |
if (body == n) |
break; |
break; |
#endif |
|
|
|
if (NULL == n && ! mdoc_nwarn(m, body, EIMPBRK)) |
if (NULL == n && ! mdoc_nmsg(m, body, MANDOCERR_SCOPE)) |
return(0); |
return(0); |
|
|
if (n && ! rew_last(m, body)) |
if (n && ! rew_last(m, body)) |
Line 1122 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1231 blk_part_imp(MACRO_PROT_ARGS) |
|
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (1 == ppos && ! append_delims(m, line, pos, buf)) |
if (nl && ! append_delims(m, line, pos, buf)) |
return(0); |
return(0); |
|
|
/* Rewind scope, if applicable. */ |
/* Rewind scope, if applicable. */ |
Line 1137 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1246 blk_part_imp(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_part_exp(MACRO_PROT_ARGS) |
blk_part_exp(MACRO_PROT_ARGS) |
{ |
{ |
int la, c; |
int la, nl; |
|
enum margserr ac; |
struct mdoc_node *head; /* keep track of head */ |
struct mdoc_node *head; /* keep track of head */ |
struct mdoc_node *body; /* keep track of body */ |
struct mdoc_node *body; /* keep track of body */ |
char *p; |
char *p; |
|
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* The opening of an explicit macro having zero or more leading |
* The opening of an explicit macro having zero or more leading |
* punctuation nodes; a head with optional single element (the |
* punctuation nodes; a head with optional single element (the |
Line 1153 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1266 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
for (head = body = NULL; ; ) { |
for (head = body = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(ARGS_PHRASE != c); |
|
|
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && 1 == mdoc_isdelim(p)) { |
if (NULL == head && ARGS_QWORD != ac && |
|
DELIM_OPEN == mdoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
Line 1204 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1316 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
assert(NULL != head && NULL != body); |
assert(NULL != head && NULL != body); |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
|
|
if (MDOC_MAX == ntok) { |
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
break; |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
|
break; |
} |
} |
|
|
/* Clean-up to leave in a consistent state. */ |
/* Clean-up to leave in a consistent state. */ |
Line 1232 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1347 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
|
|
if (ppos > 1) |
if ( ! nl) |
return(1); |
return(1); |
|
|
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
in_line_argn(MACRO_PROT_ARGS) |
in_line_argn(MACRO_PROT_ARGS) |
{ |
{ |
int la, flushed, j, c, maxargs; |
int la, flushed, j, maxargs, nl; |
struct mdoc_arg *arg; |
enum margserr ac; |
char *p; |
enum margverr av; |
|
struct mdoc_arg *arg; |
|
char *p; |
|
enum mdoct ntok; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* |
/* |
* A line macro that has a fixed number of arguments (maxargs). |
* A line macro that has a fixed number of arguments (maxargs). |
* Only open the scope once the first non-leading-punctuation is |
* Only open the scope once the first non-leading-punctuation is |
Line 1274 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1394 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
|
|
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 1292 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1412 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
for (flushed = j = 0; ; ) { |
for (flushed = j = 0; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_PUNCT == c) |
if (ARGS_PUNCT == ac) |
break; |
break; |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
0 == j && 1 == mdoc_isdelim(p)) { |
ARGS_QWORD != ac && |
|
0 == j && DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
continue; |
continue; |
Line 1316 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1437 in_line_argn(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
if (MDOC_MAX != (c = lookup(tok, p))) { |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
|
if (MDOC_MAX != ntok) { |
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
if ( ! mdoc_macro(m, c, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
j++; |
j++; |
break; |
break; |
} |
} |
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
! flushed && mdoc_isdelim(p)) { |
ARGS_QWORD != ac && |
|
! flushed && |
|
DELIM_NONE != mdoc_isdelim(p)) { |
if ( ! rew_elem(m, tok)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
flushed = 1; |
flushed = 1; |
Line 1361 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1486 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
if ( ! flushed && ! rew_elem(m, tok)) |
if ( ! flushed && ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
if ( ! nl) |
if (ppos > 1) |
|
return(1); |
return(1); |
return(append_delims(m, line, pos, buf)); |
return(append_delims(m, line, pos, buf)); |
} |
} |
Line 1371 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1495 in_line_argn(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
int c, w, la; |
int la; |
struct mdoc_arg *arg; |
enum margserr ac; |
char *p; |
enum margverr av; |
|
struct mdoc_arg *arg; |
|
char *p; |
|
enum mdoct ntok; |
|
|
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
|
|
Line 1381 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1508 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
la = *pos; |
la = *pos; |
c = mdoc_argv(m, line, tok, &arg, pos, buf); |
av = mdoc_argv(m, line, tok, &arg, pos, buf); |
|
|
if (ARGV_WORD == c) { |
if (ARGV_WORD == av) { |
*pos = la; |
*pos = la; |
break; |
break; |
} |
} |
if (ARGV_EOLN == c) |
if (ARGV_EOLN == av) |
break; |
break; |
if (ARGV_ARG == c) |
if (ARGV_ARG == av) |
continue; |
continue; |
|
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
Line 1405 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1532 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
w = mdoc_args(m, line, pos, buf, tok, &p); |
ac = mdoc_args(m, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == w) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == w) |
if (ARGS_EOLN == ac) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX == ntok) { |
if ( ! rew_elem(m, tok)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
return(mdoc_macro(m, c, line, la, pos, buf)); |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! rew_elem(m, tok)) |
return(0); |
return(0); |
|
return(mdoc_macro(m, ntok, line, la, pos, buf)); |
} |
} |
|
|
/* Close out (no delimiters). */ |
/* Close out (no delimiters). */ |
Line 1434 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1562 in_line_eoln(MACRO_PROT_ARGS) |
|
static int |
static int |
ctx_synopsis(MACRO_PROT_ARGS) |
ctx_synopsis(MACRO_PROT_ARGS) |
{ |
{ |
|
int nl; |
|
|
|
nl = MDOC_NEWLINE & m->flags; |
|
|
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
if (SEC_SYNOPSIS != m->lastsec) |
if (SEC_SYNOPSIS != m->lastsec) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* If we're a nested call, same place. */ |
/* If we're a nested call, same place. */ |
if (ppos > 1) |
if ( ! nl) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* |
/* |
|
|
obsolete(MACRO_PROT_ARGS) |
obsolete(MACRO_PROT_ARGS) |
{ |
{ |
|
|
return(mdoc_pwarn(m, line, ppos, EOBS)); |
return(mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS)); |
} |
} |
|
|
|
|
Line 1468 obsolete(MACRO_PROT_ARGS) |
|
Line 1599 obsolete(MACRO_PROT_ARGS) |
|
* macro is encountered. |
* macro is encountered. |
*/ |
*/ |
static int |
static int |
phrase(struct mdoc *m, int line, int ppos, char *buf) |
phrase(struct mdoc *m, int line, int ppos, char *buf, enum margserr ac) |
{ |
{ |
int c, w, la, pos; |
int la, pos; |
char *p; |
enum margserr aac; |
|
enum mdoct ntok; |
|
char *p; |
|
|
|
assert(ARGS_PHRASE == ac || ARGS_PPHRASE == ac); |
|
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
/* Note: no calling context! */ |
aac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
w = mdoc_zargs(m, line, &pos, buf, 0, &p); |
|
|
|
if (ARGS_ERROR == w) |
if (ARGS_ERROR == aac) |
return(0); |
return(0); |
if (ARGS_EOLN == w) |
if (ARGS_EOLN == aac) |
break; |
break; |
|
|
c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == aac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_macro(m, c, line, la, &pos, buf)) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
return(0); |
return(0); |
return(append_delims(m, line, &pos, buf)); |
continue; |
} |
} |
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! mdoc_macro(m, ntok, line, la, &pos, buf)) |
return(0); |
return(0); |
|
return(append_delims(m, line, &pos, buf)); |
} |
} |
|
|
return(1); |
return(1); |