Continue parser unification:

* Make enum rofft an internal interface as enum roff_tok in "roff.h".
* Represent mdoc and man macros in enum roff_tok.
* Make TOKEN_NONE a proper enum value and use it throughout.
* Put the prologue macros first in the macro tables.
* Unify mdoc_macroname[] and man_macroname[] into roff_name[].

1 files changed, 2 insertions, 2 deletions

diff --git a/libman.h b/libman.h
index 3529edcf..5f086d64 100644
--- a/libman.h
+++ b/libman.h
@@ -17,7 +17,7 @@
  */
 
 #define	MACRO_PROT_ARGS	  struct roff_man *man, \
-			  int tok, \
+			  enum roff_tok tok, \
 			  int line, \
 			  int ppos, \
 			  int *pos, \
@@ -35,7 +35,7 @@ struct	man_macro {
 extern	const struct man_macro *const man_macros;
 
 
-int		  man_hash_find(const char *);
+enum roff_tok	  man_hash_find(const char *);
 void		  man_node_validate(struct roff_man *);
 void		  man_state(struct roff_man *, struct roff_node *);
 void		  man_unscope(struct roff_man *, const struct roff_node *);