diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-05-31 23:13:22 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-05-31 23:13:22 +0000 |
| commit | be3e970f578850301090009923eccbd3a255b801 (patch) | |
| tree | 755a8c3733f27b9fb0e351259dfe4891ef9da919 /roff.c | |
| parent | 23ce90af4d0d1ec547a53b8a66448e146ec30065 (diff) | |
| download | mandoc-be3e970f578850301090009923eccbd3a255b801.tar.gz mandoc-be3e970f578850301090009923eccbd3a255b801.tar.zst mandoc-be3e970f578850301090009923eccbd3a255b801.zip | |
Implement the roff(7) `r' (register exists) conditional.
Missing feature found by Markus <Waldeck at gmx dot de>
in Debian's bash(1) manual page.
Diffstat (limited to 'roff.c')
| -rw-r--r-- | roff.c | 38 |
1 files changed, 32 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.270 2015/05/01 16:02:47 schwarze Exp $ */ +/* $Id: roff.c,v 1.271 2015/05/31 23:13:22 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -397,8 +397,7 @@ static enum rofferr roff_cond_text(ROFF_ARGS); static enum rofferr roff_cond_sub(ROFF_ARGS); static enum rofferr roff_ds(ROFF_ARGS); static enum rofferr roff_eqndelim(struct roff *, struct buf *, int); -static int roff_evalcond(struct roff *r, int, - const char *, int *); +static int roff_evalcond(struct roff *r, int, char *, int *); static int roff_evalnum(struct roff *, int, const char *, int *, int *, int); static int roff_evalpar(struct roff *, int, @@ -415,6 +414,8 @@ static int roff_getregn(const struct roff *, static int roff_getregro(const char *name); static const char *roff_getstrn(const struct roff *, const char *, size_t); +static int roff_hasregn(const struct roff *, + const char *, size_t); static enum rofferr roff_insec(ROFF_ARGS); static enum rofferr roff_it(ROFF_ARGS); static enum rofferr roff_line_ignore(ROFF_ARGS); @@ -2134,8 +2135,10 @@ out: * or string condition. */ static int -roff_evalcond(struct roff *r, int ln, const char *v, int *pos) +roff_evalcond(struct roff *r, int ln, char *v, int *pos) { + char *cp, *name; + size_t sz; int number, savepos, wanttrue; if ('!' == v[*pos]) { @@ -2158,13 +2161,16 @@ roff_evalcond(struct roff *r, int ln, const char *v, int *pos) /* FALLTHROUGH */ case 'e': /* FALLTHROUGH */ - case 'r': - /* FALLTHROUGH */ case 't': /* FALLTHROUGH */ case 'v': (*pos)++; return(!wanttrue); + case 'r': + cp = name = v + ++*pos; + sz = roff_getname(r, &cp, ln, *pos); + *pos = cp - v; + return((sz && roff_hasregn(r, name, sz)) == wanttrue); default: break; } @@ -2627,6 +2633,26 @@ roff_getregn(const struct roff *r, const char *name, size_t len) return(0); } +static int +roff_hasregn(const struct roff *r, const char *name, size_t len) +{ + struct roffreg *reg; + int val; + + if ('.' == name[0] && 2 == len) { + val = roff_getregro(name + 1); + if (-1 != val) + return(1); + } + + for (reg = r->regtab; reg; reg = reg->next) + if (len == reg->key.sz && + 0 == strncmp(name, reg->key.p, len)) + return(1); + + return(0); +} + static void roff_freereg(struct roffreg *reg) { |