summaryrefslogtreecommitdiff
path: root/usr.bin/mandoc/mdoc_macro.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/mandoc/mdoc_macro.c')
-rw-r--r--usr.bin/mandoc/mdoc_macro.c74
1 files changed, 33 insertions, 41 deletions
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index e170bdb33b7..ccfbedcce73 100644
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.20 2009/08/22 15:36:58 schwarze Exp $ */
+/* $Id: mdoc_macro.c,v 1.21 2009/08/22 19:43:33 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -45,9 +45,10 @@ static int rew_impblock(struct mdoc *, int, int, int);
static int rew_expblock(struct mdoc *, int, int, int);
static int rew_subblock(enum mdoc_type,
struct mdoc *, int, int, int);
-static int rew_last(struct mdoc *, struct mdoc_node *);
+static int rew_last(struct mdoc *, struct mdoc_node *); /* FIXME: make const */
static int append_delims(struct mdoc *, int, int *, char *);
-static int lookup(struct mdoc *, int, int, int, const char *);
+static int lookup(struct mdoc *, int, const char *);
+static int lookup_raw(struct mdoc *, const char *);
static int swarn(struct mdoc *, enum mdoc_type, int, int,
const struct mdoc_node *);
@@ -253,17 +254,24 @@ mdoc_macroend(struct mdoc *mdoc)
}
static int
-lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
+lookup(struct mdoc *mdoc, int from, const char *p)
+{
+
+ if ( ! (MDOC_PARSED & mdoc_macros[from].flags))
+ return(MDOC_MAX);
+ return(lookup_raw(mdoc, p));
+}
+
+
+static int
+lookup_raw(struct mdoc *mdoc, const char *p)
{
int res;
- res = mdoc_hash_find(mdoc->htab, p);
- if (MDOC_PARSED & mdoc_macros[from].flags)
- return(res);
- if (MDOC_MAX == res)
+ if (MDOC_MAX == (res = mdoc_hash_find(mdoc->htab, p)))
+ return(MDOC_MAX);
+ if (MDOC_CALLABLE & mdoc_macros[res].flags)
return(res);
- if ( ! mdoc_pwarn(mdoc, line, pos, EMACPARM))
- return(-1);
return(MDOC_MAX);
}
@@ -591,6 +599,7 @@ rew_expblock(struct mdoc *mdoc, int tok, int line, int ppos)
}
+/* FIXME: can this be merged with subblock? */
static int
rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
{
@@ -699,9 +708,7 @@ blk_exp_close(MACRO_PROT_ARGS)
if (ARGS_EOLN == c)
break;
- if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
- return(0);
- else if (MDOC_MAX != c) {
+ if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
if ( ! flushed) {
if ( ! rew_expblock(mdoc, tok,
line, ppos))
@@ -790,8 +797,7 @@ in_line(MACRO_PROT_ARGS)
/* Quoted words shouldn't be looked-up. */
- c = ARGS_QWORD == w ? MDOC_MAX :
- lookup(mdoc, line, la, tok, p);
+ c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p);
/*
* In this case, we've located a submacro and must
@@ -800,7 +806,7 @@ in_line(MACRO_PROT_ARGS)
* or raise a warning.
*/
- if (MDOC_MAX != c && -1 != c) {
+ if (MDOC_MAX != c) {
if (0 == lastpunct && ! rew_elem(mdoc, tok))
return(0);
if (nc && 0 == cnt) {
@@ -820,8 +826,7 @@ in_line(MACRO_PROT_ARGS)
if (ppos > 1)
return(1);
return(append_delims(mdoc, line, pos, buf));
- } else if (-1 == c)
- return(0);
+ }
/*
* Non-quote-enclosed punctuation. Set up our scope, if
@@ -988,10 +993,7 @@ blk_full(MACRO_PROT_ARGS)
continue;
}
- if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
- return(0);
-
- if (MDOC_MAX == c) {
+ if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
return(0);
mdoc->next = MDOC_NEXT_SIBLING;
@@ -1058,9 +1060,7 @@ blk_part_imp(MACRO_PROT_ARGS)
if (ARGS_EOLN == c)
break;
- if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
- return(0);
- else if (MDOC_MAX == c) {
+ if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {
if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
return(0);
mdoc->next = MDOC_NEXT_SIBLING;
@@ -1162,9 +1162,7 @@ blk_part_exp(MACRO_PROT_ARGS)
if (ARGS_EOLN == c)
break;
- if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
- return(0);
- else if (MDOC_MAX != c) {
+ if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
if ( ! flushed) {
if ( ! rew_subblock(MDOC_HEAD, mdoc,
tok, line, ppos))
@@ -1282,9 +1280,7 @@ in_line_argn(MACRO_PROT_ARGS)
if (ARGS_EOLN == c)
break;
- if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
- return(0);
- else if (MDOC_MAX != c) {
+ if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
if ( ! flushed && ! rew_elem(mdoc, tok))
return(0);
flushed = 1;
@@ -1360,15 +1356,13 @@ in_line_eoln(MACRO_PROT_ARGS)
if (ARGS_EOLN == w)
break;
- c = ARGS_QWORD == w ? MDOC_MAX :
- lookup(mdoc, line, la, tok, p);
+ c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p);
- if (MDOC_MAX != c && -1 != c) {
+ if (MDOC_MAX != c) {
if ( ! rew_elem(mdoc, tok))
return(0);
return(mdoc_macro(mdoc, c, line, la, pos, buf));
- } else if (-1 == c)
- return(0);
+ }
if ( ! mdoc_word_alloc(mdoc, line, la, p))
return(0);
@@ -1410,15 +1404,13 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
if (ARGS_EOLN == w)
break;
- c = ARGS_QWORD == w ? MDOC_MAX :
- mdoc_hash_find(mdoc->htab, p);
+ c = ARGS_QWORD == w ? MDOC_MAX : lookup_raw(mdoc, p);
- if (MDOC_MAX != c && -1 != c) {
+ if (MDOC_MAX != c) {
if ( ! mdoc_macro(mdoc, c, line, la, &pos, buf))
return(0);
return(append_delims(mdoc, line, &pos, buf));
- } else if (-1 == c)
- return(0);
+ }
if ( ! mdoc_word_alloc(mdoc, line, la, p))
return(0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 05:33:15 +0000