diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-31 07:13:53 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-31 07:13:53 +0000 |
| commit | ea6ed8eb4a9349ba679125913c5a03c1027783b2 (patch) | |
| tree | 5e2e9909a3d4510379a5f0deb3c96b83b16d58e0 /libmdoc.h | |
| parent | d0506b714f392d1f74c683bae920e02c500e05d5 (diff) | |
| download | mandoc-ea6ed8eb4a9349ba679125913c5a03c1027783b2.tar.gz mandoc-ea6ed8eb4a9349ba679125913c5a03c1027783b2.tar.zst mandoc-ea6ed8eb4a9349ba679125913c5a03c1027783b2.zip | |
Macro types enum-ated (enum mdoct) (for easier debugging in gdb of "tok" values).
Initial check-in of Ingo Schwarze's patch for Xo/Xc handling (in blocks ifdef'd "UGLY").
Put Oc-close-Op parts into UGLY ifdef blocks.
Diffstat (limited to 'libmdoc.h')
| -rw-r--r-- | libmdoc.h | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.30 2009/10/30 05:58:37 kristaps Exp $ */ +/* $Id: libmdoc.h,v 1.31 2010/03/31 07:13:53 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -96,8 +96,8 @@ enum merr { MERRMAX }; -#define MACRO_PROT_ARGS struct mdoc *m, int tok, int line, \ - int ppos, int *pos, char *buf +#define MACRO_PROT_ARGS struct mdoc *m, enum mdoct tok, \ + int line, int ppos, int *pos, char *buf struct mdoc_macro { int (*fp)(MACRO_PROT_ARGS); @@ -131,16 +131,16 @@ int mdoc_macro(MACRO_PROT_ARGS); int mdoc_word_alloc(struct mdoc *, int, int, const char *); int mdoc_elem_alloc(struct mdoc *, int, int, - int, struct mdoc_arg *); + enum mdoct, struct mdoc_arg *); int mdoc_block_alloc(struct mdoc *, int, int, - int, struct mdoc_arg *); -int mdoc_head_alloc(struct mdoc *, int, int, int); -int mdoc_tail_alloc(struct mdoc *, int, int, int); -int mdoc_body_alloc(struct mdoc *, int, int, int); + enum mdoct, struct mdoc_arg *); +int mdoc_head_alloc(struct mdoc *, int, int, enum mdoct); +int mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct); +int mdoc_body_alloc(struct mdoc *, int, int, enum mdoct); void mdoc_node_free(struct mdoc_node *); void mdoc_node_freelist(struct mdoc_node *); void mdoc_hash_init(void); -int mdoc_hash_find(const char *); +enum mdoct mdoc_hash_find(const char *); int mdoc_iscdelim(char); int mdoc_isdelim(const char *); size_t mdoc_isescape(const char *); @@ -160,7 +160,7 @@ int mdoc_valid_post(struct mdoc *); int mdoc_action_pre(struct mdoc *, const struct mdoc_node *); int mdoc_action_post(struct mdoc *); -int mdoc_argv(struct mdoc *, int, int, +int mdoc_argv(struct mdoc *, int, enum mdoct, struct mdoc_arg **, int *, char *); #define ARGV_ERROR (-1) #define ARGV_EOLN (0) @@ -168,7 +168,7 @@ int mdoc_argv(struct mdoc *, int, int, #define ARGV_WORD (2) void mdoc_argv_free(struct mdoc_arg *); int mdoc_args(struct mdoc *, int, - int *, char *, int, char **); + int *, char *, enum mdoct, char **); int mdoc_zargs(struct mdoc *, int, int *, char *, int, char **); #define ARGS_DELIM (1 << 1) /* See args(). */ |