diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-02 21:36:49 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-02 21:36:49 +0000 |
commit | 483afc5a7a52b601da9e854d5645cd4b0a140184 (patch) | |
tree | 159f32df48c5d133f76368d6fb95ad45656bccc4 /mdoc.h | |
parent | 0fa412f32faf6969057d9e796beabcbf0413f279 (diff) | |
download | mandoc-483afc5a7a52b601da9e854d5645cd4b0a140184.tar.gz mandoc-483afc5a7a52b601da9e854d5645cd4b0a140184.tar.zst mandoc-483afc5a7a52b601da9e854d5645cd4b0a140184.zip |
First step towards parser unification:
Replace enum mdoc_type and enum man_type by a unified enum roff_type.
Almost mechanical, no functional change.
Written on the ICE train from Frankfurt to Bruxelles on the way to p2k15.
Diffstat (limited to 'mdoc.h')
-rw-r--r-- | mdoc.h | 20 |
1 files changed, 4 insertions, 16 deletions
@@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.136 2015/02/12 12:24:33 schwarze Exp $ */ +/* $Id: mdoc.h,v 1.137 2015/04/02 21:36:50 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -7,9 +7,9 @@ * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF @@ -174,18 +174,6 @@ enum mdocargt { MDOC_ARG_MAX }; -enum mdoc_type { - MDOC_TEXT, - MDOC_ELEM, - MDOC_HEAD, - MDOC_TAIL, - MDOC_BODY, - MDOC_BLOCK, - MDOC_TBL, - MDOC_EQN, - MDOC_ROOT -}; - /* * Section (named/unnamed) of `Sh'. Note that these appear in the * conventional order imposed by mdoc.7. In the case of SEC_NONE, no @@ -363,7 +351,7 @@ struct mdoc_node { #define MDOC_BROKEN (1 << 5) /* must validate parent when ending */ #define MDOC_DELIMO (1 << 6) #define MDOC_DELIMC (1 << 7) - enum mdoc_type type; /* AST node type */ + enum roff_type type; /* AST node type */ enum mdoc_sec sec; /* current named section */ union mdoc_data *norm; /* normalised args */ int prev_font; /* before entering this node */ |