averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Browse Source
This commit is contained in:
Max Moiseev
2016-03-09 16:05:03 -08:00
parent 4da439d406 479d7929fd
commit 02006f20bc
144 changed files with 4538 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/GYBUnicodeDataUtils.py
View File

@@ -11,6 +11,7 @@
import codecs
import re
class UnicodeProperty(object):
"""Abstract base class for Unicode properties."""
@@ -34,6 +35,7 @@ class UnicodeProperty(object):
raise NotImplementedError(
"UnicodeProperty.get_numeric_value is not implemented.")
class GraphemeClusterBreakPropertyTable(UnicodeProperty):
"""Grapheme_Cluster_Break property."""
@@ -222,10 +224,12 @@ class UnicodeTrieGenerator(object):
return cp & ((1 << self.bmp_data_offset_bits) - 1)
def get_supp_first_level_index(self, cp):
return cp >> (self.supp_second_level_index_bits + self.supp_data_offset_bits)
return cp >> \
(self.supp_second_level_index_bits + self.supp_data_offset_bits)
def get_supp_second_level_index(self, cp):
return (cp >> self.supp_data_offset_bits) & ((1 << self.supp_second_level_index_bits) - 1)
return (cp >> self.supp_data_offset_bits) & \
((1 << self.supp_second_level_index_bits) - 1)
def get_supp_data_offset(self, cp):
return cp & ((1 << self.supp_data_offset_bits) - 1)
@@ -251,8 +255,8 @@ class UnicodeTrieGenerator(object):
# maximum Unicode code point value is not 2^21-1 (0x1fffff), it is
# 0x10ffff.
self.supp_first_level_index_max = \
0x10ffff >> (self.supp_second_level_index_bits +
self.supp_data_offset_bits)
0x10ffff >> \
(self.supp_second_level_index_bits + self.supp_data_offset_bits)
# A mapping from BMP first-level index to BMP data block index.
self.bmp_lookup = [i for i in range(0, 1 << self.bmp_first_level_index_bits)]
@@ -364,8 +368,7 @@ class UnicodeTrieGenerator(object):
self.supp_data.pop(j)
for k in range(0, len(self.supp_lookup2)):
self.supp_lookup2[k] = \
remap_indexes(self.supp_lookup2[k], old_idx=j,
new_idx=i)
remap_indexes(self.supp_lookup2[k], old_idx=j, new_idx=i)
else:
j += 1
i += 1
@@ -449,6 +452,7 @@ class UnicodeTrieGenerator(object):
self.supp_data_bytes_offset = len(self.trie_bytes)
self.trie_bytes += supp_data_bytes
def get_extended_grapheme_cluster_rules_matrix(grapheme_cluster_break_property_table):
any_value = \
grapheme_cluster_break_property_table.symbolic_values
@@ -497,8 +501,7 @@ def get_extended_grapheme_cluster_rules_matrix(grapheme_cluster_break_property_t
row = rules_matrix[first]
# Change strings into bits.
bits = [row[second] == 'no_boundary'
for second in any_value]
bits = [row[second] == 'no_boundary' for second in any_value]
# Pack bits into an integer.
packed = sum([bits[i] * pow(2, i) for i in range(0, len(bits))])
@@ -507,6 +510,7 @@ def get_extended_grapheme_cluster_rules_matrix(grapheme_cluster_break_property_t
return result
def get_grapheme_cluster_break_tests_as_utf8(grapheme_break_test_file_name):
def _convert_line(line):
# Strip comments.
@@ -558,6 +562,7 @@ def get_grapheme_cluster_break_tests_as_utf8(grapheme_break_test_file_name):
return result
def get_grapheme_cluster_break_tests_as_unicode_scalars(grapheme_break_test_file_name):
def _convert_line(line):
# Strip comments.