version 1.68, 2011/03/17 10:59:27 |
version 1.75, 2011/04/17 09:13:01 |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "mdoc.h" |
#include "mandoc.h" |
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
static enum mdocargt argv_a2arg(enum mdoct, const char *); |
static enum mdocargt argv_a2arg(enum mdoct, const char *); |
static enum margserr args(struct mdoc *, int, int *, |
static enum margserr args(struct mdoc *, int, int *, |
char *, int, char **); |
char *, int, char **); |
static int args_checkpunct(const char *); |
static int args_checkpunct(struct mdoc *, |
|
const char *, int, int, int); |
static int argv(struct mdoc *, int, |
static int argv(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_single(struct mdoc *, int, |
static int argv_single(struct mdoc *, int, |
Line 44 static int argv_opt_single(struct mdoc *, int, |
|
Line 46 static int argv_opt_single(struct mdoc *, int, |
|
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_multi(struct mdoc *, int, |
static int argv_multi(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
|
static void argn_free(struct mdoc_arg *, int); |
|
|
enum argvflag { |
enum argvflag { |
ARGV_NONE, /* no args to flag (e.g., -split) */ |
ARGV_NONE, /* no args to flag (e.g., -split) */ |
Line 206 static const int argflags[MDOC_MAX] = { |
|
Line 209 static const int argflags[MDOC_MAX] = { |
|
0, /* Ta */ |
0, /* Ta */ |
}; |
}; |
|
|
|
static const enum mdocargt args_Ex[] = { |
|
MDOC_Std, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_An[] = { |
|
MDOC_Split, |
|
MDOC_Nosplit, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bd[] = { |
|
MDOC_Ragged, |
|
MDOC_Unfilled, |
|
MDOC_Filled, |
|
MDOC_Literal, |
|
MDOC_File, |
|
MDOC_Offset, |
|
MDOC_Compact, |
|
MDOC_Centred, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bf[] = { |
|
MDOC_Emphasis, |
|
MDOC_Literal, |
|
MDOC_Symbolic, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bk[] = { |
|
MDOC_Words, |
|
MDOC_ARG_MAX |
|
}; |
|
|
|
static const enum mdocargt args_Bl[] = { |
|
MDOC_Bullet, |
|
MDOC_Dash, |
|
MDOC_Hyphen, |
|
MDOC_Item, |
|
MDOC_Enum, |
|
MDOC_Tag, |
|
MDOC_Diag, |
|
MDOC_Hang, |
|
MDOC_Ohang, |
|
MDOC_Inset, |
|
MDOC_Column, |
|
MDOC_Width, |
|
MDOC_Offset, |
|
MDOC_Compact, |
|
MDOC_Nested, |
|
MDOC_ARG_MAX |
|
}; |
|
|
/* |
/* |
* Parse an argument from line text. This comes in the form of -key |
* Parse an argument from line text. This comes in the form of -key |
* [value0...], which may either have a single mandatory value, at least |
* [value0...], which may either have a single mandatory value, at least |
Line 294 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 351 mdoc_argv_free(struct mdoc_arg *p) |
|
assert(p->argc); |
assert(p->argc); |
|
|
for (i = (int)p->argc - 1; i >= 0; i--) |
for (i = (int)p->argc - 1; i >= 0; i--) |
mdoc_argn_free(p, i); |
argn_free(p, i); |
|
|
free(p->argv); |
free(p->argv); |
free(p); |
free(p); |
} |
} |
|
|
void |
static void |
mdoc_argn_free(struct mdoc_arg *p, int iarg) |
argn_free(struct mdoc_arg *p, int iarg) |
{ |
{ |
struct mdoc_argv *arg; |
struct mdoc_argv *arg; |
int j; |
int j; |
Line 361 static enum margserr |
|
Line 418 static enum margserr |
|
args(struct mdoc *m, int line, int *pos, |
args(struct mdoc *m, int line, int *pos, |
char *buf, int fl, char **v) |
char *buf, int fl, char **v) |
{ |
{ |
int i; |
|
char *p, *pp; |
char *p, *pp; |
enum margserr rc; |
enum margserr rc; |
|
|
Line 399 args(struct mdoc *m, int line, int *pos, |
|
Line 455 args(struct mdoc *m, int line, int *pos, |
|
|
|
*v = &buf[*pos]; |
*v = &buf[*pos]; |
|
|
if (ARGS_DELIM & fl && args_checkpunct(&buf[*pos])) { |
if (ARGS_DELIM & fl && args_checkpunct(m, buf, *pos, line, fl)) |
i = strlen(&buf[*pos]) + *pos; |
|
if (i && ' ' != buf[i - 1]) |
|
return(ARGS_PUNCT); |
|
if (ARGS_NOWARN & fl) |
|
return(ARGS_PUNCT); |
|
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
|
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
|
|
|
/* |
/* |
* First handle TABSEP items, restricted to `Bl -column'. This |
* First handle TABSEP items, restricted to `Bl -column'. This |
Line 519 args(struct mdoc *m, int line, int *pos, |
|
Line 568 args(struct mdoc *m, int line, int *pos, |
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
/* |
p = &buf[*pos]; |
* A non-quoted term progresses until either the end of line or |
*v = mandoc_getarg(m->parse, &p, line, |
* a non-escaped whitespace. |
! (ARGS_NOWARN & fl), pos); |
*/ |
|
|
|
for ( ; buf[*pos]; (*pos)++) |
|
if (*pos && ' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
|
break; |
|
|
|
if ('\0' == buf[*pos]) |
|
return(ARGS_WORD); |
|
|
|
buf[(*pos)++] = '\0'; |
|
|
|
while (' ' == buf[*pos]) |
|
(*pos)++; |
|
|
|
if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl)) |
|
mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); |
|
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
|
|
Line 549 args(struct mdoc *m, int line, int *pos, |
|
Line 582 args(struct mdoc *m, int line, int *pos, |
|
* whitespace may separate these tokens. |
* whitespace may separate these tokens. |
*/ |
*/ |
static int |
static int |
args_checkpunct(const char *p) |
args_checkpunct(struct mdoc *m, const char *buf, int i, int ln, int fl) |
{ |
{ |
int i, j; |
int j; |
char buf[DELIMSZ]; |
char dbuf[DELIMSZ]; |
enum mdelim d; |
enum mdelim d; |
|
|
i = 0; |
|
|
|
/* First token must be a close-delimiter. */ |
/* First token must be a close-delimiter. */ |
|
|
for (j = 0; p[i] && ' ' != p[i] && j < DELIMSZ; j++, i++) |
for (j = 0; buf[i] && ' ' != buf[i] && j < DELIMSZ; j++, i++) |
buf[j] = p[i]; |
dbuf[j] = buf[i]; |
|
|
if (DELIMSZ == j) |
if (DELIMSZ == j) |
return(0); |
return(0); |
|
|
buf[j] = '\0'; |
dbuf[j] = '\0'; |
if (DELIM_CLOSE != mandoc_isdelim(buf)) |
if (DELIM_CLOSE != mdoc_isdelim(dbuf)) |
return(0); |
return(0); |
|
|
while (' ' == p[i]) |
while (' ' == buf[i]) |
i++; |
i++; |
|
|
/* Remaining must NOT be open/none. */ |
/* Remaining must NOT be open/none. */ |
|
|
while (p[i]) { |
while (buf[i]) { |
j = 0; |
j = 0; |
while (p[i] && ' ' != p[i] && j < DELIMSZ) |
while (buf[i] && ' ' != buf[i] && j < DELIMSZ) |
buf[j++] = p[i++]; |
dbuf[j++] = buf[i++]; |
|
|
if (DELIMSZ == j) |
if (DELIMSZ == j) |
return(0); |
return(0); |
|
|
buf[j] = '\0'; |
dbuf[j] = '\0'; |
d = mandoc_isdelim(buf); |
d = mdoc_isdelim(dbuf); |
if (DELIM_NONE == d || DELIM_OPEN == d) |
if (DELIM_NONE == d || DELIM_OPEN == d) |
return(0); |
return(0); |
|
|
while (' ' == p[i]) |
while (' ' == buf[i]) |
i++; |
i++; |
} |
} |
|
|
return('\0' == p[i]); |
if ( ! (ARGS_NOWARN & fl) && i && ' ' == buf[i - 1]) |
|
mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE); |
|
|
|
return('\0' == buf[i]); |
} |
} |
|
|
/* |
/* |
Line 602 args_checkpunct(const char *p) |
|
Line 636 args_checkpunct(const char *p) |
|
static enum mdocargt |
static enum mdocargt |
argv_a2arg(enum mdoct tok, const char *p) |
argv_a2arg(enum mdoct tok, const char *p) |
{ |
{ |
enum mdocargt args[MDOC_ARG_MAX]; |
const enum mdocargt *argsp; |
int i, len; |
|
|
|
len = 0; |
argsp = NULL; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_An): |
case (MDOC_An): |
args[len++] = MDOC_Split; |
argsp = args_An; |
args[len++] = MDOC_Nosplit; |
|
break; |
break; |
case (MDOC_Bd): |
case (MDOC_Bd): |
args[len++] = MDOC_Ragged; |
argsp = args_Bd; |
args[len++] = MDOC_Unfilled; |
|
args[len++] = MDOC_Filled; |
|
args[len++] = MDOC_Literal; |
|
args[len++] = MDOC_File; |
|
args[len++] = MDOC_Offset; |
|
args[len++] = MDOC_Compact; |
|
args[len++] = MDOC_Centred; |
|
break; |
break; |
case (MDOC_Bf): |
case (MDOC_Bf): |
args[len++] = MDOC_Emphasis; |
argsp = args_Bf; |
args[len++] = MDOC_Literal; |
|
args[len++] = MDOC_Symbolic; |
|
break; |
break; |
case (MDOC_Bk): |
case (MDOC_Bk): |
args[len++] = MDOC_Words; |
argsp = args_Bk; |
break; |
break; |
case (MDOC_Bl): |
case (MDOC_Bl): |
args[len++] = MDOC_Bullet; |
argsp = args_Bl; |
args[len++] = MDOC_Dash; |
|
args[len++] = MDOC_Hyphen; |
|
args[len++] = MDOC_Item; |
|
args[len++] = MDOC_Enum; |
|
args[len++] = MDOC_Tag; |
|
args[len++] = MDOC_Diag; |
|
args[len++] = MDOC_Hang; |
|
args[len++] = MDOC_Ohang; |
|
args[len++] = MDOC_Inset; |
|
args[len++] = MDOC_Column; |
|
args[len++] = MDOC_Width; |
|
args[len++] = MDOC_Offset; |
|
args[len++] = MDOC_Compact; |
|
args[len++] = MDOC_Nested; |
|
break; |
break; |
case (MDOC_Rv): |
case (MDOC_Rv): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Ex): |
case (MDOC_Ex): |
args[len++] = MDOC_Std; |
argsp = args_Ex; |
break; |
break; |
default: |
default: |
break; |
return(MDOC_ARG_MAX); |
} |
} |
|
|
for (i = 0; i < len; i++) |
assert(argsp); |
if (0 == strcmp(p, mdoc_argnames[args[i]])) |
|
return(args[i]); |
for ( ; MDOC_ARG_MAX != *argsp ; argsp++) |
|
if (0 == strcmp(p, mdoc_argnames[*argsp])) |
|
return(*argsp); |
|
|
return(MDOC_ARG_MAX); |
return(MDOC_ARG_MAX); |
} |
} |