diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2018-12-31 10:04:39 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-31 10:04:39 +0000 |
| commit | 9922cf7c78f8d88f5d9eea09fe6a82a22c7a1e98 (patch) | |
| tree | ea0e2b3cfd4de88fc5cee62db04071d5f447a7b8 | |
| parent | 9c56a55fbb79de92a9abf566b12983ebf2c1198b (diff) | |
| download | mandoc-9922cf7c78f8d88f5d9eea09fe6a82a22c7a1e98.tar.gz mandoc-9922cf7c78f8d88f5d9eea09fe6a82a22c7a1e98.tar.zst mandoc-9922cf7c78f8d88f5d9eea09fe6a82a22c7a1e98.zip | |
Cleanup, no functional change:
Since the man(7) and roff(7) validators no longer use the parser
state flag ROFF_NOFILL, we can finally get rid of the function
man_state(), resulting in a better separation of parsing and validation.
| -rw-r--r-- | libman.h | 3 | ||||
| -rw-r--r-- | man.c | 21 | ||||
| -rw-r--r-- | man_macro.c | 4 | ||||
| -rw-r--r-- | man_validate.c | 5 |
4 files changed, 6 insertions, 27 deletions
@@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.85 2018/12/31 04:55:46 schwarze Exp $ */ +/* $Id: libman.h,v 1.86 2018/12/31 10:04:39 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2018 Ingo Schwarze <schwarze@openbsd.org> @@ -39,5 +39,4 @@ struct man_macro { const struct man_macro *man_macro(enum roff_tok); void man_descope(struct roff_man *, int, int, char *); -void man_state(struct roff_man *, struct roff_node *); void man_unscope(struct roff_man *, const struct roff_node *); @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.185 2018/12/31 08:38:21 schwarze Exp $ */ +/* $Id: man.c,v 1.186 2018/12/31 10:04:39 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> @@ -343,22 +343,3 @@ man_breakscope(struct roff_man *man, int tok) man->flags &= ~MAN_BLINE; } } - -void -man_state(struct roff_man *man, struct roff_node *n) -{ - - switch(n->tok) { - case ROFF_nf: - case MAN_EX: - man->flags |= ROFF_NOFILL; - break; - case ROFF_fi: - case MAN_EE: - man->flags &= ~ROFF_NOFILL; - break; - default: - break; - } - man->last->flags |= NODE_VALID; -} diff --git a/man_macro.c b/man_macro.c index b0c8e0d1..c438cfe5 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.141 2018/12/31 08:03:46 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.142 2018/12/31 10:04:39 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> @@ -429,7 +429,7 @@ in_line_eoln(MACRO_PROT_ARGS) /* Rewind our element scope. */ for ( ; man->last; man->last = man->last->parent) { - man_state(man, man->last); + man->last->flags |= NODE_VALID; if (man->last == n) break; } diff --git a/man_validate.c b/man_validate.c index 253aca35..4bfaf764 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.145 2018/12/31 08:38:21 schwarze Exp $ */ +/* $Id: man_validate.c,v 1.146 2018/12/31 10:04:39 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org> @@ -153,7 +153,6 @@ man_validate(struct roff_man *man) default: if (n->tok < ROFF_MAX) { roff_validate(man); - man_state(man, n); break; } assert(n->tok >= MAN_TH && n->tok < MAN_MAX); @@ -161,7 +160,7 @@ man_validate(struct roff_man *man) if (*cp) (*cp)(man, n); if (man->last == n) - man_state(man, n); + n->flags |= NODE_VALID; break; } } |