@@ -11,17 +11,17 @@ extern "C" {
11
11
// The data structure & init here are inspired by Tools/build/deepfreeze.py.
12
12
13
13
// All field names generated by ASCII_STR() have a common prefix,
14
- // to help avoid collisions with keywords, etc.
14
+ // to help avoid collisions with keywords, macros, etc.
15
15
16
16
#define STRUCT_FOR_ASCII_STR (LITERAL ) \
17
17
struct { \
18
18
PyASCIIObject _ascii; \
19
19
uint8_t _data[sizeof(LITERAL)]; \
20
20
}
21
21
#define STRUCT_FOR_STR (NAME , LITERAL ) \
22
- STRUCT_FOR_ASCII_STR(LITERAL) _ ## NAME;
22
+ STRUCT_FOR_ASCII_STR(LITERAL) _py_ ## NAME;
23
23
#define STRUCT_FOR_ID (NAME ) \
24
- STRUCT_FOR_ASCII_STR(#NAME) _ ## NAME;
24
+ STRUCT_FOR_ASCII_STR(#NAME) _py_ ## NAME;
25
25
26
26
// XXX Order by frequency of use?
27
27
@@ -246,6 +246,7 @@ struct _Py_global_strings {
246
246
STRUCT_FOR_ID (_showwarnmsg )
247
247
STRUCT_FOR_ID (_shutdown )
248
248
STRUCT_FOR_ID (_slotnames )
249
+ STRUCT_FOR_ID (_strptime_datetime )
249
250
STRUCT_FOR_ID (_swappedbytes_ )
250
251
STRUCT_FOR_ID (_type_ )
251
252
STRUCT_FOR_ID (_uninitialized_submodules )
@@ -264,6 +265,7 @@ struct _Py_global_strings {
264
265
STRUCT_FOR_ID (argdefs )
265
266
STRUCT_FOR_ID (arguments )
266
267
STRUCT_FOR_ID (argv )
268
+ STRUCT_FOR_ID (as_integer_ratio )
267
269
STRUCT_FOR_ID (attribute )
268
270
STRUCT_FOR_ID (authorizer_callback )
269
271
STRUCT_FOR_ID (b )
@@ -403,6 +405,8 @@ struct _Py_global_strings {
403
405
STRUCT_FOR_ID (frequency )
404
406
STRUCT_FOR_ID (from_param )
405
407
STRUCT_FOR_ID (fromlist )
408
+ STRUCT_FOR_ID (fromtimestamp )
409
+ STRUCT_FOR_ID (fromutc )
406
410
STRUCT_FOR_ID (fset )
407
411
STRUCT_FOR_ID (func )
408
412
STRUCT_FOR_ID (future )
@@ -448,6 +452,7 @@ struct _Py_global_strings {
448
452
STRUCT_FOR_ID (intersection )
449
453
STRUCT_FOR_ID (isatty )
450
454
STRUCT_FOR_ID (isinstance )
455
+ STRUCT_FOR_ID (isoformat )
451
456
STRUCT_FOR_ID (isolation_level )
452
457
STRUCT_FOR_ID (istext )
453
458
STRUCT_FOR_ID (item )
@@ -636,6 +641,7 @@ struct _Py_global_strings {
636
641
STRUCT_FOR_ID (step )
637
642
STRUCT_FOR_ID (store_name )
638
643
STRUCT_FOR_ID (strategy )
644
+ STRUCT_FOR_ID (strftime )
639
645
STRUCT_FOR_ID (strict )
640
646
STRUCT_FOR_ID (strict_mode )
641
647
STRUCT_FOR_ID (string )
@@ -658,6 +664,7 @@ struct _Py_global_strings {
658
664
STRUCT_FOR_ID (throw )
659
665
STRUCT_FOR_ID (timeout )
660
666
STRUCT_FOR_ID (times )
667
+ STRUCT_FOR_ID (timetuple )
661
668
STRUCT_FOR_ID (top )
662
669
STRUCT_FOR_ID (trace_callback )
663
670
STRUCT_FOR_ID (traceback )
@@ -669,6 +676,7 @@ struct _Py_global_strings {
669
676
STRUCT_FOR_ID (txt )
670
677
STRUCT_FOR_ID (type )
671
678
STRUCT_FOR_ID (tz )
679
+ STRUCT_FOR_ID (tzname )
672
680
STRUCT_FOR_ID (uid )
673
681
STRUCT_FOR_ID (unlink )
674
682
STRUCT_FOR_ID (unraisablehook )
@@ -708,9 +716,9 @@ struct _Py_global_strings {
708
716
709
717
710
718
#define _Py_ID (NAME ) \
711
- (_Py_SINGLETON (strings .identifiers ._ ## NAME ._ascii .ob_base ))
719
+ (_Py_SINGLETON (strings .identifiers ._py_ ## NAME ._ascii .ob_base ))
712
720
#define _Py_STR (NAME ) \
713
- (_Py_SINGLETON (strings .literals ._ ## NAME ._ascii .ob_base ))
721
+ (_Py_SINGLETON (strings .literals ._py_ ## NAME ._ascii .ob_base ))
714
722
715
723
/* _Py_DECLARE_STR() should precede all uses of _Py_STR() in a function.
716
724
0 commit comments