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

makedefs lint

Browse Source 
The Makefile race condition report included a link to a log file
of the build attempt, and it contained this:

makedefs.c: In function 'do_grep_control':
makedefs.c:611:26: warning: suggest parentheses around operand of '!'
 or change '|' to '||' or '!' to '~' [-Wparentheses]
 #define ST_LD(old, opp) (!!(old) | (!!(opp) << 1))
                          ^
makedefs.c:722:37: note: in expansion of macro 'ST_LD'
 grep_stack[++grep_sp] = ST_LD(grep_writing, !isif);
                         ^
They're using a more recent version of gcc than I am, because my
CFLAGS includes -Wparentheses (via -Wall) and I don't get that.

It's a little confusing, but I think it's whining that we might
have meant   !!((old) | (!!(opp) << 1))
rather than  (!!(old)) | (!!(opp) << 1).
The latter is what we get (and what we intended--no bug here).

I changed it to something that more directly reflects the intent
since it's not bit twiddling within some crucial innermost loop.
This commit is contained in:
PatR
2016-03-28 17:23:00 -07:00
parent f81543aa4f
commit 9e0a9d96f9
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/makedefs.c
+33 -34
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 makedefs.c $NHDT-Date: 1455357861 2016/02/13 10:04:21 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.109 $ */ /* NetHack 3.6 makedefs.c $NHDT-Date: 1459208813 2016/03/28 23:46:53 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.110 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* Copyright (c) M. Stephenson, 1990, 1991. */ /* Copyright (c) M. Stephenson, 1990, 1991. */
/* Copyright (c) Dean Luick, 1990. */ /* Copyright (c) Dean Luick, 1990. */
@@ -578,36 +578,35 @@ do_ext_makedefs(int argc, char **argv)
#undef CONSUME #undef CONSUME
/* /*
Filtering syntax: * Filtering syntax:
Any line NOT starting with a caret is either suppressed or passed through * Any line NOT starting with a caret is either suppressed or passed
unchanged depending on the current conditional state. * through unchanged depending on the current conditional state.
*
The default conditional state is printing on. * The default conditional state is printing on.
*
Conditionals may be nested. * Conditionals may be nested.
*
makedefs will exit with a EXIT_FAILURE if any errors are detected; as many * makedefs will exit with a EXIT_FAILURE if any errors are detected;
errors as possible are detected before giving up. * as many errors as possible are detected before giving up.
*
Unknown identifiers are treated as TRUE and also as an error to allow * Unknown identifiers are treated as TRUE and also as an error to
processing to continue past the unknown identifier (note that "#undef" is * allow processing to continue past the unknown identifier (note
different than unknown). * that "#undef" is different than unknown).
*
Any line starting with a caret is a control line; as in C, zero or more * Any line starting with a caret is a control line; as in C, zero or
spaces * more spaces may be embedded in the line almost anywhere; the caret
may be embedded in the line almost anywhere; the caret MUST be in column 1. * MUST be in column 1.
(XXX for the moment, no white space is allowed after the caret because * (XXX for the moment, no white space is allowed after the caret because
existing lines in the docs look like that) * existing lines in the docs look like that.)
*
Control lines: * Control lines:
^^ a line starting with a (single) literal caret * ^^ a line starting with a (single) literal caret
^# a comment - the line is ignored * ^# a comment - the line is ignored
^?ID if defined(ID) * ^?ID if defined(ID)
^!ID if !defined(ID) * ^!ID if !defined(ID)
^: else * ^: else
^. endif * ^. endif
*/
*/
#define GREP_MAGIC '^' #define GREP_MAGIC '^'
#define GREP_STACK_SIZE 100 #define GREP_STACK_SIZE 100
#ifdef notyet #ifdef notyet
@@ -616,9 +615,9 @@ static int grep_rewrite = 0; /* need to (possibly) rewrite lines */
static int grep_writing = 1; /* need to copy lines to output */ static int grep_writing = 1; /* need to copy lines to output */
static int grep_errors = 0; static int grep_errors = 0;
static int grep_sp = 0; static int grep_sp = 0;
#define ST_LD(old, opp) (!!(old) | (!!(opp) << 1)) #define ST_LD(old, opp) (((old) ? 1 : 0) | ((opp) ? 2 : 0))
#define ST_OLD(v) ((v) &1) #define ST_OLD(v) (((v) & 1) != 0)
#define ST_OPP(v) !!((v) &2) #define ST_OPP(v) (((v) & 2) != 0)
#define ST_ELSE 4 #define ST_ELSE 4
static int grep_stack[GREP_STACK_SIZE] = { ST_LD(1, 0) }; static int grep_stack[GREP_STACK_SIZE] = { ST_LD(1, 0) };
static int grep_lineno = 0; static int grep_lineno = 0;