Start systematic improvements of error reporting.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index 3094cb8a6f1667cced37eaae492ab01a599fa529..dc187849f2f14128b58d801a0b6a448ca753c710 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.47 2011/03/20 16:02:05 kristaps Exp $ */
+/*     $Id: libman.h,v 1.58 2014/04/20 16:46:04 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 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,8 +17,6 @@
 #ifndef LIBMAN_H
 #define LIBMAN_H
 
-#include "man.h"
-
 enum   man_next {
        MAN_NEXT_SIBLING = 0,
        MAN_NEXT_CHILD
@@ -26,6 +24,7 @@ enum  man_next {
 
 struct man {
        struct mparse   *parse; /* parse pointer */
+       int              quick; /* abort parse early */
        int              flags; /* parse flags */
 #define        MAN_HALT        (1 << 0) /* badness happened: die */
 #define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
@@ -38,10 +37,10 @@ struct      man {
        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 */
+       struct roff     *roff;
 };
 
-#define        MACRO_PROT_ARGS   struct man *m, \
+#define        MACRO_PROT_ARGS   struct man *man, \
                          enum mant tok, \
                          int line, \
                          int ppos, \
@@ -56,34 +55,31 @@ struct      man_macro {
 #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(). */
+#define        MAN_BSCOPE       (1 << 5)       /* Break BLINE scope. */
 };
 
 extern const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-#define                  man_pmsg(m, l, p, t) \
-                 mandoc_msg((t), (m)->parse, (l), (p), NULL)
-#define                  man_nmsg(m, n, t) \
-                 mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
+#define                  man_pmsg(man, l, p, t) \
+                 mandoc_msg((t), (man)->parse, (l), (p), NULL)
+#define                  man_nmsg(man, n, t) \
+                 mandoc_msg((t), (man)->parse, (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);
+int              man_tail_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 *);
+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_valid_post(struct man *);
 int              man_valid_pre(struct man *, struct man_node *);
-int              man_unscope(struct man *, 
-                       const struct man_node *, enum mandocerr);
+int              man_unscope(struct man *, const struct man_node *,
+                       enum mandocerr);
 
 __END_DECLS