version 1.213, 2014/06/29 22:38:47 |
version 1.218, 2014/07/06 18:46:55 |
Line 200 static enum rofferr roff_line_ignore(ROFF_ARGS); |
|
Line 200 static enum rofferr roff_line_ignore(ROFF_ARGS); |
|
static enum rofferr roff_nr(ROFF_ARGS); |
static enum rofferr roff_nr(ROFF_ARGS); |
static void roff_openeqn(struct roff *, const char *, |
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 *, char *, int *, |
|
int, int); |
static enum rofferr roff_parsetext(char **, size_t *, int, int *); |
static enum rofferr roff_parsetext(char **, size_t *, int, int *); |
static enum rofferr roff_res(struct roff *, |
static enum rofferr roff_res(struct roff *, |
char **, size_t *, int, int); |
char **, size_t *, int, int); |
Line 499 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
Line 500 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
size_t naml; /* actual length of the escape name */ |
size_t naml; /* actual length of the escape name */ |
int expand_count; /* to avoid infinite loops */ |
int expand_count; /* to avoid infinite loops */ |
int npos; /* position in numeric expression */ |
int npos; /* position in numeric expression */ |
int irc; /* return code from roff_evalnum() */ |
int arg_complete; /* argument not interrupted by eol */ |
char term; /* character terminating the escape */ |
char term; /* character terminating the escape */ |
|
|
expand_count = 0; |
expand_count = 0; |
Line 584 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
Line 585 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
|
|
/* Advance to the end of the name. */ |
/* Advance to the end of the name. */ |
|
|
|
arg_complete = 1; |
for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) { |
for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) { |
if ('\0' == *cp) { |
if ('\0' == *cp) { |
mandoc_msg(MANDOCERR_BADESCAPE, r->parse, |
mandoc_msg(MANDOCERR_BADESCAPE, r->parse, |
ln, (int)(stesc - *bufp), NULL); |
ln, (int)(stesc - *bufp), NULL); |
|
arg_complete = 0; |
break; |
break; |
} |
} |
if (0 == maxl && *cp == term) { |
if (0 == maxl && *cp == term) { |
Line 603 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
Line 606 roff_res(struct roff *r, char **bufp, size_t *szp, int |
|
|
|
switch (stesc[1]) { |
switch (stesc[1]) { |
case '*': |
case '*': |
res = roff_getstrn(r, stnam, naml); |
if (arg_complete) |
|
res = roff_getstrn(r, stnam, naml); |
break; |
break; |
case 'B': |
case 'B': |
npos = 0; |
npos = 0; |
irc = roff_evalnum(stnam, &npos, NULL, 0); |
ubuf[0] = arg_complete && |
ubuf[0] = irc && stnam + npos + 1 == cp |
roff_evalnum(stnam, &npos, NULL, 0) && |
? '1' : '0'; |
stnam + npos + 1 == cp ? '1' : '0'; |
ubuf[1] = '\0'; |
ubuf[1] = '\0'; |
break; |
break; |
case 'n': |
case 'n': |
(void)snprintf(ubuf, sizeof(ubuf), "%d", |
if (arg_complete) |
roff_getregn(r, stnam, naml)); |
(void)snprintf(ubuf, sizeof(ubuf), "%d", |
|
roff_getregn(r, stnam, naml)); |
|
else |
|
ubuf[0] = '\0'; |
break; |
break; |
case 'w': |
case 'w': |
|
/* use even incomplete args */ |
(void)snprintf(ubuf, sizeof(ubuf), "%d", |
(void)snprintf(ubuf, sizeof(ubuf), "%d", |
24 * (int)naml); |
24 * (int)naml); |
break; |
break; |
Line 764 roff_parseln(struct roff *r, int ln, char **bufp, |
|
Line 772 roff_parseln(struct roff *r, int ln, char **bufp, |
|
* the compilers handle it. |
* the compilers handle it. |
*/ |
*/ |
|
|
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) |
if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos, ln, ppos))) |
return(ROFF_CONT); |
return(ROFF_CONT); |
|
|
assert(roffs[t].proc); |
assert(roffs[t].proc); |
Line 797 roff_endparse(struct roff *r) |
|
Line 805 roff_endparse(struct roff *r) |
|
* form of ".foo xxx" in the usual way. |
* form of ".foo xxx" in the usual way. |
*/ |
*/ |
static enum rofft |
static enum rofft |
roff_parse(struct roff *r, const char *buf, int *pos) |
roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos) |
{ |
{ |
|
char *cp; |
const char *mac; |
const char *mac; |
size_t maclen; |
size_t maclen; |
enum rofft t; |
enum rofft t; |
|
|
if ('\0' == buf[*pos] || '"' == buf[*pos] || |
cp = buf + *pos; |
'\t' == buf[*pos] || ' ' == buf[*pos]) |
|
|
if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp) |
return(ROFF_MAX); |
return(ROFF_MAX); |
|
|
/* We stop the macro parse at an escape, tab, space, or nil. */ |
mac = cp; |
|
maclen = roff_getname(r, &cp, ln, ppos); |
|
|
mac = buf + *pos; |
|
maclen = strcspn(mac, " \\\t\0"); |
|
|
|
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
? ROFF_USERDEF : roffhash_find(mac, maclen); |
? ROFF_USERDEF : roffhash_find(mac, maclen); |
|
|
*pos += (int)maclen; |
if (ROFF_MAX != t) |
|
*pos = cp - buf; |
|
|
while (buf[*pos] && ' ' == buf[*pos]) |
|
(*pos)++; |
|
|
|
return(t); |
return(t); |
} |
} |
|
|
Line 857 roff_cblock(ROFF_ARGS) |
|
Line 863 roff_cblock(ROFF_ARGS) |
|
} |
} |
|
|
if ((*bufp)[pos]) |
if ((*bufp)[pos]) |
mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL); |
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
|
".. %s", *bufp + pos); |
|
|
roffnode_pop(r); |
roffnode_pop(r); |
roffnode_cleanscope(r); |
roffnode_cleanscope(r); |
Line 918 roff_block(ROFF_ARGS) |
|
Line 925 roff_block(ROFF_ARGS) |
|
|
|
if (ROFF_ig != tok) { |
if (ROFF_ig != tok) { |
if ('\0' == *cp) { |
if ('\0' == *cp) { |
mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, |
|
ln, ppos, roffs[tok].name); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|
Line 960 roff_block(ROFF_ARGS) |
|
Line 968 roff_block(ROFF_ARGS) |
|
r->last->end = mandoc_strndup(name, namesz); |
r->last->end = mandoc_strndup(name, namesz); |
|
|
if ('\0' != *cp) |
if ('\0' != *cp) |
mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL); |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse, |
|
ln, pos, ".%s ... %s", roffs[tok].name, cp); |
|
|
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
Line 996 roff_block_sub(ROFF_ARGS) |
|
Line 1005 roff_block_sub(ROFF_ARGS) |
|
i++; |
i++; |
|
|
pos = i; |
pos = i; |
if (ROFF_MAX != roff_parse(r, *bufp, &pos)) |
if (ROFF_MAX != roff_parse(r, *bufp, &pos, ln, ppos)) |
return(ROFF_RERUN); |
return(ROFF_RERUN); |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
Line 1007 roff_block_sub(ROFF_ARGS) |
|
Line 1016 roff_block_sub(ROFF_ARGS) |
|
* pulling it out of the hashtable. |
* pulling it out of the hashtable. |
*/ |
*/ |
|
|
t = roff_parse(r, *bufp, &pos); |
t = roff_parse(r, *bufp, &pos, ln, ppos); |
|
|
/* |
/* |
* Macros other than block-end are only significant |
* Macros other than block-end are only significant |
Line 1042 roff_cond_sub(ROFF_ARGS) |
|
Line 1051 roff_cond_sub(ROFF_ARGS) |
|
|
|
rr = r->last->rule; |
rr = r->last->rule; |
roffnode_cleanscope(r); |
roffnode_cleanscope(r); |
t = roff_parse(r, *bufp, &pos); |
t = roff_parse(r, *bufp, &pos, ln, ppos); |
|
|
/* |
/* |
* Fully handle known macros when they are structurally |
* Fully handle known macros when they are structurally |
Line 1286 roff_cond(ROFF_ARGS) |
|
Line 1295 roff_cond(ROFF_ARGS) |
|
*/ |
*/ |
|
|
if ('\0' == (*bufp)[pos]) |
if ('\0' == (*bufp)[pos]) |
mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); |
mandoc_msg(MANDOCERR_COND_EMPTY, r->parse, |
|
ln, ppos, roffs[tok].name); |
|
|
r->last->endspan = 1; |
r->last->endspan = 1; |
|
|
Line 2019 roff_getname(struct roff *r, char **cpp, int ln, int p |
|
Line 2029 roff_getname(struct roff *r, char **cpp, int ln, int p |
|
} |
} |
if ('\\' != *cp) |
if ('\\' != *cp) |
continue; |
continue; |
|
namesz = cp - name; |
|
if ('{' == cp[1] || '}' == cp[1]) |
|
break; |
cp++; |
cp++; |
if ('\\' == *cp) |
if ('\\' == *cp) |
continue; |
continue; |
namesz = cp - name - 1; |
|
mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL); |
mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL); |
mandoc_escape((const char **)&cp, NULL, NULL); |
mandoc_escape((const char **)&cp, NULL, NULL); |
break; |
break; |