From dbd5746117cfc008d44b2e9e53c8f76c8d92673d Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 1 Jan 2011 17:10:20 +0000 Subject: Make some bit-flags into enums as they should be. Make printing of -Ttree tables a little bit smarter. --- tbl_data.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'tbl_data.c') diff --git a/tbl_data.c b/tbl_data.c index b04d8046..b4810767 100644 --- a/tbl_data.c +++ b/tbl_data.c @@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.4 2011/01/01 13:37:40 kristaps Exp $ */ +/* $Id: tbl_data.c,v 1.5 2011/01/01 17:10:20 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -68,16 +68,16 @@ data(struct tbl *tbl, struct tbl_span *dp, if (p[*pos]) (*pos)++; - /* XXX: do the strcmps, then malloc(). */ - if ( ! strcmp(dat->string, "_")) - dat->flags |= TBL_DATA_HORIZ; + dat->pos = TBL_DATA_HORIZ; else if ( ! strcmp(dat->string, "=")) - dat->flags |= TBL_DATA_DHORIZ; + dat->pos = TBL_DATA_DHORIZ; else if ( ! strcmp(dat->string, "\\_")) - dat->flags |= TBL_DATA_NHORIZ; + dat->pos = TBL_DATA_NHORIZ; else if ( ! strcmp(dat->string, "\\=")) - dat->flags |= TBL_DATA_NDHORIZ; + dat->pos = TBL_DATA_NDHORIZ; + else + dat->pos = TBL_DATA_DATA; } int @@ -119,13 +119,15 @@ tbl_data(struct tbl *tbl, int ln, const char *p) tbl->last_span = tbl->first_span = dp; if ( ! strcmp(p, "_")) { - dp->flags |= TBL_SPAN_HORIZ; + dp->pos = TBL_SPAN_HORIZ; return(1); } else if ( ! strcmp(p, "=")) { - dp->flags |= TBL_SPAN_DHORIZ; + dp->pos = TBL_SPAN_DHORIZ; return(1); } + dp->pos = TBL_SPAN_DATA; + while ('\0' != p[pos]) data(tbl, dp, ln, p, &pos); -- cgit v1.2.3-56-ge451