version 1.99, 2010/12/15 23:39:40 |
version 1.116, 2012/05/27 17:39:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010 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 |
|
|
#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 "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
Line 50 static int in_line(MACRO_PROT_ARGS); |
|
Line 51 static int in_line(MACRO_PROT_ARGS); |
|
static int obsolete(MACRO_PROT_ARGS); |
static int obsolete(MACRO_PROT_ARGS); |
static int phrase_ta(MACRO_PROT_ARGS); |
static int phrase_ta(MACRO_PROT_ARGS); |
|
|
|
static int dword(struct mdoc *, int, int, |
|
const char *, enum mdelim); |
static int append_delims(struct mdoc *, |
static int append_delims(struct mdoc *, |
int, int *, char *); |
int, int *, char *); |
static enum mdoct lookup(enum mdoct, const char *); |
static enum mdoct lookup(enum mdoct, const char *); |
Line 71 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 74 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ 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 */ |
{ blk_full, 0 }, /* Sh */ |
{ blk_full, MDOC_PARSED }, /* Sh */ |
{ blk_full, 0 }, /* Ss */ |
{ blk_full, MDOC_PARSED }, /* Ss */ |
{ in_line_eoln, 0 }, /* Pp */ |
{ in_line_eoln, 0 }, /* Pp */ |
{ blk_part_imp, MDOC_PARSED }, /* D1 */ |
{ blk_part_imp, MDOC_PARSED }, /* D1 */ |
{ blk_part_imp, MDOC_PARSED }, /* Dl */ |
{ blk_part_imp, MDOC_PARSED }, /* Dl */ |
Line 225 mdoc_macroend(struct mdoc *m) |
|
Line 228 mdoc_macroend(struct mdoc *m) |
|
static enum mdoct |
static enum mdoct |
lookup(enum mdoct from, const char *p) |
lookup(enum mdoct from, const char *p) |
{ |
{ |
/* FIXME: make -diag lists be un-PARSED. */ |
|
|
|
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
if ( ! (MDOC_PARSED & mdoc_macros[from].flags)) |
return(MDOC_MAX); |
return(MDOC_MAX); |
Line 252 lookup_raw(const char *p) |
|
Line 254 lookup_raw(const char *p) |
|
static int |
static int |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
rew_last(struct mdoc *mdoc, const struct mdoc_node *to) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n, *np; |
|
|
assert(to); |
assert(to); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
/* LINTED */ |
/* LINTED */ |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
|
/* |
|
* Save the parent here, because we may delete the |
|
* m->last node in the post-validation phase and reset |
|
* it to m->last->parent, causing a step in the closing |
|
* out to be lost. |
|
*/ |
|
np = mdoc->last->parent; |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
n = mdoc->last; |
n = mdoc->last; |
mdoc->last = mdoc->last->parent; |
mdoc->last = np; |
assert(mdoc->last); |
assert(mdoc->last); |
mdoc->last->last = n; |
mdoc->last->last = n; |
} |
} |
Line 506 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
Line 515 make_pending(struct mdoc_node *broken, enum mdoct tok, |
|
taker->pending = broken->pending; |
taker->pending = broken->pending; |
} |
} |
broken->pending = breaker; |
broken->pending = breaker; |
mdoc_vmsg(m, MANDOCERR_SCOPENEST, line, ppos, |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, |
"%s breaks %s", mdoc_macronames[tok], |
"%s breaks %s", mdoc_macronames[tok], |
mdoc_macronames[broken->tok]); |
mdoc_macronames[broken->tok]); |
return(1); |
return(1); |
} |
} |
|
|
Line 534 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 543 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
case (REWIND_THIS): |
case (REWIND_THIS): |
break; |
break; |
case (REWIND_FORCE): |
case (REWIND_FORCE): |
mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos, |
mandoc_vmsg(MANDOCERR_SCOPEBROKEN, m->parse, |
"%s breaks %s", mdoc_macronames[tok], |
line, ppos, "%s breaks %s", |
mdoc_macronames[n->tok]); |
mdoc_macronames[tok], |
|
mdoc_macronames[n->tok]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (REWIND_MORE): |
case (REWIND_MORE): |
n = n->parent; |
n = n->parent; |
Line 572 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
Line 582 rew_sub(enum mdoc_type t, struct mdoc *m, |
|
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* Allocate a word and check whether it's punctuation or not. |
|
* Punctuation consists of those tokens found in mdoc_isdelim(). |
|
*/ |
|
static int |
|
dword(struct mdoc *m, int line, |
|
int col, const char *p, enum mdelim d) |
|
{ |
|
|
|
if (DELIM_MAX == d) |
|
d = mdoc_isdelim(p); |
|
|
|
if ( ! mdoc_word_alloc(m, line, col, p)) |
|
return(0); |
|
|
|
if (DELIM_OPEN == d) |
|
m->last->flags |= MDOC_DELIMO; |
|
|
|
/* |
|
* Closing delimiters only suppress the preceding space |
|
* when they follow something, not when they start a new |
|
* block or element, and not when they follow `No'. |
|
* |
|
* XXX Explicitly special-casing MDOC_No here feels |
|
* like a layering violation. Find a better way |
|
* and solve this in the code related to `No'! |
|
*/ |
|
|
|
else if (DELIM_CLOSE == d && m->last->prev && |
|
m->last->prev->tok != MDOC_No) |
|
m->last->flags |= MDOC_DELIMC; |
|
|
|
return(1); |
|
} |
|
|
static int |
static int |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
append_delims(struct mdoc *m, int line, int *pos, char *buf) |
{ |
{ |
Line 585 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 629 append_delims(struct mdoc *m, int line, int *pos, char |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p); |
ac = mdoc_zargs(m, line, pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == ac) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
assert(DELIM_NONE != mdoc_isdelim(p)); |
dword(m, line, la, p, DELIM_MAX); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
|
|
|
/* |
/* |
* If we encounter end-of-sentence symbols, then trigger |
* If we encounter end-of-sentence symbols, then trigger |
* the double-space. |
* the double-space. |
* |
* |
* XXX: it's easy to allow this to propogate outward to |
* XXX: it's easy to allow this to propagate outward to |
* the last symbol, such that `. )' will cause the |
* the last symbol, such that `. )' will cause the |
* correct double-spacing. However, (1) groff isn't |
* correct double-spacing. However, (1) groff isn't |
* smart enough to do this and (2) it would require |
* smart enough to do this and (2) it would require |
* knowing which symbols break this behaviour, for |
* knowing which symbols break this behaviour, for |
* example, `. ;' shouldn't propogate the double-space. |
* example, `. ;' shouldn't propagate the double-space. |
*/ |
*/ |
if (mandoc_eos(p, strlen(p), 0)) |
if (mandoc_eos(p, strlen(p), 0)) |
m->last->flags |= MDOC_EOS; |
m->last->flags |= MDOC_EOS; |
Line 703 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 745 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 */ |
/* FIXME: do this in validate */ |
if (buf[*pos]) |
if (buf[*pos]) |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST); |
return(0); |
|
|
|
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 739 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 780 blk_exp_close(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, lastarg, p)) |
if ( ! dword(m, line, lastarg, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 847 in_line(MACRO_PROT_ARGS) |
|
Line 888 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_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
return(0); |
|
} |
} |
|
|
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) |
return(0); |
return(0); |
if ( ! nl) |
if ( ! nl) |
Line 898 in_line(MACRO_PROT_ARGS) |
|
Line 939 in_line(MACRO_PROT_ARGS) |
|
|
|
if (DELIM_NONE == d) |
if (DELIM_NONE == d) |
cnt++; |
cnt++; |
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
|
if ( ! dword(m, line, la, p, d)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 929 in_line(MACRO_PROT_ARGS) |
|
Line 971 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_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY); |
return(0); |
|
} |
} |
|
|
if ( ! nl) |
if ( ! nl) |
Line 942 in_line(MACRO_PROT_ARGS) |
|
Line 983 in_line(MACRO_PROT_ARGS) |
|
static int |
static int |
blk_full(MACRO_PROT_ARGS) |
blk_full(MACRO_PROT_ARGS) |
{ |
{ |
int la, nl; |
int la, nl, nparsed; |
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 */ |
struct mdoc_node *body; /* save of body macro */ |
Line 965 blk_full(MACRO_PROT_ARGS) |
|
Line 1006 blk_full(MACRO_PROT_ARGS) |
|
} |
} |
|
|
/* |
/* |
* This routine accomodates implicitly- and explicitly-scoped |
* This routine accommodates implicitly- and explicitly-scoped |
* macro openings. Implicit ones first close out prior scope |
* macro openings. Implicit ones first close out prior scope |
* (seen above). Delay opening the head until necessary to |
* (seen above). Delay opening the head until necessary to |
* allow leading punctuation to print. Special consideration |
* allow leading punctuation to print. Special consideration |
Line 997 blk_full(MACRO_PROT_ARGS) |
|
Line 1038 blk_full(MACRO_PROT_ARGS) |
|
head = body = NULL; |
head = body = NULL; |
|
|
/* |
/* |
|
* Exception: Heads of `It' macros in `-diag' lists are not |
|
* parsed, even though `It' macros in general are parsed. |
|
*/ |
|
nparsed = MDOC_It == tok && |
|
MDOC_Bl == m->last->parent->tok && |
|
LIST_diag == m->last->parent->norm->Bl.type; |
|
|
|
/* |
* 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 |
* of block partial-explicit and full-implicit. Stupid. |
* of block partial-explicit and full-implicit. Stupid. |
*/ |
*/ |
Line 1055 blk_full(MACRO_PROT_ARGS) |
|
Line 1104 blk_full(MACRO_PROT_ARGS) |
|
ARGS_PPHRASE != ac && |
ARGS_PPHRASE != ac && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1104 blk_full(MACRO_PROT_ARGS) |
|
Line 1153 blk_full(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = nparsed || ARGS_QWORD == ac ? |
|
MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1217 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1267 blk_part_imp(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == body && ARGS_QWORD != ac && |
if (NULL == body && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1232 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1282 blk_part_imp(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1262 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1312 blk_part_imp(MACRO_PROT_ARGS) |
|
if (mandoc_eos(n->string, strlen(n->string), 1)) |
if (mandoc_eos(n->string, strlen(n->string), 1)) |
n->flags |= MDOC_EOS; |
n->flags |= MDOC_EOS; |
|
|
/* Up-propogate the end-of-space flag. */ |
/* Up-propagate the end-of-space flag. */ |
|
|
if (n && (MDOC_EOS & n->flags)) { |
if (n && (MDOC_EOS & n->flags)) { |
body->flags |= MDOC_EOS; |
body->flags |= MDOC_EOS; |
Line 1292 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1342 blk_part_imp(MACRO_PROT_ARGS) |
|
* 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. |
*/ |
*/ |
if (n != body && ! mdoc_vmsg(m, MANDOCERR_SCOPENEST, |
if (n != body) |
line, ppos, "%s broken", mdoc_macronames[tok])) |
mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, |
return(0); |
"%s broken", mdoc_macronames[tok]); |
|
|
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos)) |
return(0); |
return(0); |
Line 1348 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1398 blk_part_exp(MACRO_PROT_ARGS) |
|
/* Flush out leading punctuation. */ |
/* Flush out leading punctuation. */ |
|
|
if (NULL == head && ARGS_QWORD != ac && |
if (NULL == head && ARGS_QWORD != ac && |
DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
assert(NULL == body); |
assert(NULL == body); |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1371 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1421 blk_part_exp(MACRO_PROT_ARGS) |
|
assert(head); |
assert(head); |
/* No check whether it's a macro! */ |
/* No check whether it's a macro! */ |
if (MDOC_Eo == tok) |
if (MDOC_Eo == tok) |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
|
|
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
Line 1389 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1439 blk_part_exp(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1401 blk_part_exp(MACRO_PROT_ARGS) |
|
Line 1451 blk_part_exp(MACRO_PROT_ARGS) |
|
|
|
/* Clean-up to leave in a consistent state. */ |
/* Clean-up to leave in a consistent state. */ |
|
|
if (NULL == head) { |
if (NULL == head) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
if ( ! mdoc_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
head = m->last; |
|
} |
|
|
|
if (NULL == body) { |
if (NULL == body) { |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) |
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; |
|
} |
} |
|
|
/* Standard appending of delimiters. */ |
/* Standard appending of delimiters. */ |
Line 1454 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1501 in_line_argn(MACRO_PROT_ARGS) |
|
case (MDOC_Ux): |
case (MDOC_Ux): |
maxargs = 0; |
maxargs = 0; |
break; |
break; |
|
case (MDOC_Bx): |
|
/* FALLTHROUGH */ |
case (MDOC_Xr): |
case (MDOC_Xr): |
maxargs = 2; |
maxargs = 2; |
break; |
break; |
Line 1492 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1541 in_line_argn(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && |
ARGS_QWORD != ac && |
ARGS_QWORD != ac && 0 == j && |
0 == j && DELIM_OPEN == mdoc_isdelim(p)) { |
DELIM_OPEN == mdoc_isdelim(p)) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_OPEN)) |
return(0); |
return(0); |
continue; |
continue; |
} else if (0 == j) |
} else if (0 == j) |
Line 1528 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1577 in_line_argn(MACRO_PROT_ARGS) |
|
flushed = 1; |
flushed = 1; |
} |
} |
|
|
/* |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
* XXX: this is a hack to work around groff's ugliness |
|
* as regards `Xr' and extraneous arguments. It should |
|
* ideally be deprecated behaviour, but because this is |
|
* code is no here, it's unlikely to be removed. |
|
*/ |
|
|
|
#ifdef __OpenBSD__ |
|
if (MDOC_Xr == tok && j == maxargs) { |
|
if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL)) |
|
return(0); |
|
if ( ! rew_elem(m, MDOC_Ns)) |
|
return(0); |
|
} |
|
#endif |
|
|
|
if ( ! mdoc_word_alloc(m, line, la, p)) |
|
return(0); |
return(0); |
j++; |
j++; |
} |
} |
Line 1615 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1648 in_line_eoln(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
|
|
obsolete(MACRO_PROT_ARGS) |
obsolete(MACRO_PROT_ARGS) |
{ |
{ |
|
|
return(mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS)); |
mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS); |
|
return(1); |
} |
} |
|
|
|
|
Line 1684 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1718 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
for (pos = ppos; ; ) { |
for (pos = ppos; ; ) { |
la = pos; |
la = pos; |
|
|
ac = mdoc_zargs(m, line, &pos, buf, 0, &p); |
ac = mdoc_zargs(m, line, &pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1694 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
Line 1728 phrase(struct mdoc *m, int line, int ppos, char *buf) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |
Line 1729 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1763 phrase_ta(MACRO_PROT_ARGS) |
|
|
|
for (;;) { |
for (;;) { |
la = *pos; |
la = *pos; |
ac = mdoc_zargs(m, line, pos, buf, 0, &p); |
ac = mdoc_zargs(m, line, pos, buf, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
Line 1739 phrase_ta(MACRO_PROT_ARGS) |
|
Line 1773 phrase_ta(MACRO_PROT_ARGS) |
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); |
|
|
if (MDOC_MAX == ntok) { |
if (MDOC_MAX == ntok) { |
if ( ! mdoc_word_alloc(m, line, la, p)) |
if ( ! dword(m, line, la, p, DELIM_MAX)) |
return(0); |
return(0); |
continue; |
continue; |
} |
} |