version 1.130, 2010/05/13 06:22:11 |
version 1.135, 2010/05/16 10:59:36 |
Line 69 const char *const __mdoc_merrnames[MERRMAX] = { |
|
Line 69 const char *const __mdoc_merrnames[MERRMAX] = { |
|
"prologue macro out of conventional order", /* EPROLOOO */ |
"prologue macro out of conventional order", /* EPROLOOO */ |
"prologue macro repeated", /* EPROLREP */ |
"prologue macro repeated", /* EPROLREP */ |
"invalid manual section", /* EBADMSEC */ |
"invalid manual section", /* EBADMSEC */ |
"invalid section", /* EBADSEC */ |
|
"invalid font mode", /* EFONT */ |
"invalid font mode", /* EFONT */ |
"invalid date syntax", /* EBADDATE */ |
"invalid date syntax", /* EBADDATE */ |
"invalid number format", /* ENUMFMT */ |
"invalid number format", /* ENUMFMT */ |
Line 151 static struct mdoc_node *node_alloc(struct mdoc *, int |
|
Line 150 static struct mdoc_node *node_alloc(struct mdoc *, int |
|
enum mdoct, enum mdoc_type); |
enum mdoct, enum mdoc_type); |
static int node_append(struct mdoc *, |
static int node_append(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, int, char *); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int macrowarn(struct mdoc *, int, const char *); |
static int macrowarn(struct mdoc *, int, |
|
const char *, int); |
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
Line 191 mdoc_free1(struct mdoc *mdoc) |
|
Line 191 mdoc_free1(struct mdoc *mdoc) |
|
free(mdoc->meta.arch); |
free(mdoc->meta.arch); |
if (mdoc->meta.vol) |
if (mdoc->meta.vol) |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
|
if (mdoc->meta.msec) |
|
free(mdoc->meta.msec); |
} |
} |
|
|
|
|
Line 283 mdoc_endparse(struct mdoc *m) |
|
Line 285 mdoc_endparse(struct mdoc *m) |
|
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
*/ |
*/ |
int |
int |
mdoc_parseln(struct mdoc *m, int ln, char *buf) |
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
if (MDOC_HALT & m->flags) |
return(0); |
return(0); |
|
|
m->flags |= MDOC_NEWLINE; |
m->flags |= MDOC_NEWLINE; |
return('.' == *buf ? |
return(('.' == buf[offs] || '\'' == buf[offs]) ? |
mdoc_pmacro(m, ln, buf) : |
mdoc_pmacro(m, ln, buf, offs) : |
mdoc_ptext(m, ln, buf)); |
mdoc_ptext(m, ln, buf, offs)); |
} |
} |
|
|
|
|
Line 629 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
Line 631 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
* control character. |
* control character. |
*/ |
*/ |
static int |
static int |
mdoc_ptext(struct mdoc *m, int line, char *buf) |
mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) |
{ |
{ |
int i; |
int i; |
|
|
/* Ignore bogus comments. */ |
/* Ignore bogus comments. */ |
|
|
if ('\\' == buf[0] && '.' == buf[1] && '\"' == buf[2]) |
if ('\\' == buf[offs] && |
return(mdoc_pwarn(m, line, 0, EBADCOMMENT)); |
'.' == buf[offs + 1] && |
|
'"' == buf[offs + 2]) |
|
return(mdoc_pwarn(m, line, offs, EBADCOMMENT)); |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) |
if (SEC_NONE == m->lastnamed) |
return(mdoc_perr(m, line, 0, ETEXTPROL)); |
return(mdoc_perr(m, line, offs, ETEXTPROL)); |
|
|
/* Literal just gets pulled in as-is. */ |
/* Literal just gets pulled in as-is. */ |
|
|
if (MDOC_LITERAL & m->flags) |
if (MDOC_LITERAL & m->flags) |
return(mdoc_word_alloc(m, line, 0, buf)); |
return(mdoc_word_alloc(m, line, offs, buf + offs)); |
|
|
/* Check for a blank line, which may also consist of spaces. */ |
/* Check for a blank line, which may also consist of spaces. */ |
|
|
for (i = 0; ' ' == buf[i]; i++) |
for (i = offs; ' ' == buf[i]; i++) |
/* Skip to first non-space. */ ; |
/* Skip to first non-space. */ ; |
|
|
if ('\0' == buf[i]) { |
if ('\0' == buf[i]) { |
if ( ! mdoc_pwarn(m, line, 0, ENOBLANK)) |
if ( ! mdoc_pwarn(m, line, offs, ENOBLANK)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 662 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
Line 666 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
* blank lines aren't allowed, but enough manuals assume this |
* blank lines aren't allowed, but enough manuals assume this |
* behaviour that we want to work around it. |
* behaviour that we want to work around it. |
*/ |
*/ |
if ( ! mdoc_elem_alloc(m, line, 0, MDOC_Pp, NULL)) |
if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL)) |
return(0); |
return(0); |
|
|
m->next = MDOC_NEXT_SIBLING; |
m->next = MDOC_NEXT_SIBLING; |
Line 693 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
Line 697 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
|
|
/* Allocate the whole word. */ |
/* Allocate the whole word. */ |
|
|
if ( ! mdoc_word_alloc(m, line, 0, buf)) |
if ( ! mdoc_word_alloc(m, line, offs, buf + offs)) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 703 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
Line 707 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
*/ |
*/ |
|
|
assert(i); |
assert(i); |
|
|
if (mandoc_eos(buf, (size_t)i)) |
if (mandoc_eos(buf, (size_t)i)) |
m->last->flags |= MDOC_EOS; |
m->last->flags |= MDOC_EOS; |
|
|
Line 712 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
Line 715 mdoc_ptext(struct mdoc *m, int line, char *buf) |
|
|
|
|
|
static int |
static int |
macrowarn(struct mdoc *m, int ln, const char *buf) |
macrowarn(struct mdoc *m, int ln, const char *buf, int offs) |
{ |
{ |
if ( ! (MDOC_IGN_MACRO & m->pflags)) |
if ( ! (MDOC_IGN_MACRO & m->pflags)) |
return(mdoc_verr(m, ln, 0, "unknown macro: %s%s", |
return(mdoc_verr(m, ln, offs, "unknown macro: %s%s", |
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s", |
return(mdoc_vwarn(m, ln, offs, "unknown macro: %s%s", |
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
} |
} |
|
|
Line 727 macrowarn(struct mdoc *m, int ln, const char *buf) |
|
Line 730 macrowarn(struct mdoc *m, int ln, const char *buf) |
|
* character. |
* character. |
*/ |
*/ |
int |
int |
mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, j, sv; |
int i, j, sv; |
Line 735 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
Line 738 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
|
|
/* Empty lines are ignored. */ |
/* Empty lines are ignored. */ |
|
|
if ('\0' == buf[1]) |
offs++; |
|
|
|
if ('\0' == buf[offs]) |
return(1); |
return(1); |
|
|
i = 1; |
i = offs; |
|
|
/* Accept whitespace after the initial control char. */ |
/* Accept whitespace after the initial control char. */ |
|
|
Line 767 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
Line 772 mdoc_pmacro(struct mdoc *m, int ln, char *buf) |
|
return(mdoc_perr(m, ln, i, EPRINT)); |
return(mdoc_perr(m, ln, i, EPRINT)); |
} |
} |
|
|
mac[j] = 0; |
mac[j] = '\0'; |
|
|
if (j == 4 || j < 2) { |
if (j == 4 || j < 2) { |
if ( ! macrowarn(m, ln, mac)) |
if ( ! macrowarn(m, ln, mac, sv)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
|
|
if (MDOC_MAX == (tok = mdoc_hash_find(mac))) { |
if (MDOC_MAX == (tok = mdoc_hash_find(mac))) { |
if ( ! macrowarn(m, ln, mac)) |
if ( ! macrowarn(m, ln, mac, sv)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |