Merge branch 'main' into add-format-level-2

python · nohlson · Jul 30, 2024 · Jul 30, 2024 · Jul 30, 2024 · Jul 30, 2024
commit b62d15560e41b4f16d6712ecfb13a1c90c3bcbb1
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -2863,30 +2863,65 @@
     case 'o': case 'u': case 'x': case 'X':
     {
         char buffer[MAX_INTMAX_CHARS];
+<<<<<<< HEAD
         const char *fmt = NULL;
         switch (*f) {
             case 'o': fmt = formats_o[sizemod]; break;
            case 'u': fmt = formats_u[sizemod]; break;
            case 'x': fmt = formats_x[sizemod]; break;
            case 'X': fmt = formats_X[sizemod]; break;
            default: fmt = formats[sizemod]; break;
        }
        int issigned = (*f == 'd' || *f == 'i');
        // Format strings for sprintf are selected from constant arrays of
        // constant strings, and the variable used to index into the arrays
        // is only assigned known constant values. Ignore warnings related
         // to the format string not being a string literal.
         _Py_COMP_DIAG_PUSH
         _Py_COMP_DIAG_IGNORE_FORMAT_NONLITERAL
+=======
+
+        // Fill buffer using sprinf, with one of many possible format
+        // strings, like "%llX" for `long long` in hexadecimal.
+        // The type/size is in `sizemod`; the format is in `*f`.
+
+        // Use macros with nested switches to keep the sprintf format strings
+        // as compile-time literals, avoiding warnings and maybe allowing
+        // optimizations.
+
+        // `SPRINT` macro does one sprintf
+        // Example usage: SPRINT("l", "X", unsigned long) expands to
+        // sprintf(buffer, "%" "l" "X", va_arg(*vargs, unsigned long))
+        #define SPRINT(SIZE_SPEC, FMT_CHAR, TYPE) \
+            sprintf(buffer, "%" SIZE_SPEC FMT_CHAR, va_arg(*vargs, TYPE))
+
+        // One inner switch to handle all format variants
+        #define DO_SPRINTS(SIZE_
A3D4
SPEC, SIGNED_TYPE, UNSIGNED_TYPE)             \
+            switch (*f) {                                                     \
+                case 'o': len = SPRINT(SIZE_SPEC, "o", UNSIGNED_TYPE); break; \
+                case 'u': len = SPRINT(SIZE_SPEC, "u", UNSIGNED_TYPE); break; \
+                case 'x': len = SPRINT(SIZE_SPEC, "x", UNSIGNED_TYPE); break; \
+                case 'X': len = SPRINT(SIZE_SPEC, "X", UNSIGNED_TYPE); break; \
+                default:  len = SPRINT(SIZE_SPEC, "d", SIGNED_TYPE); break;   \
+            }
+
+        // Outer switch to handle all the sizes/types
+>>>>>>> main
         switch (sizemod) {
             case F_LONG:     DO_SPRINTS("l", long, unsigned long); break;
             case F_LONGLONG: DO_SPRINTS("ll", long long, unsigned long long); break;
            case F_SIZE:     DO_SPRINTS("z", Py_ssize_t, size_t); break;
            case F_PTRDIFF:  DO_SPRINTS("t", ptrdiff_t, ptrdiff_t); break;
             case F_INTMAX:   DO_SPRINTS("j", intmax_t, uintmax_t); break;
             default:         DO_SPRINTS("", int, unsigned int); break;
         }
+<<<<<<< HEAD
         _Py_COMP_DIAG_POP
+=======
+        #undef SPRINT
+        #undef DO_SPRINTS
+
+>>>>>>> main
         assert(len >= 0);
 
         int sign = (buffer[0] == '-');