version 1.3, 2008/12/15 02:23:12 |
version 1.4, 2008/12/15 03:13:01 |
Line 29 static int append_text(struct mdoc *, int, |
|
Line 29 static int append_text(struct mdoc *, int, |
|
int, int, char *[]); |
int, int, char *[]); |
static int append_scoped(struct mdoc *, int, |
static int append_scoped(struct mdoc *, int, |
int, int, char *[]); |
int, int, char *[]); |
static int isdelim(const char *); |
|
static int args_next(struct mdoc *, int, |
static int args_next(struct mdoc *, int, |
int *, char *, char **); |
int *, char *, char **); |
|
|
|
|
static int |
static int |
isdelim(const char *p) |
|
{ |
|
|
|
if (0 == *p) |
|
return(0); |
|
if (0 != *(p + 1)) |
|
return(0); |
|
|
|
switch (*p) { |
|
case('{'): |
|
/* FALLTHROUGH */ |
|
case('.'): |
|
/* FALLTHROUGH */ |
|
case(','): |
|
/* FALLTHROUGH */ |
|
case(';'): |
|
/* FALLTHROUGH */ |
|
case(':'): |
|
/* FALLTHROUGH */ |
|
case('?'): |
|
/* FALLTHROUGH */ |
|
case('!'): |
|
/* FALLTHROUGH */ |
|
case('('): |
|
/* FALLTHROUGH */ |
|
case(')'): |
|
/* FALLTHROUGH */ |
|
case('['): |
|
/* FALLTHROUGH */ |
|
case(']'): |
|
/* FALLTHROUGH */ |
|
case('}'): |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
|
return(0); |
|
} |
|
|
|
|
|
static int |
|
args_next(struct mdoc *mdoc, int tok, |
args_next(struct mdoc *mdoc, int tok, |
int *pos, char *buf, char **v) |
int *pos, char *buf, char **v) |
{ |
{ |
Line 125 append_scoped(struct mdoc *mdoc, int tok, |
|
Line 82 append_scoped(struct mdoc *mdoc, int tok, |
|
int pos, int sz, char *args[]) |
int pos, int sz, char *args[]) |
{ |
{ |
|
|
|
switch (tok) { |
|
/* ======= ADD MORE MACRO CHECKS BELOW. ======= */ |
|
case (MDOC_Sh): |
|
break; |
|
case (MDOC_Ss): |
|
break; |
|
/* ======= ADD MORE MACRO CHECKS ABOVE. ======= */ |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
assert(sz >= 0); |
assert(sz >= 0); |
args[sz] = NULL; |
args[sz] = NULL; |
mdoc_block_alloc(mdoc, pos, tok, 0, NULL); |
mdoc_block_alloc(mdoc, pos, tok, 0, NULL); |
Line 143 append_text(struct mdoc *mdoc, int tok, |
|
Line 112 append_text(struct mdoc *mdoc, int tok, |
|
args[sz] = NULL; |
args[sz] = NULL; |
|
|
switch (tok) { |
switch (tok) { |
/* ======= ADD MORE MACRO ARGUMENT-LIMITS BELOW. ======= */ |
/* ======= ADD MORE MACRO CHECKS BELOW. ======= */ |
|
|
case (MDOC_Ft): |
case (MDOC_Ft): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Li): |
case (MDOC_Li): |
Line 154 append_text(struct mdoc *mdoc, int tok, |
|
Line 122 append_text(struct mdoc *mdoc, int tok, |
|
case (MDOC_Pa): |
case (MDOC_Pa): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Tn): |
case (MDOC_Tn): |
if (0 == sz && ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1)) |
if (0 < sz) |
|
break; |
|
if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1)) |
return(0); |
return(0); |
mdoc_elem_alloc(mdoc, pos, tok, 0, |
break; |
NULL, (size_t)sz, _CC(args)); |
|
return(1); |
|
|
|
case (MDOC_Ar): |
case (MDOC_Ar): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Cm): |
case (MDOC_Cm): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Fl): |
case (MDOC_Fl): |
mdoc_elem_alloc(mdoc, pos, tok, 0, |
break; |
NULL, (size_t)sz, _CC(args)); |
|
return(1); |
|
|
|
case (MDOC_Ad): |
case (MDOC_Ad): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Em): |
case (MDOC_Em): |
Line 186 append_text(struct mdoc *mdoc, int tok, |
|
Line 150 append_text(struct mdoc *mdoc, int tok, |
|
case (MDOC_Va): |
case (MDOC_Va): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Vt): |
case (MDOC_Vt): |
if (0 == sz) |
if (0 < sz) |
return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); |
break; |
mdoc_elem_alloc(mdoc, pos, tok, 0, |
return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); |
NULL, (size_t)sz, _CC(args)); |
/* ======= ADD MORE MACRO CHECKS ABOVE. ======= */ |
return(1); |
|
|
|
/* ======= ADD MORE MACRO ARGUMENT-LIMITS ABOVE. ======= */ |
|
default: |
default: |
break; |
abort(); |
|
/* NOTREACHED */ |
} |
} |
|
|
abort(); |
mdoc_elem_alloc(mdoc, pos, tok, 0, |
/* NOTREACHED */ |
NULL, (size_t)sz, _CC(args)); |
|
return(1); |
} |
} |
|
|
|
|
|
|
|
|
/* Word found. */ |
/* Word found. */ |
|
|
if ( ! isdelim(args[j])) { |
if ( ! mdoc_isdelim(args[j])) { |
j++; |
j++; |
goto again; |
goto again; |
} |
} |