diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-07-05 20:10:22 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-07-05 20:10:22 +0000 |
commit | 2d53479241546a875b9c64ec79c28fd821060f87 (patch) | |
tree | 0a679df5cc20b8a1d20193566652900a43ca5a73 | |
parent | d7a99a7add200310e8838bb9d92c7a9d70956551 (diff) | |
download | mandoc-2d53479241546a875b9c64ec79c28fd821060f87.tar.gz mandoc-2d53479241546a875b9c64ec79c28fd821060f87.tar.zst mandoc-2d53479241546a875b9c64ec79c28fd821060f87.zip |
Move register information into mandoc.h, which is where it should have
been in the first place (mandoc.h contains system-wide declarations).
-rw-r--r-- | mandoc.h | 42 | ||||
-rw-r--r-- | regs.h | 24 |
2 files changed, 39 insertions, 27 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.15 2010/07/02 12:54:33 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.16 2010/07/05 20:10:22 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -17,10 +17,13 @@ #ifndef MANDOC_H #define MANDOC_H +/* + * This contains declarations that are available system-wide. + */ + #define ASCII_NBRSP 31 /* non-breaking space */ #define ASCII_HYPH 30 /* breakable hyphen */ - __BEGIN_DECLS enum mandocerr { @@ -106,8 +109,39 @@ enum mandocerr { MANDOCERR_MAX }; -typedef int (*mandocmsg)(enum mandocerr, - void *, int, int, const char *); +enum regs { + REG_nS = 0, /* register: nS */ + REG__MAX +}; + +/* + * A single register entity. If "set" is zero, the value of the + * register should be the default one, which is per-register. It's + * assumed that callers know which type in "v" corresponds to which + * register value. + */ +struct reg { + int set; /* whether set or not */ + union { + unsigned u; /* unsigned integer */ + } v; +}; + +/* + * The primary interface to setting register values is in libroff, + * although libmdoc and libman from time to time will manipulate + * registers (such as `.Sh SYNOPSIS' enabling REG_nS). + */ +struct regset { + struct reg regs[REG__MAX]; +}; + +/* + * Callback function for warnings, errors, and fatal errors as they + * occur in the compilers libroff, libmdoc, and libman. + */ +typedef int (*mandocmsg)(enum mandocerr, void *, + int, int, const char *); __END_DECLS @@ -1,4 +1,4 @@ -/* $Id: regs.h,v 1.5 2010/07/04 22:04:04 schwarze Exp $ */ +/* $Id: regs.h,v 1.6 2010/07/05 20:10:22 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -20,28 +20,6 @@ __BEGIN_DECLS -enum regs { - REG_nS = 0, /* nS */ - REG__MAX -}; - -struct reg { - int set; /* whether set or not */ - union { - unsigned u; /* unsigned integer */ - } v; -}; - -/* - * Registers are non-scoped state. These can be manipulated directly in - * libroff or indirectly in libman or libmdoc by macros. These should - * be implemented sparingly (we are NOT roffdoc!) and documented fully - * in roff.7. - */ -struct regset { - struct reg regs[REG__MAX]; -}; - char *roff_setstr(const char *, const char *); char *roff_getstr(const char *); char *roff_getstrn(const char *, size_t); |