-/* $Id: man.c,v 1.60 2010/04/08 07:53:01 kristaps Exp $ */
+/* $Id: man.c,v 1.125 2014/03/23 11:25:26 schwarze Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <sys/types.h>
#include <assert.h>
-#include <ctype.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include "man.h"
+#include "mandoc.h"
+#include "mandoc_aux.h"
#include "libman.h"
#include "libmandoc.h"
-const char *const __man_merrnames[WERRMAX] = {
- "invalid character", /* WNPRINT */
- "invalid manual section", /* WMSEC */
- "invalid date format", /* WDATE */
- "scope of prior line violated", /* WLNSCOPE */
- "over-zealous prior line scope violation", /* WLNSCOPE2 */
- "trailing whitespace", /* WTSPACE */
- "unterminated quoted parameter", /* WTQUOTE */
- "document has no body", /* WNODATA */
- "document has no title/section", /* WNOTITLE */
- "invalid escape sequence", /* WESCAPE */
- "invalid number format", /* WNUMFMT */
- "expected block head arguments", /* WHEADARGS */
- "expected block body arguments", /* WBODYARGS */
- "expected empty block head", /* WNHEADARGS */
- "ill-formed macro", /* WMACROFORM */
- "scope open on exit", /* WEXITSCOPE */
- "no scope context", /* WNOSCOPE */
- "literal context already open", /* WOLITERAL */
- "no literal context open", /* WNLITERAL */
- "invalid nesting of roff declarations", /* WROFFNEST */
- "scope in roff instructions broken", /* WROFFSCOPE */
- "document title should be uppercase", /* WTITLECASE */
- "deprecated comment style", /* WBADCOMMENT */
-};
-
const char *const __man_macronames[MAN_MAX] = {
"br", "TH", "SH", "SS",
"TP", "LP", "PP", "P",
"IP", "HP", "SM", "SB",
"BI", "IB", "BR", "RB",
"R", "B", "I", "IR",
- "RI", "na", "i", "sp",
- "nf", "fi", "r", "RE",
- "RS", "DT", "UC", "PD",
- "Sp", "Vb", "Ve", "de",
- "dei", "am", "ami", "ig",
- ".",
+ "RI", "na", "sp", "nf",
+ "fi", "RE", "RS", "DT",
+ "UC", "PD", "AT", "in",
+ "ft", "OP", "EX", "EE",
+ "UR", "UE"
};
const char * const *man_macronames = __man_macronames;
-static struct man_node *man_node_alloc(int, int,
+static struct man_node *man_node_alloc(struct man *, int, int,
enum man_type, enum mant);
static int man_node_append(struct man *,
struct man_node *);
static void man_node_free(struct man_node *);
static void man_node_unlink(struct man *,
struct man_node *);
-static int man_ptext(struct man *, int, char *);
-static int man_pmacro(struct man *, int, char *);
+static int man_ptext(struct man *, int, char *, int);
+static int man_pmacro(struct man *, int, char *, int);
static void man_free1(struct man *);
static void man_alloc1(struct man *);
-static int pstring(struct man *, int, int,
- const char *, size_t);
-static int macrowarn(struct man *, int, const char *);
+static int man_descope(struct man *, int, int);
const struct man_node *
-man_node(const struct man *m)
+man_node(const struct man *man)
{
- return(MAN_HALT & m->flags ? NULL : m->first);
+ assert( ! (MAN_HALT & man->flags));
+ return(man->first);
}
const struct man_meta *
-man_meta(const struct man *m)
+man_meta(const struct man *man)
{
- return(MAN_HALT & m->flags ? NULL : &m->meta);
+ assert( ! (MAN_HALT & man->flags));
+ return(&man->meta);
}
struct man *
-man_alloc(void *data, int pflags, const struct man_cb *cb)
+man_alloc(struct roff *roff, struct mparse *parse, int quick)
{
struct man *p;
p = mandoc_calloc(1, sizeof(struct man));
- if (cb)
- memcpy(&p->cb, cb, sizeof(struct man_cb));
-
man_hash_init();
- p->data = data;
- p->pflags = pflags;
+ p->parse = parse;
+ p->quick = quick;
+ p->roff = roff;
man_alloc1(p);
return(p);
int
-man_endparse(struct man *m)
+man_endparse(struct man *man)
{
- if (MAN_HALT & m->flags)
- return(0);
- else if (man_macroend(m))
+ assert( ! (MAN_HALT & man->flags));
+ if (man_macroend(man))
return(1);
- m->flags |= MAN_HALT;
+ man->flags |= MAN_HALT;
return(0);
}
int
-man_parseln(struct man *m, int ln, char *buf)
+man_parseln(struct man *man, int ln, char *buf, int offs)
{
- return('.' == *buf || '\'' == *buf ?
- man_pmacro(m, ln, buf) :
- man_ptext(m, ln, buf));
+ man->flags |= MAN_NEWLINE;
+
+ assert( ! (MAN_HALT & man->flags));
+
+ return (roff_getcontrol(man->roff, buf, &offs) ?
+ man_pmacro(man, ln, buf, offs) :
+ man_ptext(man, ln, buf, offs));
}
free(man->meta.title);
if (man->meta.source)
free(man->meta.source);
+ if (man->meta.date)
+ free(man->meta.date);
if (man->meta.vol)
free(man->meta.vol);
+ if (man->meta.msec)
+ free(man->meta.msec);
}
static void
-man_alloc1(struct man *m)
+man_alloc1(struct man *man)
{
- memset(&m->meta, 0, sizeof(struct man_meta));
- m->flags = 0;
- m->last = mandoc_calloc(1, sizeof(struct man_node));
- m->first = m->last;
- m->last->type = MAN_ROOT;
- m->last->tok = MAN_MAX;
- m->next = MAN_NEXT_CHILD;
+ memset(&man->meta, 0, sizeof(struct man_meta));
+ man->flags = 0;
+ man->last = mandoc_calloc(1, sizeof(struct man_node));
+ man->first = man->last;
+ man->last->type = MAN_ROOT;
+ man->last->tok = MAN_MAX;
+ man->next = MAN_NEXT_CHILD;
}
assert(MAN_BLOCK == p->parent->type);
p->parent->head = p;
break;
+ case (MAN_TAIL):
+ assert(MAN_BLOCK == p->parent->type);
+ p->parent->tail = p;
+ break;
case (MAN_BODY):
assert(MAN_BLOCK == p->parent->type);
p->parent->body = p;
man->last = p;
switch (p->type) {
+ case (MAN_TBL):
+ /* FALLTHROUGH */
case (MAN_TEXT):
if ( ! man_valid_post(man))
return(0);
- if ( ! man_action_post(man))
- return(0);
break;
default:
break;
static struct man_node *
-man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
+man_node_alloc(struct man *man, int line, int pos,
+ enum man_type type, enum mant tok)
{
struct man_node *p;
p->pos = pos;
p->type = type;
p->tok = tok;
+
+ if (MAN_NEWLINE & man->flags)
+ p->flags |= MAN_LINE;
+ man->flags &= ~MAN_NEWLINE;
return(p);
}
int
-man_elem_alloc(struct man *m, int line, int pos, enum mant tok)
+man_elem_alloc(struct man *man, int line, int pos, enum mant tok)
{
struct man_node *p;
- p = man_node_alloc(line, pos, MAN_ELEM, tok);
- if ( ! man_node_append(m, p))
+ p = man_node_alloc(man, line, pos, MAN_ELEM, tok);
+ if ( ! man_node_append(man, p))
return(0);
- m->next = MAN_NEXT_CHILD;
+ man->next = MAN_NEXT_CHILD;
return(1);
}
int
-man_head_alloc(struct man *m, int line, int pos, enum mant tok)
+man_tail_alloc(struct man *man, int line, int pos, enum mant tok)
{
struct man_node *p;
- p = man_node_alloc(line, pos, MAN_HEAD, tok);
- if ( ! man_node_append(m, p))
+ p = man_node_alloc(man, line, pos, MAN_TAIL, tok);
+ if ( ! man_node_append(man, p))
return(0);
- m->next = MAN_NEXT_CHILD;
+ man->next = MAN_NEXT_CHILD;
return(1);
}
int
-man_body_alloc(struct man *m, int line, int pos, enum mant tok)
+man_head_alloc(struct man *man, int line, int pos, enum mant tok)
{
struct man_node *p;
- p = man_node_alloc(line, pos, MAN_BODY, tok);
- if ( ! man_node_append(m, p))
+ p = man_node_alloc(man, line, pos, MAN_HEAD, tok);
+ if ( ! man_node_append(man, p))
return(0);
- m->next = MAN_NEXT_CHILD;
+ man->next = MAN_NEXT_CHILD;
return(1);
}
int
-man_block_alloc(struct man *m, int line, int pos, enum mant tok)
+man_body_alloc(struct man *man, int line, int pos, enum mant tok)
{
struct man_node *p;
- p = man_node_alloc(line, pos, MAN_BLOCK, tok);
- if ( ! man_node_append(m, p))
+ p = man_node_alloc(man, line, pos, MAN_BODY, tok);
+ if ( ! man_node_append(man, p))
return(0);
- m->next = MAN_NEXT_CHILD;
+ man->next = MAN_NEXT_CHILD;
return(1);
}
-static int
-pstring(struct man *m, int line, int pos,
- const char *p, size_t len)
+int
+man_block_alloc(struct man *man, int line, int pos, enum mant tok)
{
- struct man_node *n;
- size_t sv;
-
- n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX);
- n->string = mandoc_malloc(len + 1);
- sv = strlcpy(n->string, p, len + 1);
-
- /* Prohibit truncation. */
- assert(sv < len + 1);
+ struct man_node *p;
- if ( ! man_node_append(m, n))
+ p = man_node_alloc(man, line, pos, MAN_BLOCK, tok);
+ if ( ! man_node_append(man, p))
return(0);
- m->next = MAN_NEXT_SIBLING;
+ man->next = MAN_NEXT_CHILD;
return(1);
}
-
int
-man_word_alloc(struct man *m, int line, int pos, const char *word)
+man_word_alloc(struct man *man, int line, int pos, const char *word)
{
+ struct man_node *n;
+
+ n = man_node_alloc(man, line, pos, MAN_TEXT, MAN_MAX);
+ n->string = roff_strdup(man->roff, word);
- return(pstring(m, line, pos, word, strlen(word)));
+ if ( ! man_node_append(man, n))
+ return(0);
+
+ man->next = MAN_NEXT_SIBLING;
+ return(1);
}
void
-man_node_delete(struct man *m, struct man_node *p)
+man_node_delete(struct man *man, struct man_node *p)
{
while (p->child)
- man_node_delete(m, p->child);
+ man_node_delete(man, p->child);
- man_node_unlink(m, p);
+ man_node_unlink(man, p);
man_node_free(p);
}
-
-static int
-man_ptext(struct man *m, int line, char *buf)
+int
+man_addeqn(struct man *man, const struct eqn *ep)
{
- int i, j;
- char sv;
+ struct man_node *n;
- /* Ignore bogus comments. */
+ assert( ! (MAN_HALT & man->flags));
- if ('\\' == buf[0] && '.' == buf[1] && '\"' == buf[2])
- return(man_pwarn(m, line, 0, WBADCOMMENT));
+ n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
+ n->eqn = ep;
- /* Literal free-form text whitespace is preserved. */
+ if ( ! man_node_append(man, n))
+ return(0);
- if (MAN_LITERAL & m->flags) {
- if ( ! man_word_alloc(m, line, 0, buf))
- return(0);
- goto descope;
- }
+ man->next = MAN_NEXT_SIBLING;
+ return(man_descope(man, ep->ln, ep->pos));
+}
- /* First de-chunk and allocate words. */
+int
+man_addspan(struct man *man, const struct tbl_span *sp)
+{
+ struct man_node *n;
- for (i = 0; ' ' == buf[i]; i++)
- /* Skip leading whitespace. */ ;
+ assert( ! (MAN_HALT & man->flags));
- if ('\0' == buf[i]) {
- /* Trailing whitespace? */
- if (i && ' ' == buf[i - 1])
- if ( ! man_pwarn(m, line, i - 1, WTSPACE))
- return(0);
- if ( ! pstring(m, line, 0, &buf[i], 0))
+ n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
+ n->span = sp;
+
+ if ( ! man_node_append(man, n))
+ return(0);
+
+ man->next = MAN_NEXT_SIBLING;
+ return(man_descope(man, sp->line, 0));
+}
+
+static int
+man_descope(struct man *man, int line, int offs)
+{
+ /*
+ * Co-ordinate what happens with having a next-line scope open:
+ * first close out the element scope (if applicable), then close
+ * out the block scope (also if applicable).
+ */
+
+ if (MAN_ELINE & man->flags) {
+ man->flags &= ~MAN_ELINE;
+ if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX))
return(0);
- goto descope;
}
- for (j = i; buf[i]; i++) {
- if (' ' != buf[i])
- continue;
+ if ( ! (MAN_BLINE & man->flags))
+ return(1);
+ man->flags &= ~MAN_BLINE;
+
+ if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX))
+ return(0);
+ return(man_body_alloc(man, line, offs, man->last->tok));
+}
- /* Escaped whitespace. */
- if (i && ' ' == buf[i] && '\\' == buf[i - 1])
- continue;
+static int
+man_ptext(struct man *man, int line, char *buf, int offs)
+{
+ int i;
- sv = buf[i];
- buf[i++] = '\0';
+ /* Literal free-form text whitespace is preserved. */
- if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+ if (MAN_LITERAL & man->flags) {
+ if ( ! man_word_alloc(man, line, offs, buf + offs))
return(0);
+ return(man_descope(man, line, offs));
+ }
- /* Trailing whitespace? Check at overwritten byte. */
+ for (i = offs; ' ' == buf[i]; i++)
+ /* Skip leading whitespace. */ ;
+
+ /*
+ * Blank lines are ignored right after headings
+ * but add a single vertical space elsewhere.
+ */
- if (' ' == sv && '\0' == buf[i])
- if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+ if ('\0' == buf[i]) {
+ /* Allocate a blank entry. */
+ if (MAN_SH != man->last->tok &&
+ MAN_SS != man->last->tok) {
+ if ( ! man_elem_alloc(man, line, offs, MAN_sp))
return(0);
+ man->next = MAN_NEXT_SIBLING;
+ }
+ return(1);
+ }
- for ( ; ' ' == buf[i]; i++)
- /* Skip trailing whitespace. */ ;
+ /*
+ * Warn if the last un-escaped character is whitespace. Then
+ * strip away the remaining spaces (tabs stay!).
+ */
- j = i;
+ i = (int)strlen(buf);
+ assert(i);
- /* Trailing whitespace? */
+ if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+ if (i > 1 && '\\' != buf[i - 2])
+ man_pmsg(man, line, i - 1, MANDOCERR_EOLNSPACE);
- if (' ' == buf[i - 1] && '\0' == buf[i])
- if ( ! man_pwarn(m, line, i - 1, WTSPACE))
- return(0);
+ for (--i; i && ' ' == buf[i]; i--)
+ /* Spin back to non-space. */ ;
+
+ /* Jump ahead of escaped whitespace. */
+ i += '\\' == buf[i] ? 2 : 1;
- if ('\0' == buf[i])
- break;
+ buf[i] = '\0';
}
- if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+ if ( ! man_word_alloc(man, line, offs, buf + offs))
return(0);
-descope:
-
/*
- * Co-ordinate what happens with having a next-line scope open:
- * first close out the element scope (if applicable), then close
- * out the block scope (also if applicable).
+ * End-of-sentence check. If the last character is an unescaped
+ * EOS character, then flag the node as being the end of a
+ * sentence. The front-end will know how to interpret this.
*/
- if (MAN_ELINE & m->flags) {
- m->flags &= ~MAN_ELINE;
- if ( ! man_unscope(m, m->last->parent, WERRMAX))
- return(0);
- }
-
- if ( ! (MAN_BLINE & m->flags))
- return(1);
- m->flags &= ~MAN_BLINE;
+ assert(i);
+ if (mandoc_eos(buf, (size_t)i))
+ man->last->flags |= MAN_EOS;
- if ( ! man_unscope(m, m->last->parent, WERRMAX))
- return(0);
- return(man_body_alloc(m, line, 0, m->last->tok));
+ return(man_descope(man, line, offs));
}
-
static int
-macrowarn(struct man *m, int ln, const char *buf)
-{
- if ( ! (MAN_IGN_MACRO & m->pflags))
- return(man_verr(m, ln, 0,
- "unknown macro: %s%s",
- buf, strlen(buf) > 3 ? "..." : ""));
- return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
- buf, strlen(buf) > 3 ? "..." : ""));
-}
-
-
-int
-man_pmacro(struct man *m, int ln, char *buf)
+man_pmacro(struct man *man, int ln, char *buf, int offs)
{
- int i, j, ppos;
+ int i, ppos;
enum mant tok;
char mac[5];
struct man_node *n;
- /* Comments and empties are quickly ignored. */
-
- if ('\0' == buf[1])
+ if ('"' == buf[offs]) {
+ man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT);
+ return(1);
+ } else if ('\0' == buf[offs])
return(1);
- i = 1;
+ ppos = offs;
/*
- * Skip whitespace between the control character and initial
- * text. "Whitespace" is both spaces and tabs.
+ * Copy the first word into a nil-terminated buffer.
+ * Stop copying when a tab, space, or eoln is encountered.
*/
- if (' ' == buf[i] || '\t' == buf[i]) {
- i++;
- while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))
- i++;
- if ('\0' == buf[i])
- goto out;
- }
-
- ppos = i;
-
- /* Copy the first word into a nil-terminated buffer. */
- for (j = 0; j < 4; j++, i++) {
- if ('\0' == (mac[j] = buf[i]))
- break;
- else if (' ' == buf[i])
- break;
+ i = 0;
+ while (i < 4 && '\0' != buf[offs] &&
+ ' ' != buf[offs] && '\t' != buf[offs])
+ mac[i++] = buf[offs++];
- /* Check for invalid characters. */
-
- if (isgraph((u_char)buf[i]))
- continue;
- return(man_perr(m, ln, i, WNPRINT));
- }
+ mac[i] = '\0';
- mac[j] = '\0';
+ tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
- if (j == 4 || j < 1) {
- if ( ! (MAN_IGN_MACRO & m->pflags)) {
- (void)man_perr(m, ln, ppos, WMACROFORM);
- goto err;
- }
- if ( ! man_pwarn(m, ln, ppos, WMACROFORM))
- goto err;
- return(1);
- }
-
- if (MAN_MAX == (tok = man_hash_find(mac))) {
- if ( ! macrowarn(m, ln, mac))
- goto err;
+ if (MAN_MAX == tok) {
+ mandoc_vmsg(MANDOCERR_MACRO, man->parse, ln,
+ ppos, "%s", buf + ppos - 1);
return(1);
}
/* The macro is sane. Jump to the next word. */
- while (buf[i] && ' ' == buf[i])
- i++;
+ while (buf[offs] && ' ' == buf[offs])
+ offs++;
- /* Trailing whitespace? */
+ /*
+ * Trailing whitespace. Note that tabs are allowed to be passed
+ * into the parser as "text", so we only warn about spaces here.
+ */
- if ('\0' == buf[i] && ' ' == buf[i - 1])
- if ( ! man_pwarn(m, ln, i - 1, WTSPACE))
- goto err;
+ if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+ man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE);
/*
- * Remove prior ELINE macro, as it's being clobbering by a new
+ * Remove prior ELINE macro, as it's being clobbered by a new
* macro. Note that NSCOPED macros do not close out ELINE
* macros---they don't print text---so we let those slip by.
- * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded
- * here because that would stipulate blocks as children of
- * elements!
*/
if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
- m->flags & MAN_ELINE) {
- assert(MAN_TEXT != m->last->type);
-
- /*
- * This occurs in the following construction:
- * .B
- * .br
- * .B
- * .br
- * I hate man macros.
- * Flat-out disallow this madness.
+ man->flags & MAN_ELINE) {
+ n = man->last;
+ assert(MAN_TEXT != n->type);
+
+ /* Remove repeated NSCOPED macros causing ELINE. */
+
+ if (MAN_NSCOPED & man_macros[n->tok].flags)
+ n = n->parent;
+
+ mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line,
+ n->pos, "%s breaks %s", man_macronames[tok],
+ man_macronames[n->tok]);
+
+ man_node_delete(man, n);
+ man->flags &= ~MAN_ELINE;
+ }
+
+ /*
+ * Remove prior BLINE macro that is being clobbered.
+ */
+ if ((man->flags & MAN_BLINE) &&
+ (MAN_BSCOPE & man_macros[tok].flags)) {
+ n = man->last;
+
+ /* Might be a text node like 8 in
+ * .TP 8
+ * .SH foo
*/
- if (MAN_NSCOPED & man_macros[m->last->tok].flags)
- return(man_perr(m, ln, ppos, WLNSCOPE));
+ if (MAN_TEXT == n->type)
+ n = n->parent;
- n = m->last;
+ /* Remove element that didn't end BLINE, if any. */
+ if ( ! (MAN_BSCOPE & man_macros[n->tok].flags))
+ n = n->parent;
- assert(n);
- assert(NULL == n->child);
- assert(0 == n->nchild);
+ assert(MAN_HEAD == n->type);
+ n = n->parent;
+ assert(MAN_BLOCK == n->type);
+ assert(MAN_SCOPED & man_macros[n->tok].flags);
- if ( ! man_nwarn(m, n, WLNSCOPE))
- return(0);
+ mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line,
+ n->pos, "%s breaks %s", man_macronames[tok],
+ man_macronames[n->tok]);
- man_node_delete(m, n);
- m->flags &= ~MAN_ELINE;
+ man_node_delete(man, n);
+ man->flags &= ~MAN_BLINE;
}
/*
* when they exit.
*/
- if (MAN_BLINE & m->flags)
- m->flags |= MAN_BPLINE;
+ if (MAN_BLINE & man->flags)
+ man->flags |= MAN_BPLINE;
/* Call to handler... */
assert(man_macros[tok].fp);
- if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))
+ if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
goto err;
-out:
+ /* In quick mode (for mandocdb), abort after the NAME section. */
+
+ if (man->quick && MAN_SH == tok &&
+ strcmp(man->last->prev->child->string, "NAME"))
+ return(2);
+
/*
* We weren't in a block-line scope when entering the
* above-parsed macro, so return.
*/
- if ( ! (MAN_BPLINE & m->flags)) {
- m->flags &= ~MAN_ILINE;
+ if ( ! (MAN_BPLINE & man->flags)) {
+ man->flags &= ~MAN_ILINE;
return(1);
}
- m->flags &= ~MAN_BPLINE;
+ man->flags &= ~MAN_BPLINE;
/*
* If we're in a block scope, then allow this macro to slip by
* without closing scope around it.
*/
- if (MAN_ILINE & m->flags) {
- m->flags &= ~MAN_ILINE;
+ if (MAN_ILINE & man->flags) {
+ man->flags &= ~MAN_ILINE;
return(1);
}
* now, as the next line will close out the block scope.
*/
- if (MAN_ELINE & m->flags)
+ if (MAN_ELINE & man->flags)
return(1);
/* Close out the block scope opened in the prior line. */
- assert(MAN_BLINE & m->flags);
- m->flags &= ~MAN_BLINE;
+ assert(MAN_BLINE & man->flags);
+ man->flags &= ~MAN_BLINE;
- if ( ! man_unscope(m, m->last->parent, WERRMAX))
+ if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX))
return(0);
- return(man_body_alloc(m, ln, 0, m->last->tok));
+ return(man_body_alloc(man, ln, ppos, man->last->tok));
err: /* Error out. */
- m->flags |= MAN_HALT;
+ man->flags |= MAN_HALT;
return(0);
}
-
-int
-man_verr(struct man *man, int ln, int pos, const char *fmt, ...)
-{
- char buf[256];
- va_list ap;
-
- if (NULL == man->cb.man_err)
- return(0);
-
- va_start(ap, fmt);
- (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
- va_end(ap);
- return((*man->cb.man_err)(man->data, ln, pos, buf));
-}
-
-
-int
-man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...)
-{
- char buf[256];
- va_list ap;
-
- if (NULL == man->cb.man_warn)
- return(0);
-
- va_start(ap, fmt);
- (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
- va_end(ap);
- return((*man->cb.man_warn)(man->data, ln, pos, buf));
-}
-
-
-int
-man_err(struct man *m, int line, int pos, int iserr, enum merr type)
-{
- const char *p;
-
- p = __man_merrnames[(int)type];
- assert(p);
-
- if (iserr)
- return(man_verr(m, line, pos, p));
-
- return(man_vwarn(m, line, pos, p));
-}
-
-
/*
- * Unlink a node from its context. If "m" is provided, the last parse
+ * Unlink a node from its context. If "man" is provided, the last parse
* point will also be adjusted accordingly.
*/
static void
-man_node_unlink(struct man *m, struct man_node *n)
+man_node_unlink(struct man *man, struct man_node *n)
{
/* Adjust siblings. */
/* Adjust parse point, if applicable. */
- if (m && m->last == n) {
+ if (man && man->last == n) {
/*XXX: this can occur when bailing from validation. */
/*assert(NULL == n->next);*/
if (n->prev) {
- m->last = n->prev;
- m->next = MAN_NEXT_SIBLING;
+ man->last = n->prev;
+ man->next = MAN_NEXT_SIBLING;
} else {
- m->last = n->parent;
- m->next = MAN_NEXT_CHILD;
+ man->last = n->parent;
+ man->next = MAN_NEXT_CHILD;
}
}
- if (m && m->first == n)
- m->first = NULL;
+ if (man && man->first == n)
+ man->first = NULL;
+}
+
+const struct mparse *
+man_mparse(const struct man *man)
+{
+
+ assert(man && man->parse);
+ return(man->parse);
}
git.ckatri.com / mandoc.git / blobdiff