===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.13
retrieving revision 1.41
diff -u -p -r1.13 -r1.41
--- mandoc/libmdoc.h	2009/07/06 13:04:52	1.13
+++ mandoc/libmdoc.h	2010/05/12 08:41:17	1.41
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.13 2009/07/06 13:04:52 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.41 2010/05/12 08:41:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,7 +27,6 @@ enum	mdoc_next {
 struct	mdoc {
 	void		 *data;
 	struct mdoc_cb	  cb;
-	void		 *htab;
 	int		  flags;
 #define	MDOC_HALT	 (1 << 0)	/* Error in parse. Halt. */
 #define	MDOC_LITERAL	 (1 << 1)	/* In a literal scope. */
@@ -42,17 +41,12 @@ struct	mdoc {
 };
 
 enum	merr {
-	ETAILWS,
-	ECOLEMPTY,
-	EARGVPARM,
+	ETAILWS = 0,
 	EQUOTPARM,
 	EQUOTTERM,
-	EMALLOC,
 	EARGVAL,	
-	ENOCALL,
 	EBODYPROL,
 	EPROLBODY,
-	ESPACE,
 	ETEXTPROL,
 	ENOBLANK,
 	ETOOLONG,
@@ -66,8 +60,9 @@ enum	merr {
 	ELISTTYPE,
 	EDISPTYPE,
 	EMULTIDISP,
-	ESECNAME,
 	EMULTILIST,
+	ESECNAME,
+	ENAMESECINC,
 	EARGREP,
 	EBOOL,
 	ECOLMIS,
@@ -77,31 +72,33 @@ enum	merr {
 	ESECOOO,
 	ESECREP,
 	EBADSTAND,
-	ENAMESECINC,
 	ENOMULTILINE,
 	EMULTILINE,
 	ENOLINE,
 	EPROLOOO,
 	EPROLREP,
 	EBADMSEC,
+	EBADSEC,
 	EFONT,
 	EBADDATE,
+	ENUMFMT,
 	ENOWIDTH,
-	EBADSEC,
 	EUTSNAME,
-	ENUMFMT,
 	EOBS,
-	EMACPARM,
 	EIMPBRK,
 	EIGNE,
 	EOPEN,
-	EQUOT,
+	EQUOTPHR,
 	ENOCTX,
-	ENOPARMS
+	ELIB,
+	EBADCHILD,
+	ENOTYPE,
+	EBADCOMMENT,
+	MERRMAX
 };
 
-#define	MACRO_PROT_ARGS	struct mdoc *mdoc, int tok, int line, \
-			int ppos, int *pos, char *buf
+#define	MACRO_PROT_ARGS	struct mdoc *m, enum mdoct tok, \
+			int line, int ppos, int *pos, char *buf
 
 struct	mdoc_macro {
 	int		(*fp)(MACRO_PROT_ARGS);
@@ -114,6 +111,24 @@ struct	mdoc_macro {
 	/* Reserved words in arguments treated as text. */
 };
 
+enum	margserr {
+	ARGS_ERROR,
+	ARGS_EOLN,
+	ARGS_WORD,
+	ARGS_PUNCT,
+	ARGS_QWORD,
+	ARGS_PHRASE,
+	ARGS_PPHRASE,
+	ARGS_PEND
+};
+
+enum	margverr {
+	ARGV_ERROR,
+	ARGV_EOLN,
+	ARGV_ARG,
+	ARGV_WORD
+};
+
 extern	const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
@@ -123,9 +138,9 @@ __BEGIN_DECLS
 #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, 0, (t))
-#define		  mdoc_nwarn(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 *, ...);
@@ -135,24 +150,24 @@ int		  mdoc_macro(MACRO_PROT_ARGS);
 int		  mdoc_word_alloc(struct mdoc *, 
 			int, int, const char *);
 int		  mdoc_elem_alloc(struct mdoc *, int, int, 
-			int, struct mdoc_arg *);
+			enum mdoct, struct mdoc_arg *);
 int		  mdoc_block_alloc(struct mdoc *, int, int, 
-			int, struct mdoc_arg *);
-int		  mdoc_head_alloc(struct mdoc *, int, int, int);
-int		  mdoc_tail_alloc(struct mdoc *, int, int, int);
-int		  mdoc_body_alloc(struct mdoc *, int, int, int);
-void		  mdoc_node_free(struct mdoc_node *);
-void		  mdoc_node_freelist(struct mdoc_node *);
-void		 *mdoc_hash_alloc(void);
-int		  mdoc_hash_find(const void *, const char *);
-void		  mdoc_hash_free(void *);
+			enum mdoct, struct mdoc_arg *);
+int		  mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
+int		  mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
+int		  mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);
+void		  mdoc_node_delete(struct mdoc *, struct mdoc_node *);
+void		  mdoc_hash_init(void);
+enum mdoct	  mdoc_hash_find(const char *);
 int		  mdoc_iscdelim(char);
 int		  mdoc_isdelim(const char *);
 size_t		  mdoc_isescape(const char *);
-enum	mdoc_sec  mdoc_atosec(const char *);
+enum	mdoc_sec  mdoc_str2sec(const char *);
 time_t		  mdoc_atotime(const char *);
-
-size_t		  mdoc_macro2len(int);
+size_t		  mdoc_macro2len(enum mdoct);
+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 *);
@@ -162,21 +177,17 @@ int		  mdoc_valid_post(struct mdoc *);
 int		  mdoc_action_pre(struct mdoc *, 
 			const struct mdoc_node *);
 int		  mdoc_action_post(struct mdoc *);
-int		  mdoc_argv(struct mdoc *, int, int,
+enum margverr	  mdoc_argv(struct mdoc *, int, enum mdoct,
 			struct mdoc_arg **, int *, char *);
-#define	ARGV_ERROR	(-1)
-#define	ARGV_EOLN	(0)
-#define	ARGV_ARG	(1)
-#define	ARGV_WORD	(2)
 void		  mdoc_argv_free(struct mdoc_arg *);
-int		  mdoc_args(struct mdoc *, int,
+void		  mdoc_argn_free(struct mdoc_arg *, int);
+enum margserr	  mdoc_args(struct mdoc *, int,
+			int *, char *, enum mdoct, char **);
+enum margserr	  mdoc_zargs(struct mdoc *, int, 
 			int *, char *, int, char **);
-#define	ARGS_ERROR	(-1)
-#define	ARGS_EOLN	(0)
-#define	ARGS_WORD	(1)
-#define	ARGS_PUNCT	(2)
-#define	ARGS_QWORD	(3)
-#define	ARGS_PHRASE	(4)
+#define	ARGS_DELIM	(1 << 1)	/* See args(). */
+#define	ARGS_TABSEP	(1 << 2)	/* See args(). */
+#define	ARGS_NOWARN	(1 << 3)	/* See args(). */
 
 int		  mdoc_macroend(struct mdoc *);