[Python-checkins] bpo-36642: make unicodedata const (GH-12855)

Inada Naoki webhook-mailer at python.org
Tue Apr 16 19:40:37 EDT 2019 

https://github.com/python/cpython/commit/6fec905de5c139017f36b212e54cac46959808fe
commit: 6fec905de5c139017f36b212e54cac46959808fe
branch: master
author: Inada Naoki <songofacandy at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-04-17T08:40:34+09:00
summary:

bpo-36642: make unicodedata const (GH-12855)

files:
M Modules/unicodedata.c
M Modules/unicodedata_db.h
M Modules/unicodename_db.h
M Objects/unicodetype_db.h
M Tools/unicode/makeunicodedata.py

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 9ceab1b3db4f..7fdbf332ee74 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -1029,7 +1029,7 @@ _getucname(PyObject *self, Py_UCS4 code, char* buffer, int buflen,
     int offset;
     int i;
     int word;
-    unsigned char* w;
+    const unsigned char* w;
 
     if (code >= 0x110000)
         return 0;
diff --git a/Modules/unicodedata_db.h b/Modules/unicodedata_db.h
index 11c7dc87244a..66f81e311e29 100644
--- a/Modules/unicodedata_db.h
+++ b/Modules/unicodedata_db.h
@@ -699,7 +699,7 @@ static const char *decomp_prefix[] = {
 };
 /* index tables for the database records */
 #define SHIFT 7
-static unsigned short index1[] = {
+static const unsigned short index1[] = {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
     21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
     39, 40, 41, 41, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
@@ -1322,7 +1322,7 @@ static unsigned short index1[] = {
     121, 260,
 };
 
-static unsigned short index2[] = {
+static const unsigned short index2[] = {
     1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 2, 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 3, 3, 3, 2, 5, 6, 6, 7, 8, 7, 6, 6, 9, 10, 6, 11, 12, 13, 12,
     12, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 12, 6, 15, 16, 15, 6, 6, 17,
@@ -3260,7 +3260,7 @@ static unsigned short index2[] = {
 };
 
 /* decomposition data */
-static unsigned int decomp_data[] = {
+static const unsigned int decomp_data[] = {
     0, 257, 32, 514, 32, 776, 259, 97, 514, 32, 772, 259, 50, 259, 51, 514,
     32, 769, 258, 956, 514, 32, 807, 259, 49, 259, 111, 772, 49, 8260, 52,
     772, 49, 8260, 50, 772, 51, 8260, 52, 512, 65, 768, 512, 65, 769, 512,
@@ -4328,7 +4328,7 @@ static unsigned int decomp_data[] = {
 
 /* index tables for the decomposition data */
 #define DECOMP_SHIFT 7
-static unsigned char decomp_index1[] = {
+static const unsigned char decomp_index1[] = {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 0, 0, 0, 0, 13, 14, 15, 0,
     16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 29, 30, 31, 32, 33, 34,
@@ -4695,7 +4695,7 @@ static unsigned char decomp_index1[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-static unsigned short decomp_index2[] = {
+static const unsigned short decomp_index2[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -5512,7 +5512,7 @@ static unsigned short decomp_index2[] = {
 
 /* NFC pairs */
 #define COMP_SHIFT 2
-static unsigned short comp_index[] = {
+static const unsigned short comp_index[] = {
     0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5,
     6, 7, 8, 9, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 12, 0, 13, 0, 0,
@@ -5772,7 +5772,7 @@ static unsigned short comp_index[] = {
     656,
 };
 
-static unsigned int comp_data[] = {
+static const unsigned int comp_data[] = {
     0, 0, 0, 0, 0, 0, 0, 8814, 0, 8800, 0, 0, 0, 0, 0, 8815, 0, 0, 192, 193,
     194, 195, 256, 258, 550, 196, 7842, 197, 0, 461, 512, 514, 0, 0, 0, 7840,
     0, 7680, 0, 0, 260, 0, 0, 0, 0, 0, 7682, 0, 0, 7684, 0, 0, 0, 0, 7686, 0,
@@ -5982,7 +5982,7 @@ static const change_record change_records_3_2_0[] = {
     { 255, 19, 255, 255, 255, -1 },
     { 1, 255, 255, 0, 255, 0 },
 };
-static unsigned char changes_3_2_0_index[] = {
+static const unsigned char changes_3_2_0_index[] = {
     0, 1, 2, 2, 3, 4, 5, 6, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
     19, 20, 21, 22, 23, 24, 25, 2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
     36, 37, 2, 2, 2, 38, 39, 2, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
@@ -6356,7 +6356,7 @@ static unsigned char changes_3_2_0_index[] = {
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 };
 
-static unsigned char changes_3_2_0_data[] = {
+static const unsigned char changes_3_2_0_data[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 2,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/Modules/unicodename_db.h b/Modules/unicodename_db.h
index 8fa87a02cd26..372616966aa4 100644
--- a/Modules/unicodename_db.h
+++ b/Modules/unicodename_db.h
@@ -3,7 +3,7 @@
 #define NAME_MAXLEN 256
 
 /* lexicon */
-static unsigned char lexicon[] = {
+static const unsigned char lexicon[] = {
     76, 69, 84, 84, 69, 210, 83, 73, 71, 206, 87, 73, 84, 200, 83, 77, 65,
     76, 204, 83, 89, 76, 76, 65, 66, 76, 197, 67, 65, 80, 73, 84, 65, 204,
     72, 73, 69, 82, 79, 71, 76, 89, 80, 200, 76, 65, 84, 73, 206, 65, 82, 65,
@@ -6442,7 +6442,7 @@ static unsigned char lexicon[] = {
     45, 68, 90, 85, 196, 45, 67, 72, 65, 210, 45, 67, 72, 65, 76, 128,
 };
 
-static unsigned int lexicon_offset[] = {
+static const unsigned int lexicon_offset[] = {
     0, 0, 6, 10, 14, 19, 27, 34, 44, 49, 55, 64, 66, 69, 81, 89, 102, 108,
     113, 118, 124, 129, 137, 146, 157, 162, 167, 170, 174, 183, 189, 195,
     201, 206, 214, 221, 229, 171, 232, 241, 242, 250, 256, 261, 266, 273,
@@ -8012,7 +8012,7 @@ static unsigned int lexicon_offset[] = {
 /* code->name phrasebook */
 #define phrasebook_shift 7
 #define phrasebook_short 194
-static unsigned char phrasebook[] = {
+static const unsigned char phrasebook[] = {
     0, 205, 148, 236, 89, 78, 211, 61, 78, 31, 55, 239, 9, 55, 213, 44, 55,
     251, 110, 251, 29, 50, 213, 139, 53, 213, 139, 250, 178, 98, 55, 244,
     158, 231, 5, 234, 216, 204, 226, 205, 177, 17, 195, 79, 17, 100, 17, 102,
@@ -19073,7 +19073,7 @@ static unsigned char phrasebook[] = {
     73, 241, 124, 152, 154,
 };
 
-static unsigned short phrasebook_offset1[] = {
+static const unsigned short phrasebook_offset1[] = {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
     21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
     39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
@@ -19696,7 +19696,7 @@ static unsigned short phrasebook_offset1[] = {
     104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
 };
 
-static unsigned int phrasebook_offset2[] = {
+static const unsigned int phrasebook_offset2[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 6, 9, 11, 14, 17, 19, 21, 24, 27, 29, 31,
     33, 35, 39, 41, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 69, 72,
@@ -23496,7 +23496,7 @@ static unsigned int phrasebook_offset2[] = {
 };
 
 /* name->code dictionary */
-static unsigned int code_hash[] = {
+static const unsigned int code_hash[] = {
     74224, 4851, 0, 0, 0, 0, 7929, 0, 0, 0, 0, 127931, 0, 42833, 983091,
     12064, 0, 129548, 194597, 69850, 65842, 0, 0, 0, 78159, 68476, 72392,
     1373, 0, 0, 5816, 0, 0, 4231, 0, 0, 4233, 4234, 4232, 68885, 70351, 0,
diff --git a/Objects/unicodetype_db.h b/Objects/unicodetype_db.h
index e64b5059342a..957bd4c62126 100644
--- a/Objects/unicodetype_db.h
+++ b/Objects/unicodetype_db.h
@@ -1750,7 +1750,7 @@ const Py_UCS4 _PyUnicode_ExtendedCase[] = {
 
 /* type indexes */
 #define SHIFT 7
-static unsigned short index1[] = {
+static const unsigned short index1[] = {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
     21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 34, 35, 36, 37,
     38, 39, 34, 34, 34, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
@@ -2359,7 +2359,7 @@ static unsigned short index1[] = {
     126, 126, 126, 126, 126, 126, 126, 269,
 };
 
-static unsigned short index2[] = {
+static const unsigned short index2[] = {
     1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 3, 3, 3, 2, 4, 5, 5, 5, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 6, 5,
     7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 6, 5, 5, 5, 5, 5, 5, 17, 17, 17, 17,
diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py
index 9327693a1732..2550b8f940c2 100644
--- a/Tools/unicode/makeunicodedata.py
+++ b/Tools/unicode/makeunicodedata.py
@@ -1249,7 +1249,7 @@ def dump(self, file, trace=0):
         size = getsize(self.data)
         if trace:
             print(self.name+":", size*len(self.data), "bytes", file=sys.stderr)
-        file.write("static ")
+        file.write("static const ")
         if size == 1:
             file.write("unsigned char")
         elif size == 2:

More information about the Python-checkins mailing list