Mechanical diff allowing the const struct regset to propogate through

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 8faa7a043f18f3bd62c0ce4be886118514dfc5cd..2bc500273b956f60cd529e27eb26f25f7a878a2e 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.29 2010/03/29 04:52:14 kristaps Exp $ */
+/*     $Id: libman.h,v 1.38 2010/06/26 16:07:08 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,6 +17,7 @@
 #ifndef LIBMAN_H
 #define LIBMAN_H
 
+#include "regs.h"
 #include "man.h"
 
 enum   man_next {
@@ -26,9 +27,8 @@ enum  man_next {
 
 struct man {
        void            *data;
-       struct man_cb    cb;
+       mandocmsg        msg;
        int              pflags; /* parse flags (see man.h) */
-       int              svflags; /* flags saved during roff blocks */
        int              flags; /* parse flags */
 #define        MAN_HALT        (1 << 0) /* badness happened: die */
 #define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
@@ -42,34 +42,13 @@ struct      man {
        struct man_meta  meta;
 };
 
-enum   merr {
-       WNPRINT = 0,
-       WMSEC,
-       WDATE,
-       WLNSCOPE,
-       WLNSCOPE2,
-       WTSPACE,
-       WTQUOTE,
-       WNODATA,
-       WNOTITLE,
-       WESCAPE,
-       WNUMFMT,
-       WHEADARGS,
-       WBODYARGS,
-       WNHEADARGS,
-       WMACROFORM,
-       WEXITSCOPE,
-       WNOSCOPE,
-       WOLITERAL,
-       WNLITERAL,
-       WROFFNEST,
-       WROFFSCOPE,
-       WTITLECASE,
-       WERRMAX
-};
-
-#define        MACRO_PROT_ARGS   struct man *m, enum mant tok, int line, \
-                         int ppos, int *pos, char *buf
+#define        MACRO_PROT_ARGS   struct man *m, \
+                         const struct regset *regs, \
+                         enum mant tok, \
+                         int line, \
+                         int ppos, \
+                         int *pos, \
+                         char *buf
 
 struct man_macro {
        int             (*fp)(MACRO_PROT_ARGS);
@@ -85,15 +64,10 @@ 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, enum mant);
 int              man_head_alloc(struct man *, int, int, enum mant);
@@ -108,15 +82,14 @@ int                  man_args(struct man *, int, int *, char *, char **);
 #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_valid_pre(struct man *, 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 *, enum merr);
+                       const struct man_node *, enum mandocerr);
 
 __END_DECLS