Clean up error reporting:

[mandoc.git] / libroff.h

diff --git a/libroff.h b/libroff.h
index 558ae0f1f88aec660e9674a7f7c69b0d1bffb573..f917b14926f9ab83dcbf9e9f96ea6098bda6ad79 100644 (file)
--- a/libroff.h
+++ b/libroff.h
@@ -1,4 +1,4 @@
-/*     $Id: libroff.h,v 1.19 2011/02/09 09:05:52 kristaps Exp $ */
+/*     $Id: libroff.h,v 1.29 2014/04/20 16:46:04 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -27,12 +27,11 @@ enum        tbl_part {
 };
 
 struct tbl_node {
 };
 
 struct tbl_node {

-       mandocmsg         msg; /* status messages */
-       void             *data; /* privdata for messages */
+       struct mparse    *parse; /* parse point */

        int               pos; /* invocation column */
        int               line; /* invocation line */
        enum tbl_part     part;
        int               pos; /* invocation column */
        int               line; /* invocation line */
        enum tbl_part     part;

-       struct tbl        opts;
+       struct tbl_opts   opts;

        struct tbl_row   *first_row;
        struct tbl_row   *last_row;
        struct tbl_span  *first_span;
        struct tbl_row   *first_row;
        struct tbl_row   *last_row;
        struct tbl_span  *first_span;


@@ -44,28 +43,41 @@ struct      tbl_node {
 };
 
 struct eqn_node {
 };
 
 struct eqn_node {

+       struct eqn_def   *defs;
+       size_t            defsz;
+       char             *data;
+       size_t            rew;
+       size_t            cur;
+       size_t            sz;
+       int               gsize;

        struct eqn        eqn;
        struct eqn        eqn;

-       struct eqn_node  *next;
+       struct mparse    *parse;
+       struct eqn_node  *next;

 };
 
 };
 

-#define        TBL_MSG(tblp, type, line, col) \
-       (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL)
+struct eqn_def {
+       char             *key;
+       size_t            keysz;
+       char             *val;
+       size_t            valsz;
+};

 
 

-struct tbl_node        *tbl_alloc(int, int, void *, mandocmsg);
+struct tbl_node        *tbl_alloc(int, int, struct mparse *);

 void            tbl_restart(int, int, struct tbl_node *);
 void            tbl_free(struct tbl_node *);
 void            tbl_reset(struct tbl_node *);
 void            tbl_restart(int, int, struct tbl_node *);
 void            tbl_free(struct tbl_node *);
 void            tbl_reset(struct tbl_node *);

-enum rofferr    tbl_read(struct tbl_node *, int, const char *, int);
+enum rofferr    tbl_read(struct tbl_node *, int, const char *, int);

 int             tbl_option(struct tbl_node *, int, const char *);
 int             tbl_layout(struct tbl_node *, int, const char *);
 int             tbl_data(struct tbl_node *, int, const char *);
 int             tbl_cdata(struct tbl_node *, int, const char *);
 const struct tbl_span  *tbl_span(struct tbl_node *);
 int             tbl_option(struct tbl_node *, int, const char *);
 int             tbl_layout(struct tbl_node *, int, const char *);
 int             tbl_data(struct tbl_node *, int, const char *);
 int             tbl_cdata(struct tbl_node *, int, const char *);
 const struct tbl_span  *tbl_span(struct tbl_node *);

-void            tbl_end(struct tbl_node *);
-struct eqn_node        *eqn_alloc(int, int);
-void            eqn_end(struct eqn_node *);
+void            tbl_end(struct tbl_node **);
+struct eqn_node        *eqn_alloc(const char *, int, int, struct mparse *);
+enum rofferr    eqn_end(struct eqn_node **);

 void            eqn_free(struct eqn_node *);
 void            eqn_free(struct eqn_node *);

-enum rofferr    eqn_read(struct eqn_node **, int, const char *, int);
+enum rofferr    eqn_read(struct eqn_node **, int,
+                       const char *, int, int *);

 
 __END_DECLS
 
 
 __END_DECLS