Skip to content

Commit 5e36099

Browse files
committed
Add: Objc Generics
1 parent ef72a72 commit 5e36099

23 files changed

Lines changed: 758 additions & 487 deletions

src/compiler/objc_message_field.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,13 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
298298

299299
void RepeatedMessageFieldGenerator::GeneratePropertyHeader(io::Printer* printer) const {
300300

301-
printer->Print(variables_, "@property (readonly, strong) NSArray * $name$;\n");
301+
printer->Print(variables_, "@property (readonly, strong) NSArray<$storage_type$> * $name$;\n");
302302
}
303303

304304

305305
void RepeatedMessageFieldGenerator::GenerateExtensionSource(io::Printer* printer) const {
306306

307-
printer->Print(variables_,"@property (strong)$storage_attribute$ NSMutableArray * $list_name$;\n");
307+
printer->Print(variables_,"@property (strong)$storage_attribute$ NSMutableArray<$storage_type$> * $list_name$;\n");
308308
}
309309

310310

@@ -327,7 +327,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
327327
{
328328

329329
printer->Print(variables_,
330-
"- (NSArray *)$name$ {\n"
330+
"- (NSArray<$storage_type$> *)$name$ {\n"
331331
" return $list_name$;\n"
332332
"}\n"
333333
"- ($storage_type$)$name$AtIndex:(NSUInteger)index {\n"
@@ -342,10 +342,10 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
342342
//check if object array vs primitive array
343343
if(isObjectArray(descriptor_)){
344344
printer->Print(variables_,
345-
"- (NSMutableArray *)$name$;\n"
345+
"- (NSMutableArray<$storage_type$> *)$name$;\n"
346346
"- ($storage_type$)$name$AtIndex:(NSUInteger)index;\n"
347347
"- ($classname$Builder *)add$capitalized_name$:($storage_type$)value;\n"
348-
"- ($classname$Builder *)set$capitalized_name$Array:(NSArray *)array;\n"
348+
"- ($classname$Builder *)set$capitalized_name$Array:(NSArray<$storage_type$> *)array;\n"
349349
"- ($classname$Builder *)clear$capitalized_name$;\n");
350350
}else{
351351
printer->Print(variables_,
@@ -361,7 +361,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
361361

362362
void RepeatedMessageFieldGenerator::GenerateBuilderMembersSource(io::Printer* printer) const {
363363
printer->Print(variables_,
364-
"- (NSMutableArray *)$name$ {\n"
364+
"- (NSMutableArray<$storage_type$> *)$name$ {\n"
365365
" return result$classname_capitalized$.$list_name$;\n"
366366
"}\n"
367367
"- ($storage_type$)$name$AtIndex:(NSUInteger)index {\n"
@@ -374,7 +374,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
374374
" [result$classname_capitalized$.$list_name$ addObject:value];\n"
375375
" return self;\n"
376376
"}\n"
377-
"- ($classname$Builder *)set$capitalized_name$Array:(NSArray *)array {\n"
377+
"- ($classname$Builder *)set$capitalized_name$Array:(NSArray<$storage_type$> *)array {\n"
378378
" result$classname_capitalized$.$list_name$ = [[NSMutableArray alloc]initWithArray:array];\n"
379379
" return self;\n"
380380
"}\n"

src/runtime/Classes/Descriptor.pb.h

Lines changed: 66 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)