nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

VA_DECL/VA_END usage

Browse Source 
Make the variadic functions look more like ordinary code rather than
have the function opening brace be hidden inside the VA_DECL() macro.
That brace is still there, but VA_DECL() now needs to be followed by
a visible brace (which introduces a nested block rather than the
start of the funciton).  VA_END() now provides a hidden closing brace
to end the nested block, and the existing closing brace still matches
the one in VA_DECL().

Sample usage:
void foo VA_DECL(int, arg)  --macro expansion has a hidden opening brace
{  --new, explicit opening brace (actually introduces a nested block)
  VA_START(bar);
  ...code for foo...
  VA_END();  --expansion now provides a closing brace for the nested block
}  --existing closing brace, still pairs with the hidden one in VA_DECL()

This should help if/when another round of reformatting ever takes place,
and also with editors or other tools that do brace/bracket/parenthesis
matching.

I had forgotten that there were variadic functions in sys/* and ended
up modifying a lot more files than intended.  The majority of changes
to those just inserted a new '{' line so that revised VA_END()'s '}'
won't introduce a syntax error.  A couple of them needed VA_END() moved
so that local variables wouldn't go out of scope too soon.  Only the
Unix ones have been tested.
This commit is contained in:
PatR
2015-05-15 17:45:21 -07:00
parent dd62a6831f
commit fabf9cd901
16 changed files with 8339 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sys/mac/macerrs.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 macerrs.c $NHDT-Date: 1431192785 2015/05/09 17:33:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.8 $ */
/* NetHack 3.6 macerrs.c $NHDT-Date: 1431737061 2015/05/16 00:44:21 $ $NHDT-Branch: master $:$NHDT-Revision: 1.9 $ */
/* NetHack 3.6 macerrs.c $Date: 2009/05/06 10:49:10 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)macerrs.c 3.5 1993/01/24 */
/* Copyright (c) Michael Hamel, 1991 */
@@ -102,7 +102,8 @@ static void vprogerror();
#endif
/* Macro substitute for error() */
void error VA_DECL(const char *, line){
void error VA_DECL(const char *, line)
{
VA_START(line);
VA_INIT(line, char *);
vprogerror(line, VA_ARGS);
@@ -111,18 +112,18 @@ void error VA_DECL(const char *, line){
#ifdef USE_STDARG
static void
vprogerror(const char *line, va_list the_args) {
vprogerror(const char *line, va_list the_args)
#else
static void
vprogerror(line, the_args) const char *line; va_list the_args; {
vprogerror(line, the_args) const char *line; va_list the_args;
#endif
#else /* USE_STDARG | USE_VARARG */
void
error VA_DECL(const char *, line){
error VA_DECL(const char *, line)
#endif
/* Do NOT use VA_START and VA_END in here... see above */
{ /* opening brace for vprogerror(), nested block for USE_OLDARG error() */
char pbuf[BUFSZ];
if(index(line, '%')) {
@@ -130,6 +131,10 @@ error VA_DECL(const char *, line){
line = pbuf;
}
showerror("of an internal error",line);
#if !(defined(USE_STDARG) || defined(USE_VARARGS))
VA_END(); /* provides closing brace for USE_OLDARGS's nested block */
#endif
}