version 1.171, 2011/09/19 08:34:45 |
version 1.174, 2012/06/12 20:21:04 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011, 2012 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 |
|
|
ROFF_am, |
ROFF_am, |
ROFF_ami, |
ROFF_ami, |
ROFF_am1, |
ROFF_am1, |
|
ROFF_cc, |
ROFF_de, |
ROFF_de, |
ROFF_dei, |
ROFF_dei, |
ROFF_de1, |
ROFF_de1, |
|
|
struct mparse *parse; /* parse point */ |
struct mparse *parse; /* parse point */ |
struct roffnode *last; /* leaf of stack */ |
struct roffnode *last; /* leaf of stack */ |
enum roffrule rstack[RSTACK_MAX]; /* stack of !`ie' rules */ |
enum roffrule rstack[RSTACK_MAX]; /* stack of !`ie' rules */ |
|
char control; /* control character */ |
int rstackpos; /* position in rstack */ |
int rstackpos; /* position in rstack */ |
struct reg regs[REG__MAX]; |
struct reg regs[REG__MAX]; |
struct roffkv *strtab; /* user-defined strings & macros */ |
struct roffkv *strtab; /* user-defined strings & macros */ |
Line 169 static enum rofferr roff_block(ROFF_ARGS); |
|
Line 171 static enum rofferr roff_block(ROFF_ARGS); |
|
static enum rofferr roff_block_text(ROFF_ARGS); |
static enum rofferr roff_block_text(ROFF_ARGS); |
static enum rofferr roff_block_sub(ROFF_ARGS); |
static enum rofferr roff_block_sub(ROFF_ARGS); |
static enum rofferr roff_cblock(ROFF_ARGS); |
static enum rofferr roff_cblock(ROFF_ARGS); |
|
static enum rofferr roff_cc(ROFF_ARGS); |
static enum rofferr roff_ccond(ROFF_ARGS); |
static enum rofferr roff_ccond(ROFF_ARGS); |
static enum rofferr roff_cond(ROFF_ARGS); |
static enum rofferr roff_cond(ROFF_ARGS); |
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_text(ROFF_ARGS); |
Line 186 static void roff_openeqn(struct roff *, const char * |
|
Line 189 static void roff_openeqn(struct roff *, const char * |
|
int, int, const char *); |
int, int, const char *); |
static enum rofft roff_parse(struct roff *, const char *, int *); |
static enum rofft roff_parse(struct roff *, const char *, int *); |
static enum rofferr roff_parsetext(char *); |
static enum rofferr roff_parsetext(char *); |
static void roff_res(struct roff *, |
static enum rofferr roff_res(struct roff *, |
char **, size_t *, int, int); |
char **, size_t *, int, int); |
static enum rofferr roff_rm(ROFF_ARGS); |
static enum rofferr roff_rm(ROFF_ARGS); |
static void roff_setstr(struct roff *, |
static void roff_setstr(struct roff *, |
Line 215 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 218 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
|
{ "cc", roff_cc, NULL, NULL, 0, NULL }, |
{ "de", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
{ "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL }, |
Line 392 roff_reset(struct roff *r) |
|
Line 396 roff_reset(struct roff *r) |
|
|
|
roff_free1(r); |
roff_free1(r); |
|
|
|
r->control = 0; |
memset(&r->regs, 0, sizeof(struct reg) * REG__MAX); |
memset(&r->regs, 0, sizeof(struct reg) * REG__MAX); |
|
|
for (i = 0; i < PREDEFS_MAX; i++) |
for (i = 0; i < PREDEFS_MAX; i++) |
Line 432 roff_alloc(struct mparse *parse) |
|
Line 437 roff_alloc(struct mparse *parse) |
|
* is processed. |
* is processed. |
* This also checks the syntax of regular escapes. |
* This also checks the syntax of regular escapes. |
*/ |
*/ |
static void |
static enum rofferr |
roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) |
roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) |
{ |
{ |
enum mandoc_esc esc; |
enum mandoc_esc esc; |
|
|
*/ |
*/ |
|
|
if ('\0' == *cp) |
if ('\0' == *cp) |
return; |
return(ROFF_CONT); |
|
|
if ('*' != *cp) { |
if ('*' != *cp) { |
res = cp; |
res = cp; |
|
|
mandoc_msg |
mandoc_msg |
(MANDOCERR_BADESCAPE, r->parse, |
(MANDOCERR_BADESCAPE, r->parse, |
ln, (int)(stesc - *bufp), NULL); |
ln, (int)(stesc - *bufp), NULL); |
return; |
return(ROFF_CONT); |
} |
} |
|
|
cp++; |
cp++; |
|
|
|
|
switch (*cp) { |
switch (*cp) { |
case ('\0'): |
case ('\0'): |
return; |
return(ROFF_CONT); |
case ('('): |
case ('('): |
cp++; |
cp++; |
maxl = 2; |
maxl = 2; |
|
|
(MANDOCERR_BADESCAPE, |
(MANDOCERR_BADESCAPE, |
r->parse, ln, |
r->parse, ln, |
(int)(stesc - *bufp), NULL); |
(int)(stesc - *bufp), NULL); |
return; |
return(ROFF_CONT); |
} |
} |
if (0 == maxl && ']' == *cp) |
if (0 == maxl && ']' == *cp) |
break; |
break; |
|
|
|
|
/* Just leave the string unexpanded. */ |
/* Just leave the string unexpanded. */ |
mandoc_msg(MANDOCERR_ROFFLOOP, r->parse, ln, pos, NULL); |
mandoc_msg(MANDOCERR_ROFFLOOP, r->parse, ln, pos, NULL); |
return; |
return(ROFF_IGN); |
} |
} |
|
return(ROFF_CONT); |
} |
} |
|
|
/* |
/* |
Line 604 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 610 roff_parseln(struct roff *r, int ln, char **bufp, |
|
* words to fill in. |
* words to fill in. |
*/ |
*/ |
|
|
roff_res(r, bufp, szp, ln, pos); |
e = roff_res(r, bufp, szp, ln, pos); |
|
if (ROFF_IGN == e) |
|
return(e); |
|
assert(ROFF_CONT == e); |
|
|
ppos = pos; |
ppos = pos; |
ctl = mandoc_getcontrol(*bufp, &pos); |
ctl = roff_getcontrol(r, *bufp, &pos); |
|
|
/* |
/* |
* First, if a scope is open and we're not a macro, pass the |
* First, if a scope is open and we're not a macro, pass the |
Line 774 roffnode_cleanscope(struct roff *r) |
|
Line 783 roffnode_cleanscope(struct roff *r) |
|
{ |
{ |
|
|
while (r->last) { |
while (r->last) { |
if (--r->last->endspan < 0) |
if (--r->last->endspan != 0) |
break; |
break; |
roffnode_pop(r); |
roffnode_pop(r); |
} |
} |
Line 1094 roff_line_ignore(ROFF_ARGS) |
|
Line 1103 roff_line_ignore(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_cond(ROFF_ARGS) |
roff_cond(ROFF_ARGS) |
{ |
{ |
int sv; |
|
enum roffrule rule; |
|
|
|
|
roffnode_push(r, tok, NULL, ln, ppos); |
|
|
/* |
/* |
* An `.el' has no conditional body: it will consume the value |
* An `.el' has no conditional body: it will consume the value |
* of the current rstack entry set in prior `ie' calls or |
* of the current rstack entry set in prior `ie' calls or |
Line 1105 roff_cond(ROFF_ARGS) |
|
Line 1114 roff_cond(ROFF_ARGS) |
|
* If we're not an `el', however, then evaluate the conditional. |
* If we're not an `el', however, then evaluate the conditional. |
*/ |
*/ |
|
|
rule = ROFF_el == tok ? |
r->last->rule = ROFF_el == tok ? |
(r->rstackpos < 0 ? |
(r->rstackpos < 0 ? |
ROFFRULE_DENY : r->rstack[r->rstackpos--]) : |
ROFFRULE_DENY : r->rstack[r->rstackpos--]) : |
roff_evalcond(*bufp, &pos); |
roff_evalcond(*bufp, &pos); |
|
|
sv = pos; |
|
while (' ' == (*bufp)[pos]) |
|
pos++; |
|
|
|
/* |
/* |
* Roff is weird. If we have just white-space after the |
|
* conditional, it's considered the BODY and we exit without |
|
* really doing anything. Warn about this. It's probably |
|
* wrong. |
|
*/ |
|
|
|
if ('\0' == (*bufp)[pos] && sv != pos) { |
|
mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); |
|
return(ROFF_IGN); |
|
} |
|
|
|
roffnode_push(r, tok, NULL, ln, ppos); |
|
|
|
r->last->rule = rule; |
|
|
|
/* |
|
* An if-else will put the NEGATION of the current evaluated |
* An if-else will put the NEGATION of the current evaluated |
* conditional into the stack of rules. |
* conditional into the stack of rules. |
*/ |
*/ |
Line 1152 roff_cond(ROFF_ARGS) |
|
Line 1141 roff_cond(ROFF_ARGS) |
|
r->last->rule = ROFFRULE_DENY; |
r->last->rule = ROFFRULE_DENY; |
|
|
/* |
/* |
* Determine scope. If we're invoked with "\{" trailing the |
* Determine scope. |
* conditional, then we're in a multiline scope. Else our scope |
* If there is nothing on the line after the conditional, |
* expires on the next line. |
* not even whitespace, use next-line scope. |
*/ |
*/ |
|
|
r->last->endspan = 1; |
if ('\0' == (*bufp)[pos]) { |
|
r->last->endspan = 2; |
|
goto out; |
|
} |
|
|
|
while (' ' == (*bufp)[pos]) |
|
pos++; |
|
|
|
/* An opening brace requests multiline scope. */ |
|
|
if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) { |
if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) { |
r->last->endspan = -1; |
r->last->endspan = -1; |
pos += 2; |
pos += 2; |
|
goto out; |
} |
} |
|
|
/* |
/* |
* If there are no arguments on the line, the next-line scope is |
* Anything else following the conditional causes |
* assumed. |
* single-line scope. Warn if the scope contains |
|
* nothing but trailing whitespace. |
*/ |
*/ |
|
|
if ('\0' == (*bufp)[pos]) |
if ('\0' == (*bufp)[pos]) |
return(ROFF_IGN); |
mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); |
|
|
/* Otherwise re-run the roff parser after recalculating. */ |
r->last->endspan = 1; |
|
|
|
out: |
*offs = pos; |
*offs = pos; |
return(ROFF_RERUN); |
return(ROFF_RERUN); |
} |
} |
Line 1368 roff_TS(ROFF_ARGS) |
|
Line 1368 roff_TS(ROFF_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static enum rofferr |
static enum rofferr |
|
roff_cc(ROFF_ARGS) |
|
{ |
|
const char *p; |
|
|
|
p = *bufp + pos; |
|
|
|
if ('\0' == *p || '.' == (r->control = *p++)) |
|
r->control = 0; |
|
|
|
if ('\0' != *p) |
|
mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL); |
|
|
|
return(ROFF_IGN); |
|
} |
|
|
|
/* ARGSUSED */ |
|
static enum rofferr |
roff_tr(ROFF_ARGS) |
roff_tr(ROFF_ARGS) |
{ |
{ |
const char *p, *first, *second; |
const char *p, *first, *second; |
Line 1761 roff_strdup(const struct roff *r, const char *p) |
|
Line 1778 roff_strdup(const struct roff *r, const char *p) |
|
|
|
res[(int)ssz] = '\0'; |
res[(int)ssz] = '\0'; |
return(res); |
return(res); |
|
} |
|
|
|
/* |
|
* Find out whether a line is a macro line or not. |
|
* If it is, adjust the current position and return one; if it isn't, |
|
* return zero and don't change the current position. |
|
* If the control character has been set with `.cc', then let that grain |
|
* precedence. |
|
* This is slighly contrary to groff, where using the non-breaking |
|
* control character when `cc' has been invoked will cause the |
|
* non-breaking macro contents to be printed verbatim. |
|
*/ |
|
int |
|
roff_getcontrol(const struct roff *r, const char *cp, int *ppos) |
|
{ |
|
int pos; |
|
|
|
pos = *ppos; |
|
|
|
if (0 != r->control && cp[pos] == r->control) |
|
pos++; |
|
else if (0 != r->control) |
|
return(0); |
|
else if ('\\' == cp[pos] && '.' == cp[pos + 1]) |
|
pos += 2; |
|
else if ('.' == cp[pos] || '\'' == cp[pos]) |
|
pos++; |
|
else |
|
return(0); |
|
|
|
while (' ' == cp[pos] || '\t' == cp[pos]) |
|
pos++; |
|
|
|
*ppos = pos; |
|
return(1); |
} |
} |