Clean-ups & documentation.

[mandoc.git] / private.h

diff --git a/private.h b/private.h
index 10559e776cd2346a5531dfff8252c2e0c38fe172..a46a5612a072cabf7b68f0c2d2f8b719c5df9be4 100644 (file)
--- a/private.h
+++ b/private.h
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.62 2009/01/12 16:39:57 kristaps Exp $ */
+/* $Id: private.h,v 1.65 2009/01/16 12:23:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -41,36 +41,67 @@ struct      mdoc {
 };
 
 
+/* FIXME: it's 9 (this isn't used properly). */
+
+#define        MDOC_LINEARG_MAX 12
+
 #define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
                        int ppos, int *pos, char *buf
 
 struct mdoc_macro {
-       int     (*fp)(MACRO_PROT_ARGS);
-       int       flags;
-#define        MDOC_CALLABLE   (1 << 0)
-#define        MDOC_PARSED     (1 << 1)
-#define        MDOC_EXPLICIT   (1 << 2)
-#define        MDOC_QUOTABLE   (1 << 3)
-#define        MDOC_PROLOGUE   (1 << 4)
-#define        MDOC_NESTED     (1 << 5)
-#define        MDOC_TABSEP     (1 << 6)
+       int             (*fp)(MACRO_PROT_ARGS);
+       int               flags;
+#define        MDOC_CALLABLE    (1 << 0)
+#define        MDOC_PARSED      (1 << 1)
+#define        MDOC_EXPLICIT    (1 << 2)
+#define        MDOC_QUOTABLE    (1 << 3)
+#define        MDOC_PROLOGUE    (1 << 4)
+#define        MDOC_TABSEP      (1 << 5)
 };
 
+#define        mdoc_nwarn(mdoc, node, type, fmt, ...) \
+                 mdoc_vwarn((mdoc), (node)->line, \
+                 (node)->pos, (type), (fmt), ##__VA_ARGS__)
+
+#define        mdoc_nerr(mdoc, node, fmt, ...) \
+                 mdoc_verr((mdoc), (node)->line, \
+                 (node)->pos, (fmt), ##__VA_ARGS__)
+
+#define        mdoc_warn(mdoc, type, fmt, ...) \
+                 mdoc_vwarn((mdoc), (mdoc)->last->line, \
+                 (mdoc)->last->pos, (type), (fmt), ##__VA_ARGS__)
+
+#define        mdoc_err(mdoc, fmt, ...) \
+                 mdoc_verr((mdoc), (mdoc)->last->line, \
+                 (mdoc)->last->pos, (fmt), ##__VA_ARGS__)
+
+#define        mdoc_msg(mdoc, fmt, ...) \
+                 mdoc_vmsg((mdoc), (mdoc)->last->line, \
+                 (mdoc)->last->pos, (fmt), ##__VA_ARGS__)
+
+#define        mdoc_pmsg(mdoc, line, pos, fmt, ...) \
+                 mdoc_vmsg((mdoc), (line), \
+                 (pos), (fmt), ##__VA_ARGS__)
+
+#define        mdoc_pwarn(mdoc, line, pos, type, fmt, ...) \
+                 mdoc_vwarn((mdoc), (line), \
+                 (pos), (type), (fmt), ##__VA_ARGS__)
+
+#define        mdoc_perr(mdoc, line, pos, fmt, ...) \
+                 mdoc_verr((mdoc), (line), \
+                 (pos), (fmt), ##__VA_ARGS__)
+
 extern const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
-#define        mdoc_vwarn(m, n, t) \
-                 mdoc_pwarn((m), (n)->line, (n)->pos, (t))
-#define        mdoc_verr(m, n, t) \
-                 mdoc_perr((m), (n)->line, (n)->pos, (t))
-#define        mdoc_warn(m, t) \
-                 mdoc_pwarn((m), (m)->last->line, (m)->last->pos, (t))
-#define        mdoc_err(m, t) \
-                 mdoc_perr((m), (m)->last->line, (m)->last->pos, (t))
-int              mdoc_pwarn(struct mdoc *, int, int, enum mdoc_warn);
-int              mdoc_perr(struct mdoc *, int, int, enum mdoc_err);
-void             mdoc_msg(struct mdoc *, const char *, ...);
+int              mdoc_vwarn(struct mdoc *, int, int, 
+                       enum mdoc_warn, const char *, ...);
+void             mdoc_vmsg(struct mdoc *, int, int, 
+                       const char *, ...);
+int              mdoc_verr(struct mdoc *, int, int, 
+                       const char *, ...);
+
 int              mdoc_macro(MACRO_PROT_ARGS);
 int              mdoc_find(const struct mdoc *, const char *);
 int              mdoc_word_alloc(struct mdoc *, 
@@ -133,7 +164,7 @@ int           macro_constant_scoped(MACRO_PROT_ARGS);
 int              macro_constant_delimited(MACRO_PROT_ARGS);
 int              macro_text(MACRO_PROT_ARGS);
 int              macro_scoped(MACRO_PROT_ARGS);
-int              macro_close_explicit(MACRO_PROT_ARGS);
+int              macro_scoped_close(MACRO_PROT_ARGS);
 int              macro_scoped_line(MACRO_PROT_ARGS);
 int              macro_prologue(MACRO_PROT_ARGS);
 int              macro_end(struct mdoc *);