summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-12-06 16:55:35 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-12-06 16:55:35 +0000
commitb507579b5e5952001272bc42544306b89a045f7e (patch)
tree64f8cb594eaeff530034a63c068e64d0e5dc8b4f
parentd02db7b30f3d647b5f1b3afd0cbda971da7aca5a (diff)
downloadmandoc-b507579b5e5952001272bc42544306b89a045f7e.tar.gz
Bring schwarze@'s mandoc.h and main.c errors and warnings entirely in sync,
except for the tbl one which will be the focus of later study.
-rw-r--r--main.c95
-rw-r--r--mandoc.h96
2 files changed, 106 insertions, 85 deletions
diff --git a/main.c b/main.c
index 8d477ed2..4bf39c3c 100644
--- a/main.c
+++ b/main.c
@@ -122,73 +122,82 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"generic warning",
+ /* related to the prologue */
+ "no title in document",
+ "document title should be all caps",
+ "unknown manual section",
+ "cannot parse date argument",
+ "prologue macros out of order",
+ "duplicate prologue macro",
+ "macro not allowed in prologue",
+ "macro not allowed in body",
+
+ /* related to document structure */
".so is fragile, better use ln(1)",
- "text should be uppercase",
+ "NAME section must come first",
+ "bad NAME section contents",
+ "manual name not yet set",
"sections out of conventional order",
- "section name repeats",
- "out of order prologue",
- "repeated prologue entry",
- "list type must come first",
- "tab in non-literal context",
- "bad escape sequence",
- "unterminated quoted string",
- "argument requires the width argument",
- "bad date argument",
- "bad width argument",
- "unknown manual section",
+ "duplicate section name",
"section not in conventional manual section",
- "end of line whitespace",
+
+ /* related to macros and nesting */
+ "skipping obsolete macro",
+ "skipping paragraph macro",
"blocks badly nested",
+ "child violates parent syntax",
+ "nested displays are not portable",
+ "already in literal mode",
- "generic error",
+ /* related to missing macro arguments */
+ "skipping empty macro",
+ "missing display type",
+ "list type must come first",
+ "tag lists require a width argument",
+ "missing font type",
- "NAME section must come first",
+ /* related to bad macro arguments */
+ "skipping argument",
+ "duplicate argument",
+ "duplicate display type",
+ "duplicate list type",
+ "unknown AT&T UNIX version",
"bad Boolean value",
"unknown font",
- "child violates parent syntax",
- "displays may not be nested",
- "bad AT&T symbol",
- "bad standard",
- "list type repeated",
- "display type repeated",
- "argument repeated",
- "ignoring argument",
- "manual name not yet set",
- "obsolete macro ignored",
- "empty macro ignored",
- "macro not allowed in body",
- "macro not allowed in prologue",
- "bad character",
- "bad NAME section contents",
- "no blank lines",
- "no text in this context",
+ "unknown standard specifier",
+ "bad width argument",
+
+ /* related to plain text */
+ "blank line in non-literal context",
+ "tab in non-literal context",
+ "end of line whitespace",
"bad comment style",
- "unknown macro will be lost",
+ "unknown escape sequence",
+ "unterminated quoted string",
+
+ "generic error",
+
+ "skipping bad character",
+ "skipping text before the first section header",
+ "skipping unknown macro",
"NOT IMPLEMENTED: skipping request",
"line scope broken",
"argument count wrong",
- "request scope close w/none open",
- "scope already open",
+ "skipping end of block that is not open",
+ "missing end of block",
"scope open on exit",
"uname(3) system call failed",
"macro requires line argument(s)",
"macro requires body argument(s)",
"macro requires argument(s)",
- "no title in document",
"missing list type",
- "missing display type",
- "missing font type",
"line argument(s) will be lost",
"body argument(s) will be lost",
- "paragraph macro ignored",
"generic fatal error",
"column syntax is inconsistent",
- "unsupported display type",
- "blocks badly nested",
- "no such block is open",
- "missing end of block",
+ "NOT IMPLEMENTED: .Bd -file",
"line scope broken, syntax violated",
"argument count wrong, violates syntax",
"child violates parent syntax",
diff --git a/mandoc.h b/mandoc.h
index 43b6ece8..041b004f 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -45,72 +45,84 @@ enum mandocerr {
MANDOCERR_OK,
MANDOCERR_WARNING, /* ===== start of warnings ===== */
+
+ /* related to the prologue */
+ MANDOCERR_NOTITLE, /* no title in document */
+ MANDOCERR_UPPERCASE, /* document title should be all caps */
+ MANDOCERR_BADMSEC, /* unknown manual section */
+ MANDOCERR_BADDATE, /* cannot parse date argument */
+ MANDOCERR_PROLOGOOO, /* prologue macros out of order */
+ MANDOCERR_PROLOGREP, /* duplicate prologue macro */
+ MANDOCERR_BADPROLOG, /* macro not allowed in prologue */
+ MANDOCERR_BADBODY, /* macro not allowed in body */
+
+ /* related to document structure */
MANDOCERR_SO, /* .so is fragile, better use ln(1) */
- MANDOCERR_UPPERCASE, /* text should be uppercase */
+ MANDOCERR_NAMESECFIRST, /* NAME section must come first */
+ MANDOCERR_BADNAMESEC, /* bad NAME section contents */
+ MANDOCERR_NONAME, /* manual name not yet set */
MANDOCERR_SECOOO, /* sections out of conventional order */
- MANDOCERR_SECREP, /* section name repeats */
- MANDOCERR_PROLOGOOO, /* out of order prologue */
- MANDOCERR_PROLOGREP, /* repeated prologue entry */
- MANDOCERR_LISTFIRST, /* list type must come first */
- MANDOCERR_BADTAB, /* tab in non-literal context */
- MANDOCERR_BADESCAPE, /* bad escape sequence */
- MANDOCERR_BADQUOTE, /* unterminated quoted string */
- MANDOCERR_NOWIDTHARG, /* argument requires the width argument */
- MANDOCERR_BADDATE, /* bad date argument */
- MANDOCERR_BADWIDTH, /* bad width argument */
- MANDOCERR_BADMSEC, /* unknown manual section */
+ MANDOCERR_SECREP, /* duplicate section name */
MANDOCERR_SECMSEC, /* section not in conventional manual section */
- MANDOCERR_EOLNSPACE, /* end of line whitespace */
+
+ /* related to macros and nesting */
+ MANDOCERR_MACROOBS, /* skipping obsolete macro */
+ MANDOCERR_IGNPAR, /* skipping paragraph macro */
MANDOCERR_SCOPENEST, /* blocks badly nested */
+ MANDOCERR_CHILD, /* child violates parent syntax */
+ MANDOCERR_NESTEDDISP, /* nested displays are not portable */
+ MANDOCERR_SCOPEREP, /* already in literal mode */
- MANDOCERR_ERROR, /* ===== start of errors ===== */
- MANDOCERR_NAMESECFIRST, /* NAME section must come first */
+ /* related to missing macro arguments */
+ MANDOCERR_MACROEMPTY, /* skipping empty macro */
+ MANDOCERR_DISPTYPE, /* missing display type */
+ MANDOCERR_LISTFIRST, /* list type must come first */
+ MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */
+ MANDOCERR_FONTTYPE, /* missing font type */
+
+ /* related to bad macro arguments */
+ MANDOCERR_IGNARGV, /* skipping argument */
+ MANDOCERR_ARGVREP, /* duplicate argument */
+ MANDOCERR_DISPREP, /* duplicate display type */
+ MANDOCERR_LISTREP, /* duplicate list type */
+ MANDOCERR_BADATT, /* unknown AT&T UNIX version */
MANDOCERR_BADBOOL, /* bad Boolean value */
MANDOCERR_BADFONT, /* unknown font */
- MANDOCERR_CHILD, /* child violates parent syntax */
- MANDOCERR_NESTEDDISP, /* displays may not be nested */
- MANDOCERR_BADATT, /* bad AT&T symbol */
- MANDOCERR_BADSTANDARD, /* bad standard */
- MANDOCERR_LISTREP, /* list type repeated */
- MANDOCERR_DISPREP, /* display type repeated */
- MANDOCERR_ARGVREP, /* argument repeated */
- MANDOCERR_IGNARGV, /* ignoring argument */
- MANDOCERR_NONAME, /* manual name not yet set */
- MANDOCERR_MACROOBS, /* obsolete macro ignored */
- MANDOCERR_MACROEMPTY, /* empty macro ignored */
- MANDOCERR_BADBODY, /* macro not allowed in body */
- MANDOCERR_BADPROLOG, /* macro not allowed in prologue */
- MANDOCERR_BADCHAR, /* bad character */
- MANDOCERR_BADNAMESEC, /* bad NAME section contents */
- MANDOCERR_NOBLANKLN, /* no blank lines */
- MANDOCERR_NOTEXT, /* no text in this context */
+ MANDOCERR_BADSTANDARD, /* unknown standard specifier */
+ MANDOCERR_BADWIDTH, /* bad width argument */
+
+ /* related to plain text */
+ MANDOCERR_NOBLANKLN, /* blank line in non-literal context */
+ MANDOCERR_BADTAB, /* tab in non-literal context */
+ MANDOCERR_EOLNSPACE, /* end of line whitespace */
MANDOCERR_BADCOMMENT, /* bad comment style */
- MANDOCERR_MACRO, /* unknown macro will be lost */
+ MANDOCERR_BADESCAPE, /* unknown escape sequence */
+ MANDOCERR_BADQUOTE, /* unterminated quoted string */
+
+ MANDOCERR_ERROR, /* ===== start of errors ===== */
+
+ MANDOCERR_BADCHAR, /* skipping bad character */
+ MANDOCERR_NOTEXT, /* skipping text before the first section header */
+ MANDOCERR_MACRO, /* skipping unknown macro */
MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */
MANDOCERR_LINESCOPE, /* line scope broken */
MANDOCERR_ARGCOUNT, /* argument count wrong */
- MANDOCERR_NOSCOPE, /* no such block is open */
+ MANDOCERR_NOSCOPE, /* skipping end of block that is not open */
MANDOCERR_SCOPEBROKEN, /* missing end of block */
- MANDOCERR_SCOPEREP, /* scope already open */
MANDOCERR_SCOPEEXIT, /* scope open on exit */
MANDOCERR_UNAME, /* uname(3) system call failed */
/* FIXME: merge following with MANDOCERR_ARGCOUNT */
MANDOCERR_NOARGS, /* macro requires line argument(s) */
MANDOCERR_NOBODY, /* macro requires body argument(s) */
MANDOCERR_NOARGV, /* macro requires argument(s) */
- MANDOCERR_NOTITLE, /* no title in document */
MANDOCERR_LISTTYPE, /* missing list type */
- MANDOCERR_DISPTYPE, /* missing display type */
- MANDOCERR_FONTTYPE, /* missing font type */
MANDOCERR_ARGSLOST, /* line argument(s) will be lost */
MANDOCERR_BODYLOST, /* body argument(s) will be lost */
- MANDOCERR_IGNPAR, /* paragraph macro ignored */
MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
+
MANDOCERR_COLUMNS, /* column syntax is inconsistent */
- MANDOCERR_BADDISP, /* unsupported display type */
- MANDOCERR_SCOPEFATAL, /* blocks badly nested */
- MANDOCERR_SYNTNOSCOPE, /* no scope to rewind: syntax violated */
+ MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */
MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */
MANDOCERR_SYNTARGVCOUNT, /* argument count wrong, violates syntax */
MANDOCERR_SYNTCHILD, /* child violates parent syntax */