version 1.106, 2015/10/15 22:45:43 |
version 1.115, 2017/05/30 16:22:03 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2014-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 |
|
|
#include "roff.h" |
#include "roff.h" |
#include "mdoc.h" |
#include "mdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
#include "roff_int.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
|
|
#define MULTI_STEP 5 /* pre-allocate argument values */ |
#define MULTI_STEP 5 /* pre-allocate argument values */ |
Line 143 static const enum mdocargt args_Bl[] = { |
|
Line 144 static const enum mdocargt args_Bl[] = { |
|
MDOC_ARG_MAX |
MDOC_ARG_MAX |
}; |
}; |
|
|
static const struct mdocarg mdocargs[MDOC_MAX] = { |
static const struct mdocarg __mdocargs[MDOC_MAX - MDOC_Dd] = { |
{ ARGSFL_DELIM, NULL }, /* Ap */ |
|
{ ARGSFL_NONE, NULL }, /* Dd */ |
{ ARGSFL_NONE, NULL }, /* Dd */ |
{ ARGSFL_NONE, NULL }, /* Dt */ |
{ ARGSFL_NONE, NULL }, /* Dt */ |
{ ARGSFL_NONE, NULL }, /* Os */ |
{ ARGSFL_NONE, NULL }, /* Os */ |
Line 160 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 160 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_NONE, NULL }, /* It */ |
{ ARGSFL_NONE, NULL }, /* It */ |
{ ARGSFL_DELIM, NULL }, /* Ad */ |
{ ARGSFL_DELIM, NULL }, /* Ad */ |
{ ARGSFL_DELIM, args_An }, /* An */ |
{ ARGSFL_DELIM, args_An }, /* An */ |
|
{ ARGSFL_DELIM, NULL }, /* Ap */ |
{ ARGSFL_DELIM, NULL }, /* Ar */ |
{ ARGSFL_DELIM, NULL }, /* Ar */ |
{ ARGSFL_DELIM, NULL }, /* Cd */ |
{ ARGSFL_DELIM, NULL }, /* Cd */ |
{ ARGSFL_DELIM, NULL }, /* Cm */ |
{ ARGSFL_DELIM, NULL }, /* Cm */ |
Line 262 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 263 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_DELIM, NULL }, /* En */ |
{ ARGSFL_DELIM, NULL }, /* En */ |
{ ARGSFL_DELIM, NULL }, /* Dx */ |
{ ARGSFL_DELIM, NULL }, /* Dx */ |
{ ARGSFL_NONE, NULL }, /* %Q */ |
{ ARGSFL_NONE, NULL }, /* %Q */ |
{ ARGSFL_NONE, NULL }, /* br */ |
|
{ ARGSFL_NONE, NULL }, /* sp */ |
|
{ ARGSFL_NONE, NULL }, /* %U */ |
{ ARGSFL_NONE, NULL }, /* %U */ |
{ ARGSFL_NONE, NULL }, /* Ta */ |
{ ARGSFL_NONE, NULL }, /* Ta */ |
{ ARGSFL_NONE, NULL }, /* ll */ |
|
}; |
}; |
|
static const struct mdocarg *const mdocargs = __mdocargs - MDOC_Dd; |
|
|
|
|
/* |
/* |
Line 276 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 275 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
* Some flags take no argument, some one, some multiple. |
* Some flags take no argument, some one, some multiple. |
*/ |
*/ |
void |
void |
mdoc_argv(struct roff_man *mdoc, int line, int tok, |
mdoc_argv(struct roff_man *mdoc, int line, enum roff_tok tok, |
struct mdoc_arg **reta, int *pos, char *buf) |
struct mdoc_arg **reta, int *pos, char *buf) |
{ |
{ |
struct mdoc_argv tmpv; |
struct mdoc_argv tmpv; |
Line 290 mdoc_argv(struct roff_man *mdoc, int line, int tok, |
|
Line 289 mdoc_argv(struct roff_man *mdoc, int line, int tok, |
|
|
|
/* Which flags does this macro support? */ |
/* Which flags does this macro support? */ |
|
|
|
assert(tok >= MDOC_Dd && tok < MDOC_MAX); |
argtable = mdocargs[tok].argvs; |
argtable = mdocargs[tok].argvs; |
if (argtable == NULL) |
if (argtable == NULL) |
return; |
return; |
Line 414 argn_free(struct mdoc_arg *p, int iarg) |
|
Line 414 argn_free(struct mdoc_arg *p, int iarg) |
|
|
|
enum margserr |
enum margserr |
mdoc_args(struct roff_man *mdoc, int line, int *pos, |
mdoc_args(struct roff_man *mdoc, int line, int *pos, |
char *buf, int tok, char **v) |
char *buf, enum roff_tok tok, char **v) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
char *v_local; |
char *v_local; |
Line 423 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
Line 423 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
if (v == NULL) |
if (v == NULL) |
v = &v_local; |
v = &v_local; |
fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags; |
fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags; |
if (tok != MDOC_It) |
|
return args(mdoc, line, pos, buf, fl, v); |
|
|
|
/* |
/* |
* We know that we're in an `It', so it's reasonable to expect |
* We know that we're in an `It', so it's reasonable to expect |
Line 433 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
Line 431 mdoc_args(struct roff_man *mdoc, int line, int *pos, |
|
* safe fall-back into the default behaviour. |
* safe fall-back into the default behaviour. |
*/ |
*/ |
|
|
for (n = mdoc->last; n; n = n->parent) |
if (tok == MDOC_It) { |
if (MDOC_Bl == n->tok) |
for (n = mdoc->last; n != NULL; n = n->parent) { |
if (LIST_column == n->norm->Bl.type) { |
if (n->tok != MDOC_Bl) |
|
continue; |
|
if (n->norm->Bl.type == LIST_column) |
fl = ARGSFL_TABSEP; |
fl = ARGSFL_TABSEP; |
break; |
break; |
} |
} |
|
} |
|
|
return args(mdoc, line, pos, buf, fl, v); |
return args(mdoc, line, pos, buf, fl, v); |
} |
} |
Line 449 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 450 args(struct roff_man *mdoc, int line, int *pos, |
|
{ |
{ |
char *p; |
char *p; |
int pairs; |
int pairs; |
enum margserr rc; |
|
|
|
if (buf[*pos] == '\0') { |
if (buf[*pos] == '\0') { |
if (mdoc->flags & MDOC_PHRASELIT && |
if (mdoc->flags & MDOC_PHRASELIT && |
! (mdoc->flags & MDOC_PPHRASE)) { |
! (mdoc->flags & MDOC_PHRASE)) { |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
mdoc->parse, line, *pos, NULL); |
mdoc->parse, line, *pos, NULL); |
mdoc->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
Line 473 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 473 args(struct roff_man *mdoc, int line, int *pos, |
|
|
|
if (fl == ARGSFL_TABSEP) { |
if (fl == ARGSFL_TABSEP) { |
if ((p = strchr(*v, '\t')) != NULL) { |
if ((p = strchr(*v, '\t')) != NULL) { |
/* Skip any blank characters after the tab. */ |
|
|
/* |
|
* Words right before and right after |
|
* tab characters are not parsed, |
|
* unless there is a blank in between. |
|
*/ |
|
|
|
if (p > buf && p[-1] != ' ') |
|
mdoc->flags |= MDOC_PHRASEQL; |
|
if (p[1] != ' ') |
|
mdoc->flags |= MDOC_PHRASEQN; |
|
|
|
/* |
|
* One or more blanks after a tab cause |
|
* one leading blank in the next column. |
|
* So skip all but one of them. |
|
*/ |
|
|
*pos += (int)(p - *v) + 1; |
*pos += (int)(p - *v) + 1; |
while (buf[*pos] == ' ') |
while (buf[*pos] == ' ' && buf[*pos + 1] == ' ') |
(*pos)++; |
(*pos)++; |
rc = ARGS_PPHRASE; |
|
|
/* |
|
* A tab at the end of an input line |
|
* switches to the next column. |
|
*/ |
|
|
|
if (buf[*pos] == '\0' || buf[*pos + 1] == '\0') |
|
mdoc->flags |= MDOC_PHRASEQN; |
} else { |
} else { |
p = strchr(*v, '\0'); |
p = strchr(*v, '\0'); |
if (p[-1] == ' ') |
if (p[-1] == ' ') |
mandoc_msg(MANDOCERR_SPACE_EOL, |
mandoc_msg(MANDOCERR_SPACE_EOL, |
mdoc->parse, line, *pos, NULL); |
mdoc->parse, line, *pos, NULL); |
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
rc = ARGS_PEND; |
|
} |
} |
|
|
/* Skip any trailing blank characters. */ |
/* Skip any trailing blank characters. */ |
Line 493 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 516 args(struct roff_man *mdoc, int line, int *pos, |
|
p--; |
p--; |
*p = '\0'; |
*p = '\0'; |
|
|
return rc; |
return ARGS_PHRASE; |
} |
} |
|
|
/* |
/* |
Line 504 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 527 args(struct roff_man *mdoc, int line, int *pos, |
|
* Whitespace is NOT involved in literal termination. |
* Whitespace is NOT involved in literal termination. |
*/ |
*/ |
|
|
if (MDOC_PHRASELIT & mdoc->flags || '\"' == buf[*pos]) { |
if (mdoc->flags & MDOC_PHRASELIT || buf[*pos] == '\"') { |
if ( ! (MDOC_PHRASELIT & mdoc->flags)) |
if ( ! (mdoc->flags & MDOC_PHRASELIT)) |
*v = &buf[++(*pos)]; |
*v = &buf[++(*pos)]; |
|
|
if (MDOC_PPHRASE & mdoc->flags) |
if (mdoc->flags & MDOC_PHRASE) |
mdoc->flags |= MDOC_PHRASELIT; |
mdoc->flags |= MDOC_PHRASELIT; |
|
|
pairs = 0; |
pairs = 0; |
Line 528 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 551 args(struct roff_man *mdoc, int line, int *pos, |
|
if (pairs) |
if (pairs) |
buf[*pos - pairs] = '\0'; |
buf[*pos - pairs] = '\0'; |
|
|
if ('\0' == buf[*pos]) { |
if (buf[*pos] == '\0') { |
if (MDOC_PPHRASE & mdoc->flags) |
if ( ! (mdoc->flags & MDOC_PHRASE)) |
return ARGS_QWORD; |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
mdoc->parse, line, *pos, NULL); |
mdoc->parse, line, *pos, NULL); |
return ARGS_WORD; |
return ARGS_QWORD; |
|
} |
} |
|
|
mdoc->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
buf[(*pos)++] = '\0'; |
buf[(*pos)++] = '\0'; |
|
|
if ('\0' == buf[*pos]) |
if ('\0' == buf[*pos]) |
return ARGS_QWORD; |
return ARGS_WORD; |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
Line 549 args(struct roff_man *mdoc, int line, int *pos, |
|
Line 571 args(struct roff_man *mdoc, int line, int *pos, |
|
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
line, *pos, NULL); |
line, *pos, NULL); |
|
|
return ARGS_QWORD; |
return ARGS_WORD; |
} |
} |
|
|
p = &buf[*pos]; |
p = &buf[*pos]; |
*v = mandoc_getarg(mdoc->parse, &p, line, pos); |
*v = mandoc_getarg(mdoc->parse, &p, line, pos); |
|
|
|
/* |
|
* After parsing the last word in this phrase, |
|
* tell lookup() whether or not to interpret it. |
|
*/ |
|
|
|
if (*p == '\0' && mdoc->flags & MDOC_PHRASEQL) { |
|
mdoc->flags &= ~MDOC_PHRASEQL; |
|
mdoc->flags |= MDOC_PHRASEQF; |
|
} |
return ARGS_WORD; |
return ARGS_WORD; |
} |
} |
|
|