Cleaned up validation source a bit.

[mandoc.git] / private.h

diff --git a/private.h b/private.h
index fbcdc90d64a020bc20bb158eaa42dd02dd84821b..1f2125486d3477cc5f91358df1ff1d7f9e54421f 100644 (file)
--- a/private.h
+++ b/private.h
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.70 2009/01/20 12:51:28 kristaps Exp $ */
+/* $Id: private.h,v 1.78 2009/02/22 14:31:08 kristaps Exp $ */

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


@@ -33,13 +33,12 @@ struct      mdoc {
        int               linetok;
        int               flags;
 #define        MDOC_HALT        (1 << 0)
        int               linetok;
        int               flags;
 #define        MDOC_HALT        (1 << 0)

-#define        MDOC_BODYPARSE   (1 << 1)

        enum mdoc_next    next;
        struct mdoc_node *last;
        struct mdoc_node *first;
        struct mdoc_meta  meta;
        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;

 };
 
 
 };
 
 


@@ -60,9 +59,7 @@ struct        mdoc_macro {
 #define        MDOC_CALLABLE    (1 << 0)
 #define        MDOC_PARSED      (1 << 1)
 #define        MDOC_EXPLICIT    (1 << 2)
 #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, ...) \
 };
 
 #define        mdoc_nwarn(mdoc, node, type, fmt, ...) \


@@ -127,7 +124,6 @@ void                  mdoc_sibling(struct mdoc *, int, struct mdoc_node **,
 void            *mdoc_tokhash_alloc(void);
 int              mdoc_tokhash_find(const void *, const char *);
 void             mdoc_tokhash_free(void *);
 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(const char *);
 enum   mdoc_msec mdoc_atomsec(const char *);
 int              mdoc_iscdelim(char);
 enum   mdoc_sec  mdoc_atosec(const char *);
 enum   mdoc_msec mdoc_atomsec(const char *);


@@ -157,15 +153,14 @@ int                 mdoc_args(struct mdoc *, int,
 #define        ARGS_EOLN       (0)
 #define        ARGS_WORD       (1)
 #define        ARGS_PUNCT      (2)
 #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              xstrlcats(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 *);
 
 int              xstrlcats(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 *);

+int              xstrncmp(const char *, const char *, size_t);

 void            *xcalloc(size_t, size_t);
 char            *xstrdup(const char *);
 
 void            *xcalloc(size_t, size_t);
 char            *xstrdup(const char *);