Tabularised error-code lookup in mdoc.c.

3 files changed, 73 insertions, 187 deletions

diff --git a/libmdoc.h b/libmdoc.h
index 441e4071..6a92bcb6 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.13 2009/07/06 13:04:52 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.14 2009/07/07 09:29:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -42,7 +42,7 @@ struct	mdoc {
 };
 
 enum	merr {
-	ETAILWS,
+	ETAILWS = 0,
 	ECOLEMPTY,
 	EARGVPARM,
 	EQUOTPARM,
@@ -52,7 +52,6 @@ enum	merr {
 	ENOCALL,
 	EBODYPROL,
 	EPROLBODY,
-	ESPACE,
 	ETEXTPROL,
 	ENOBLANK,
 	ETOOLONG,
@@ -66,8 +65,9 @@ enum	merr {
 	ELISTTYPE,
 	EDISPTYPE,
 	EMULTIDISP,
-	ESECNAME,
 	EMULTILIST,
+	ESECNAME,
+	ENAMESECINC,
 	EARGREP,
 	EBOOL,
 	ECOLMIS,
@@ -77,27 +77,27 @@ enum	merr {
 	ESECOOO,
 	ESECREP,
 	EBADSTAND,
-	ENAMESECINC,
 	ENOMULTILINE,
 	EMULTILINE,
 	ENOLINE,
 	EPROLOOO,
 	EPROLREP,
 	EBADMSEC,
+	EBADSEC,
 	EFONT,
 	EBADDATE,
+	ENUMFMT,
 	ENOWIDTH,
-	EBADSEC,
 	EUTSNAME,
-	ENUMFMT,
 	EOBS,
 	EMACPARM,
 	EIMPBRK,
 	EIGNE,
 	EOPEN,
-	EQUOT,
+	EQUOTPHR,
 	ENOCTX,
-	ENOPARMS
+	ESPACE,
+	MERRMAX
 };
 
 #define	MACRO_PROT_ARGS	struct mdoc *mdoc, int tok, int line, \
diff --git a/mdoc.c b/mdoc.c
index 7237d92a..45ed32ea 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.88 2009/07/06 13:04:52 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.89 2009/07/07 09:29:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,6 +23,64 @@
 
 #include "libmdoc.h"
 
+const	char *const __mdoc_merrnames[MERRMAX] = {		 
+	"trailing whitespace", /* ETAILWS */
+	"empty last list column", /* ECOLEMPTY */
+	"argument-like parameter", /* EARGVPARM */
+	"unexpected quoted parameter", /* EQUOTPARM */
+	"unterminated quoted parameter", /* EQUOTTERM */
+	"system: malloc error", /* EMALLOC */
+	"argument parameter suggested", /* EARGVAL */
+	"macro not callable", /* ENOCALL */
+	"macro disallowed in prologue", /* EBODYPROL */
+	"macro disallowed in body", /* EPROLBODY */
+	"text disallowed in prologue", /* ETEXTPROL */
+	"blank line disallowed", /* ENOBLANK */
+	"text parameter too long", /* ETOOLONG */
+	"invalid escape sequence", /* EESCAPE */
+	"invalid character", /* EPRINT */
+	"document has no body", /* ENODAT */
+	"document has no prologue", /* ENOPROLOGUE */
+	"expected line arguments", /* ELINE */
+	"invalid AT&T argument", /* EATT */
+	"default name not yet set", /* ENAME */
+	"missing list type", /* ELISTTYPE */
+	"missing display type", /* EDISPTYPE */
+	"too many display types", /* EMULTIDISP */
+	"too many list types", /* EMULTILIST */
+	"NAME section must be first", /* ESECNAME */
+	"badly-formed NAME section", /* ENAMESECINC */
+	"argument repeated", /* EARGREP */
+	"expected boolean parameter", /* EBOOL */
+	"inconsistent column syntax", /* ECOLMIS */
+	"nested display invalid", /* ENESTDISP */
+	"width argument missing", /* EMISSWIDTH */
+	"invalid section for this manual section", /* EWRONGMSEC */
+	"section out of conventional order", /* ESECOOO */
+	"section repeated", /* ESECREP */
+	"invalid standard argument", /* EBADSTAND */
+	"multi-line arguments discouraged", /* ENOMULTILINE */
+	"multi-line arguments suggested", /* EMULTILINE */
+	"line arguments discouraged", /* ENOLINE */
+	"prologue macro out of conventional order", /* EPROLOOO */
+	"prologue macro repeated", /* EPROLREP */
+	"invalid manual section", /* EBADMSEC */
+	"invalid section", /* EBADSEC */
+	"invalid font mode", /* EFONT */
+	"invalid date syntax", /* EBADDATE */
+	"invalid number format", /* ENUMFMT */
+	"superfluous width argument", /* ENOWIDTH */
+	"system: utsname error", /* EUTSNAME */
+	"obsolete macro", /* EOBS */
+	"macro-like parameter", /* EMACPARM */
+	"end-of-line scope violation", /* EIMPBRK */
+	"empty macro ignored", /* EIGNE */
+	"unclosed explicit scope", /* EOPEN */
+	"unterminated quoted phrase", /* EQUOTPHR */
+	"closure macro without prior context", /* ENOCTX */
+	"invalid whitespace after control character", /* ESPACE */
+};
+
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"Ap",		"Dd",		"Dt",		"Os",
 	"Sh",		"Ss",		"Pp",		"D1",
@@ -274,181 +332,9 @@ mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
 int
 mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type)
 {
-	char		 *p;
-	
-	p = NULL;
-
-	switch (type) {
-	case (ENOCALL):
-		p = "not callable";
-		break;
-	case (EPROLBODY):
-		p = "macro disallowed in document body";
-		break;
-	case (EBODYPROL):
-		p = "macro disallowed in document prologue";
-		break;
-	case (EMALLOC):
-		p = "memory exhausted";
-		break;
-	case (ETEXTPROL):
-		p = "text disallowed in document prologue";
-		break;
-	case (ENOBLANK):
-		p = "blank lines disallowed in non-literal contexts";
-		break;
-	case (ESPACE):
-		p = "whitespace disallowed after delimiter";
-		break;
-	case (ETOOLONG):
-		p = "text argument too long";
-		break;
-	case (EESCAPE):
-		p = "invalid escape sequence";
-		break;
-	case (EPRINT):
-		p = "invalid character";
-		break;
-	case (ENESTDISP):
-		p = "displays may not be nested";
-		break;
-	case (EBOOL):
-		p = "expected boolean value";
-		break;
-	case (EARGREP):
-		p = "argument repeated";
-		break;
-	case (EMULTIDISP):
-		p = "multiple display types specified";
-		break;
-	case (EMULTILIST):
-		p = "multiple list types specified";
-		break;
-	case (ELISTTYPE):
-		p = "missing list type";
-		break;
-	case (EDISPTYPE):
-		p = "missing display type";
-		break;
-	case (ESECNAME):
-		p = "the NAME section must come first";
-		break;
-	case (ELINE):
-		p = "expected line arguments";
-		break;
-	case (ENOPROLOGUE):
-		p = "document has no prologue";
-		break;
-	case (ENODAT):
-		p = "document has no data";
-		break;
-	case (ECOLMIS):
-		p = "column syntax style mismatch";
-		break;
-	case (EATT):
-		p = "expected valid AT&T symbol";
-		break;
-	case (ENAME):
-		p = "default name not yet set";
-		break;
-	case (ENOWIDTH):
-		p = "superfluous width argument";
-		break;
-	case (EMISSWIDTH):
-		p = "missing width argument";
-		break;
-	case (EWRONGMSEC):
-		p = "document section in wrong manual section";
-		break;
-	case (ESECOOO):
-		p = "document section out of conventional order";
-		break;
-	case (ESECREP):
-		p = "document section repeated";
-		break;
-	case (EBADSTAND):
-		p = "unknown standard";
-		break;
-	case (ENAMESECINC):
-		p = "NAME section contents incomplete/badly-ordered";
-		break;
-	case (ENOMULTILINE):
-		p = "suggested no multi-line arguments";
-		break;
-	case (EMULTILINE):
-		p = "suggested multi-line arguments";
-		break;
-	case (ENOLINE):
-		p = "suggested no line arguments";
-		break;
-	case (EPROLOOO):
-		p = "prologue macros out-of-order";
-		break;
-	case (EPROLREP):
-		p = "prologue macros repeated";
-		break;
-	case (EARGVAL):
-		p = "argument value suggested";
-		break;
-	case (EFONT):
-		p = "invalid font mode";
-		break;
-	case (EBADMSEC):
-		p = "inappropriate manual section";
-		break;
-	case (EBADSEC):
-		p = "inappropriate document section";
-		break;
-	case (EQUOTTERM):
-		p = "unterminated quoted parameter";
-		break;
-	case (EQUOTPARM):
-		p = "unexpected quoted parameter";
-		break;
-	case (EARGVPARM):
-		p = "argument-like parameter";
-		break;
-	case (ECOLEMPTY):
-		p = "last list column is empty";
-		break;
-	case (ETAILWS):
-		p = "trailing whitespace";
-		break;
-	case (ENUMFMT):
-		p = "bad number format";
-		break;
-	case (EUTSNAME):
-		p = "utsname";
-		break;
-	case (EBADDATE):
-		p = "malformed date syntax";
-		break;
-	case (EOPEN):
-		p = "explicit scope still open on exit";
-		break;
-	case (EQUOT):
-		p = "unterminated quotation";
-		break;
-	case (ENOCTX):
-		p = "closure has no prior context";
-		break;
-	case (ENOPARMS):
-		p = "unexpect line arguments";
-		break;
-	case (EIGNE):
-		p = "ignoring empty element";
-		break;
-	case (EIMPBRK):
-		p = "crufty end-of-line scope violation";
-		break;
-	case (EMACPARM):
-		p = "macro-like parameter";
-		break;
-	case (EOBS):
-		p = "macro marked obsolete";
-		break;
-	}
+	const char	*p;
 
+	p = __mdoc_merrnames[(int)type];
 	assert(p);
 
 	if (iserr)
diff --git a/mdoc_macro.c b/mdoc_macro.c
index fffc1480..c324449d 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.16 2009/07/06 13:04:52 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.17 2009/07/07 09:29:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -660,7 +660,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 				return(0);
 			return(rew_expblock(mdoc, tok, line, ppos));
 		}
-		return(mdoc_perr(mdoc, line, ppos, ENOPARMS));
+		return(mdoc_perr(mdoc, line, ppos, ENOLINE));
 	}
 
 	if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
@@ -1382,7 +1382,7 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
 				else if ('\\' != buf[i - 1])
 					break;
 			if (0 == buf[i]) 
-				return(mdoc_perr(mdoc, line, la, EQUOT));
+				return(mdoc_perr(mdoc, line, la, EQUOTPHR));
 			quoted = 1;
 		} else
 			for ( ; buf[i]; i++)