summaryrefslogtreecommitdiffstats
path: root/mdoc_macro.c
diff options
context:
space:
mode:
Diffstat (limited to 'mdoc_macro.c')
-rw-r--r--mdoc_macro.c268
1 files changed, 144 insertions, 124 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 8b38efde..0652af14 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -33,33 +33,33 @@ enum rew {
REWIND_HALT
};
-static int ctx_synopsis(MACRO_PROT_ARGS);
-static int obsolete(MACRO_PROT_ARGS);
-static int blk_part_exp(MACRO_PROT_ARGS);
-static int in_line_eoln(MACRO_PROT_ARGS);
-static int in_line_argn(MACRO_PROT_ARGS);
-static int in_line(MACRO_PROT_ARGS);
-static int blk_full(MACRO_PROT_ARGS);
-static int blk_exp_close(MACRO_PROT_ARGS);
-static int blk_part_imp(MACRO_PROT_ARGS);
-
-static int phrase(struct mdoc *, int, int, char *);
-static enum rew rew_dohalt(enum mdoct, enum mdoc_type,
- const struct mdoc_node *);
-static enum mdoct rew_alt(enum mdoct);
-static int rew_dobreak(enum mdoct, const struct mdoc_node *);
-static int rew_elem(struct mdoc *, enum mdoct);
-static int rew_sub(enum mdoc_type, struct mdoc *,
- enum mdoct, int, int);
-static int rew_last(struct mdoc *,
- const struct mdoc_node *);
-static int append_delims(struct mdoc *, int, int *, char *);
-static int lookup(int, const char *);
-static int lookup_raw(const char *);
-static int swarn(struct mdoc *, enum mdoc_type, int, int,
- const struct mdoc_node *);
-
-/* Central table of library: who gets parsed how. */
+static int blk_full(MACRO_PROT_ARGS);
+static int blk_exp_close(MACRO_PROT_ARGS);
+static int blk_part_exp(MACRO_PROT_ARGS);
+static int blk_part_imp(MACRO_PROT_ARGS);
+static int ctx_synopsis(MACRO_PROT_ARGS);
+static int in_line_eoln(MACRO_PROT_ARGS);
+static int in_line_argn(MACRO_PROT_ARGS);
+static int in_line(MACRO_PROT_ARGS);
+static int obsolete(MACRO_PROT_ARGS);
+
+static int append_delims(struct mdoc *,
+ int, int *, char *);
+static enum mdoct lookup(int, const char *);
+static enum mdoct lookup_raw(const char *);
+static int phrase(struct mdoc *, int, int, char *);
+static enum mdoct rew_alt(enum mdoct);
+static int rew_dobreak(enum mdoct,
+ const struct mdoc_node *);
+static enum rew rew_dohalt(enum mdoct, enum mdoc_type,
+ const struct mdoc_node *);
+static int rew_elem(struct mdoc *, enum mdoct);
+static int rew_last(struct mdoc *,
+ const struct mdoc_node *);
+static int rew_sub(enum mdoc_type, struct mdoc *,
+ enum mdoct, int, int);
+static int swarn(struct mdoc *, enum mdoc_type, int,
+ int, const struct mdoc_node *);
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
@@ -266,7 +266,7 @@ mdoc_macroend(struct mdoc *m)
/*
* Look up a macro from within a subsequent context.
*/
-static int
+static enum mdoct
lookup(int from, const char *p)
{
/* FIXME: make -diag lists be un-PARSED. */
@@ -280,7 +280,7 @@ lookup(int from, const char *p)
/*
* Lookup a macro following the initial line macro.
*/
-static int
+static enum mdoct
lookup_raw(const char *p)
{
int res;
@@ -622,7 +622,8 @@ rew_sub(enum mdoc_type t, struct mdoc *m,
static int
append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
{
- int c, lastarg;
+ int lastarg;
+ enum margerr ac;
char *p;
if (0 == buf[*pos])
@@ -630,12 +631,12 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
for (;;) {
lastarg = *pos;
- c = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p);
- assert(ARGS_PHRASE != c);
+ ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p);
+ assert(ARGS_PHRASE != ac);
- if (ARGS_ERROR == c)
+ if (ARGS_ERROR == ac)
return(0);
- else if (ARGS_EOLN == c)
+ else if (ARGS_EOLN == ac)
break;
assert(mdoc_isdelim(p));
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
@@ -652,7 +653,9 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
static int
blk_exp_close(MACRO_PROT_ARGS)
{
- int j, c, lastarg, maxargs, flushed;
+ int j, lastarg, maxargs, flushed;
+ enum margerr ac;
+ enum mdoct ntok;
char *p;
switch (tok) {
@@ -690,22 +693,22 @@ blk_exp_close(MACRO_PROT_ARGS)
flushed = 1;
}
- c = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- if (ARGS_ERROR == c)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_PUNCT == c)
+ if (ARGS_PUNCT == ac)
break;
- if (ARGS_EOLN == c)
+ if (ARGS_EOLN == ac)
break;
- if (MDOC_MAX != (c = lookup(tok, p))) {
+ if (MDOC_MAX != (ntok = lookup(tok, p))) {
if ( ! flushed) {
if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
return(0);
flushed = 1;
}
- if ( ! mdoc_macro(m, c, line, lastarg, pos, buf))
+ if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf))
return(0);
break;
}
@@ -726,9 +729,11 @@ blk_exp_close(MACRO_PROT_ARGS)
static int
in_line(MACRO_PROT_ARGS)
{
- int la, lastpunct, c, w, cnt, d, nc;
- struct mdoc_arg *arg;
- char *p;
+ int la, lastpunct, c, cnt, d, nc;
+ enum mdoct ntok;
+ enum margerr ac;
+ struct mdoc_arg *arg;
+ char *p;
/*
* Whether we allow ignored elements (those without content,
@@ -773,18 +778,18 @@ in_line(MACRO_PROT_ARGS)
for (cnt = 0, lastpunct = 1;; ) {
la = *pos;
- w = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- if (ARGS_ERROR == w)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == w)
+ if (ARGS_EOLN == ac)
break;
- if (ARGS_PUNCT == w)
+ if (ARGS_PUNCT == ac)
break;
/* Quoted words shouldn't be looked-up. */
- c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p);
+ ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
/*
* In this case, we've located a submacro and must
@@ -793,7 +798,7 @@ in_line(MACRO_PROT_ARGS)
* or raise a warning.
*/
- if (MDOC_MAX != c) {
+ if (MDOC_MAX != ntok) {
if (0 == lastpunct && ! rew_elem(m, tok))
return(0);
if (nc && 0 == cnt) {
@@ -806,8 +811,7 @@ in_line(MACRO_PROT_ARGS)
if ( ! mdoc_pwarn(m, line, ppos, EIGNE))
return(0);
}
- c = mdoc_macro(m, c, line, la, pos, buf);
- if (0 == c)
+ if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
return(0);
if (ppos > 1)
return(1);
@@ -820,9 +824,9 @@ in_line(MACRO_PROT_ARGS)
* the word.
*/
- d = ARGS_QWORD == w ? 0 : mdoc_isdelim(p);
+ d = ARGS_QWORD == ac ? 0 : mdoc_isdelim(p);
- if (ARGS_QWORD != w && d) {
+ if (ARGS_QWORD != ac && d) {
if (0 == lastpunct && ! rew_elem(m, tok))
return(0);
lastpunct = 1;
@@ -885,6 +889,8 @@ blk_full(MACRO_PROT_ARGS)
#ifdef UGLY
struct mdoc_node *n;
#endif
+ enum mdoct ntok;
+ enum margerr ac;
char *p;
/* Close out prior implicit scope. */
@@ -946,17 +952,17 @@ blk_full(MACRO_PROT_ARGS)
for (;;) {
la = *pos;
- c = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- if (ARGS_ERROR == c)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == c)
+ if (ARGS_EOLN == ac)
break;
/* Don't emit leading punct. for phrases. */
- if (NULL == head && ARGS_PHRASE != c &&
- ARGS_QWORD != c &&
+ if (NULL == head && ARGS_PHRASE != ac &&
+ ARGS_QWORD != ac &&
1 == mdoc_isdelim(p)) {
if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
@@ -965,13 +971,13 @@ blk_full(MACRO_PROT_ARGS)
/* Always re-open head for phrases. */
- if (NULL == head || ARGS_PHRASE == c) {
+ if (NULL == head || ARGS_PHRASE == ac) {
if ( ! mdoc_head_alloc(m, line, ppos, tok))
return(0);
head = m->last;
}
- if (ARGS_PHRASE == c) {
+ if (ARGS_PHRASE == ac) {
if ( ! phrase(m, line, la, buf))
return(0);
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
@@ -979,15 +985,15 @@ blk_full(MACRO_PROT_ARGS)
continue;
}
- c = lookup(tok, p);
- if (MDOC_MAX != c) {
- if ( ! mdoc_macro(m, c, line, la, pos, buf))
+ if (MDOC_MAX == (ntok = lookup(tok, p))) {
+ if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
- break;
+ continue;
}
- if ( ! mdoc_word_alloc(m, line, la, p))
- return(0);
+ if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
+ return(0);
+ break;
}
if (NULL == head) {
@@ -1036,7 +1042,9 @@ blk_full(MACRO_PROT_ARGS)
static int
blk_part_imp(MACRO_PROT_ARGS)
{
- int la, c;
+ int la;
+ enum mdoct ntok;
+ enum margerr ac;
char *p;
struct mdoc_node *blk; /* saved block context */
struct mdoc_node *body; /* saved body context */
@@ -1069,18 +1077,18 @@ blk_part_imp(MACRO_PROT_ARGS)
for (body = NULL; ; ) {
la = *pos;
- c = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- assert(ARGS_PHRASE != c);
+ assert(ARGS_PHRASE != ac);
- if (ARGS_ERROR == c)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == c)
+ if (ARGS_EOLN == ac)
break;
- if (ARGS_PUNCT == c)
+ if (ARGS_PUNCT == ac)
break;
- if (NULL == body && ARGS_QWORD != c &&
+ if (NULL == body && ARGS_QWORD != ac &&
1 == mdoc_isdelim(p)) {
if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
@@ -1093,14 +1101,15 @@ blk_part_imp(MACRO_PROT_ARGS)
body = m->last;
}
- if (MDOC_MAX != (c = lookup(tok, p))) {
- if ( ! mdoc_macro(m, c, line, la, pos, buf))
+ if (MDOC_MAX == (ntok = lookup(tok, p))) {
+ if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
- break;
- }
+ continue;
+ }
- if ( ! mdoc_word_alloc(m, line, la, p))
+ if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
return(0);
+ break;
}
/* Clean-ups to leave in a consistent state. */
@@ -1144,10 +1153,12 @@ blk_part_imp(MACRO_PROT_ARGS)
static int
blk_part_exp(MACRO_PROT_ARGS)
{
- int la, c;
+ int la;
+ enum margerr ac;
struct mdoc_node *head; /* keep track of head */
struct mdoc_node *body; /* keep track of body */
char *p;
+ enum mdoct ntok;
/*
* The opening of an explicit macro having zero or more leading
@@ -1160,20 +1171,20 @@ blk_part_exp(MACRO_PROT_ARGS)
for (head = body = NULL; ; ) {
la = *pos;
- c = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- if (ARGS_ERROR == c)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_PUNCT == c)
+ if (ARGS_PUNCT == ac)
break;
- if (ARGS_EOLN == c)
+ if (ARGS_EOLN == ac)
break;
- assert(ARGS_PHRASE != c);
+ assert(ARGS_PHRASE != ac);
/* Flush out leading punctuation. */
- if (NULL == head && ARGS_QWORD != c &&
+ if (NULL == head && ARGS_QWORD != ac &&
1 == mdoc_isdelim(p)) {
assert(NULL == body);
if ( ! mdoc_word_alloc(m, line, la, p))
@@ -1212,14 +1223,15 @@ blk_part_exp(MACRO_PROT_ARGS)
assert(NULL != head && NULL != body);
- if (MDOC_MAX != (c = lookup(tok, p))) {
- if ( ! mdoc_macro(m, c, line, la, pos, buf))
+ if (MDOC_MAX == (ntok = lookup(tok, p))) {
+ if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
- break;
+ continue;
}
- if ( ! mdoc_word_alloc(m, line, la, p))
+ if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
return(0);
+ break;
}
/* Clean-up to leave in a consistent state. */
@@ -1250,9 +1262,11 @@ blk_part_exp(MACRO_PROT_ARGS)
static int
in_line_argn(MACRO_PROT_ARGS)
{
- int la, flushed, j, c, maxargs;
- struct mdoc_arg *arg;
- char *p;
+ int la, flushed, j, c, maxargs;
+ enum margerr ac;
+ struct mdoc_arg *arg;
+ char *p;
+ enum mdoct ntok;
/*
* A line macro that has a fixed number of arguments (maxargs).
@@ -1300,17 +1314,17 @@ in_line_argn(MACRO_PROT_ARGS)
for (flushed = j = 0; ; ) {
la = *pos;
- c = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- if (ARGS_ERROR == c)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_PUNCT == c)
+ if (ARGS_PUNCT == ac)
break;
- if (ARGS_EOLN == c)
+ if (ARGS_EOLN == ac)
break;
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
- ARGS_QWORD != c &&
+ ARGS_QWORD != ac &&
0 == j && 1 == mdoc_isdelim(p)) {
if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
@@ -1325,18 +1339,18 @@ in_line_argn(MACRO_PROT_ARGS)
flushed = 1;
}
- if (MDOC_MAX != (c = lookup(tok, p))) {
+ if (MDOC_MAX != (ntok = lookup(tok, p))) {
if ( ! flushed && ! rew_elem(m, tok))
return(0);
flushed = 1;
- if ( ! mdoc_macro(m, c, line, la, pos, buf))
+ if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
return(0);
j++;
break;
}
if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
- ARGS_QWORD != c &&
+ ARGS_QWORD != ac &&
! flushed && mdoc_isdelim(p)) {
if ( ! rew_elem(m, tok))
return(0);
@@ -1381,9 +1395,11 @@ in_line_argn(MACRO_PROT_ARGS)
static int
in_line_eoln(MACRO_PROT_ARGS)
{
- int c, w, la;
- struct mdoc_arg *arg;
- char *p;
+ int c, la;
+ enum margerr ac;
+ struct mdoc_arg *arg;
+ char *p;
+ enum mdoct ntok;
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));
@@ -1415,23 +1431,24 @@ in_line_eoln(MACRO_PROT_ARGS)
for (;;) {
la = *pos;
- w = mdoc_args(m, line, pos, buf, tok, &p);
+ ac = mdoc_args(m, line, pos, buf, tok, &p);
- if (ARGS_ERROR == w)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == w)
+ if (ARGS_EOLN == ac)
break;
- c = ARGS_QWORD == w ? MDOC_MAX : lookup(tok, p);
+ ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
- if (MDOC_MAX != c) {
- if ( ! rew_elem(m, tok))
+ if (MDOC_MAX == ntok) {
+ if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
- return(mdoc_macro(m, c, line, la, pos, buf));
- }
+ continue;
+ }
- if ( ! mdoc_word_alloc(m, line, la, p))
+ if ( ! rew_elem(m, tok))
return(0);
+ return(mdoc_macro(m, ntok, line, la, pos, buf));
}
/* Close out (no delimiters). */
@@ -1480,30 +1497,33 @@ obsolete(MACRO_PROT_ARGS)
static int
phrase(struct mdoc *m, int line, int ppos, char *buf)
{
- int c, w, la, pos;
- char *p;
+ int la, pos;
+ enum margerr ac;
+ enum mdoct ntok;
+ char *p;
for (pos = ppos; ; ) {
la = pos;
/* Note: no calling context! */
- w = mdoc_zargs(m, line, &pos, buf, 0, &p);
+ ac = mdoc_zargs(m, line, &pos, buf, 0, &p);
- if (ARGS_ERROR == w)
+ if (ARGS_ERROR == ac)
return(0);
- if (ARGS_EOLN == w)
+ if (ARGS_EOLN == ac)
break;
- c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(p);
+ ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
- if (MDOC_MAX != c) {
- if ( ! mdoc_macro(m, c, line, la, &pos, buf))
+ if (MDOC_MAX == ntok) {
+ if ( ! mdoc_word_alloc(m, line, la, p))
return(0);
- return(append_delims(m, line, &pos, buf));
- }
+ continue;
+ }
- if ( ! mdoc_word_alloc(m, line, la, p))
+ if ( ! mdoc_macro(m, ntok, line, la, &pos, buf))
return(0);
+ return(append_delims(m, line, &pos, buf));
}
return(1);
generated by cgit (git 2.34.1) at 2024-11-09 23:05:01 +0000