Backed-out warning messages (lots).

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 1596866213c04c07b901fdc84c9e779990d154d8..7f96b535ab406549646bf171659eee2ce4e2a273 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.12 2009/07/04 09:01:55 kristaps Exp $ */
+/*     $Id: libman.h,v 1.32 2010/05/15 15:54:39 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,56 +27,97 @@ 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)
+       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. */
+#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;
+       enum man_next    svnext;
        struct man_node *last;
        struct man_node *first;
        struct man_meta  meta;
 };
 
 enum   merr {
-       WNPRINT,
-       WNMEM,
-       WMSEC,
+       WNPRINT = 0,
        WDATE,
        WLNSCOPE,
+       WLNSCOPE2,
        WTSPACE,
        WTQUOTE,
        WNODATA,
        WNOTITLE,
-       WESCAPE
+       WESCAPE,
+       WNUMFMT,
+       WHEADARGS,
+       WBODYARGS,
+       WNHEADARGS,
+       WMACROFORM,
+       WEXITSCOPE,
+       WNOSCOPE,
+       WOLITERAL,
+       WNLITERAL,
+       WROFFNEST,
+       WROFFSCOPE,
+       WTITLECASE,
+       WBADCOMMENT,
+       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(). */
+};
+
+extern const struct man_macro *const man_macros;
+
 __BEGIN_DECLS
 
 #define                  man_perr(m, l, p, t) \
-                 man_err((m), l, p, 1, (t))
+                 man_err((m), (l), (p), 1, (t))
 #define                  man_pwarn(m, l, p, t) \
-                 man_err((m), l, p, 0, (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))
 
-int              man_err(struct man *, int, int, int, enum merr);
 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_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 *, enum merr);
 
 __END_DECLS