version 1.181, 2015/02/10 17:47:45 |
version 1.222, 2017/05/05 13:17:55 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
* copyright notice and this permission notice appear in all copies. |
* copyright notice and this permission notice appear in all copies. |
* |
* |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|
|
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mdoc.h" |
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "libmdoc.h" |
#include "roff.h" |
|
#include "mdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
#include "roff_int.h" |
|
#include "libmdoc.h" |
|
|
static void blk_full(MACRO_PROT_ARGS); |
static void blk_full(MACRO_PROT_ARGS); |
static void blk_exp_close(MACRO_PROT_ARGS); |
static void blk_exp_close(MACRO_PROT_ARGS); |
Line 41 static void in_line_argn(MACRO_PROT_ARGS); |
|
Line 43 static void in_line_argn(MACRO_PROT_ARGS); |
|
static void in_line(MACRO_PROT_ARGS); |
static void in_line(MACRO_PROT_ARGS); |
static void phrase_ta(MACRO_PROT_ARGS); |
static void phrase_ta(MACRO_PROT_ARGS); |
|
|
static void dword(struct mdoc *, int, int, const char *, |
static void append_delims(struct roff_man *, int, int *, char *); |
enum mdelim, int); |
static void dword(struct roff_man *, int, int, const char *, |
static void append_delims(struct mdoc *, int, int *, char *); |
enum mdelim, int); |
static enum mdoct lookup(struct mdoc *, enum mdoct, |
static int find_pending(struct roff_man *, enum roff_tok, |
int, int, const char *); |
int, int, struct roff_node *); |
|
static int lookup(struct roff_man *, int, int, int, const char *); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static int macro_or_word(MACRO_PROT_ARGS, int); |
static void make_pending(struct mdoc *, struct mdoc_node *, |
static void break_intermediate(struct roff_node *, |
struct mdoc_node *, int, int); |
struct roff_node *); |
static int parse_rest(struct mdoc *, enum mdoct, |
static int parse_rest(struct roff_man *, enum roff_tok, |
int, int *, char *); |
int, int *, char *); |
static enum mdoct rew_alt(enum mdoct); |
static enum roff_tok rew_alt(enum roff_tok); |
static void rew_elem(struct mdoc *, enum mdoct); |
static void rew_elem(struct roff_man *, enum roff_tok); |
static void rew_last(struct mdoc *, const struct mdoc_node *); |
static void rew_last(struct roff_man *, const struct roff_node *); |
static void rew_pending(struct mdoc *, const struct mdoc_node *); |
static void rew_pending(struct roff_man *, |
|
const struct roff_node *); |
|
|
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
const struct mdoc_macro __mdoc_macros[MDOC_MAX - MDOC_Dd] = { |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */ |
|
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dt */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Dt */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Os */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* Os */ |
Line 73 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 76 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */ |
{ blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */ |
|
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
Line 193 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 197 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ |
{ in_line_eoln, MDOC_JOIN }, /* %Q */ |
{ in_line_eoln, MDOC_JOIN }, /* %Q */ |
{ in_line_eoln, 0 }, /* br */ |
|
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* %U */ |
{ in_line_eoln, 0 }, /* %U */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* ll */ |
|
}; |
}; |
|
const struct mdoc_macro *const mdoc_macros = __mdoc_macros - MDOC_Dd; |
|
|
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
|
|
|
|
|
/* |
/* |
* This is called at the end of parsing. It must traverse up the tree, |
* This is called at the end of parsing. It must traverse up the tree, |
* closing out open [implicit] scopes. Obviously, open explicit scopes |
* closing out open [implicit] scopes. Obviously, open explicit scopes |
* are errors. |
* are errors. |
*/ |
*/ |
void |
void |
mdoc_macroend(struct mdoc *mdoc) |
mdoc_endparse(struct roff_man *mdoc) |
{ |
{ |
struct mdoc_node *n; |
struct roff_node *n; |
|
|
/* Scan for open explicit scopes. */ |
/* Scan for open explicit scopes. */ |
|
|
n = mdoc->last->flags & MDOC_VALID ? |
n = mdoc->last->flags & NODE_VALID ? |
mdoc->last->parent : mdoc->last; |
mdoc->last->parent : mdoc->last; |
|
|
for ( ; n; n = n->parent) |
for ( ; n; n = n->parent) |
if (n->type == MDOC_BLOCK && |
if (n->type == ROFFT_BLOCK && |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) |
mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse, |
n->line, n->pos, mdoc_macronames[n->tok]); |
n->line, n->pos, roff_name[n->tok]); |
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
|
|
rew_last(mdoc, mdoc->first); |
rew_last(mdoc, mdoc->first); |
|
mdoc_state_reset(mdoc); |
} |
} |
|
|
/* |
/* |
* Look up the macro at *p called by "from", |
* Look up the macro at *p called by "from", |
* or as a line macro if from == MDOC_MAX. |
* or as a line macro if from == TOKEN_NONE. |
*/ |
*/ |
static enum mdoct |
static int |
lookup(struct mdoc *mdoc, enum mdoct from, int line, int ppos, const char *p) |
lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p) |
{ |
{ |
enum mdoct res; |
enum roff_tok res; |
|
|
if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) { |
if (mdoc->flags & MDOC_PHRASEQF) { |
res = mdoc_hash_find(p); |
mdoc->flags &= ~MDOC_PHRASEQF; |
if (res != MDOC_MAX) { |
return TOKEN_NONE; |
|
} |
|
if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) { |
|
res = roffhash_find(mdoc->mdocmac, p, 0); |
|
if (res != TOKEN_NONE) { |
if (mdoc_macros[res].flags & MDOC_CALLABLE) |
if (mdoc_macros[res].flags & MDOC_CALLABLE) |
return(res); |
return res; |
if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll) |
if (res != MDOC_sp) |
mandoc_msg(MANDOCERR_MACRO_CALL, |
mandoc_msg(MANDOCERR_MACRO_CALL, |
mdoc->parse, line, ppos, p); |
mdoc->parse, line, ppos, p); |
} |
} |
} |
} |
return(MDOC_MAX); |
return TOKEN_NONE; |
} |
} |
|
|
/* |
/* |
* Rewind up to and including a specific node. |
* Rewind up to and including a specific node. |
*/ |
*/ |
static void |
static void |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
rew_last(struct roff_man *mdoc, const struct roff_node *to) |
{ |
{ |
struct mdoc_node *n, *np; |
|
|
|
assert(to); |
if (to->flags & NODE_VALID) |
mdoc->next = MDOC_NEXT_SIBLING; |
return; |
|
|
while (mdoc->last != to) { |
while (mdoc->last != to) { |
/* |
mdoc_state(mdoc, mdoc->last); |
* Save the parent here, because we may delete the |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
* mdoc->last node in the post-validation phase and reset |
mdoc->last = mdoc->last->parent; |
* it to mdoc->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
np = mdoc->last->parent; |
|
mdoc_valid_post(mdoc); |
|
n = mdoc->last; |
|
mdoc->last = np; |
|
assert(mdoc->last); |
|
mdoc->last->last = n; |
|
} |
} |
mdoc_valid_post(mdoc); |
mdoc_state(mdoc, mdoc->last); |
|
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
|
mdoc->next = ROFF_NEXT_SIBLING; |
} |
} |
|
|
/* |
/* |
* Rewind up to a specific block, including all blocks that broke it. |
* Rewind up to a specific block, including all blocks that broke it. |
*/ |
*/ |
static void |
static void |
rew_pending(struct mdoc *mdoc, const struct mdoc_node *n) |
rew_pending(struct roff_man *mdoc, const struct roff_node *n) |
{ |
{ |
|
|
rew_last(mdoc, n); |
for (;;) { |
|
rew_last(mdoc, n); |
|
|
if (n->type != MDOC_BLOCK) |
if (mdoc->last == n) { |
return; |
switch (n->type) { |
|
case ROFFT_HEAD: |
|
roff_body_alloc(mdoc, n->line, n->pos, |
|
n->tok); |
|
break; |
|
case ROFFT_BLOCK: |
|
break; |
|
default: |
|
return; |
|
} |
|
if ( ! (n->flags & NODE_BROKEN)) |
|
return; |
|
} else |
|
n = mdoc->last; |
|
|
while ((n = n->pending) != NULL) { |
for (;;) { |
rew_last(mdoc, n); |
if ((n = n->parent) == NULL) |
if (n->type == MDOC_HEAD) |
return; |
mdoc_body_alloc(mdoc, n->line, n->pos, n->tok); |
|
|
if (n->type == ROFFT_BLOCK || |
|
n->type == ROFFT_HEAD) { |
|
if (n->flags & NODE_ENDED) |
|
break; |
|
else |
|
return; |
|
} |
|
} |
} |
} |
} |
} |
|
|
Line 301 rew_pending(struct mdoc *mdoc, const struct mdoc_node |
|
Line 322 rew_pending(struct mdoc *mdoc, const struct mdoc_node |
|
* For a block closing macro, return the corresponding opening one. |
* For a block closing macro, return the corresponding opening one. |
* Otherwise, return the macro itself. |
* Otherwise, return the macro itself. |
*/ |
*/ |
static enum mdoct |
static enum roff_tok |
rew_alt(enum mdoct tok) |
rew_alt(enum roff_tok tok) |
{ |
{ |
switch (tok) { |
switch (tok) { |
case MDOC_Ac: |
case MDOC_Ac: |
return(MDOC_Ao); |
return MDOC_Ao; |
case MDOC_Bc: |
case MDOC_Bc: |
return(MDOC_Bo); |
return MDOC_Bo; |
case MDOC_Brc: |
case MDOC_Brc: |
return(MDOC_Bro); |
return MDOC_Bro; |
case MDOC_Dc: |
case MDOC_Dc: |
return(MDOC_Do); |
return MDOC_Do; |
case MDOC_Ec: |
case MDOC_Ec: |
return(MDOC_Eo); |
return MDOC_Eo; |
case MDOC_Ed: |
case MDOC_Ed: |
return(MDOC_Bd); |
return MDOC_Bd; |
case MDOC_Ef: |
case MDOC_Ef: |
return(MDOC_Bf); |
return MDOC_Bf; |
case MDOC_Ek: |
case MDOC_Ek: |
return(MDOC_Bk); |
return MDOC_Bk; |
case MDOC_El: |
case MDOC_El: |
return(MDOC_Bl); |
return MDOC_Bl; |
case MDOC_Fc: |
case MDOC_Fc: |
return(MDOC_Fo); |
return MDOC_Fo; |
case MDOC_Oc: |
case MDOC_Oc: |
return(MDOC_Oo); |
return MDOC_Oo; |
case MDOC_Pc: |
case MDOC_Pc: |
return(MDOC_Po); |
return MDOC_Po; |
case MDOC_Qc: |
case MDOC_Qc: |
return(MDOC_Qo); |
return MDOC_Qo; |
case MDOC_Re: |
case MDOC_Re: |
return(MDOC_Rs); |
return MDOC_Rs; |
case MDOC_Sc: |
case MDOC_Sc: |
return(MDOC_So); |
return MDOC_So; |
case MDOC_Xc: |
case MDOC_Xc: |
return(MDOC_Xo); |
return MDOC_Xo; |
default: |
default: |
return(tok); |
return tok; |
} |
} |
/* NOTREACHED */ |
|
} |
} |
|
|
static void |
static void |
rew_elem(struct mdoc *mdoc, enum mdoct tok) |
rew_elem(struct roff_man *mdoc, enum roff_tok tok) |
{ |
{ |
struct mdoc_node *n; |
struct roff_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (MDOC_ELEM != n->type) |
if (n->type != ROFFT_ELEM) |
n = n->parent; |
n = n->parent; |
assert(MDOC_ELEM == n->type); |
assert(n->type == ROFFT_ELEM); |
assert(tok == n->tok); |
assert(tok == n->tok); |
rew_last(mdoc, n); |
rew_last(mdoc, n); |
} |
} |
|
|
|
static void |
|
break_intermediate(struct roff_node *n, struct roff_node *breaker) |
|
{ |
|
if (n != breaker && |
|
n->type != ROFFT_BLOCK && n->type != ROFFT_HEAD && |
|
(n->type != ROFFT_BODY || n->end != ENDBODY_NOT)) |
|
n = n->parent; |
|
while (n != breaker) { |
|
if ( ! (n->flags & NODE_VALID)) |
|
n->flags |= NODE_BROKEN; |
|
n = n->parent; |
|
} |
|
} |
|
|
/* |
/* |
* We are trying to close the block *breaker, |
* If there is an open sub-block of the target requiring |
* but the child block *broken is still open. |
* explicit close-out, postpone closing out the target until |
* Thus, postpone closing the *breaker |
* the rew_pending() call closing out the sub-block. |
* until the rew_pending() call closing *broken. |
|
*/ |
*/ |
static void |
static int |
make_pending(struct mdoc *mdoc, struct mdoc_node *breaker, |
find_pending(struct roff_man *mdoc, enum roff_tok tok, int line, int ppos, |
struct mdoc_node *broken, int line, int ppos) |
struct roff_node *target) |
{ |
{ |
struct mdoc_node *n; |
struct roff_node *n; |
|
int irc; |
|
|
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos, |
if (target->flags & NODE_VALID) |
"%s breaks %s", mdoc_macronames[breaker->tok], |
return 0; |
mdoc_macronames[broken->tok]); |
|
|
|
/* |
irc = 0; |
* If the *broken block (Z) is already broken by a block (B) |
for (n = mdoc->last; n != NULL && n != target; n = n->parent) { |
* contained in the breaker (A), make the breaker pending |
if (n->flags & NODE_ENDED) |
* on that inner breaker (B). Graphically, |
continue; |
* |
if (n->type == ROFFT_BLOCK && |
* breaker=[A! broken=n=[B!->A (old broken=)[Z->B B] A] Z] |
mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
* |
irc = 1; |
* In these graphics, "->" indicates the "pending" pointer and |
break_intermediate(mdoc->last, target); |
* "!" indicates the MDOC_BREAK flag. Each of the cases gets |
if (target->type == ROFFT_HEAD) |
* one additional pointer (B->A) and one additional flag (A!). |
target->flags |= NODE_ENDED; |
*/ |
else if ( ! (target->flags & NODE_ENDED)) { |
|
mandoc_vmsg(MANDOCERR_BLK_NEST, |
for (n = broken->parent; ; n = n->parent) |
mdoc->parse, line, ppos, |
if (n == broken->pending) |
"%s breaks %s", roff_name[tok], |
broken = n; |
roff_name[n->tok]); |
else if (n == breaker) |
mdoc_endbody_alloc(mdoc, line, ppos, |
break; |
tok, target); |
|
} |
/* |
} |
* Found the breaker. |
|
* |
|
* If another, outer breaker (X) is already pending on |
|
* the *broken block (B), we must not clobber the link |
|
* to the outer breaker, but make it pending on the new, |
|
* now inner breaker (A). Graphically, |
|
* |
|
* [X! n=breaker=[A!->X broken=[B(->X)->A X] A] B]. |
|
*/ |
|
|
|
if (broken->pending != NULL) { |
|
n = breaker; |
|
|
|
/* |
|
* If the inner breaker (A) is already broken, too, |
|
* it cannot take on the outer breaker (X) but must |
|
* hand it on to its own breakers (Y). Graphically, |
|
* |
|
* [X! n=[Y!->X breaker=[A!->Y Y] broken=[B(->X)->A X] A] B] |
|
*/ |
|
|
|
while (n->pending) |
|
n = n->pending; |
|
n->pending = broken->pending; |
|
} |
} |
|
return irc; |
/* |
|
* Now we have reduced the situation to the simplest case: |
|
* breaker=[A! broken=[B->A A] B]. |
|
*/ |
|
|
|
broken->pending = breaker; |
|
breaker->flags |= MDOC_BREAK; |
|
if (breaker->body != NULL) |
|
breaker->body->flags |= MDOC_BREAK; |
|
} |
} |
|
|
/* |
/* |
Line 433 make_pending(struct mdoc *mdoc, struct mdoc_node *brea |
|
Line 433 make_pending(struct mdoc *mdoc, struct mdoc_node *brea |
|
* Punctuation consists of those tokens found in mdoc_isdelim(). |
* Punctuation consists of those tokens found in mdoc_isdelim(). |
*/ |
*/ |
static void |
static void |
dword(struct mdoc *mdoc, int line, int col, const char *p, |
dword(struct roff_man *mdoc, int line, int col, const char *p, |
enum mdelim d, int may_append) |
enum mdelim d, int may_append) |
{ |
{ |
|
|
Line 442 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 442 dword(struct mdoc *mdoc, int line, int col, const char |
|
|
|
if (may_append && |
if (may_append && |
! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) && |
! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) && |
d == DELIM_NONE && mdoc->last->type == MDOC_TEXT && |
d == DELIM_NONE && mdoc->last->type == ROFFT_TEXT && |
mdoc_isdelim(mdoc->last->string) == DELIM_NONE) { |
mdoc_isdelim(mdoc->last->string) == DELIM_NONE) { |
mdoc_word_append(mdoc, p); |
roff_word_append(mdoc, p); |
return; |
return; |
} |
} |
|
|
mdoc_word_alloc(mdoc, line, col, p); |
roff_word_alloc(mdoc, line, col, p); |
|
|
/* |
/* |
* If the word consists of a bare delimiter, |
* If the word consists of a bare delimiter, |
Line 458 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 458 dword(struct mdoc *mdoc, int line, int col, const char |
|
*/ |
*/ |
|
|
if (d == DELIM_OPEN) |
if (d == DELIM_OPEN) |
mdoc->last->flags |= MDOC_DELIMO; |
mdoc->last->flags |= NODE_DELIMO; |
else if (d == DELIM_CLOSE && |
else if (d == DELIM_CLOSE && |
! (mdoc->flags & MDOC_NODELIMC) && |
! (mdoc->flags & MDOC_NODELIMC) && |
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->flags |= MDOC_DELIMC; |
mdoc->last->flags |= NODE_DELIMC; |
mdoc->flags &= ~MDOC_NODELIMC; |
mdoc->flags &= ~MDOC_NODELIMC; |
} |
} |
|
|
static void |
static void |
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) |
append_delims(struct roff_man *mdoc, int line, int *pos, char *buf) |
{ |
{ |
char *p; |
char *p; |
int la; |
int la; |
Line 477 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 477 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
if (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, &p) == ARGS_EOLN) |
if (mdoc_args(mdoc, line, pos, buf, TOKEN_NONE, &p) == |
|
ARGS_EOLN) |
break; |
break; |
dword(mdoc, line, la, p, DELIM_MAX, 1); |
dword(mdoc, line, la, p, DELIM_MAX, 1); |
|
|
Line 494 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
Line 495 append_delims(struct mdoc *mdoc, int line, int *pos, c |
|
*/ |
*/ |
|
|
if (mandoc_eos(p, strlen(p))) |
if (mandoc_eos(p, strlen(p))) |
mdoc->last->flags |= MDOC_EOS; |
mdoc->last->flags |= NODE_EOS; |
} |
} |
} |
} |
|
|
|
|
macro_or_word(MACRO_PROT_ARGS, int parsed) |
macro_or_word(MACRO_PROT_ARGS, int parsed) |
{ |
{ |
char *p; |
char *p; |
enum mdoct ntok; |
int ntok; |
|
|
p = buf + ppos; |
p = buf + ppos; |
ntok = MDOC_MAX; |
ntok = TOKEN_NONE; |
if (*p == '"') |
if (*p == '"') |
p++; |
p++; |
else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT)) |
else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT)) |
ntok = lookup(mdoc, tok, line, ppos, p); |
ntok = lookup(mdoc, tok, line, ppos, p); |
|
|
if (ntok == MDOC_MAX) { |
if (ntok == TOKEN_NONE) { |
dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX || |
dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE || |
mdoc_macros[tok].flags & MDOC_JOIN); |
mdoc_macros[tok].flags & MDOC_JOIN); |
return(0); |
return 0; |
} else { |
} else { |
if (mdoc_macros[tok].fp == in_line_eoln) |
if (tok != TOKEN_NONE && |
|
mdoc_macros[tok].fp == in_line_eoln) |
rew_elem(mdoc, tok); |
rew_elem(mdoc, tok); |
mdoc_macro(mdoc, ntok, line, ppos, pos, buf); |
mdoc_macro(mdoc, ntok, line, ppos, pos, buf); |
if (tok == MDOC_MAX) |
if (tok == TOKEN_NONE) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
return(1); |
return 1; |
} |
} |
} |
} |
|
|
Line 536 macro_or_word(MACRO_PROT_ARGS, int parsed) |
|
Line 538 macro_or_word(MACRO_PROT_ARGS, int parsed) |
|
static void |
static void |
blk_exp_close(MACRO_PROT_ARGS) |
blk_exp_close(MACRO_PROT_ARGS) |
{ |
{ |
struct mdoc_node *body; /* Our own body. */ |
struct roff_node *body; /* Our own body. */ |
struct mdoc_node *endbody; /* Our own end marker. */ |
struct roff_node *endbody; /* Our own end marker. */ |
struct mdoc_node *itblk; /* An It block starting later. */ |
struct roff_node *itblk; /* An It block starting later. */ |
struct mdoc_node *later; /* A sub-block starting later. */ |
struct roff_node *later; /* A sub-block starting later. */ |
struct mdoc_node *n; /* Search back to our block. */ |
struct roff_node *n; /* Search back to our block. */ |
|
struct roff_node *target; /* For find_pending(). */ |
|
|
int j, lastarg, maxargs, nl; |
int j, lastarg, maxargs, nl, pending; |
enum margserr ac; |
enum margserr ac; |
enum mdoct atok, ntok; |
enum roff_tok atok, ntok; |
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
Line 561 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 564 blk_exp_close(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
/* Search backwards for the beginning of our own body. */ |
|
|
|
atok = rew_alt(tok); |
|
body = NULL; |
|
for (n = mdoc->last; n; n = n->parent) { |
|
if (n->flags & NODE_ENDED || n->tok != atok || |
|
n->type != ROFFT_BODY || n->end != ENDBODY_NOT) |
|
continue; |
|
body = n; |
|
break; |
|
} |
|
|
/* |
/* |
* Search backwards for beginnings of blocks, |
* Search backwards for beginnings of blocks, |
* both of our own and of pending sub-blocks. |
* both of our own and of pending sub-blocks. |
*/ |
*/ |
|
|
atok = rew_alt(tok); |
endbody = itblk = later = NULL; |
body = endbody = itblk = later = NULL; |
|
for (n = mdoc->last; n; n = n->parent) { |
for (n = mdoc->last; n; n = n->parent) { |
if (n->flags & (MDOC_VALID | MDOC_BREAK)) |
if (n->flags & NODE_ENDED) |
continue; |
continue; |
|
|
/* Remember the start of our own body. */ |
/* |
|
* Mismatching end macros can never break anything |
|
* and we only care about the breaking of BLOCKs. |
|
*/ |
|
|
if (n->type == MDOC_BODY && atok == n->tok) { |
if (body == NULL || n->type != ROFFT_BLOCK) |
if (n->end == ENDBODY_NOT) |
|
body = n; |
|
continue; |
continue; |
} |
|
|
|
if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm) |
/* |
|
* SYNOPSIS name blocks can not be broken themselves, |
|
* but they do get broken together with a broken child. |
|
*/ |
|
|
|
if (n->tok == MDOC_Nm) { |
|
if (later != NULL) |
|
n->flags |= NODE_BROKEN | NODE_ENDED; |
continue; |
continue; |
|
} |
|
|
if (n->tok == MDOC_It) { |
if (n->tok == MDOC_It) { |
itblk = n; |
itblk = n; |
Line 589 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 611 blk_exp_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (atok == n->tok) { |
if (atok == n->tok) { |
assert(body); |
|
|
|
/* |
/* |
* Found the start of our own block. |
* Found the start of our own block. |
Line 605 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 626 blk_exp_close(MACRO_PROT_ARGS) |
|
* When there is a pending sub block, postpone |
* When there is a pending sub block, postpone |
* closing out the current block until the |
* closing out the current block until the |
* rew_pending() closing out the sub-block. |
* rew_pending() closing out the sub-block. |
*/ |
|
|
|
make_pending(mdoc, n, later, line, ppos); |
|
if (tok == MDOC_El) |
|
itblk->flags |= MDOC_BREAK; |
|
|
|
/* |
|
* Mark the place where the formatting - but not |
* Mark the place where the formatting - but not |
* the scope - of the current block ends. |
* the scope - of the current block ends. |
*/ |
*/ |
|
|
|
mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, |
|
line, ppos, "%s breaks %s", |
|
roff_name[atok], roff_name[later->tok]); |
|
|
endbody = mdoc_endbody_alloc(mdoc, line, ppos, |
endbody = mdoc_endbody_alloc(mdoc, line, ppos, |
atok, body, ENDBODY_SPACE); |
atok, body); |
|
|
|
if (tok == MDOC_El) |
|
itblk->flags |= NODE_ENDED | NODE_BROKEN; |
|
|
/* |
/* |
* If a block closing macro taking arguments |
* If a block closing macro taking arguments |
* breaks another block, put the arguments |
* breaks another block, put the arguments |
Line 626 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 647 blk_exp_close(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (maxargs) |
if (maxargs) |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
break; |
break; |
} |
} |
|
|
/* |
/* |
* When finding an open sub block, remember the last |
* Explicit blocks close out description lines, but |
* open explicit block, or, in case there are only |
* even those can get broken together with a child. |
* implicit ones, the first open implicit block. |
|
*/ |
*/ |
|
|
if (later == NULL || |
if (n->tok == MDOC_Nd) { |
! (mdoc_macros[later->tok].flags & MDOC_EXPLICIT)) |
if (later != NULL) |
|
n->flags |= NODE_BROKEN | NODE_ENDED; |
|
else |
|
rew_last(mdoc, n); |
|
continue; |
|
} |
|
|
|
/* Breaking an open sub block. */ |
|
|
|
break_intermediate(mdoc->last, body); |
|
n->flags |= NODE_BROKEN; |
|
if (later == NULL) |
later = n; |
later = n; |
} |
} |
|
|
if (body == NULL) { |
if (body == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, roff_name[tok]); |
if (maxargs && endbody == NULL) { |
if (maxargs && endbody == NULL) { |
/* |
/* |
* Stray .Ec without previous .Eo: |
* Stray .Ec without previous .Eo: |
* Break the output line, keep the arguments. |
* Break the output line, keep the arguments. |
*/ |
*/ |
mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); |
roff_elem_alloc(mdoc, line, ppos, ROFF_br); |
rew_elem(mdoc, MDOC_br); |
rew_elem(mdoc, ROFF_br); |
} |
} |
} else if (endbody == NULL) { |
} else if (endbody == NULL) { |
rew_last(mdoc, body); |
rew_last(mdoc, body); |
Line 662 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 693 blk_exp_close(MACRO_PROT_ARGS) |
|
if (buf[*pos] != '\0') |
if (buf[*pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"%s %s", mdoc_macronames[tok], |
"%s %s", roff_name[tok], |
buf + *pos); |
buf + *pos); |
if (endbody == NULL && n != NULL) |
if (endbody == NULL && n != NULL) |
rew_pending(mdoc, n); |
rew_pending(mdoc, n); |
Line 671 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 702 blk_exp_close(MACRO_PROT_ARGS) |
|
|
|
if (endbody != NULL) |
if (endbody != NULL) |
n = endbody; |
n = endbody; |
|
|
|
ntok = TOKEN_NONE; |
for (j = 0; ; j++) { |
for (j = 0; ; j++) { |
lastarg = *pos; |
lastarg = *pos; |
|
|
if (j == maxargs && n != NULL) { |
if (j == maxargs && n != NULL) |
rew_pending(mdoc, n); |
rew_last(mdoc, n); |
n = NULL; |
|
} |
|
|
|
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
break; |
break; |
|
|
ntok = ac == ARGS_QWORD ? MDOC_MAX : |
ntok = ac == ARGS_QWORD ? TOKEN_NONE : |
lookup(mdoc, tok, line, lastarg, p); |
lookup(mdoc, tok, line, lastarg, p); |
|
|
if (ntok == MDOC_MAX) { |
if (ntok == TOKEN_NONE) { |
dword(mdoc, line, lastarg, p, DELIM_MAX, |
dword(mdoc, line, lastarg, p, DELIM_MAX, |
MDOC_JOIN & mdoc_macros[tok].flags); |
MDOC_JOIN & mdoc_macros[tok].flags); |
continue; |
continue; |
} |
} |
|
|
if (n != NULL) { |
if (n != NULL) |
rew_pending(mdoc, n); |
rew_last(mdoc, n); |
n = NULL; |
|
} |
|
mdoc->flags &= ~MDOC_NEWLINE; |
mdoc->flags &= ~MDOC_NEWLINE; |
mdoc_macro(mdoc, ntok, line, lastarg, pos, buf); |
mdoc_macro(mdoc, ntok, line, lastarg, pos, buf); |
break; |
break; |
} |
} |
|
|
if (n != NULL) |
if (n != NULL) { |
rew_pending(mdoc, n); |
pending = 0; |
|
if (ntok != TOKEN_NONE && n->flags & NODE_BROKEN) { |
|
target = n; |
|
do |
|
target = target->parent; |
|
while ( ! (target->flags & NODE_ENDED)); |
|
pending = find_pending(mdoc, ntok, line, ppos, target); |
|
} |
|
if ( ! pending) |
|
rew_pending(mdoc, n); |
|
} |
if (nl) |
if (nl) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
} |
} |
|
|
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, scope, cnt, firstarg, mayopen, nc, nl; |
int la, scope, cnt, firstarg, mayopen, nc, nl; |
enum mdoct ntok; |
enum roff_tok ntok; |
enum margserr ac; |
enum margserr ac; |
enum mdelim d; |
enum mdelim d; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
Line 726 in_line(MACRO_PROT_ARGS) |
|
Line 765 in_line(MACRO_PROT_ARGS) |
|
|
|
switch (tok) { |
switch (tok) { |
case MDOC_An: |
case MDOC_An: |
/* FALLTHROUGH */ |
|
case MDOC_Ar: |
case MDOC_Ar: |
/* FALLTHROUGH */ |
|
case MDOC_Fl: |
case MDOC_Fl: |
/* FALLTHROUGH */ |
|
case MDOC_Mt: |
case MDOC_Mt: |
/* FALLTHROUGH */ |
|
case MDOC_Nm: |
case MDOC_Nm: |
/* FALLTHROUGH */ |
|
case MDOC_Pa: |
case MDOC_Pa: |
nc = 1; |
nc = 1; |
break; |
break; |
Line 759 in_line(MACRO_PROT_ARGS) |
|
Line 793 in_line(MACRO_PROT_ARGS) |
|
|
|
if (ac == ARGS_EOLN) { |
if (ac == ARGS_EOLN) { |
if (d == DELIM_OPEN) |
if (d == DELIM_OPEN) |
mdoc->last->flags &= ~MDOC_DELIMO; |
mdoc->last->flags &= ~NODE_DELIMO; |
break; |
break; |
} |
} |
|
|
Line 778 in_line(MACRO_PROT_ARGS) |
|
Line 812 in_line(MACRO_PROT_ARGS) |
|
} |
} |
|
|
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
MDOC_MAX : lookup(mdoc, tok, line, la, p); |
TOKEN_NONE : lookup(mdoc, tok, line, la, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 787 in_line(MACRO_PROT_ARGS) |
|
Line 821 in_line(MACRO_PROT_ARGS) |
|
* or raise a warning. |
* or raise a warning. |
*/ |
*/ |
|
|
if (ntok != MDOC_MAX) { |
if (ntok != TOKEN_NONE) { |
if (scope) |
if (scope) |
rew_elem(mdoc, tok); |
rew_elem(mdoc, tok); |
if (nc && ! cnt) { |
if (nc && ! cnt) { |
Line 797 in_line(MACRO_PROT_ARGS) |
|
Line 831 in_line(MACRO_PROT_ARGS) |
|
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
mdoc_macronames[tok]); |
roff_name[tok]); |
} |
} |
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
mdoc_macro(mdoc, ntok, line, la, pos, buf); |
if (nl) |
if (nl) |
Line 845 in_line(MACRO_PROT_ARGS) |
|
Line 879 in_line(MACRO_PROT_ARGS) |
|
} |
} |
|
|
dword(mdoc, line, la, p, d, |
dword(mdoc, line, la, p, d, |
MDOC_JOIN & mdoc_macros[tok].flags); |
mdoc_macros[tok].flags & MDOC_JOIN); |
|
|
/* |
/* |
* If the first argument is a closing delimiter, |
* If the first argument is a closing delimiter, |
Line 853 in_line(MACRO_PROT_ARGS) |
|
Line 887 in_line(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (firstarg && d == DELIM_CLOSE && !nc) |
if (firstarg && d == DELIM_CLOSE && !nc) |
mdoc->last->flags &= ~MDOC_DELIMC; |
mdoc->last->flags &= ~NODE_DELIMC; |
firstarg = 0; |
firstarg = 0; |
|
|
/* |
/* |
Line 867 in_line(MACRO_PROT_ARGS) |
|
Line 901 in_line(MACRO_PROT_ARGS) |
|
} |
} |
} |
} |
|
|
if (scope) |
if (scope && tok != MDOC_Lk) { |
rew_elem(mdoc, tok); |
rew_elem(mdoc, tok); |
|
scope = 0; |
|
} |
|
|
/* |
/* |
* If no elements have been collected and we're allowed to have |
* If no elements have been collected and we're allowed to have |
Line 883 in_line(MACRO_PROT_ARGS) |
|
Line 919 in_line(MACRO_PROT_ARGS) |
|
} else { |
} else { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, roff_name[tok]); |
} |
} |
} |
} |
if (nl) |
if (nl) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
|
if (scope) |
|
rew_elem(mdoc, tok); |
} |
} |
|
|
static void |
static void |
Line 895 blk_full(MACRO_PROT_ARGS) |
|
Line 933 blk_full(MACRO_PROT_ARGS) |
|
{ |
{ |
int la, nl, parsed; |
int la, nl, parsed; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
struct mdoc_node *blk; /* Our own or a broken block. */ |
struct roff_node *blk; /* Our own or a broken block. */ |
struct mdoc_node *head; /* Our own head. */ |
struct roff_node *head; /* Our own head. */ |
struct mdoc_node *body; /* Our own body. */ |
struct roff_node *body; /* Our own body. */ |
struct mdoc_node *n; |
struct roff_node *n; |
enum margserr ac, lac; |
enum margserr ac, lac; |
char *p; |
char *p; |
|
|
Line 906 blk_full(MACRO_PROT_ARGS) |
|
Line 944 blk_full(MACRO_PROT_ARGS) |
|
|
|
if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) { |
if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) { |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, roff_name[tok]); |
return; |
return; |
} |
} |
|
|
Line 916 blk_full(MACRO_PROT_ARGS) |
|
Line 954 blk_full(MACRO_PROT_ARGS) |
|
|
|
blk = NULL; |
blk = NULL; |
for (n = mdoc->last; n != NULL; n = n->parent) { |
for (n = mdoc->last; n != NULL; n = n->parent) { |
if (n->flags & (MDOC_VALID | MDOC_BREAK) || |
if (n->flags & NODE_ENDED) { |
n->type != MDOC_BLOCK) |
if ( ! (n->flags & NODE_VALID)) |
|
n->flags |= NODE_BROKEN; |
continue; |
continue; |
|
} |
|
if (n->type != ROFFT_BLOCK) |
|
continue; |
|
|
if (tok == MDOC_It && n->tok == MDOC_Bl) { |
if (tok == MDOC_It && n->tok == MDOC_Bl) { |
if (blk != NULL) { |
if (blk != NULL) { |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"It breaks %s", |
"It breaks %s", |
mdoc_macronames[blk->tok]); |
roff_name[blk->tok]); |
rew_pending(mdoc, blk); |
rew_pending(mdoc, blk); |
} |
} |
break; |
break; |
Line 933 blk_full(MACRO_PROT_ARGS) |
|
Line 976 blk_full(MACRO_PROT_ARGS) |
|
if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) { |
switch (tok) { |
switch (tok) { |
case MDOC_Sh: |
case MDOC_Sh: |
/* FALLTHROUGH */ |
|
case MDOC_Ss: |
case MDOC_Ss: |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"%s breaks %s", |
"%s breaks %s", roff_name[tok], |
mdoc_macronames[tok], |
roff_name[n->tok]); |
mdoc_macronames[n->tok]); |
|
rew_pending(mdoc, n); |
rew_pending(mdoc, n); |
n = mdoc->last; |
n = mdoc->last; |
continue; |
continue; |
Line 965 blk_full(MACRO_PROT_ARGS) |
|
Line 1006 blk_full(MACRO_PROT_ARGS) |
|
if (blk != NULL) { |
if (blk != NULL) { |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
mandoc_vmsg(MANDOCERR_BLK_BROKEN, |
mdoc->parse, line, ppos, |
mdoc->parse, line, ppos, |
"It breaks %s", |
"It breaks %s", roff_name[blk->tok]); |
mdoc_macronames[blk->tok]); |
|
rew_pending(mdoc, blk); |
rew_pending(mdoc, blk); |
blk = NULL; |
blk = NULL; |
} |
} |
|
|
/* Close out prior implicit scopes. */ |
/* Close out prior implicit scopes. */ |
|
|
rew_last(mdoc, n); |
rew_pending(mdoc, n); |
} |
} |
|
|
/* Skip items outside lists. */ |
/* Skip items outside lists. */ |
Line 981 blk_full(MACRO_PROT_ARGS) |
|
Line 1021 blk_full(MACRO_PROT_ARGS) |
|
if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) { |
if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) { |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse, |
line, ppos, "It %s", buf + *pos); |
line, ppos, "It %s", buf + *pos); |
mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL); |
roff_elem_alloc(mdoc, line, ppos, ROFF_br); |
rew_elem(mdoc, MDOC_br); |
rew_elem(mdoc, ROFF_br); |
return; |
return; |
} |
} |
} |
} |
Line 1015 blk_full(MACRO_PROT_ARGS) |
|
Line 1055 blk_full(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (tok == MDOC_Nd) { |
if (tok == MDOC_Nd) { |
head = mdoc_head_alloc(mdoc, line, ppos, tok); |
head = roff_head_alloc(mdoc, line, ppos, tok); |
rew_last(mdoc, head); |
rew_last(mdoc, head); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = roff_body_alloc(mdoc, line, ppos, tok); |
} |
} |
|
|
if (tok == MDOC_Bk) |
if (tok == MDOC_Bk) |
mdoc->flags |= MDOC_KEEP; |
mdoc->flags |= MDOC_KEEP; |
|
|
ac = ARGS_PEND; |
ac = ARGS_EOLN; |
for (;;) { |
for (;;) { |
|
|
|
/* |
|
* If we are right after a tab character, |
|
* do not parse the first word for macros. |
|
*/ |
|
|
|
if (mdoc->flags & MDOC_PHRASEQN) { |
|
mdoc->flags &= ~MDOC_PHRASEQN; |
|
mdoc->flags |= MDOC_PHRASEQF; |
|
} |
|
|
la = *pos; |
la = *pos; |
lac = ac; |
lac = ac; |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ac == ARGS_EOLN) { |
if (ac == ARGS_EOLN) { |
if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE) |
if (lac != ARGS_PHRASE || |
|
! (mdoc->flags & MDOC_PHRASEQF)) |
break; |
break; |
|
|
/* |
/* |
* This is necessary: if the last token on a |
* This line ends in a tab; start the next |
* line is a `Ta' or tab, then we'll get |
* column now, with a leading blank. |
* ARGS_EOLN, so we must be smart enough to |
|
* reopen our scope if the last parse was a |
|
* phrase or partial phrase. |
|
*/ |
*/ |
|
|
if (body != NULL) |
if (body != NULL) |
rew_last(mdoc, body); |
rew_last(mdoc, body); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = roff_body_alloc(mdoc, line, ppos, tok); |
|
roff_word_alloc(mdoc, line, ppos, "\\&"); |
break; |
break; |
} |
} |
|
|
if (tok == MDOC_Bd || tok == MDOC_Bk) { |
if (tok == MDOC_Bd || tok == MDOC_Bk) { |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mdoc->parse, line, la, "%s ... %s", |
mdoc->parse, line, la, "%s ... %s", |
mdoc_macronames[tok], buf + la); |
roff_name[tok], buf + la); |
break; |
break; |
} |
} |
if (tok == MDOC_Rs) { |
if (tok == MDOC_Rs) { |
Line 1059 blk_full(MACRO_PROT_ARGS) |
|
Line 1112 blk_full(MACRO_PROT_ARGS) |
|
|
|
/* |
/* |
* Emit leading punctuation (i.e., punctuation before |
* Emit leading punctuation (i.e., punctuation before |
* the MDOC_HEAD) for non-phrase types. |
* the ROFFT_HEAD) for non-phrase types. |
*/ |
*/ |
|
|
if (head == NULL && |
if (head == NULL && |
ac != ARGS_PEND && |
|
ac != ARGS_PHRASE && |
ac != ARGS_PHRASE && |
ac != ARGS_PPHRASE && |
|
ac != ARGS_QWORD && |
ac != ARGS_QWORD && |
mdoc_isdelim(p) == DELIM_OPEN) { |
mdoc_isdelim(p) == DELIM_OPEN) { |
dword(mdoc, line, la, p, DELIM_OPEN, 0); |
dword(mdoc, line, la, p, DELIM_OPEN, 0); |
Line 1075 blk_full(MACRO_PROT_ARGS) |
|
Line 1126 blk_full(MACRO_PROT_ARGS) |
|
/* Open a head if one hasn't been opened. */ |
/* Open a head if one hasn't been opened. */ |
|
|
if (head == NULL) |
if (head == NULL) |
head = mdoc_head_alloc(mdoc, line, ppos, tok); |
head = roff_head_alloc(mdoc, line, ppos, tok); |
|
|
if (ac == ARGS_PHRASE || |
if (ac == ARGS_PHRASE) { |
ac == ARGS_PEND || |
|
ac == ARGS_PPHRASE) { |
|
|
|
/* |
/* |
* If we haven't opened a body yet, rewind the |
* If we haven't opened a body yet, rewind the |
Line 1087 blk_full(MACRO_PROT_ARGS) |
|
Line 1136 blk_full(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
rew_last(mdoc, body == NULL ? head : body); |
rew_last(mdoc, body == NULL ? head : body); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = roff_body_alloc(mdoc, line, ppos, tok); |
|
|
/* |
/* Process to the tab or to the end of the line. */ |
* Process phrases: set whether we're in a |
|
* partial-phrase (this effects line handling) |
|
* then call down into the phrase parser. |
|
*/ |
|
|
|
if (ac == ARGS_PPHRASE) |
mdoc->flags |= MDOC_PHRASE; |
mdoc->flags |= MDOC_PPHRASE; |
parse_rest(mdoc, TOKEN_NONE, line, &la, buf); |
if (ac == ARGS_PEND && lac == ARGS_PPHRASE) |
mdoc->flags &= ~MDOC_PHRASE; |
mdoc->flags |= MDOC_PPHRASE; |
|
parse_rest(mdoc, MDOC_MAX, line, &la, buf); |
/* There may have been `Ta' macros. */ |
mdoc->flags &= ~MDOC_PPHRASE; |
|
|
while (body->next != NULL) |
|
body = body->next; |
continue; |
continue; |
} |
} |
|
|
Line 1108 blk_full(MACRO_PROT_ARGS) |
|
Line 1155 blk_full(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
if (blk->flags & MDOC_VALID) |
if (blk->flags & NODE_VALID) |
return; |
return; |
if (head == NULL) |
if (head == NULL) |
head = mdoc_head_alloc(mdoc, line, ppos, tok); |
head = roff_head_alloc(mdoc, line, ppos, tok); |
if (nl && tok != MDOC_Bd && tok != MDOC_Bl && tok != MDOC_Rs) |
if (nl && tok != MDOC_Bd && tok != MDOC_Bl && tok != MDOC_Rs) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
if (body != NULL) |
if (body != NULL) |
goto out; |
goto out; |
|
if (find_pending(mdoc, tok, line, ppos, head)) |
|
return; |
|
|
/* |
|
* If there is an open (i.e., unvalidated) sub-block requiring |
|
* explicit close-out, postpone switching the current block from |
|
* head to body until the rew_pending() call closing out that |
|
* sub-block. |
|
*/ |
|
for (n = mdoc->last; n && n != head; n = n->parent) { |
|
if (n->type == MDOC_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT && |
|
! (n->flags & MDOC_VALID)) { |
|
n->pending = head; |
|
return; |
|
} |
|
} |
|
|
|
/* Close out scopes to remain in a consistent state. */ |
/* Close out scopes to remain in a consistent state. */ |
|
|
rew_last(mdoc, head); |
rew_last(mdoc, head); |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = roff_body_alloc(mdoc, line, ppos, tok); |
out: |
out: |
if (mdoc->flags & MDOC_FREECOL) { |
if (mdoc->flags & MDOC_FREECOL) { |
rew_last(mdoc, body); |
rew_last(mdoc, body); |
Line 1150 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1184 blk_part_imp(MACRO_PROT_ARGS) |
|
int la, nl; |
int la, nl; |
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
struct mdoc_node *blk; /* saved block context */ |
struct roff_node *blk; /* saved block context */ |
struct mdoc_node *body; /* saved body context */ |
struct roff_node *body; /* saved body context */ |
struct mdoc_node *n; |
struct roff_node *n; |
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
Line 1166 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1200 blk_part_imp(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL); |
blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL); |
rew_last(mdoc, mdoc_head_alloc(mdoc, line, ppos, tok)); |
rew_last(mdoc, roff_head_alloc(mdoc, line, ppos, tok)); |
|
|
/* |
/* |
* Open the body scope "on-demand", that is, after we've |
* Open the body scope "on-demand", that is, after we've |
Line 1187 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1221 blk_part_imp(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (body == NULL) |
if (body == NULL) |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = roff_body_alloc(mdoc, line, ppos, tok); |
|
|
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
break; |
break; |
} |
} |
if (body == NULL) |
if (body == NULL) |
body = mdoc_body_alloc(mdoc, line, ppos, tok); |
body = roff_body_alloc(mdoc, line, ppos, tok); |
|
|
/* |
if (find_pending(mdoc, tok, line, ppos, body)) |
* If there is an open sub-block requiring explicit close-out, |
return; |
* postpone closing out the current block until the |
|
* rew_pending() call closing out the sub-block. |
|
*/ |
|
|
|
for (n = mdoc->last; n && n != body && n != blk->parent; |
|
n = n->parent) { |
|
if (n->type == MDOC_BLOCK && |
|
mdoc_macros[n->tok].flags & MDOC_EXPLICIT && |
|
! (n->flags & MDOC_VALID)) { |
|
make_pending(mdoc, blk, n, line, ppos); |
|
mdoc_endbody_alloc(mdoc, line, ppos, |
|
tok, body, ENDBODY_NOSPACE); |
|
return; |
|
} |
|
} |
|
assert(n == body); |
|
rew_last(mdoc, body); |
rew_last(mdoc, body); |
if (nl) |
if (nl) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
Line 1231 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1250 blk_part_exp(MACRO_PROT_ARGS) |
|
{ |
{ |
int la, nl; |
int la, nl; |
enum margserr ac; |
enum margserr ac; |
struct mdoc_node *head; /* keep track of head */ |
struct roff_node *head; /* keep track of head */ |
char *p; |
char *p; |
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
Line 1242 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1261 blk_part_exp(MACRO_PROT_ARGS) |
|
* case of `Eo'); and a body that may be empty. |
* case of `Eo'); and a body that may be empty. |
*/ |
*/ |
|
|
mdoc_block_alloc(mdoc, line, ppos, tok, NULL); |
roff_block_alloc(mdoc, line, ppos, tok); |
head = NULL; |
head = NULL; |
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
Line 1259 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1278 blk_part_exp(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (head == NULL) { |
if (head == NULL) { |
head = mdoc_head_alloc(mdoc, line, ppos, tok); |
head = roff_head_alloc(mdoc, line, ppos, tok); |
if (tok == MDOC_Eo) /* Not parsed. */ |
if (tok == MDOC_Eo) /* Not parsed. */ |
dword(mdoc, line, la, p, DELIM_MAX, 0); |
dword(mdoc, line, la, p, DELIM_MAX, 0); |
rew_last(mdoc, head); |
rew_last(mdoc, head); |
mdoc_body_alloc(mdoc, line, ppos, tok); |
roff_body_alloc(mdoc, line, ppos, tok); |
if (tok == MDOC_Eo) |
if (tok == MDOC_Eo) |
continue; |
continue; |
} |
} |
Line 1275 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1294 blk_part_exp(MACRO_PROT_ARGS) |
|
/* Clean-up to leave in a consistent state. */ |
/* Clean-up to leave in a consistent state. */ |
|
|
if (head == NULL) { |
if (head == NULL) { |
rew_last(mdoc, mdoc_head_alloc(mdoc, line, ppos, tok)); |
rew_last(mdoc, roff_head_alloc(mdoc, line, ppos, tok)); |
mdoc_body_alloc(mdoc, line, ppos, tok); |
roff_body_alloc(mdoc, line, ppos, tok); |
} |
} |
if (nl) |
if (nl) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
Line 1288 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1307 in_line_argn(MACRO_PROT_ARGS) |
|
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
char *p; |
char *p; |
enum margserr ac; |
enum margserr ac; |
enum mdoct ntok; |
enum roff_tok ntok; |
int state; /* arg#; -1: not yet open; -2: closed */ |
int state; /* arg#; -1: not yet open; -2: closed */ |
int la, maxargs, nl; |
int la, maxargs, nl; |
|
|
Line 1304 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1323 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
switch (tok) { |
switch (tok) { |
case MDOC_Ap: |
case MDOC_Ap: |
/* FALLTHROUGH */ |
|
case MDOC_Ns: |
case MDOC_Ns: |
/* FALLTHROUGH */ |
|
case MDOC_Ux: |
case MDOC_Ux: |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
case MDOC_Bx: |
case MDOC_Bx: |
/* FALLTHROUGH */ |
|
case MDOC_Es: |
case MDOC_Es: |
/* FALLTHROUGH */ |
|
case MDOC_Xr: |
case MDOC_Xr: |
maxargs = 2; |
maxargs = 2; |
break; |
break; |
Line 1357 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1372 in_line_argn(MACRO_PROT_ARGS) |
|
} |
} |
|
|
ntok = (ac == ARGS_QWORD || (tok == MDOC_Pf && state == 0)) ? |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Pf && state == 0)) ? |
MDOC_MAX : lookup(mdoc, tok, line, la, p); |
TOKEN_NONE : lookup(mdoc, tok, line, la, p); |
|
|
if (ntok != MDOC_MAX) { |
if (ntok != TOKEN_NONE) { |
if (state >= 0) { |
if (state >= 0) { |
rew_elem(mdoc, tok); |
rew_elem(mdoc, tok); |
state = -2; |
state = -2; |
Line 1382 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1397 in_line_argn(MACRO_PROT_ARGS) |
|
} |
} |
|
|
dword(mdoc, line, la, p, DELIM_MAX, |
dword(mdoc, line, la, p, DELIM_MAX, |
MDOC_JOIN & mdoc_macros[tok].flags); |
mdoc_macros[tok].flags & MDOC_JOIN); |
} |
} |
|
|
if (state == -1) { |
if (state == -1) { |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, roff_name[tok]); |
return; |
return; |
} |
} |
|
|
Line 1402 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1417 in_line_argn(MACRO_PROT_ARGS) |
|
static void |
static void |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct roff_node *n; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
|
|
if ((tok == MDOC_Pp || tok == MDOC_Lp) && |
if ((tok == MDOC_Pp || tok == MDOC_Lp) && |
! (mdoc->flags & MDOC_SYNOPSIS)) { |
! (mdoc->flags & MDOC_SYNOPSIS)) { |
n = mdoc->last; |
n = mdoc->last; |
if (mdoc->next == MDOC_NEXT_SIBLING) |
if (mdoc->next == ROFF_NEXT_SIBLING) |
n = n->parent; |
n = n->parent; |
if (n->tok == MDOC_Nm) |
if (n->tok == MDOC_Nm) |
rew_last(mdoc, mdoc->last->parent); |
rew_last(mdoc, n->parent); |
} |
} |
|
|
if (buf[*pos] == '\0' && |
if (buf[*pos] == '\0' && |
(tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) { |
(tok == MDOC_Fd || *roff_name[tok] == '%')) { |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
line, ppos, mdoc_macronames[tok]); |
line, ppos, roff_name[tok]); |
return; |
return; |
} |
} |
|
|
Line 1434 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1449 in_line_eoln(MACRO_PROT_ARGS) |
|
* or until the next macro, call that macro, and return 1. |
* or until the next macro, call that macro, and return 1. |
*/ |
*/ |
static int |
static int |
parse_rest(struct mdoc *mdoc, enum mdoct tok, int line, int *pos, char *buf) |
parse_rest(struct roff_man *mdoc, enum roff_tok tok, |
|
int line, int *pos, char *buf) |
{ |
{ |
int la; |
int la; |
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN) |
if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN) |
return(0); |
return 0; |
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
if (macro_or_word(mdoc, tok, line, la, pos, buf, 1)) |
return(1); |
return 1; |
} |
} |
} |
} |
|
|
Line 1469 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1485 ctx_synopsis(MACRO_PROT_ARGS) |
|
static void |
static void |
phrase_ta(MACRO_PROT_ARGS) |
phrase_ta(MACRO_PROT_ARGS) |
{ |
{ |
struct mdoc_node *body, *n; |
struct roff_node *body, *n; |
|
|
/* Make sure we are in a column list or ignore this macro. */ |
/* Make sure we are in a column list or ignore this macro. */ |
|
|
body = NULL; |
body = NULL; |
for (n = mdoc->last; n != NULL; n = n->parent) { |
for (n = mdoc->last; n != NULL; n = n->parent) { |
if (n->flags & (MDOC_VALID | MDOC_BREAK)) |
if (n->flags & NODE_ENDED) |
continue; |
continue; |
if (n->tok == MDOC_It && n->type == MDOC_BODY) |
if (n->tok == MDOC_It && n->type == ROFFT_BODY) |
body = n; |
body = n; |
if (n->tok == MDOC_Bl) |
if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT) |
break; |
break; |
} |
} |
|
|
Line 1492 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1508 phrase_ta(MACRO_PROT_ARGS) |
|
/* Advance to the next column. */ |
/* Advance to the next column. */ |
|
|
rew_last(mdoc, body); |
rew_last(mdoc, body); |
mdoc_body_alloc(mdoc, line, ppos, MDOC_It); |
roff_body_alloc(mdoc, line, ppos, MDOC_It); |
parse_rest(mdoc, MDOC_MAX, line, pos, buf); |
parse_rest(mdoc, TOKEN_NONE, line, pos, buf); |
} |
} |