version 1.108, 2015/04/19 14:57:38 |
version 1.117, 2017/05/04 17:48:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 38 static void blk_imp(MACRO_PROT_ARGS); |
|
Line 38 static void blk_imp(MACRO_PROT_ARGS); |
|
static void in_line_eoln(MACRO_PROT_ARGS); |
static void in_line_eoln(MACRO_PROT_ARGS); |
static int man_args(struct roff_man *, int, |
static int man_args(struct roff_man *, int, |
int *, char *, char **); |
int *, char *, char **); |
static void rew_scope(struct roff_man *, int); |
static void rew_scope(struct roff_man *, enum roff_tok); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX - MAN_TH] = { |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
|
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
Line 63 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 62 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_exp, MAN_BSCOPE }, /* RS */ |
{ blk_exp, MAN_BSCOPE }, /* RS */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* DT */ |
Line 80 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 79 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ in_line_eoln, 0 }, /* ll */ |
{ in_line_eoln, 0 }, /* ll */ |
}; |
}; |
|
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
|
|
const struct man_macro * const man_macros = __man_macros; |
|
|
|
|
|
void |
void |
man_unscope(struct roff_man *man, const struct roff_node *to) |
man_unscope(struct roff_man *man, const struct roff_node *to) |
{ |
{ |
Line 95 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 93 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
/* Reached the end of the document? */ |
/* Reached the end of the document? */ |
|
|
if (to == NULL && ! (n->flags & MAN_VALID)) { |
if (to == NULL && ! (n->flags & NODE_VALID)) { |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
man_macros[n->tok].flags & MAN_SCOPED) { |
man_macros[n->tok].flags & MAN_SCOPED) { |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
man->parse, n->line, n->pos, |
man->parse, n->line, n->pos, |
"EOF breaks %s", |
"EOF breaks %s", roff_name[n->tok]); |
man_macronames[n->tok]); |
|
if (man->flags & MAN_ELINE) |
if (man->flags & MAN_ELINE) |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
else { |
else { |
Line 118 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 115 man_unscope(struct roff_man *man, const struct roff_no |
|
man_macros[n->tok].fp == blk_exp) |
man_macros[n->tok].fp == blk_exp) |
mandoc_msg(MANDOCERR_BLK_NOEND, |
mandoc_msg(MANDOCERR_BLK_NOEND, |
man->parse, n->line, n->pos, |
man->parse, n->line, n->pos, |
man_macronames[n->tok]); |
roff_name[n->tok]); |
} |
} |
|
|
/* |
/* |
Line 130 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 127 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
man->last = n; |
man->last = n; |
n = n->parent; |
n = n->parent; |
man_valid_post(man); |
man->last->flags |= NODE_VALID; |
} |
} |
|
|
/* |
/* |
Line 150 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 147 man_unscope(struct roff_man *man, const struct roff_no |
|
* scopes. When a scope is closed, it must be validated and actioned. |
* scopes. When a scope is closed, it must be validated and actioned. |
*/ |
*/ |
static void |
static void |
rew_scope(struct roff_man *man, int tok) |
rew_scope(struct roff_man *man, enum roff_tok tok) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
/* Preserve empty paragraphs before RS. */ |
/* Preserve empty paragraphs before RS. */ |
|
|
n = man->last; |
n = man->last; |
if (tok == MAN_RS && n->nchild == 0 && |
if (tok == MAN_RS && n->child == NULL && |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
return; |
return; |
|
|
for (;;) { |
for (;;) { |
if (n->type == ROFFT_ROOT) |
if (n->type == ROFFT_ROOT) |
return; |
return; |
if (n->flags & MAN_VALID) { |
if (n->flags & NODE_VALID) { |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
} |
} |
Line 193 rew_scope(struct roff_man *man, int tok) |
|
Line 190 rew_scope(struct roff_man *man, int tok) |
|
void |
void |
blk_close(MACRO_PROT_ARGS) |
blk_close(MACRO_PROT_ARGS) |
{ |
{ |
int ntok; |
enum roff_tok ntok; |
const struct roff_node *nn; |
const struct roff_node *nn; |
char *p; |
char *p; |
int nrew, target; |
int nrew, target; |
Line 225 blk_close(MACRO_PROT_ARGS) |
|
Line 222 blk_close(MACRO_PROT_ARGS) |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
|
|
for (nn = man->last->parent; nn; nn = nn->parent) |
for (nn = man->last->parent; nn; nn = nn->parent) |
Line 234 blk_close(MACRO_PROT_ARGS) |
|
Line 230 blk_close(MACRO_PROT_ARGS) |
|
|
|
if (nn == NULL) { |
if (nn == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
line, ppos, man_macronames[tok]); |
line, ppos, roff_name[tok]); |
rew_scope(man, MAN_PP); |
rew_scope(man, MAN_PP); |
} else { |
} else { |
line = man->last->line; |
line = man->last->line; |
Line 267 blk_exp(MACRO_PROT_ARGS) |
|
Line 263 blk_exp(MACRO_PROT_ARGS) |
|
roff_word_alloc(man, line, la, p); |
roff_word_alloc(man, line, la, p); |
|
|
if (buf[*pos] != '\0') |
if (buf[*pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, |
man->parse, line, *pos, "%s ... %s", |
*pos, "%s ... %s", roff_name[tok], buf + *pos); |
man_macronames[tok], buf + *pos); |
|
|
|
man_unscope(man, head); |
man_unscope(man, head); |
roff_body_alloc(man, line, ppos, tok); |
roff_body_alloc(man, line, ppos, tok); |
Line 332 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 327 in_line_eoln(MACRO_PROT_ARGS) |
|
n = man->last; |
n = man->last; |
|
|
for (;;) { |
for (;;) { |
if (buf[*pos] != '\0' && (tok == MAN_br || |
if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) { |
tok == MAN_fi || tok == MAN_nf)) { |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
man->parse, line, *pos, "%s %s", |
man->parse, line, *pos, "%s %s", |
man_macronames[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
if (buf[*pos] != '\0' && man->last != n && |
if (buf[*pos] != '\0' && man->last != n && |
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
man->parse, line, *pos, "%s ... %s", |
man->parse, line, *pos, "%s ... %s", |
man_macronames[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
la = *pos; |
la = *pos; |
Line 357 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 351 in_line_eoln(MACRO_PROT_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Append MAN_EOS in case the last snipped argument |
* Append NODE_EOS in case the last snipped argument |
* ends with a dot, e.g. `.IR syslog (3).' |
* ends with a dot, e.g. `.IR syslog (3).' |
*/ |
*/ |
|
|
if (n != man->last && |
if (n != man->last && |
mandoc_eos(man->last->string, strlen(man->last->string))) |
mandoc_eos(man->last->string, strlen(man->last->string))) |
man->last->flags |= MAN_EOS; |
man->last->flags |= NODE_EOS; |
|
|
/* |
/* |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
Line 380 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 374 in_line_eoln(MACRO_PROT_ARGS) |
|
assert(man->last->type != ROFFT_ROOT); |
assert(man->last->type != ROFFT_ROOT); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
|
|
/* |
/* Rewind our element scope. */ |
* Rewind our element scope. Note that when TH is pruned, we'll |
|
* be back at the root, so make sure that we don't clobber as |
|
* its sibling. |
|
*/ |
|
|
|
for ( ; man->last; man->last = man->last->parent) { |
for ( ; man->last; man->last = man->last->parent) { |
|
man_state(man, man->last); |
if (man->last == n) |
if (man->last == n) |
break; |
break; |
if (man->last->type == ROFFT_ROOT) |
|
break; |
|
man_valid_post(man); |
|
} |
} |
|
|
assert(man->last); |
|
|
|
/* |
|
* Same here regarding whether we're back at the root. |
|
*/ |
|
|
|
if (man->last->type != ROFFT_ROOT) |
|
man_valid_post(man); |
|
} |
} |
|
|
|
|
void |
void |
man_macroend(struct roff_man *man) |
man_endparse(struct roff_man *man) |
{ |
{ |
|
|
man_unscope(man, man->first); |
man_unscope(man, man->first); |
|
man->flags &= ~MAN_LITERAL; |
} |
} |
|
|
static int |
static int |
Line 422 man_args(struct roff_man *man, int line, int *pos, cha |
|
Line 401 man_args(struct roff_man *man, int line, int *pos, cha |
|
assert(' ' != *start); |
assert(' ' != *start); |
|
|
if ('\0' == *start) |
if ('\0' == *start) |
return(0); |
return 0; |
|
|
*v = mandoc_getarg(man->parse, v, line, pos); |
*v = mandoc_getarg(man->parse, v, line, pos); |
return(1); |
return 1; |
} |
} |