From 73b0f736c94c1cb300bc56f9032aff744fe1c7af Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 20 Aug 2019 19:47:30 -0600 Subject: [PATCH] ignore NSOrderedSet types --- Scripts/sds_codegen/sds_generate.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Scripts/sds_codegen/sds_generate.py b/Scripts/sds_codegen/sds_generate.py index deb9c30939..a21a8f21b6 100755 --- a/Scripts/sds_codegen/sds_generate.py +++ b/Scripts/sds_codegen/sds_generate.py @@ -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: