@@ -2377,7 +2377,7 @@ binary_op_fail_kind(int oparg, PyObject *lhs, PyObject *rhs)
23772377/* float-long */
23782378
23792379static int
2380- float_long_guard (PyObject * lhs , PyObject * rhs )
2380+ float_compactlong_guard (PyObject * lhs , PyObject * rhs )
23812381{
23822382 return (
23832383 PyFloat_CheckExact (lhs ) &&
@@ -2394,23 +2394,23 @@ float_long_guard(PyObject *lhs, PyObject *rhs)
23942394 Py_ssize_t rhs_val = _PyLong_CompactValue((PyLongObject *)rhs); \
23952395 return PyFloat_FromDouble(lhs_val OP rhs_val); \
23962396 }
2397- FLOAT_LONG_ACTION (float_long_add , + )
2398- FLOAT_LONG_ACTION (float_long_subtract , - )
2399- FLOAT_LONG_ACTION (float_long_multiply , * )
2400- FLOAT_LONG_ACTION (float_long_true_div , /)
2397+ FLOAT_LONG_ACTION (float_compactlong_add , + )
2398+ FLOAT_LONG_ACTION (float_compactlong_subtract , - )
2399+ FLOAT_LONG_ACTION (float_compactlong_multiply , * )
2400+ FLOAT_LONG_ACTION (float_compactlong_true_div , /)
24012401#undef FLOAT_LONG_ACTION
24022402
2403- static binaryopactionfunc float_long_actions [NB_OPARG_LAST + 1 ] = {
2404- [NB_ADD ] = float_long_add ,
2405- [NB_SUBTRACT ] = float_long_subtract ,
2406- [NB_TRUE_DIVIDE ] = float_long_true_div ,
2407- [NB_INPLACE_MULTIPLY ] = float_long_multiply ,
2403+ static binaryopactionfunc float_compactlong_actions [NB_OPARG_LAST + 1 ] = {
2404+ [NB_ADD ] = float_compactlong_add ,
2405+ [NB_SUBTRACT ] = float_compactlong_subtract ,
2406+ [NB_TRUE_DIVIDE ] = float_compactlong_true_div ,
2407+ [NB_INPLACE_MULTIPLY ] = float_compactlong_multiply ,
24082408};
24092409
24102410/* long-float */
24112411
24122412static int
2413- long_float_guard (PyObject * lhs , PyObject * rhs )
2413+ compactlong_float_guard (PyObject * lhs , PyObject * rhs )
24142414{
24152415 return (
24162416 PyFloat_CheckExact (rhs ) &&
@@ -2427,34 +2427,34 @@ long_float_guard(PyObject *lhs, PyObject *rhs)
24272427 Py_ssize_t lhs_val = _PyLong_CompactValue ((PyLongObject * )lhs ); \
24282428 return PyFloat_FromDouble (lhs_val OP rhs_val ); \
24292429 }
2430- LONG_FLOAT_ACTION (long_float_add , + )
2431- LONG_FLOAT_ACTION (long_float_subtract , - )
2432- LONG_FLOAT_ACTION (long_float_multiply , * )
2433- LONG_FLOAT_ACTION (long_float_true_div , /)
2430+ LONG_FLOAT_ACTION (compactlong_float_add , + )
2431+ LONG_FLOAT_ACTION (compactlong_float_subtract , - )
2432+ LONG_FLOAT_ACTION (compactlong_float_multiply , * )
2433+ LONG_FLOAT_ACTION (compactlong_float_true_div , /)
24342434#undef LONG_FLOAT_ACTION
24352435
2436- static binaryopactionfunc long_float_actions [NB_OPARG_LAST + 1 ] = {
2437- [NB_ADD ] = long_float_add ,
2438- [NB_SUBTRACT ] = long_float_subtract ,
2439- [NB_TRUE_DIVIDE ] = long_float_true_div ,
2440- [NB_INPLACE_MULTIPLY ] = long_float_multiply ,
2436+ static binaryopactionfunc compactlong_float_actions [NB_OPARG_LAST + 1 ] = {
2437+ [NB_ADD ] = compactlong_float_add ,
2438+ [NB_SUBTRACT ] = compactlong_float_subtract ,
2439+ [NB_TRUE_DIVIDE ] = compactlong_float_true_div ,
2440+ [NB_INPLACE_MULTIPLY ] = compactlong_float_multiply ,
24412441};
24422442
24432443static int
24442444binary_op_extended_specialization (PyObject * lhs , PyObject * rhs , int oparg ,
24452445 binaryopguardfunc * guard , binaryopactionfunc * action )
24462446{
2447- if (long_float_actions [oparg ]) {
2448- if (long_float_guard (lhs , rhs )) {
2449- * guard = long_float_guard ;
2450- * action = long_float_actions [oparg ];
2447+ if (compactlong_float_actions [oparg ]) {
2448+ if (compactlong_float_guard (lhs , rhs )) {
2449+ * guard = compactlong_float_guard ;
2450+ * action = compactlong_float_actions [oparg ];
24512451 return 1 ;
24522452 }
24532453 }
2454- if (float_long_actions [oparg ]) {
2455- if (float_long_guard (lhs , rhs )) {
2456- * guard = float_long_guard ;
2457- * action = float_long_actions [oparg ];
2454+ if (float_compactlong_actions [oparg ]) {
2455+ if (float_compactlong_guard (lhs , rhs )) {
2456+ * guard = float_compactlong_guard ;
2457+ * action = float_compactlong_actions [oparg ];
24582458 return 1 ;
24592459 }
24602460 }
0 commit comments