Removed "regression" for OpenBSD (broken).

[mandoc.git] / private.h

diff --git a/private.h b/private.h
index 0895f30bccb39441a304279332c4a605a815d827..fe48bb9918e7ff7c22e6a744c35071394980c583 100644 (file)
--- a/private.h
+++ b/private.h
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.64 2009/01/15 17:38:58 kristaps Exp $ */
+/* $Id: private.h,v 1.88 2009/03/08 19:47:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -30,14 +30,16 @@ struct      mdoc {
        void             *data;
        struct mdoc_cb    cb;
        void             *htab;
+       int               linetok;
        int               flags;
 #define        MDOC_HALT        (1 << 0)
+       int               pflags;
        enum mdoc_next    next;
        struct mdoc_node *last;
        struct mdoc_node *first;
        struct mdoc_meta  meta;
-       enum mdoc_sec     sec_lastn;
-       enum mdoc_sec     sec_last;
+       enum mdoc_sec     lastnamed;
+       enum mdoc_sec     lastsec;
 };
 
 
@@ -50,9 +52,7 @@ struct        mdoc_macro {
 #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_PROLOGUE    (1 << 3)
 };
 
 #define        mdoc_nwarn(mdoc, node, type, fmt, ...) \
@@ -97,72 +97,57 @@ 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 *, 
                        int, int, const char *);
 int              mdoc_elem_alloc(struct mdoc *, int, int, 
-                       int, size_t, const struct mdoc_arg *);
+                       int, struct mdoc_arg *);
 int              mdoc_block_alloc(struct mdoc *, int, int, 
-                       int, size_t, const struct mdoc_arg *);
+                       int, struct mdoc_arg *);
 int              mdoc_root_alloc(struct mdoc *);
 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_sibling(struct mdoc *, int, struct mdoc_node **,
-                       struct mdoc_node **, struct mdoc_node *);
+void             mdoc_node_freelist(struct mdoc_node *);
 void            *mdoc_tokhash_alloc(void);
 int              mdoc_tokhash_find(const void *, const char *);
 void             mdoc_tokhash_free(void *);
-int              mdoc_isdelim(const char *);
 int              mdoc_iscdelim(char);
-enum   mdoc_sec  mdoc_atosec(size_t, const char **);
-enum   mdoc_msec mdoc_atomsec(const char *);
-enum   mdoc_vol  mdoc_atovol(const char *);
-enum   mdoc_arch mdoc_atoarch(const char *);
-enum   mdoc_att  mdoc_atoatt(const char *);
+size_t           mdoc_isescape(const char *);
+enum   mdoc_sec  mdoc_atosec(const char *);
 time_t           mdoc_atotime(const char *);
-
-int              mdoc_valid_pre(struct mdoc *, struct mdoc_node *);
+size_t           mdoc_macro2len(int);
+const char      *mdoc_a2arch(const char *);
+const char      *mdoc_a2vol(const char *);
+const char      *mdoc_a2msec(const char *);
+int              mdoc_valid_pre(struct mdoc *, 
+                       const struct mdoc_node *);
 int              mdoc_valid_post(struct mdoc *);
 int              mdoc_action_pre(struct mdoc *, struct mdoc_node *);
 int              mdoc_action_post(struct mdoc *);
-
-int              mdoc_argv(struct mdoc *, int, int, 
-                       struct mdoc_arg *, int *, char *);
+int              mdoc_argv(struct mdoc *, int, int,
+                       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(int, struct mdoc_arg *);
+void             mdoc_argv_free(struct mdoc_arg *);
 int              mdoc_args(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_QUOTED     (1 << 0)
-#define        ARGS_DELIM      (1 << 1)
-#define        ARGS_TABSEP     (1 << 2)
-
+#define        ARGS_QWORD      (3)
+#define        ARGS_PHRASE     (4)
+int              xstrlcpys(char *, const struct mdoc_node *, size_t);
 int              xstrlcat(char *, const char *, size_t);
 int              xstrlcpy(char *, const char *, size_t);
 int              xstrcmp(const char *, const char *);
 void            *xcalloc(size_t, size_t);
+void            *xrealloc(void *, size_t);
 char            *xstrdup(const char *);
-
-int              macro_obsolete(MACRO_PROT_ARGS);
-int              macro_constant(MACRO_PROT_ARGS);
-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_scoped_close(MACRO_PROT_ARGS);
-int              macro_scoped_line(MACRO_PROT_ARGS);
-int              macro_prologue(MACRO_PROT_ARGS);
 int              macro_end(struct mdoc *);
 
 __END_DECLS