Using perror() instead of fprintf for failure from library functions.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 56c9b9967c04935cae4d0dce1bb3600e92bf07e7..c0b5cb462f43389c2d3a7673798e1f1d4544c8c2 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.13 2009/07/06 13:04:52 kristaps Exp $ */
+/*     $Id: libman.h,v 1.23 2009/10/30 05:58:36 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,11 +27,12 @@ enum        man_next {
 struct man {
        void            *data;
        struct man_cb    cb;
-       void            *htab;
        int              pflags;
        int              flags;
 #define        MAN_HALT        (1 << 0)
-#define        MAN_NLINE       (1 << 1)
+#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. */
        enum man_next    next;
        struct man_node *last;
        struct man_node *first;
@@ -39,8 +40,7 @@ struct        man {
 };
 
 enum   merr {
-       WNPRINT,
-       WNMEM,
+       WNPRINT = 0,
        WMSEC,
        WDATE,
        WLNSCOPE,
@@ -48,9 +48,32 @@ enum merr {
        WTQUOTE,
        WNODATA,
        WNOTITLE,
-       WESCAPE
+       WESCAPE,
+       WNUMFMT,
+       WHEADARGS,
+       WBODYARGS,
+       WNHEADARGS,
+       WMACROFORM,
+       WEXITSCOPE,
+       WNOSCOPE,
+       WOLITERAL,
+       WNLITERAL,
+       WERRMAX
 };
 
+#define        MACRO_PROT_ARGS   struct man *m, int 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(). */
+};
+
+extern const struct man_macro *const man_macros;
+
 __BEGIN_DECLS
 
 #define                  man_perr(m, l, p, t) \
@@ -62,21 +85,29 @@ __BEGIN_DECLS
 #define                  man_nwarn(m, n, t) \
                  man_err((m), (n)->line, (n)->pos, 0, (t))
 
-int              man_err(struct man *, int, int, int, enum merr);
 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_macro(struct man *, int, 
-                       int, int, int *, char *);
-int              man_hash_find(const void *, const char *);
-void             man_hash_free(void *);
+void             man_hash_init(void);
+int              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_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 *);
 
 __END_DECLS