*** empty log message ***

[mandoc.git] / private.h

diff --git a/private.h b/private.h
index b78dcdb6c2b421e9ae94d6cf3fd1d29c3f175454..42c1b85c93edb2c09e7731abdb08205c83aa4913 100644 (file)
--- a/private.h
+++ b/private.h
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.54 2009/01/05 14:14:04 kristaps Exp $ */
+/* $Id: private.h,v 1.63 2009/01/14 11:58:24 kristaps Exp $ */

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


@@ -31,6 +31,7 @@ struct        mdoc {
        struct mdoc_cb    cb;
        void             *htab;
        int               flags;
        struct mdoc_cb    cb;
        void             *htab;
        int               flags;

+#define        MDOC_HALT        (1 << 0)

        enum mdoc_next    next;
        struct mdoc_node *last;
        struct mdoc_node *first;
        enum mdoc_next    next;
        struct mdoc_node *last;
        struct mdoc_node *first;


@@ -39,34 +40,48 @@ struct      mdoc {
        enum mdoc_sec     sec_last;
 };
 
        enum mdoc_sec     sec_last;
 };
 

+
+#define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
+                       int ppos, int *pos, char *buf
+

 struct mdoc_macro {
 struct mdoc_macro {

-       int     (*fp)(struct mdoc *, int, int, int *, char *);
+       int     (*fp)(MACRO_PROT_ARGS);

        int       flags;
 #define        MDOC_CALLABLE   (1 << 0)
        int       flags;
 #define        MDOC_CALLABLE   (1 << 0)

-#define        MDOC_EXPLICIT   (1 << 1)
-#define        MDOC_QUOTABLE   (1 << 2)
-#define        MDOC_PROLOGUE   (1 << 3)
+#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)

 };
 
 extern const struct mdoc_macro *const mdoc_macros;
 
 };
 
 extern const struct mdoc_macro *const mdoc_macros;
 

-#define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, \
-                       int ppos, int *pos, char *buf
-

 __BEGIN_DECLS
 
 __BEGIN_DECLS
 

-int              mdoc_err(struct mdoc *, int, int, enum mdoc_err);
-int              mdoc_warn(struct mdoc *, int, int, enum mdoc_warn);
-void             mdoc_msg(struct mdoc *, int, const char *, ...);
-int              mdoc_macro(struct mdoc *, int, int, int *, char *);
+#define        mdoc_vwarn(m, n, t) \
+                 mdoc_pwarn((m), (n)->line, (n)->pos, (t))
+#define        mdoc_verr(m, n, t) \
+                 mdoc_perr((m), (n)->line, (n)->pos, (t))
+#define        mdoc_warn(m, t) \
+                 mdoc_pwarn((m), (m)->last->line, (m)->last->pos, (t))
+#define        mdoc_err(m, t) \
+                 mdoc_perr((m), (m)->last->line, (m)->last->pos, (t))
+int              mdoc_pwarn(struct mdoc *, int, int, enum mdoc_warn);
+int              mdoc_perr(struct mdoc *, int, int, enum mdoc_err);
+void             mdoc_msg(struct mdoc *, const char *, ...);
+int              mdoc_macro(MACRO_PROT_ARGS);

 int              mdoc_find(const struct mdoc *, const char *);
 int              mdoc_find(const struct mdoc *, const char *);

-void             mdoc_word_alloc(struct mdoc *, int, const char *);
-void             mdoc_elem_alloc(struct mdoc *, int, int, 
-                       size_t, const struct mdoc_arg *);
-void             mdoc_block_alloc(struct mdoc *, int, int, 
-                       size_t, const struct mdoc_arg *);
-void             mdoc_head_alloc(struct mdoc *, int, int);
-void             mdoc_body_alloc(struct mdoc *, int, int);
+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              mdoc_block_alloc(struct mdoc *, int, int, 
+                       int, size_t, const 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_free(struct mdoc_node *);
 void             mdoc_sibling(struct mdoc *, int, struct mdoc_node **,
                        struct mdoc_node **, struct mdoc_node *);


@@ -82,12 +97,12 @@ enum        mdoc_arch mdoc_atoarch(const char *);
 enum   mdoc_att  mdoc_atoatt(const char *);
 time_t           mdoc_atotime(const char *);
 
 enum   mdoc_att  mdoc_atoatt(const char *);
 time_t           mdoc_atotime(const char *);
 

-int              mdoc_valid_pre(struct mdoc *, int, int,
-                       int, const struct mdoc_arg *);
-int              mdoc_valid_post(struct mdoc *, int, int);
-int              mdoc_action(struct mdoc *, int, int);
+int              mdoc_valid_pre(struct mdoc *, 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              mdoc_argv(struct mdoc *, int, int, 

                        struct mdoc_arg *, int *, char *);
 #define        ARGV_ERROR      (-1)
 #define        ARGV_EOLN       (0)
                        struct mdoc_arg *, int *, char *);
 #define        ARGV_ERROR      (-1)
 #define        ARGV_EOLN       (0)


@@ -103,6 +118,7 @@ int           mdoc_args(struct mdoc *, int,
 
 #define        ARGS_QUOTED     (1 << 0)
 #define        ARGS_DELIM      (1 << 1)
 
 #define        ARGS_QUOTED     (1 << 0)
 #define        ARGS_DELIM      (1 << 1)

+#define        ARGS_TABSEP     (1 << 2)

 
 int              xstrlcat(char *, const char *, size_t);
 int              xstrlcpy(char *, const char *, size_t);
 
 int              xstrlcat(char *, const char *, size_t);
 int              xstrlcpy(char *, const char *, size_t);


@@ -111,17 +127,15 @@ void               *xcalloc(size_t, size_t);
 char            *xstrdup(const char *);
 
 int              macro_obsolete(MACRO_PROT_ARGS);
 char            *xstrdup(const char *);
 
 int              macro_obsolete(MACRO_PROT_ARGS);

-int              macro_constant_quoted(MACRO_PROT_ARGS);
-int              macro_constant_obsolete(MACRO_PROT_ARGS);
-int              macro_constant_argv(MACRO_PROT_ARGS);

 int              macro_constant(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_constant_delimited(MACRO_PROT_ARGS);
 int              macro_text(MACRO_PROT_ARGS);
 int              macro_scoped(MACRO_PROT_ARGS);

-int              macro_close_explicit(MACRO_PROT_ARGS);
+int              macro_scoped_close(MACRO_PROT_ARGS);

 int              macro_scoped_line(MACRO_PROT_ARGS);
 int              macro_scoped_line(MACRO_PROT_ARGS);

-int              macro_scoped_pline(MACRO_PROT_ARGS);

 int              macro_prologue(MACRO_PROT_ARGS);
 int              macro_prologue(MACRO_PROT_ARGS);

+int              macro_end(struct mdoc *);

 
 __END_DECLS
 
 
 __END_DECLS