Replacement of `Lb' in mdoc_action.c.

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 1461fdf79c2b62c551768fc3dfa01cf5e9329535..c6633890f72b36108d2af5a84661f9bee4936d35 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.8 2009/06/15 09:55:43 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.18 2009/07/12 20:50:08 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -29,8 +29,9 @@ struct        mdoc {
        struct mdoc_cb    cb;
        void             *htab;
        int               flags;
        struct mdoc_cb    cb;
        void             *htab;
        int               flags;

-#define        MDOC_HALT        (1 << 0)
-#define        MDOC_LITERAL     (1 << 1)
+#define        MDOC_HALT        (1 << 0)       /* Error in parse. Halt. */
+#define        MDOC_LITERAL     (1 << 1)       /* In a literal scope. */
+#define        MDOC_PBODY       (1 << 2)       /* In the document body. */

        int               pflags;
        enum mdoc_next    next;
        struct mdoc_node *last;
        int               pflags;
        enum mdoc_next    next;
        struct mdoc_node *last;


@@ -40,6 +41,65 @@ struct       mdoc {
        enum mdoc_sec     lastsec;
 };
 
        enum mdoc_sec     lastsec;
 };
 

+enum   merr {
+       ETAILWS = 0,
+       ECOLEMPTY,
+       EARGVPARM,
+       EQUOTPARM,
+       EQUOTTERM,
+       EMALLOC,
+       EARGVAL,        
+       ENOCALL,
+       EBODYPROL,
+       EPROLBODY,
+       ETEXTPROL,
+       ENOBLANK,
+       ETOOLONG,
+       EESCAPE,
+       EPRINT,
+       ENODAT,
+       ENOPROLOGUE,
+       ELINE,
+       EATT,
+       ENAME,
+       ELISTTYPE,
+       EDISPTYPE,
+       EMULTIDISP,
+       EMULTILIST,
+       ESECNAME,
+       ENAMESECINC,
+       EARGREP,
+       EBOOL,
+       ECOLMIS,
+       ENESTDISP,
+       EMISSWIDTH,
+       EWRONGMSEC,
+       ESECOOO,
+       ESECREP,
+       EBADSTAND,
+       ENOMULTILINE,
+       EMULTILINE,
+       ENOLINE,
+       EPROLOOO,
+       EPROLREP,
+       EBADMSEC,
+       EBADSEC,
+       EFONT,
+       EBADDATE,
+       ENUMFMT,
+       ENOWIDTH,
+       EUTSNAME,
+       EOBS,
+       EMACPARM,
+       EIMPBRK,
+       EIGNE,
+       EOPEN,
+       EQUOTPHR,
+       ENOCTX,
+       ESPACE,
+       ELIB,
+       MERRMAX
+};

 
 #define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
                        int ppos, int *pos, char *buf
 
 #define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
                        int ppos, int *pos, char *buf


@@ -59,27 +119,19 @@ extern     const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
 
 __BEGIN_DECLS
 

-/* 
- * When GCC2 is deprecated, most of these can be reverted to #define
- * as mdoc_vmsg using __VA_ARGS__.  Until then, use real functions.
- */
-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_nwarn(struct mdoc *, const struct mdoc_node *,
-                       enum mdoc_warn, const char *, ...);
-int              mdoc_nerr(struct mdoc *, const struct mdoc_node *,
-                       const char *, ...);
-int              mdoc_warn(struct mdoc *, enum mdoc_warn, const char *, ...);
-int              mdoc_err(struct mdoc *, const char *, ...);
-void             mdoc_msg(struct mdoc *, const char *, ...);
-void             mdoc_pmsg(struct mdoc *, int, int, const char *, ...);
-int              mdoc_pwarn(struct mdoc *, int, int,
-                       enum mdoc_warn,const char *, ...);
-int              mdoc_perr(struct mdoc *, int, int, const char *, ...);
+#define                  mdoc_perr(m, l, p, t) \
+                 mdoc_err((m), (l), (p), 1, (t))
+#define                  mdoc_pwarn(m, l, p, t) \
+                 mdoc_err((m), (l), (p), 0, (t))
+#define                  mdoc_nerr(m, n, t) \
+                 mdoc_err((m), (n)->line, (n)->pos, 1, (t))
+#define                  mdoc_nwarn(m, n, t) \
+                 mdoc_err((m), (n)->line, (n)->pos, 0, (t))
+
+int              mdoc_err(struct mdoc *, int, int, int, enum merr);
+int              mdoc_verr(struct mdoc *, int, int, const char *, ...);
+int              mdoc_vwarn(struct mdoc *, int, int, const char *, ...);
+

 int              mdoc_macro(MACRO_PROT_ARGS);
 int              mdoc_word_alloc(struct mdoc *, 
                        int, int, const char *);
 int              mdoc_macro(MACRO_PROT_ARGS);
 int              mdoc_word_alloc(struct mdoc *, 
                        int, int, const char *);


@@ -102,6 +154,9 @@ enum        mdoc_sec  mdoc_atosec(const char *);
 time_t           mdoc_atotime(const char *);
 
 size_t           mdoc_macro2len(int);
 time_t           mdoc_atotime(const char *);
 
 size_t           mdoc_macro2len(int);

+const char      *mdoc_a2att(const char *);
+const char      *mdoc_a2lib(const char *);
+const char      *mdoc_a2st(const char *);

 const char      *mdoc_a2arch(const char *);
 const char      *mdoc_a2vol(const char *);
 const char      *mdoc_a2msec(const char *);
 const char      *mdoc_a2arch(const char *);
 const char      *mdoc_a2vol(const char *);
 const char      *mdoc_a2msec(const char *);