Skip to content

Commit e3987b0

Browse files
committed
rename not field to not_ for C++ extension modules
1 parent d07e9eb commit e3987b0

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Include/internal/pycore_optimizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ typedef struct _jit_opt_tuple {
201201

202202
typedef struct {
203203
uint8_t tag;
204-
bool not;
204+
bool not_;
205205
uint16_t value;
206206
} JitOptTruthiness;
207207

Python/optimizer_symbols.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ _Py_uop_sym_is_const(JitOptContext *ctx, JitOptSymbol *sym)
113113
if (truthiness < 0) {
114114
return false;
115115
}
116-
make_const(sym, (truthiness ^ sym->truthiness.not) ? Py_True : Py_False);
116+
make_const(sym, (truthiness ^ sym->truthiness.not_) ? Py_True : Py_False);
117117
return true;
118118
}
119119
return false;
@@ -138,7 +138,7 @@ _Py_uop_sym_get_const(JitOptContext *ctx, JitOptSymbol *sym)
138138
if (truthiness < 0) {
139139
return NULL;
140140
}
141-
PyObject *res = (truthiness ^ sym->truthiness.not) ? Py_True : Py_False;
141+
PyObject *res = (truthiness ^ sym->truthiness.not_) ? Py_True : Py_False;
142142
make_const(sym, res);
143143
return res;
144144
}
@@ -289,7 +289,7 @@ _Py_uop_sym_set_const(JitOptContext *ctx, JitOptSymbol *sym, PyObject *const_val
289289
}
290290
JitOptSymbol *value = allocation_base(ctx) + sym->truthiness.value;
291291
PyTypeObject *type = _Py_uop_sym_get_type(value);
292-
if (const_val == (sym->truthiness.not ? Py_False : Py_True)) {
292+
if (const_val == (sym->truthiness.not_ ? Py_False : Py_True)) {
293293
// value is truthy. This is only useful for bool:
294294
if (type == &PyBool_Type) {
295295
_Py_uop_sym_set_const(ctx, value, Py_True);
@@ -496,7 +496,7 @@ _Py_uop_sym_truthiness(JitOptContext *ctx, JitOptSymbol *sym)
496496
if (truthiness < 0) {
497497
return truthiness;
498498
}
499-
truthiness ^= sym->truthiness.not;
499+
truthiness ^= sym->truthiness.not_;
500500
make_const(sym, truthiness ? Py_True : Py_False);
501501
return truthiness;
502502
}
@@ -590,8 +590,8 @@ JitOptSymbol *
590590
_Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptSymbol *value, bool truthy)
591591
{
592592
// It's clearer to invert this in the signature:
593-
bool not = !truthy;
594-
if (value->tag == JIT_SYM_TRUTHINESS_TAG && value->truthiness.not == not) {
593+
bool not_ = !truthy;
594+
if (value->tag == JIT_SYM_TRUTHINESS_TAG && value->truthiness.not_ == not_) {
595595
return value;
596596
}
597597
JitOptSymbol *res = sym_new(ctx);
@@ -601,11 +601,11 @@ _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptSymbol *value, bool truthy)
601601
int truthiness = _Py_uop_sym_truthiness(ctx, value);
602602
if (truthiness < 0) {
603603
res->tag = JIT_SYM_TRUTHINESS_TAG;
604-
res->truthiness.not = not;
604+
res->truthiness.not_ = not_;
605605
res->truthiness.value = (uint16_t)(value - allocation_base(ctx));
606606
}
607607
else {
608-
make_const(res, (truthiness ^ not) ? Py_True : Py_False);
608+
make_const(res, (truthiness ^ not_) ? Py_True : Py_False);
609609
}
610610
return res;
611611
}

0 commit comments

Comments
 (0)