signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

ignore NSOrderedSet types

Browse Source
This commit is contained in:
Michael Kirk 2019-08-20 19:47:30 -06:00
parent c34fd8d935
commit 73b0f736c9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Scripts/sds_codegen/sds_generate.py
View File

@ -485,7 +485,12 @@ class ParsedProperty:
split1 = dict_match.group(2).strip()
split2 = dict_match.group(3).strip()
return '[' + self.convert_objc_class_to_swift(split1, unpack_nsnumber=False) + ': ' + self.convert_objc_class_to_swift(split2, unpack_nsnumber=False) + ']'
ordered_set_match = re.search(r'^NSOrderedSet<(.+)> \*$', objc_type)
if ordered_set_match is not None:
# swift has no primitive for ordered set, so we lose the element type
return 'NSOrderedSet'
swift_type = objc_type[:-len(' *')]
if '<' in swift_type or '{' in swift_type or '*' in swift_type: