version 1.96, 2010/07/27 13:16:00 |
version 1.98, 2010/08/20 01:02:07 |
Line 168 static void roff_free1(struct roff *); |
|
Line 168 static void roff_free1(struct roff *); |
|
static enum rofft roff_hash_find(const char *); |
static enum rofft roff_hash_find(const char *); |
static void roff_hash_init(void); |
static void roff_hash_init(void); |
static void roffnode_cleanscope(struct roff *); |
static void roffnode_cleanscope(struct roff *); |
static int roffnode_push(struct roff *, |
static void roffnode_push(struct roff *, |
enum rofft, int, int); |
enum rofft, int, int); |
static void roffnode_pop(struct roff *); |
static void roffnode_pop(struct roff *); |
static enum rofft roff_parse(const char *, int *); |
static enum rofft roff_parse(const char *, int *); |
Line 258 roffnode_pop(struct roff *r) |
|
Line 258 roffnode_pop(struct roff *r) |
|
* Push a roff node onto the instruction stack. This must later be |
* Push a roff node onto the instruction stack. This must later be |
* removed with roffnode_pop(). |
* removed with roffnode_pop(). |
*/ |
*/ |
static int |
static void |
roffnode_push(struct roff *r, enum rofft tok, int line, int col) |
roffnode_push(struct roff *r, enum rofft tok, int line, int col) |
{ |
{ |
struct roffnode *p; |
struct roffnode *p; |
|
|
if (NULL == (p = calloc(1, sizeof(struct roffnode)))) { |
p = mandoc_calloc(1, sizeof(struct roffnode)); |
(*r->msg)(MANDOCERR_MEM, r->data, line, col, NULL); |
|
return(0); |
|
} |
|
|
|
p->tok = tok; |
p->tok = tok; |
p->parent = r->last; |
p->parent = r->last; |
p->line = line; |
p->line = line; |
Line 275 roffnode_push(struct roff *r, enum rofft tok, int line |
|
Line 271 roffnode_push(struct roff *r, enum rofft tok, int line |
|
p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY; |
p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY; |
|
|
r->last = p; |
r->last = p; |
return(1); |
|
} |
} |
|
|
|
|
Line 307 roff_free(struct roff *r) |
|
Line 302 roff_free(struct roff *r) |
|
|
|
|
|
struct roff * |
struct roff * |
roff_alloc(struct regset *regs, const mandocmsg msg, void *data) |
roff_alloc(struct regset *regs, void *data, const mandocmsg msg) |
{ |
{ |
struct roff *r; |
struct roff *r; |
|
|
if (NULL == (r = calloc(1, sizeof(struct roff)))) { |
r = mandoc_calloc(1, sizeof(struct roff)); |
(*msg)(MANDOCERR_MEM, data, 0, 0, NULL); |
|
return(0); |
|
} |
|
|
|
r->regs = regs; |
r->regs = regs; |
r->msg = msg; |
r->msg = msg; |
r->data = data; |
r->data = data; |
Line 650 roff_block(ROFF_ARGS) |
|
Line 641 roff_block(ROFF_ARGS) |
|
pos++; |
pos++; |
} |
} |
|
|
if ( ! roffnode_push(r, tok, ln, ppos)) |
roffnode_push(r, tok, ln, ppos); |
return(ROFF_ERR); |
|
|
|
if ('\0' == (*bufp)[pos]) |
if ('\0' == (*bufp)[pos]) |
return(ROFF_IGN); |
return(ROFF_IGN); |
Line 673 roff_block(ROFF_ARGS) |
|
Line 663 roff_block(ROFF_ARGS) |
|
if (1 == sz && '.' == (*bufp)[sv]) |
if (1 == sz && '.' == (*bufp)[sv]) |
return(ROFF_IGN); |
return(ROFF_IGN); |
|
|
r->last->end = malloc(sz + 1); |
r->last->end = mandoc_malloc(sz + 1); |
|
|
if (NULL == r->last->end) { |
|
(*r->msg)(MANDOCERR_MEM, r->data, ln, pos, NULL); |
|
return(ROFF_ERR); |
|
} |
|
|
|
memcpy(r->last->end, *bufp + sv, sz); |
memcpy(r->last->end, *bufp + sv, sz); |
r->last->end[(int)sz] = '\0'; |
r->last->end[(int)sz] = '\0'; |
|
|
Line 905 roff_cond(ROFF_ARGS) |
|
Line 890 roff_cond(ROFF_ARGS) |
|
return(ROFF_ERR); |
return(ROFF_ERR); |
} |
} |
|
|
if ( ! roffnode_push(r, tok, ln, ppos)) |
roffnode_push(r, tok, ln, ppos); |
return(ROFF_ERR); |
|
|
|
r->last->rule = rule; |
r->last->rule = rule; |
|
|
Line 1081 roff_getstrn(const struct roff *r, const char *name, s |
|
Line 1065 roff_getstrn(const struct roff *r, const char *name, s |
|
const struct roffstr *n; |
const struct roffstr *n; |
|
|
n = r->first_string; |
n = r->first_string; |
while (n && (strncmp(name, n->name, len) || '\0' != n->name[len])) |
while (n && (strncmp(name, n->name, len) || '\0' != n->name[(int)len])) |
n = n->next; |
n = n->next; |
|
|
return(n ? n->string : NULL); |
return(n ? n->string : NULL); |