Clean up {mdoc,man}_pmsg and vmsg invocations (ignore return values).

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index af72cd967d9a3afab85a52aedc6b9a06b42a0c82..e1a9aecc8ee6c6ba1c77194395ff189451392003 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.14 2009/07/07 09:35:40 kristaps Exp $ */
+/*     $Id: libman.h,v 1.44 2010/11/30 15:36:28 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -25,59 +25,67 @@ enum        man_next {
 };
 
 struct man {
 };
 
 struct man {

-       void            *data;
-       struct man_cb    cb;
-       void            *htab;
-       int              pflags;
-       int              flags;
-#define        MAN_HALT        (1 << 0)
-#define        MAN_NLINE       (1 << 1)
-       enum man_next    next;
-       struct man_node *last;
-       struct man_node *first;
-       struct man_meta  meta;
+       void            *data; /* private application data */
+       mandocmsg        msg; /* output message handler */
+       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; /* where to put the next node */
+       struct man_node *last; /* the last parsed node */
+       struct man_node *first; /* the first parsed node */
+       struct man_meta  meta; /* document meta-data */
+       struct regset   *regs; /* registers */

 };
 
 };
 

-enum   merr {
-       WNPRINT = 0,
-       WNMEM,
-       WMSEC,
-       WDATE,
-       WLNSCOPE,
-       WTSPACE,
-       WTQUOTE,
-       WNODATA,
-       WNOTITLE,
-       WESCAPE,
-       WERRMAX
+#define        MACRO_PROT_ARGS   struct man *m, \
+                         enum mant tok, \
+                         int line, \
+                         int ppos, \
+                         int *pos, \
+                         char *buf
+
+struct man_macro {
+       int             (*fp)(MACRO_PROT_ARGS);
+       int               flags;
+#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(). */

 };
 
 };
 

-__BEGIN_DECLS
+extern const struct man_macro *const man_macros;

 
 

-#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))
+__BEGIN_DECLS

 
 

-int              man_err(struct man *, int, int, int, enum merr);
+#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_word_alloc(struct man *, int, int, const char *);

-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_macro(struct man *, int, 
-                       int, int, int *, char *);
-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_macroend(struct man *);

-int              man_vwarn(struct man *, int, int, const char *, ...);
-int              man_verr(struct man *, int, int, const char *, ...);
+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_vmsg(struct man *, enum mandocerr,
+                       int, int, const char *, ...);

 int              man_valid_post(struct man *);
 int              man_valid_post(struct man *);

-int              man_action_post(struct man *);
+int              man_valid_pre(struct man *, struct man_node *);
+int              man_unscope(struct man *, 
+                       const struct man_node *, enum mandocerr);

 
 __END_DECLS
 
 
 __END_DECLS