More validation on prologue/first NAME section.

[mandoc.git] / private.h

diff --git a/private.h b/private.h
index 62b4d9b7ab7828cd63e934bb077005fc476defc8..dd4febfe3fee6067f049db91ac57f031eb0db61d 100644 (file)
--- a/private.h
+++ b/private.h
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.68 2009/01/17 20:10:36 kristaps Exp $ */
+/* $Id: private.h,v 1.74 2009/01/21 11:35:26 kristaps Exp $ */

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


@@ -30,20 +30,24 @@ struct      mdoc {
        void             *data;
        struct mdoc_cb    cb;
        void             *htab;
        void             *data;
        struct mdoc_cb    cb;
        void             *htab;

+       int               linetok;

        int               flags;
 #define        MDOC_HALT        (1 << 0)
        enum mdoc_next    next;
        struct mdoc_node *last;
        struct mdoc_node *first;
        struct mdoc_meta  meta;
        int               flags;
 #define        MDOC_HALT        (1 << 0)
        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;

 };
 
 
 };
 
 

-/* FIXME: it's 9 (this isn't used properly). */
+/* Hard-limit of macro arguments. */

 
 

-#define        MDOC_LINEARG_MAX 12
+#define        MDOC_LINEARG_MAX 9
+
+/* Suggested limit of macro arguments. */
+
+#define        MDOC_LINEARG_SOFTMAX 9

 
 #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


@@ -54,9 +58,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, ...) \


@@ -115,6 +117,7 @@ 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 *);
 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_sibling(struct mdoc *, int, struct mdoc_node **,
                        struct mdoc_node **, struct mdoc_node *);
 void            *mdoc_tokhash_alloc(void);
 void             mdoc_sibling(struct mdoc *, int, struct mdoc_node **,
                        struct mdoc_node **, struct mdoc_node *);
 void            *mdoc_tokhash_alloc(void);


@@ -150,15 +153,13 @@ 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)

 
 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 *);