From 71ddcd873082a3c68ed2be7b7661075fb09d5849 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 20 Mar 2011 16:02:05 +0000 Subject: Consolidate messages. Have all parse-time messages (in libmdoc, libroff, etc., etc.) route into mandoc_msg() and mandoc_vmsg(), for the time being in libmandoc.h. This requires struct mparse to be passed into the allocation routines instead of mandocmsg and a void pointer. Then, move some of the functionality of the old mmsg() into read.c's mparse_mmsg() (check against wlevel and setting of file_status) and use main.c's mmsg() as simply a printing tool. --- libroff.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libroff.h') diff --git a/libroff.h b/libroff.h index 558ae0f1..d0136887 100644 --- 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.20 2011/03/20 16:02:05 kristaps Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * @@ -27,8 +27,7 @@ enum tbl_part { }; 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; @@ -48,10 +47,7 @@ struct eqn_node { struct eqn_node *next; }; -#define TBL_MSG(tblp, type, line, col) \ - (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL) - -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 *); -- cgit v1.2.3