gh-121249: adjust formatting codes for complex types in struct/ctypes… · python/cpython@85f89cb

GitHub

@@ -764,9 +764,9 @@ d_get(void *ptr, Py_ssize_t size)

764764}

765765766766#if defined(Py_HAVE_C_COMPLEX) && defined(Py_FFI_SUPPORT_C_COMPLEX)

767-/* C: double complex */

767+/* D: double complex */

768768staticPyObject*

769-C_set(void*ptr, PyObject*value, Py_ssize_tsize)

769+D_set(void*ptr, PyObject*value, Py_ssize_tsize)

770770{

771771assert(NUM_BITS(size) || (size==sizeof(doublecomplex)));

772772Py_complexc=PyComplex_AsCComplex(value);

@@ -780,7 +780,7 @@ C_set(void *ptr, PyObject *value, Py_ssize_t size)

780780}

781781782782staticPyObject*

783-C_get(void*ptr, Py_ssize_tsize)

783+D_get(void*ptr, Py_ssize_tsize)

784784{

785785assert(NUM_BITS(size) || (size==sizeof(doublecomplex)));

786786doublecomplexx;

@@ -789,9 +789,9 @@ C_get(void *ptr, Py_ssize_t size)

789789returnPyComplex_FromDoubles(creal(x), cimag(x));

790790}

791791792-/* E: float complex */

792+/* F: float complex */

793793staticPyObject*

794-E_set(void*ptr, PyObject*value, Py_ssize_tsize)

794+F_set(void*ptr, PyObject*value, Py_ssize_tsize)

795795{

796796assert(NUM_BITS(size) || (size==sizeof(floatcomplex)));

797797Py_complexc=PyComplex_AsCComplex(value);

@@ -805,7 +805,7 @@ E_set(void *ptr, PyObject *value, Py_ssize_t size)

805805}

806806807807staticPyObject*

808-E_get(void*ptr, Py_ssize_tsize)

808+F_get(void*ptr, Py_ssize_tsize)

809809{

810810assert(NUM_BITS(size) || (size==sizeof(floatcomplex)));

811811floatcomplexx;

@@ -814,9 +814,9 @@ E_get(void *ptr, Py_ssize_t size)

814814returnPyComplex_FromDoubles(crealf(x), cimagf(x));

815815}

816816817-/* F: long double complex */

817+/* G: long double complex */

818818staticPyObject*

819-F_set(void*ptr, PyObject*value, Py_ssize_tsize)

819+G_set(void*ptr, PyObject*value, Py_ssize_tsize)

820820{

821821assert(NUM_BITS(size) || (size==sizeof(long doublecomplex)));

822822Py_complexc=PyComplex_AsCComplex(value);

@@ -830,7 +830,7 @@ F_set(void *ptr, PyObject *value, Py_ssize_t size)

830830}

831831832832staticPyObject*

833-F_get(void*ptr, Py_ssize_tsize)

833+G_get(void*ptr, Py_ssize_tsize)

834834{

835835assert(NUM_BITS(size) || (size==sizeof(long doublecomplex)));

836836long doublecomplexx;

@@ -1372,7 +1372,7 @@ struct formattable {

13721372for nbytes in 8, 16, 32, 64:

13731373 for sgn in 'i', 'u':

13741374 print(f' struct fielddesc fmt_{sgn}{nbytes};')

1375-for code in 'sbBcdCEFgfhHiIlLqQPzuUZXvO':

1375+for code in 'sbBcdFDGgfhHiIlLqQPzuUZXvO':

13761376 print(f' struct fielddesc fmt_{code};')

13771377[python start generated code]*/

13781378structfielddescfmt_i8;

@@ -1388,9 +1388,9 @@ for code in 'sbBcdCEFgfhHiIlLqQPzuUZXvO':

13881388structfielddescfmt_B;

13891389structfielddescfmt_c;

13901390structfielddescfmt_d;

1391-structfielddescfmt_C;

1392-structfielddescfmt_E;

13931391structfielddescfmt_F;

1392+structfielddescfmt_D;

1393+structfielddescfmt_G;

13941394structfielddescfmt_g;

13951395structfielddescfmt_f;

13961396structfielddescfmt_h;

@@ -1409,7 +1409,7 @@ for code in 'sbBcdCEFgfhHiIlLqQPzuUZXvO':

14091409structfielddescfmt_X;

14101410structfielddescfmt_v;

14111411structfielddescfmt_O;

1412-/*[python end generated code: output=fa648744ec7f919d input=087d58357d4bf2c5]*/

1412+/*[python end generated code: output=f5a07c066fedaca6 input=ffa5d46c29dfb07a]*/

1413141314141414// bool has code '?':

14151415structfielddescfmt_bool;

@@ -1598,9 +1598,9 @@ for base_code, base_c_type in [

15981598TABLE_ENTRY_SW(d, &ffi_type_double);

15991599#if defined(Py_HAVE_C_COMPLEX) && defined(Py_FFI_SUPPORT_C_COMPLEX)

16001600if (Py_FFI_COMPLEX_AVAILABLE) {

1601-TABLE_ENTRY(C, &ffi_type_complex_double);

1602-TABLE_ENTRY(E, &ffi_type_complex_float);

1603-TABLE_ENTRY(F, &ffi_type_complex_longdouble);

1601+TABLE_ENTRY(D, &ffi_type_complex_double);

1602+TABLE_ENTRY(F, &ffi_type_complex_float);

1603+TABLE_ENTRY(G, &ffi_type_complex_longdouble);

16041604 }

16051605#endif

16061606TABLE_ENTRY(g, &ffi_type_longdouble);

@@ -1635,7 +1635,7 @@ for base_code, base_c_type in [

16351635formattable.fmt_bool.getfunc=bool_get;

1636163616371637/*[python input]

1638-all_chars = "cbBhHiIlLdCEFfuzZqQPXOv?g"

1638+all_chars = "cbBhHiIlLdDFGfuzZqQPXOv?g"

16391639print(f' assert(sizeof(formattable.simple_type_chars) == {len(all_chars)+1});')

16401640print(f' int i = 0;')

16411641for char in all_chars:

@@ -1656,9 +1656,9 @@ print(f" formattable.simple_type_chars[i] = 0;")

16561656if (formattable.fmt_l.code) formattable.simple_type_chars[i++] ='l';

16571657if (formattable.fmt_L.code) formattable.simple_type_chars[i++] ='L';

16581658if (formattable.fmt_d.code) formattable.simple_type_chars[i++] ='d';

1659-if (formattable.fmt_C.code) formattable.simple_type_chars[i++] ='C';

1660-if (formattable.fmt_E.code) formattable.simple_type_chars[i++] ='E';

1659+if (formattable.fmt_D.code) formattable.simple_type_chars[i++] ='D';

16611660if (formattable.fmt_F.code) formattable.simple_type_chars[i++] ='F';

1661+if (formattable.fmt_G.code) formattable.simple_type_chars[i++] ='G';

16621662if (formattable.fmt_f.code) formattable.simple_type_chars[i++] ='f';

16631663if (formattable.fmt_u.code) formattable.simple_type_chars[i++] ='u';

16641664if (formattable.fmt_z.code) formattable.simple_type_chars[i++] ='z';

@@ -1672,7 +1672,7 @@ print(f" formattable.simple_type_chars[i] = 0;")

16721672if (formattable.fmt_bool.code) formattable.simple_type_chars[i++] ='?';

16731673if (formattable.fmt_g.code) formattable.simple_type_chars[i++] ='g';

16741674formattable.simple_type_chars[i] =0;

1675-/*[python end generated code: output=e6e5098a02f4b606 input=72031a625eac00c1]*/

1675+/*[python end generated code: output=2aa52670d1570f18 input=cff3e7cb95adac61]*/

1676167616771677}

16781678#undef FIXINT_FIELDDESC_FOR

@@ -1689,17 +1689,17 @@ _ctypes_get_fielddesc(const char *fmt)

16891689structfielddesc*result=NULL;

16901690switch(fmt[0]) {

16911691/*[python input]

1692-for code in 'sbBcdCEFgfhHiIlLqQPzuUZXvO':

1692+for code in 'sbBcdDFGgfhHiIlLqQPzuUZXvO':

16931693 print(f" case '{code}': result = &formattable.fmt_{code}; break;")

16941694[python start generated code]*/

16951695case's': result=&formattable.fmt_s; break;

16961696case'b': result=&formattable.fmt_b; break;

16971697case'B': result=&formattable.fmt_B; break;

16981698case'c': result=&formattable.fmt_c; break;

16991699case'd': result=&formattable.fmt_d; break;

1700-case'C': result=&formattable.fmt_C; break;

1701-case'E': result=&formattable.fmt_E; break;

1700+case'D': result=&formattable.fmt_D; break;

17021701case'F': result=&formattable.fmt_F; break;

1702+case'G': result=&formattable.fmt_G; break;

17031703case'g': result=&formattable.fmt_g; break;

17041704case'f': result=&formattable.fmt_f; break;

17051705case'h': result=&formattable.fmt_h; break;

@@ -1718,7 +1718,7 @@ for code in 'sbBcdCEFgfhHiIlLqQPzuUZXvO':

17181718case'X': result=&formattable.fmt_X; break;

17191719case'v': result=&formattable.fmt_v; break;

17201720case'O': result=&formattable.fmt_O; break;

1721-/*[python end generated code: output=81a8223dda9f81f7 input=2f59666d3c024edf]*/

1721+/*[python end generated code: output=6e5c91940732fde9 input=902223feffc2fe38]*/

17221722case'?': result=&formattable.fmt_bool; break;

17231723 }

17241724if (!result|| !result->code) {