Enable the unified error/warning enumeration in mandoc.h that's

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 1ccbe9ffad648451616c918a721fb95453cf9a62..623327502a692af5bb89c855957e00727ff0a612 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.20 2009/08/21 13:14:07 kristaps Exp $ */
+/*     $Id: libman.h,v 1.34 2010/05/17 22:11:42 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,45 +26,22 @@ enum        man_next {
 
 struct man {
        void            *data;
-       struct man_cb    cb;
-       void            *htab;
-       int              pflags;
-       int              flags;
-#define        MAN_HALT        (1 << 0)
-#define        MAN_ELINE       (1 << 1)        /* Next-line element scope. */
-#define        MAN_BLINE       (1 << 2)        /* Next-line block scope. */
-#define        MAN_LITERAL     (1 << 3)        /* Literal input. */
+       mandocmsg        msg;
+       int              pflags; /* parse flags (see man.h) */
+       int              flags; /* parse flags */
+#define        MAN_HALT        (1 << 0) /* badness happened: die */
+#define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
+#define        MAN_BLINE       (1 << 2) /* Next-line block scope. */
+#define        MAN_ILINE       (1 << 3) /* Ignored in next-line scope. */
+#define        MAN_LITERAL     (1 << 4) /* Literal input. */
+#define        MAN_BPLINE      (1 << 5)
        enum man_next    next;
        struct man_node *last;
        struct man_node *first;
        struct man_meta  meta;
 };
 
-enum   merr {
-       WNPRINT = 0,
-       WNMEM,
-       WMSEC,
-       WDATE,
-       WLNSCOPE,
-       WTSPACE,
-       WTQUOTE,
-       WNODATA,
-       WNOTITLE,
-       WESCAPE,
-       WNUMFMT,
-       WHEADARGS,
-       WBODYARGS,
-       WNHEADARGS,
-       WMACRO,
-       WMACROFORM,
-       WEXITSCOPE,
-       WNOSCOPE,
-       WOLITERAL,
-       WNLITERAL,
-       WERRMAX
-};
-
-#define        MACRO_PROT_ARGS   struct man *m, int tok, int line, \
+#define        MACRO_PROT_ARGS   struct man *m, enum mant tok, int line, \
                          int ppos, int *pos, char *buf
 
 struct man_macro {
@@ -73,45 +50,40 @@ struct      man_macro {
 #define        MAN_SCOPED       (1 << 0)
 #define        MAN_EXPLICIT     (1 << 1)       /* See blk_imp(). */
 #define        MAN_FSCOPED      (1 << 2)       /* See blk_imp(). */
+#define        MAN_NSCOPED      (1 << 3)       /* See in_line_eoln(). */
+#define        MAN_NOCLOSE      (1 << 4)       /* See blk_exp(). */
 };
 
 extern const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-#define                  man_perr(m, l, p, t) \
-                 man_err((m), (l), (p), 1, (t))
-#define                  man_pwarn(m, l, p, t) \
-                 man_err((m), (l), (p), 0, (t))
-#define                  man_nerr(m, n, t) \
-                 man_err((m), (n)->line, (n)->pos, 1, (t))
-#define                  man_nwarn(m, n, t) \
-                 man_err((m), (n)->line, (n)->pos, 0, (t))
-
+#define                  man_pmsg(m, l, p, t) \
+                 (*(m)->msg)((t), (m)->data, (l), (p), NULL)
+#define                  man_nmsg(m, n, t) \
+                 (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
 int              man_word_alloc(struct man *, int, int, const char *);
-int              man_block_alloc(struct man *, int, int, int);
-int              man_head_alloc(struct man *, int, int, int);
-int              man_body_alloc(struct man *, int, int, int);
-int              man_elem_alloc(struct man *, int, int, int);
-void             man_node_free(struct man_node *);
-void             man_node_freelist(struct man_node *);
-void            *man_hash_alloc(void);
-int              man_hash_find(const void *, const char *);
-void             man_hash_free(void *);
+int              man_block_alloc(struct man *, int, int, enum mant);
+int              man_head_alloc(struct man *, int, int, enum mant);
+int              man_body_alloc(struct man *, int, int, enum mant);
+int              man_elem_alloc(struct man *, int, int, enum mant);
+void             man_node_delete(struct man *, struct man_node *);
+void             man_hash_init(void);
+enum   mant      man_hash_find(const char *);
 int              man_macroend(struct man *);
 int              man_args(struct man *, int, int *, char *, char **);
 #define        ARGS_ERROR      (-1)
 #define        ARGS_EOLN       (0)
 #define        ARGS_WORD       (1)
 #define        ARGS_QWORD      (1)
-int              man_err(struct man *, int, int, int, enum merr);
-int              man_vwarn(struct man *, int, int, const char *, ...);
-int              man_verr(struct man *, int, int, const char *, ...);
+int              man_vmsg(struct man *, enum mandocerr,
+                       int, int, const char *, ...);
 int              man_valid_post(struct man *);
 int              man_valid_pre(struct man *, const struct man_node *);
 int              man_action_post(struct man *);
 int              man_action_pre(struct man *, struct man_node *);
-int              man_unscope(struct man *, const struct man_node *);
+int              man_unscope(struct man *, 
+                       const struct man_node *, enum mandocerr);
 
 __END_DECLS