two typos; patch from Raf Czlonka <rczlonka at gmail dot com>

[mandoc.git] / libmandoc.h

diff --git a/libmandoc.h b/libmandoc.h
index 9ed8f15049f621e8078f95c0764ca9669a009925..ab7c29be510f3f986a990b9dc07fdcbb786460e8 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: libmandoc.h,v 1.63 2016/07/07 19:19:01 schwarze Exp $ */
+/* $Id: libmandoc.h,v 1.80 2021/06/27 17:57:54 schwarze Exp $ */
 /*
+ * Copyright (c) 2013-2015,2017,2018,2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,71 +14,72 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Internal interfaces for parser utilities needed by multiple parsers
+ * and the top-level functions to call the mdoc, man, and roff parsers.
  */
 
-enum   rofferr {
-       ROFF_CONT, /* continue processing line */
-       ROFF_RERUN, /* re-run roff interpreter with offset */
-       ROFF_APPEND, /* re-run main parser, appending next line */
-       ROFF_REPARSE, /* re-run main parser on the result */
-       ROFF_SO, /* include another file */
-       ROFF_IGN, /* ignore current line */
-       ROFF_TBL, /* a table row was successfully parsed */
-       ROFF_EQN /* an equation was successfully parsed */
-};
+/*
+ * Return codes passed from the roff parser to the main parser.
+ */
+
+/* Main instruction: what to do with the returned line. */
+#define        ROFF_IGN        0x000   /* Don't do anything with it. */
+#define        ROFF_CONT       0x001   /* Give it to the high-level parser. */
+#define        ROFF_RERUN      0x002   /* Re-run the roff parser with an offset. */
+#define        ROFF_REPARSE    0x004   /* Recursively run the main parser on it. */
+#define        ROFF_SO         0x008   /* Include the named file. */
+#define        ROFF_MASK       0x00f   /* Only one of these bits should be set. */
+
+/* Options for further parsing, to be OR'ed with the above. */
+#define        ROFF_APPEND     0x010   /* Append the next line to this one. */
+#define        ROFF_USERCALL   0x020   /* Start execution of a new macro. */
+#define        ROFF_USERRET    0x040   /* Abort execution of the current macro. */
+#define        ROFF_WHILE      0x100   /* Start a new .while loop. */
+#define        ROFF_LOOPCONT   0x200   /* Iterate the current .while loop. */
+#define        ROFF_LOOPEXIT   0x400   /* Exit the current .while loop. */
+#define        ROFF_LOOPMASK   0xf00
+
 
 struct buf {
-       char    *buf;
-       size_t   sz;
+       char            *buf;
+       size_t           sz;
+       struct buf      *next;
 };
 
 
-struct mparse;
-struct tbl_span;
-struct eqn;
 struct roff;
 struct roff_man;
+struct roff_node;
 
-void            mandoc_msg(enum mandocerr, struct mparse *,
-                       int, int, const char *);
-#if __GNUC__ - 0 >= 4
-__attribute__((__format__ (__printf__, 5, 6)))
-#endif
-void            mandoc_vmsg(enum mandocerr, struct mparse *,
-                       int, int, const char *, ...);
-char           *mandoc_getarg(struct mparse *, char **, int, int *);
-char           *mandoc_normdate(struct mparse *, char *, int, int);
+char           *mandoc_normdate(struct roff_node *, struct roff_node *);
 int             mandoc_eos(const char *, size_t);
 int             mandoc_strntoi(const char *, size_t, int);
 const char     *mandoc_a2msec(const char*);
 
-void            mdoc_hash_init(void);
 int             mdoc_parseln(struct roff_man *, int, char *, int);
 void            mdoc_endparse(struct roff_man *);
 
-void            man_hash_init(void);
 int             man_parseln(struct roff_man *, int, char *, int);
 void            man_endparse(struct roff_man *);
 
 int             preconv_cue(const struct buf *, size_t);
-int             preconv_encode(struct buf *, size_t *,
+int             preconv_encode(const struct buf *, size_t *,
                        struct buf *, size_t *, int *);
 
 void            roff_free(struct roff *);
-struct roff    *roff_alloc(struct mparse *, int);
+struct roff    *roff_alloc(int);
 void            roff_reset(struct roff *);
 void            roff_man_free(struct roff_man *);
-struct roff_man        *roff_man_alloc(struct roff *, struct mparse *,
-                       const char *, int);
+struct roff_man        *roff_man_alloc(struct roff *, const char *, int);
 void            roff_man_reset(struct roff_man *);
-enum rofferr    roff_parseln(struct roff *, int, struct buf *, int *);
+int             roff_parseln(struct roff *, int, struct buf *, int *, size_t);
+void            roff_userret(struct roff *);
 void            roff_endparse(struct roff *);
-void            roff_setreg(struct roff *, const char *, int, char sign);
-int             roff_getreg(const struct roff *, const char *);
+void            roff_setreg(struct roff *, const char *, int, char);
+int             roff_getreg(struct roff *, const char *);
 char           *roff_strdup(const struct roff *, const char *);
+char           *roff_getarg(struct roff *, char **, int, int *);
 int             roff_getcontrol(const struct roff *,
                        const char *, int *);
 int             roff_getformat(const struct roff *);
-
-const struct tbl_span  *roff_span(const struct roff *);
-const struct eqn       *roff_eqn(const struct roff *);