version 1.130, 2011/03/29 09:00:48 |
version 1.140, 2011/05/24 15:22:14 |
|
|
#endif |
#endif |
|
|
#include <assert.h> |
#include <assert.h> |
#include <errno.h> |
|
#include <ctype.h> |
#include <ctype.h> |
#include <limits.h> |
|
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <stdio.h> |
|
|
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "libroff.h" |
#include "libroff.h" |
Line 206 static void roffnode_push(struct roff *, enum rofft, |
|
Line 203 static void roffnode_push(struct roff *, enum rofft, |
|
const char *, int, int); |
const char *, int, int); |
static void roffnode_pop(struct roff *); |
static void roffnode_pop(struct roff *); |
static enum rofft roff_parse(struct roff *, const char *, int *); |
static enum rofft roff_parse(struct roff *, const char *, int *); |
static int roff_parse_nat(const char *, unsigned int *); |
|
|
|
/* See roff_hash_find() */ |
/* See roff_hash_find() */ |
#define ROFF_HASH(p) (p[0] - ASCII_LO) |
#define ROFF_HASH(p) (p[0] - ASCII_LO) |
Line 277 roffnode_pop(struct roff *r) |
|
Line 273 roffnode_pop(struct roff *r) |
|
assert(r->last); |
assert(r->last); |
p = r->last; |
p = r->last; |
|
|
if (ROFF_el == p->tok) |
|
if (r->rstackpos > -1) |
|
r->rstackpos--; |
|
|
|
r->last = r->last->parent; |
r->last = r->last->parent; |
free(p->name); |
free(p->name); |
free(p->end); |
free(p->end); |
Line 597 roff_parse(struct roff *r, const char *buf, int *pos) |
|
Line 589 roff_parse(struct roff *r, const char *buf, int *pos) |
|
return(t); |
return(t); |
} |
} |
|
|
|
|
static int |
|
roff_parse_nat(const char *buf, unsigned int *res) |
|
{ |
|
char *ep; |
|
long lval; |
|
|
|
errno = 0; |
|
lval = strtol(buf, &ep, 10); |
|
if (buf[0] == '\0' || *ep != '\0') |
|
return(0); |
|
if ((errno == ERANGE && |
|
(lval == LONG_MAX || lval == LONG_MIN)) || |
|
(lval > INT_MAX || lval < 0)) |
|
return(0); |
|
|
|
*res = (unsigned int)lval; |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static enum rofferr |
static enum rofferr |
roff_cblock(ROFF_ARGS) |
roff_cblock(ROFF_ARGS) |
Line 739 roff_block(ROFF_ARGS) |
|
Line 710 roff_block(ROFF_ARGS) |
|
mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, |
mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, |
roffs[tok].name); |
roffs[tok].name); |
|
|
while ((*bufp)[pos] && ' ' != (*bufp)[pos]) |
while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos])) |
pos++; |
pos++; |
|
|
while (' ' == (*bufp)[pos]) |
while (isspace((unsigned char)(*bufp)[pos])) |
(*bufp)[pos++] = '\0'; |
(*bufp)[pos++] = '\0'; |
} |
} |
|
|
Line 763 roff_block(ROFF_ARGS) |
|
Line 734 roff_block(ROFF_ARGS) |
|
/* If present, process the custom end-of-line marker. */ |
/* If present, process the custom end-of-line marker. */ |
|
|
sv = pos; |
sv = pos; |
while ((*bufp)[pos] && |
while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos])) |
' ' != (*bufp)[pos] && |
|
'\t' != (*bufp)[pos]) |
|
pos++; |
pos++; |
|
|
/* |
/* |
Line 835 roff_block_sub(ROFF_ARGS) |
|
Line 804 roff_block_sub(ROFF_ARGS) |
|
* pulling it out of the hashtable. |
* pulling it out of the hashtable. |
*/ |
*/ |
|
|
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) |
t = roff_parse(r, *bufp, &pos); |
return(ROFF_IGN); |
|
|
|
/* |
/* |
* Macros other than block-end are only significant |
* Macros other than block-end are only significant |
Line 872 roff_cond_sub(ROFF_ARGS) |
|
Line 840 roff_cond_sub(ROFF_ARGS) |
|
{ |
{ |
enum rofft t; |
enum rofft t; |
enum roffrule rr; |
enum roffrule rr; |
|
char *ep; |
|
|
rr = r->last->rule; |
rr = r->last->rule; |
|
roffnode_cleanscope(r); |
|
|
/* |
/* |
* Clean out scope. If we've closed ourselves, then don't |
* If the macro is unknown, first check if it contains a closing |
* continue. |
* delimiter `\}'. If it does, close out our scope and return |
|
* the currently-scoped rule (ignore or continue). Else, drop |
|
* into the currently-scoped rule. |
*/ |
*/ |
|
|
roffnode_cleanscope(r); |
|
|
|
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) { |
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) { |
if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1]) |
ep = &(*bufp)[pos]; |
return(roff_ccond |
for ( ; NULL != (ep = strchr(ep, '\\')); ep++) { |
(r, ROFF_ccond, bufp, szp, |
ep++; |
ln, pos, pos + 2, offs)); |
if ('}' != *ep) |
|
continue; |
|
*ep = '&'; |
|
roff_ccond(r, ROFF_ccond, bufp, szp, |
|
ln, pos, pos + 2, offs); |
|
break; |
|
} |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
} |
} |
|
|
Line 895 roff_cond_sub(ROFF_ARGS) |
|
Line 871 roff_cond_sub(ROFF_ARGS) |
|
* if they're either structurally required (such as loops and |
* if they're either structurally required (such as loops and |
* conditionals) or a closing macro. |
* conditionals) or a closing macro. |
*/ |
*/ |
|
|
if (ROFFRULE_DENY == rr) |
if (ROFFRULE_DENY == rr) |
if ( ! (ROFFMAC_STRUCT & roffs[t].flags)) |
if ( ! (ROFFMAC_STRUCT & roffs[t].flags)) |
if (ROFF_ccond != t) |
if (ROFF_ccond != t) |
Line 905 roff_cond_sub(ROFF_ARGS) |
|
Line 882 roff_cond_sub(ROFF_ARGS) |
|
ln, ppos, pos, offs)); |
ln, ppos, pos, offs)); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static enum rofferr |
static enum rofferr |
roff_cond_text(ROFF_ARGS) |
roff_cond_text(ROFF_ARGS) |
{ |
{ |
char *ep, *st; |
char *ep; |
enum roffrule rr; |
enum roffrule rr; |
|
|
rr = r->last->rule; |
rr = r->last->rule; |
|
roffnode_cleanscope(r); |
|
|
/* |
ep = &(*bufp)[pos]; |
* We display the value of the text if out current evaluation |
for ( ; NULL != (ep = strchr(ep, '\\')); ep++) { |
* scope permits us to do so. |
ep++; |
*/ |
if ('}' != *ep) |
|
continue; |
/* FIXME: use roff_ccond? */ |
*ep = '&'; |
|
roff_ccond(r, ROFF_ccond, bufp, szp, |
st = &(*bufp)[pos]; |
ln, pos, pos + 2, offs); |
if (NULL == (ep = strstr(st, "\\}"))) { |
|
roffnode_cleanscope(r); |
|
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
|
} |
} |
|
|
if (ep == st || (ep > st && '\\' != *(ep - 1))) |
|
roffnode_pop(r); |
|
|
|
roffnode_cleanscope(r); |
|
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |
} |
} |
|
|
|
|
static enum roffrule |
static enum roffrule |
roff_evalcond(const char *v, int *pos) |
roff_evalcond(const char *v, int *pos) |
{ |
{ |
Line 978 roff_cond(ROFF_ARGS) |
|
Line 946 roff_cond(ROFF_ARGS) |
|
int sv; |
int sv; |
enum roffrule rule; |
enum roffrule rule; |
|
|
/* Stack overflow! */ |
/* |
|
* An `.el' has no conditional body: it will consume the value |
|
* of the current rstack entry set in prior `ie' calls or |
|
* defaults to DENY. |
|
* |
|
* If we're not an `el', however, then evaluate the conditional. |
|
*/ |
|
|
if (ROFF_ie == tok && r->rstackpos == RSTACK_MAX - 1) { |
rule = ROFF_el == tok ? |
mandoc_msg(MANDOCERR_MEM, r->parse, ln, ppos, NULL); |
(r->rstackpos < 0 ? |
return(ROFF_ERR); |
ROFFRULE_DENY : r->rstack[r->rstackpos--]) : |
} |
roff_evalcond(*bufp, &pos); |
|
|
/* First, evaluate the conditional. */ |
|
|
|
if (ROFF_el == tok) { |
|
/* |
|
* An `.el' will get the value of the current rstack |
|
* entry set in prior `ie' calls or defaults to DENY. |
|
*/ |
|
if (r->rstackpos < 0) |
|
rule = ROFFRULE_DENY; |
|
else |
|
rule = r->rstack[r->rstackpos]; |
|
} else |
|
rule = roff_evalcond(*bufp, &pos); |
|
|
|
sv = pos; |
sv = pos; |
|
|
while (' ' == (*bufp)[pos]) |
while (' ' == (*bufp)[pos]) |
pos++; |
pos++; |
|
|
Line 1020 roff_cond(ROFF_ARGS) |
|
Line 979 roff_cond(ROFF_ARGS) |
|
|
|
r->last->rule = rule; |
r->last->rule = rule; |
|
|
|
/* |
|
* An if-else will put the NEGATION of the current evaluated |
|
* conditional into the stack of rules. |
|
*/ |
|
|
if (ROFF_ie == tok) { |
if (ROFF_ie == tok) { |
/* |
if (r->rstackpos == RSTACK_MAX - 1) { |
* An if-else will put the NEGATION of the current |
mandoc_msg(MANDOCERR_MEM, |
* evaluated conditional into the stack. |
r->parse, ln, ppos, NULL); |
*/ |
return(ROFF_ERR); |
r->rstackpos++; |
} |
if (ROFFRULE_DENY == r->last->rule) |
r->rstack[++r->rstackpos] = |
r->rstack[r->rstackpos] = ROFFRULE_ALLOW; |
ROFFRULE_DENY == r->last->rule ? |
else |
ROFFRULE_ALLOW : ROFFRULE_DENY; |
r->rstack[r->rstackpos] = ROFFRULE_DENY; |
|
} |
} |
|
|
/* If the parent has false as its rule, then so do we. */ |
/* If the parent has false as its rule, then so do we. */ |
Line 1102 roff_nr(ROFF_ARGS) |
|
Line 1065 roff_nr(ROFF_ARGS) |
|
{ |
{ |
const char *key; |
const char *key; |
char *val; |
char *val; |
|
int iv; |
struct reg *rg; |
struct reg *rg; |
|
|
val = *bufp + pos; |
val = *bufp + pos; |
Line 1110 roff_nr(ROFF_ARGS) |
|
Line 1074 roff_nr(ROFF_ARGS) |
|
|
|
if (0 == strcmp(key, "nS")) { |
if (0 == strcmp(key, "nS")) { |
rg[(int)REG_nS].set = 1; |
rg[(int)REG_nS].set = 1; |
if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u)) |
if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0) |
rg[(int)REG_nS].v.u = 0; |
rg[REG_nS].v.u = (unsigned)iv; |
|
else |
|
rg[(int)REG_nS].v.u = 0u; |
} |
} |
|
|
return(ROFF_IGN); |
return(ROFF_IGN); |