version 1.127, 2018/08/17 20:33:37 |
version 1.135, 2018/12/14 05:18:02 |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
|
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
Line 41 static int man_args(struct roff_man *, int, |
|
Line 42 static int man_args(struct roff_man *, int, |
|
static void rew_scope(struct roff_man *, enum roff_tok); |
static void rew_scope(struct roff_man *, enum roff_tok); |
|
|
static const struct man_macro man_macros[MAN_MAX - MAN_TH] = { |
static const struct man_macro man_macros[MAN_MAX - MAN_TH] = { |
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ in_line_eoln, MAN_XSCOPE }, /* TH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* SS */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* TP */ |
{ blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* TP */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* TQ */ |
{ blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* TQ */ |
{ blk_imp, MAN_BSCOPE }, /* LP */ |
{ blk_imp, MAN_XSCOPE }, /* LP */ |
{ blk_imp, MAN_BSCOPE }, /* PP */ |
{ blk_imp, MAN_XSCOPE }, /* PP */ |
{ blk_imp, MAN_BSCOPE }, /* P */ |
{ blk_imp, MAN_XSCOPE }, /* P */ |
{ blk_imp, MAN_BSCOPE }, /* IP */ |
{ blk_imp, MAN_XSCOPE }, /* IP */ |
{ blk_imp, MAN_BSCOPE }, /* HP */ |
{ blk_imp, MAN_XSCOPE }, /* HP */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* SM */ |
{ in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* SM */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* SB */ |
{ in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* SB */ |
{ in_line_eoln, 0 }, /* BI */ |
{ in_line_eoln, 0 }, /* BI */ |
{ in_line_eoln, 0 }, /* IB */ |
{ in_line_eoln, 0 }, /* IB */ |
{ in_line_eoln, 0 }, /* BR */ |
{ in_line_eoln, 0 }, /* BR */ |
{ in_line_eoln, 0 }, /* RB */ |
{ in_line_eoln, 0 }, /* RB */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* R */ |
{ in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* R */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* B */ |
{ in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* B */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* I */ |
{ 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 }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_close, MAN_XSCOPE }, /* RE */ |
{ blk_exp, MAN_BSCOPE }, /* RS */ |
{ blk_exp, MAN_XSCOPE }, /* RS */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* UC */ |
{ in_line_eoln, 0 }, /* UC */ |
{ in_line_eoln, MAN_NSCOPED }, /* PD */ |
{ in_line_eoln, MAN_NSCOPED }, /* PD */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, MAN_NSCOPED }, /* in */ |
{ in_line_eoln, MAN_NSCOPED }, /* in */ |
|
{ blk_imp, MAN_XSCOPE }, /* SY */ |
|
{ blk_close, MAN_XSCOPE }, /* YS */ |
{ in_line_eoln, 0 }, /* OP */ |
{ in_line_eoln, 0 }, /* OP */ |
{ in_line_eoln, MAN_BSCOPE }, /* EX */ |
{ in_line_eoln, MAN_XSCOPE }, /* EX */ |
{ in_line_eoln, MAN_BSCOPE }, /* EE */ |
{ in_line_eoln, MAN_XSCOPE }, /* EE */ |
{ blk_exp, MAN_BSCOPE }, /* UR */ |
{ blk_exp, MAN_XSCOPE }, /* UR */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ blk_close, MAN_XSCOPE }, /* UE */ |
{ blk_exp, MAN_BSCOPE }, /* MT */ |
{ blk_exp, MAN_XSCOPE }, /* MT */ |
{ blk_close, MAN_BSCOPE }, /* ME */ |
{ blk_close, MAN_XSCOPE }, /* ME */ |
}; |
}; |
|
|
|
|
Line 101 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 104 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
if (to == NULL && ! (n->flags & NODE_VALID)) { |
if (to == NULL && ! (n->flags & NODE_VALID)) { |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
man_macro(n->tok)->flags & MAN_SCOPED) { |
man_macro(n->tok)->flags & |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
(MAN_BSCOPED | MAN_NSCOPED)) { |
man->parse, n->line, n->pos, |
mandoc_msg(MANDOCERR_BLK_LINE, |
|
n->line, n->pos, |
"EOF breaks %s", roff_name[n->tok]); |
"EOF breaks %s", roff_name[n->tok]); |
if (man->flags & MAN_ELINE) |
if (man->flags & MAN_ELINE) |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
Line 120 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 124 man_unscope(struct roff_man *man, const struct roff_no |
|
if (n->type == ROFFT_BLOCK && |
if (n->type == ROFFT_BLOCK && |
man_macro(n->tok)->fp == blk_exp) |
man_macro(n->tok)->fp == blk_exp) |
mandoc_msg(MANDOCERR_BLK_NOEND, |
mandoc_msg(MANDOCERR_BLK_NOEND, |
man->parse, n->line, n->pos, |
n->line, n->pos, "%s", |
roff_name[n->tok]); |
roff_name[n->tok]); |
} |
} |
|
|
Line 212 blk_close(MACRO_PROT_ARGS) |
|
Line 216 blk_close(MACRO_PROT_ARGS) |
|
nrew++; |
nrew++; |
target = strtol(p, &p, 10); |
target = strtol(p, &p, 10); |
if (*p != '\0') |
if (*p != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, |
mandoc_msg(MANDOCERR_ARG_EXCESS, line, |
line, p - buf, "RE ... %s", p); |
(int)(p - buf), "RE ... %s", p); |
if (target == 0) |
if (target == 0) |
target = 1; |
target = 1; |
nrew -= target; |
nrew -= target; |
if (nrew < 1) { |
if (nrew < 1) { |
mandoc_vmsg(MANDOCERR_RE_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_RE_NOTOPEN, |
line, ppos, "RE %d", target); |
line, ppos, "RE %d", target); |
return; |
return; |
} |
} |
break; |
break; |
|
case MAN_YS: |
|
ntok = MAN_SY; |
|
break; |
case MAN_UE: |
case MAN_UE: |
ntok = MAN_UR; |
ntok = MAN_UR; |
break; |
break; |
Line 238 blk_close(MACRO_PROT_ARGS) |
|
Line 245 blk_close(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (nn == NULL) { |
if (nn == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, |
line, ppos, roff_name[tok]); |
line, ppos, "%s", roff_name[tok]); |
rew_scope(man, MAN_PP); |
rew_scope(man, MAN_PP); |
|
if (tok == MAN_RE) { |
|
roff_elem_alloc(man, line, ppos, ROFF_br); |
|
man->last->flags |= NODE_LINE | |
|
NODE_VALID | NODE_ENDED; |
|
man->next = ROFF_NEXT_SIBLING; |
|
} |
return; |
return; |
} |
} |
|
|
Line 257 blk_close(MACRO_PROT_ARGS) |
|
Line 270 blk_close(MACRO_PROT_ARGS) |
|
if (buf[*pos] != '\0') { |
if (buf[*pos] != '\0') { |
roff_word_alloc(man, line, ppos, buf + *pos); |
roff_word_alloc(man, line, ppos, buf + *pos); |
man->last->flags |= NODE_DELIMC; |
man->last->flags |= NODE_DELIMC; |
|
if (mandoc_eos(man->last->string, strlen(man->last->string))) |
|
man->last->flags |= NODE_EOS; |
} |
} |
|
|
/* Move a trailing paragraph behind the block. */ |
/* Move a trailing paragraph behind the block. */ |
Line 265 blk_close(MACRO_PROT_ARGS) |
|
Line 280 blk_close(MACRO_PROT_ARGS) |
|
*pos = strlen(buf); |
*pos = strlen(buf); |
blk_imp(man, ctok, cline, cpos, pos, buf); |
blk_imp(man, ctok, cline, cpos, pos, buf); |
} |
} |
|
|
|
/* Synopsis blocks need an explicit end marker for spacing. */ |
|
|
|
if (tok == MAN_YS && man->last == nn) { |
|
roff_elem_alloc(man, line, ppos, tok); |
|
man_unscope(man, man->last); |
|
} |
} |
} |
|
|
void |
void |
Line 274 blk_exp(MACRO_PROT_ARGS) |
|
Line 296 blk_exp(MACRO_PROT_ARGS) |
|
char *p; |
char *p; |
int la; |
int la; |
|
|
rew_scope(man, tok); |
if (tok == MAN_RS) |
|
rew_scope(man, tok); |
roff_block_alloc(man, line, ppos, tok); |
roff_block_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
|
|
Line 292 blk_exp(MACRO_PROT_ARGS) |
|
Line 315 blk_exp(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (buf[*pos] != '\0') |
if (buf[*pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, |
mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos, |
*pos, "%s ... %s", roff_name[tok], buf + *pos); |
"%s ... %s", roff_name[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 330 blk_imp(MACRO_PROT_ARGS) |
|
Line 353 blk_imp(MACRO_PROT_ARGS) |
|
/* |
/* |
* For macros having optional next-line scope, |
* For macros having optional next-line scope, |
* keep the head open if there were no arguments. |
* keep the head open if there were no arguments. |
* For `TP', always keep the head open. |
* For `TP' and `TQ', always keep the head open. |
*/ |
*/ |
|
|
if (man_macro(tok)->flags & MAN_SCOPED && |
if (man_macro(tok)->flags & MAN_BSCOPED && |
(tok == MAN_TP || tok == MAN_TQ || n == man->last)) { |
(tok == MAN_TP || tok == MAN_TQ || n == man->last)) { |
man->flags |= MAN_BLINE; |
man->flags |= MAN_BLINE; |
return; |
return; |
Line 357 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 380 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) { |
if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) { |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_msg(MANDOCERR_ARG_SKIP, line, *pos, |
man->parse, line, *pos, "%s %s", |
"%s %s", roff_name[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
|
break; |
break; |
} |
} |
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) { |
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) { |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos, |
man->parse, line, *pos, "%s ... %s", |
"%s ... %s", roff_name[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
|
break; |
break; |
} |
} |
la = *pos; |
la = *pos; |
Line 388 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 409 in_line_eoln(MACRO_PROT_ARGS) |
|
man->last->flags |= NODE_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_ESCOPED (i.e., |
* next-line scoped), then set our mode to indicate that we're |
* next-line scoped), then set our mode to indicate that we're |
* waiting for terms to load into our context. |
* waiting for terms to load into our context. |
*/ |
*/ |
|
|
if (n == man->last && man_macro(tok)->flags & MAN_SCOPED) { |
if (n == man->last && man_macro(tok)->flags & MAN_ESCOPED) { |
assert((man_macro(tok)->flags & MAN_NSCOPED) == 0); |
|
man->flags |= MAN_ELINE; |
man->flags |= MAN_ELINE; |
return; |
return; |
} |
} |
Line 409 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 429 in_line_eoln(MACRO_PROT_ARGS) |
|
if (man->last == n) |
if (man->last == n) |
break; |
break; |
} |
} |
|
|
|
/* Rewind next-line scoped ancestors, if any. */ |
|
|
|
if (man_macro(tok)->flags & MAN_ESCOPED) |
|
man_descope(man, line, ppos, NULL); |
} |
} |
|
|
void |
void |