Decouple the token code for "no request or macro" from the individual

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 6ca9232a59de356cf83a3221a19ed3210c0e292d..b4b71b5d66818e27566ae175d7a6bcb46ff985da 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.137 2015/04/18 17:28:36 schwarze Exp $ */
+/*     $Id: read.c,v 1.138 2015/04/19 14:00:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -293,17 +293,17 @@ choose_parser(struct mparse *curp)
                curp->man = roff_man_alloc(curp->roff, curp, curp->defos,
                    curp->options & MPARSE_QUICK ? 1 : 0);
                curp->man->macroset = MACROSET_MAN;
-               curp->man->first->tok = MDOC_MAX;
+               curp->man->first->tok = TOKEN_NONE;
        }
 
        if (format == MPARSE_MDOC) {
                mdoc_hash_init();
                curp->man->macroset = MACROSET_MDOC;
-               curp->man->first->tok = MDOC_MAX;
+               curp->man->first->tok = TOKEN_NONE;
        } else {
                man_hash_init();
                curp->man->macroset = MACROSET_MAN;
-               curp->man->first->tok = MAN_MAX;
+               curp->man->first->tok = TOKEN_NONE;
        }
 }
 
@@ -893,12 +893,11 @@ mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
        if (curp->options & MPARSE_MDOC) {
                mdoc_hash_init();
                curp->man->macroset = MACROSET_MDOC;
-               curp->man->first->tok = MDOC_MAX;
        } else if (curp->options & MPARSE_MAN) {
                man_hash_init();
                curp->man->macroset = MACROSET_MAN;
-               curp->man->first->tok = MAN_MAX;
        }
+       curp->man->first->tok = TOKEN_NONE;
        return(curp);
 }