Skip to content

Instantly share code, notes, and snippets.

@pdcgomes

pdcgomes/gist:7005463

Created October 16, 2013 10:01
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save pdcgomes/7005463 to your computer and use it in GitHub Desktop.
Save pdcgomes/7005463 to your computer and use it in GitHub Desktop.
Download ZIP
Small patch to prevent naming clashes when defining message fields named 'result'
Raw
gistfile1.darcspatch
From 0510e6ed2b9dd28d141f4daa539c2a3524747e15 Mon Sep 17 00:00:00 2001
From: Pedro Gomes <pdcgomes@gmail.com>
Date: Wed, 16 Oct 2013 10:44:12 +0100
Subject: [PATCH] [PATCH] because of potential clashes, the message builder
result holder property named 'result' has been renamed to
'__result'
---
src/compiler/objc_enum_field.cc | 34 +++++++++----------
src/compiler/objc_message.cc | 20 +++++------
src/compiler/objc_message_field.cc | 50 +++++++++++++--------------
src/compiler/objc_primitive_field.cc | 66 ++++++++++++++++++------------------
4 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/src/compiler/objc_enum_field.cc b/src/compiler/objc_enum_field.cc
index 9e675e0..4fefd61 100644
--- a/src/compiler/objc_enum_field.cc
+++ b/src/compiler/objc_enum_field.cc
@@ -123,19 +123,19 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void EnumFieldGenerator::GenerateBuilderMembersSource(io::Printer* printer) const {
printer->Print(variables_,
"- (BOOL) has$capitalized_name$ {\n"
- " return result.has$capitalized_name$;\n"
+ " return __result.has$capitalized_name$;\n"
"}\n"
"- ($type$) $name$ {\n"
- " return result.$name$;\n"
+ " return __result.$name$;\n"
"}\n"
"- ($classname$_Builder*) set$capitalized_name$:($type$) value {\n"
- " result.has$capitalized_name$ = YES;\n"
- " result.$name$ = value;\n"
+ " __result.has$capitalized_name$ = YES;\n"
+ " __result.$name$ = value;\n"
" return self;\n"
"}\n"
"- ($classname$_Builder*) clear$capitalized_name$ {\n"
- " result.has$capitalized_name$ = NO;\n"
- " result.$name$ = $default$;\n"
+ " __result.has$capitalized_name$ = NO;\n"
+ " __result.$name$ = $default$;\n"
" return self;\n"
"}\n");
}
@@ -335,28 +335,28 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void RepeatedEnumFieldGenerator::GenerateBuilderMembersSource(io::Printer* printer) const {
printer->Print(variables_,
"- (PBAppendableArray *)$name$ {\n"
- " return result.$list_name$;\n"
+ " return __result.$list_name$;\n"
"}\n"
"- ($type$)$name$AtIndex:(NSUInteger)index {\n"
- " return [result $name$AtIndex:index];\n"
+ " return [__result $name$AtIndex:index];\n"
"}\n"
"- ($classname$_Builder *)add$capitalized_name$:($type$)value {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithValueType:PBArrayValueTypeInt32];\n"
" }\n"
- " [result.$list_name$ addInt32:value];\n"
+ " [__result.$list_name$ addInt32:value];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)set$capitalized_name$Array:(NSArray *)array {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32];\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithArray:array valueType:PBArrayValueTypeInt32];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)set$capitalized_name$Values:(const $type$ *)values count:(NSUInteger)count {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32];\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithValues:values count:count valueType:PBArrayValueTypeInt32];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)clear$capitalized_name$ {\n"
- " result.$list_name$ = nil;\n"
+ " __result.$list_name$ = nil;\n"
" return self;\n"
"}\n");
}
@@ -364,10 +364,10 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void RepeatedEnumFieldGenerator::GenerateMergingCodeSource(io::Printer* printer) const {
printer->Print(variables_,
"if (other.$list_name$.count > 0) {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [other.$list_name$ copy];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [other.$list_name$ copy];\n"
" } else {\n"
- " [result.$list_name$ appendArray:other.$list_name$];\n"
+ " [__result.$list_name$ appendArray:other.$list_name$];\n"
" }\n"
"}\n");
}
diff --git a/src/compiler/objc_message.cc b/src/compiler/objc_message.cc
index 43af647..36cf750 100644
--- a/src/compiler/objc_message.cc
+++ b/src/compiler/objc_message.cc
@@ -466,7 +466,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
printer->Print(
"@private\n"
- " $classname$* result;\n"
+ " $classname$* __result;\n"
"}\n",
"classname", ClassName(descriptor_));
@@ -829,17 +829,17 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void MessageGenerator::GenerateBuilderSource(io::Printer* printer) {
printer->Print(
"@interface $classname$_Builder()\n"
- "@property (strong) $classname$* result;\n"
+ "@property (strong) $classname$* __result;\n"
"@end\n"
"\n"
"@implementation $classname$_Builder\n"
- "@synthesize result;\n",
+ "@synthesize __result;\n",
"classname", ClassName(descriptor_));
printer->Print(
"- (id) init {\n"
" if ((self = [super init])) {\n"
- " self.result = [[$classname$ alloc] init];\n"
+ " self.__result = [[$classname$ alloc] init];\n"
" }\n"
" return self;\n"
"}\n",
@@ -860,22 +860,22 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
if (descriptor_->extension_range_count() > 0) {
printer->Print(
"- (PBExtendableMessage*) internalGetResult {\n"
- " return result;\n"
+ " return __result;\n"
"}\n");
} else {
printer->Print(
"- (PBGeneratedMessage*) internalGetResult {\n"
- " return result;\n"
+ " return __result;\n"
"}\n");
}
printer->Print(
"- ($classname$_Builder*) clear {\n"
- " self.result = [[$classname$ alloc] init];\n"
+ " self.__result = [[$classname$ alloc] init];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder*) clone {\n"
- " return [$classname$ builderWithPrototype:result];\n"
+ " return [$classname$ builderWithPrototype:__result];\n"
"}\n"
"- ($classname$*) defaultInstance {\n"
" return [$classname$ defaultInstance];\n"
@@ -897,8 +897,8 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
printer->Outdent();
printer->Print(
- " $classname$* returnMe = result;\n"
- " self.result = nil;\n"
+ " $classname$* returnMe = __result;\n"
+ " self.__result = nil;\n"
" return returnMe;\n"
"}\n",
"classname", ClassName(descriptor_));
diff --git a/src/compiler/objc_message_field.cc b/src/compiler/objc_message_field.cc
index f860d3e..4f14fc1 100644
--- a/src/compiler/objc_message_field.cc
+++ b/src/compiler/objc_message_field.cc
@@ -125,33 +125,33 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void MessageFieldGenerator::GenerateBuilderMembersSource(io::Printer* printer) const {
printer->Print(variables_,
"- (BOOL) has$capitalized_name$ {\n"
- " return result.has$capitalized_name$;\n"
+ " return __result.has$capitalized_name$;\n"
"}\n"
"- ($storage_type$) $name$ {\n"
- " return result.$name$;\n"
+ " return __result.$name$;\n"
"}\n"
"- ($classname$_Builder*) set$capitalized_name$:($storage_type$) value {\n"
- " result.has$capitalized_name$ = YES;\n"
- " result.$name$ = value;\n"
+ " __result.has$capitalized_name$ = YES;\n"
+ " __result.$name$ = value;\n"
" return self;\n"
"}\n"
"- ($classname$_Builder*) set$capitalized_name$Builder:($type$_Builder*) builderForValue {\n"
" return [self set$capitalized_name$:[builderForValue build]];\n"
"}\n"
"- ($classname$_Builder*) merge$capitalized_name$:($storage_type$) value {\n"
- " if (result.has$capitalized_name$ &&\n"
- " result.$name$ != [$type$ defaultInstance]) {\n"
- " result.$name$ =\n"
- " [[[$type$ builderWithPrototype:result.$name$] mergeFrom:value] buildPartial];\n"
+ " if (__result.has$capitalized_name$ &&\n"
+ " __result.$name$ != [$type$ defaultInstance]) {\n"
+ " __result.$name$ =\n"
+ " [[[$type$ builderWithPrototype:__result.$name$] mergeFrom:value] buildPartial];\n"
" } else {\n"
- " result.$name$ = value;\n"
+ " __result.$name$ = value;\n"
" }\n"
- " result.has$capitalized_name$ = YES;\n"
+ " __result.has$capitalized_name$ = YES;\n"
" return self;\n"
"}\n"
"- ($classname$_Builder*) clear$capitalized_name$ {\n"
- " result.has$capitalized_name$ = NO;\n"
- " result.$name$ = [$type$ defaultInstance];\n"
+ " __result.has$capitalized_name$ = NO;\n"
+ " __result.$name$ = [$type$ defaultInstance];\n"
" return self;\n"
"}\n");
}
@@ -364,24 +364,24 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void RepeatedMessageFieldGenerator::GenerateBuilderMembersSource(io::Printer* printer) const {
printer->Print(variables_,
"- (NSMutableArray *)$name$ {\n"
- " return result.$list_name$;\n"
+ " return __result.$list_name$;\n"
"}\n"
"- ($storage_type$)$name$AtIndex:(NSUInteger)index {\n"
- " return [result $name$AtIndex:index];\n"
+ " return [__result $name$AtIndex:index];\n"
"}\n"
"- ($classname$_Builder *)add$capitalized_name$:($storage_type$)value {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [[NSMutableArray alloc]init];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [[NSMutableArray alloc]init];\n"
" }\n"
- " [result.$list_name$ addObject:value];\n"
+ " [__result.$list_name$ addObject:value];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)set$capitalized_name$Array:(NSArray *)array {\n"
- " result.$list_name$ = [[NSMutableArray alloc]init];\n"
+ " __result.$list_name$ = [[NSMutableArray alloc]init];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)clear$capitalized_name$ {\n"
- " result.$list_name$ = nil;\n"
+ " __result.$list_name$ = nil;\n"
" return self;\n"
"}\n");
}
@@ -412,19 +412,19 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
if(isObjectArray(descriptor_)){
printer->Print(variables_,
"if (other.$list_name$.count > 0) {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [[NSMutableArray alloc] initWithArray:other.$list_name$];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [[NSMutableArray alloc] initWithArray:other.$list_name$];\n"
" } else {\n"
- " [result.$list_name$ addObjectsFromArray:other.$list_name$];\n"
+ " [__result.$list_name$ addObjectsFromArray:other.$list_name$];\n"
" }\n"
"}\n");
}else{
printer->Print(variables_,
"if (other.$list_name$.count > 0) {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [other.$list_name$ copy];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [other.$list_name$ copy];\n"
" } else {\n"
- " [result.$list_name$ appendArray:other.$list_name$];\n"
+ " [__result.$list_name$ appendArray:other.$list_name$];\n"
" }\n"
"}\n");
diff --git a/src/compiler/objc_primitive_field.cc b/src/compiler/objc_primitive_field.cc
index c4a93b6..53860fe 100644
--- a/src/compiler/objc_primitive_field.cc
+++ b/src/compiler/objc_primitive_field.cc
@@ -339,19 +339,19 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
void PrimitiveFieldGenerator::GenerateBuilderMembersSource(io::Printer* printer) const {
printer->Print(variables_,
"- (BOOL) has$capitalized_name$ {\n"
- " return result.has$capitalized_name$;\n"
+ " return __result.has$capitalized_name$;\n"
"}\n"
"- ($storage_type$) $name$ {\n"
- " return result.$name$;\n"
+ " return __result.$name$;\n"
"}\n"
"- ($classname$_Builder*) set$capitalized_name$:($storage_type$) value {\n"
- " result.has$capitalized_name$ = YES;\n"
- " result.$name$ = value;\n"
+ " __result.has$capitalized_name$ = YES;\n"
+ " __result.$name$ = value;\n"
" return self;\n"
"}\n"
"- ($classname$_Builder*) clear$capitalized_name$ {\n"
- " result.has$capitalized_name$ = NO;\n"
- " result.$name$ = $default$;\n"
+ " __result.has$capitalized_name$ = NO;\n"
+ " __result.$name$ = $default$;\n"
" return self;\n"
"}\n");
}
@@ -527,51 +527,51 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
if(isObjectArray(descriptor_)){
printer->Print(variables_,
"- (NSMutableArray *)$name$ {\n"
- " return result.$list_name$;\n"
+ " return __result.$list_name$;\n"
"}\n"
"- ($storage_type$)$name$AtIndex:(NSUInteger)index {\n"
- " return [result $name$AtIndex:index];\n"
+ " return [__result $name$AtIndex:index];\n"
"}\n"
"- ($classname$_Builder *)add$capitalized_name$:($storage_type$)value {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [[NSMutableArray alloc]init];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [[NSMutableArray alloc]init];\n"
" }\n"
- " [result.$list_name$ addObject:value];\n"
+ " [__result.$list_name$ addObject:value];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)set$capitalized_name$Array:(NSArray *)array {\n"
- " result.$list_name$ = [[NSMutableArray alloc] initWithArray:array];\n"
+ " __result.$list_name$ = [[NSMutableArray alloc] initWithArray:array];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)clear$capitalized_name$ {\n"
- " result.$list_name$ = nil;\n"
+ " __result.$list_name$ = nil;\n"
" return self;\n"
"}\n");
}else{
printer->Print(variables_,
"- (PBAppendableArray *)$name$ {\n"
- " return result.$list_name$;\n"
+ " return __result.$list_name$;\n"
"}\n"
"- ($storage_type$)$name$AtIndex:(NSUInteger)index {\n"
- " return [result $name$AtIndex:index];\n"
+ " return [__result $name$AtIndex:index];\n"
"}\n"
"- ($classname$_Builder *)add$capitalized_name$:($storage_type$)value {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithValueType:$array_value_type$];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithValueType:$array_value_type$];\n"
" }\n"
- " [result.$list_name$ add$array_value_type_name_cap$:value];\n"
+ " [__result.$list_name$ add$array_value_type_name_cap$:value];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)set$capitalized_name$Array:(NSArray *)array {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithArray:array valueType:$array_value_type$];\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithArray:array valueType:$array_value_type$];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)set$capitalized_name$Values:(const $storage_type$ *)values count:(NSUInteger)count {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithValues:values count:count valueType:$array_value_type$];\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithValues:values count:count valueType:$array_value_type$];\n"
" return self;\n"
"}\n"
"- ($classname$_Builder *)clear$capitalized_name$ {\n"
- " result.$list_name$ = nil;\n"
+ " __result.$list_name$ = nil;\n"
" return self;\n"
"}\n");
}
@@ -582,19 +582,19 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
if(isObjectArray(descriptor_)){
printer->Print(variables_,
"if (other.$list_name$.count > 0) {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [[NSMutableArray alloc] initWithArray:other.$list_name$];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [[NSMutableArray alloc] initWithArray:other.$list_name$];\n"
" } else {\n"
- " [result.$list_name$ addObjectsFromArray:other.$list_name$];\n"
+ " [__result.$list_name$ addObjectsFromArray:other.$list_name$];\n"
" }\n"
"}\n");
}else{
printer->Print(variables_,
"if (other.$list_name$.count > 0) {\n"
- " if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [other.$list_name$ copy];\n"
+ " if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [other.$list_name$ copy];\n"
" } else {\n"
- " [result.$list_name$ appendArray:other.$list_name$];\n"
+ " [__result.$list_name$ appendArray:other.$list_name$];\n"
" }\n"
"}\n");
}
@@ -612,11 +612,11 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
printer->Print(variables_,
"int32_t length = [input readRawVarint32];\n"
"int32_t limit = [input pushLimit:length];\n"
- "if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [[NSMutableArray alloc]init];\n"
+ "if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [[NSMutableArray alloc]init];\n"
"}\n"
"while (input.bytesUntilLimit > 0) {\n"
- " [result.$list_name$ addObject:[input read$capitalized_type$]];\n"
+ " [__result.$list_name$ addObject:[input read$capitalized_type$]];\n"
"}\n"
"[input popLimit:limit];\n");
}
@@ -624,11 +624,11 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
printer->Print(variables_,
"int32_t length = [input readRawVarint32];\n"
"int32_t limit = [input pushLimit:length];\n"
- "if (result.$list_name$ == nil) {\n"
- " result.$list_name$ = [PBAppendableArray arrayWithValueType:$array_value_type$];\n"
+ "if (__result.$list_name$ == nil) {\n"
+ " __result.$list_name$ = [PBAppendableArray arrayWithValueType:$array_value_type$];\n"
"}\n"
"while (input.bytesUntilLimit > 0) {\n"
- " [result.$list_name$ add$array_value_type_name_cap$:[input read$capitalized_type$]];\n"
+ " [__result.$list_name$ add$array_value_type_name_cap$:[input read$capitalized_type$]];\n"
"}\n"
"[input popLimit:limit];\n");
}
--
1.7.11.1
@he15his
Copy link

he15his commented Jun 13, 2014

If I want to change the name of the class，which files i should change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment