First pass at the mutable API. Quite a bit more to do - in particular, it's pretty slow right now.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/google/protobuf/compiler/csharp/csharp_message_field.cc b/src/google/protobuf/compiler/csharp/csharp_message_field.cc
index 90aa201b..4b7ac88f 100644
--- a/src/google/protobuf/compiler/csharp/csharp_message_field.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_message_field.cc
@@ -49,8 +49,8 @@ namespace csharp {
 MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor,
                                              int fieldOrdinal)
     : FieldGeneratorBase(descriptor, fieldOrdinal) {
-  variables_["has_property_check"] = property_name() + "_ != null";
-  variables_["has_not_property_check"] = property_name() + "_ == null";
+  variables_["has_property_check"] = name() + "_ != null";
+  variables_["has_not_property_check"] = name() + "_ == null";
 }
 
 MessageFieldGenerator::~MessageFieldGenerator() {
@@ -66,7 +66,7 @@ void MessageFieldGenerator::GenerateMembers(io::Printer* printer) {
     variables_,
     "public $type_name$ $property_name$ {\n"
     "  get { return $name$_; }\n"
-    "  set { return $name$_ = value; }\n"
+    "  set { $name$_ = value; }\n"
     "}\n");
 }
 
@@ -74,17 +74,17 @@ void MessageFieldGenerator::GenerateMergingCode(io::Printer* printer) {
   printer->Print(
     variables_,
     "if (other.$has_property_check$) {\n"
-    "  if ($has_not_property_check) {\n"
+    "  if ($has_not_property_check$) {\n"
     "    $name$_ = new $type_name$();\n"
     "  }\n"
-    "  $property_name$.MergeWith(other.$property_name);\n"
+    "  $property_name$.MergeFrom(other.$property_name$);\n"
     "}\n");
 }
 
 void MessageFieldGenerator::GenerateParsingCode(io::Printer* printer) {
   printer->Print(
     variables_,
-    "if ($has_not_property_check) {\n"
+    "if ($has_not_property_check$) {\n"
     "  $name$_ = new $type_name$();\n"
     "}\n"
     "input.ReadMessage($name$_);\n"); // No need to support TYPE_GROUP...
@@ -110,12 +110,12 @@ void MessageFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
 void MessageFieldGenerator::WriteHash(io::Printer* printer) {
   printer->Print(
     variables_,
-    "if ($has_property_check$) hash ^= $name$_.GetHashCode();\n");
+    "if ($has_property_check$) hash ^= $property_name$.GetHashCode();\n");
 }
 void MessageFieldGenerator::WriteEquals(io::Printer* printer) {
   printer->Print(
     variables_,
-    "if (!object.Equals($property_name$_, other.$property_name$_)) return false;\n");
+    "if (!object.Equals($property_name$, other.$property_name$)) return false;");
 }
 void MessageFieldGenerator::WriteToString(io::Printer* printer) {
   variables_["field_name"] = GetFieldName(descriptor_);
@@ -140,10 +140,10 @@ void MessageOneofFieldGenerator::GenerateMembers(io::Printer* printer) {
     variables_,
     "public $type_name$ $property_name$ {\n"
     "  get { return $has_property_check$ ? ($type_name$) $oneof_name$_ : null; }\n"
-    "  set { \n"
-    "    $name$_ = value;"
-    "    $oneof_name$Case_ = value == null ? $oneof_property_name$Case.None : $oneof_property_name$Case.$property_name$; }\n"
-    "  } \n"
+    "  set {\n"
+    "    $oneof_name$_ = value;\n"
+    "    $oneof_name$Case_ = value == null ? $oneof_property_name$OneofCase.None : $oneof_property_name$OneofCase.$property_name$;\n"
+    "  }\n"
     "}\n");
 }
 
@@ -151,12 +151,12 @@ void MessageOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
   // TODO(jonskeet): We may be able to do better than this
   printer->Print(
     variables_,
-    "$type_name$ subBuilder = new type_name$();\n"
+    "$type_name$ subBuilder = new $type_name$();\n"
     "if ($has_property_check$) {\n"
-    "  subBuilder.MergeWith($property_name$);\n"
+    "  subBuilder.MergeFrom($property_name$);\n"
     "}\n"
     "input.ReadMessage(subBuilder);\n" // No support of TYPE_GROUP
-    "$oneof_property_name$ = subBuilder;\n");
+    "$property_name$ = subBuilder;\n");
 }
 
 void MessageOneofFieldGenerator::WriteToString(io::Printer* printer) {