From 39aaf21d5194fdc07c296847def8e7795279e041 Mon Sep 17 00:00:00 2001
From: Jon Skeet <skeet@pobox.com>
Date: Thu, 11 Jun 2015 21:15:36 +0100
Subject: Reimplement enums as int values, and get rid of EnumHelper. This
 makes repeated fields really awkward at the moment - but when we reimplement
 RepeatedField<T> to be backed by an array, we can cast the array directly...

---
 src/google/protobuf/compiler/csharp/csharp_enum.cc        |  2 +-
 src/google/protobuf/compiler/csharp/csharp_enum_field.cc  | 15 +++++++++------
 .../compiler/csharp/csharp_repeated_enum_field.cc         |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/google')

diff --git a/src/google/protobuf/compiler/csharp/csharp_enum.cc b/src/google/protobuf/compiler/csharp/csharp_enum.cc
index d511bba3..0e8f9836 100644
--- a/src/google/protobuf/compiler/csharp/csharp_enum.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_enum.cc
@@ -58,7 +58,7 @@ EnumGenerator::~EnumGenerator() {
 
 void EnumGenerator::Generate(io::Printer* printer) {
   WriteGeneratedCodeAttributes(printer);
-  printer->Print("$access_level$ enum $name$ : long {\n",
+  printer->Print("$access_level$ enum $name$ {\n",
                  "access_level", class_access_level(),
                  "name", descriptor_->name());
   printer->Indent();
diff --git a/src/google/protobuf/compiler/csharp/csharp_enum_field.cc b/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
index ee9d6a1d..3494b228 100644
--- a/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
@@ -54,14 +54,17 @@ EnumFieldGenerator::~EnumFieldGenerator() {
 }
 
 void EnumFieldGenerator::GenerateParsingCode(io::Printer* printer) {
+  // TODO(jonskeet): Get rid of the temporary variable when we sanitize CodedInputStream not to use ref.
   printer->Print(variables_,
-    "input.ReadEnum(ref $name$_);\n");
+    "int tmp = 0;\n"
+    "input.ReadEnum(ref tmp);\n"
+    "$name$_ = ($type_name$) tmp;");
 }
 
 void EnumFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
   printer->Print(variables_,
     "if ($has_property_check$) {\n"
-    "  output.WriteEnum($number$, fieldNames[$field_ordinal$], $property_name$);\n"
+    "  output.WriteEnum($number$, fieldNames[$field_ordinal$], (int) $property_name$);\n"
     "}\n");
 }
 
@@ -69,7 +72,7 @@ void EnumFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
   printer->Print(
     variables_,
     "if ($has_property_check$) {\n"
-    "  size += pb::CodedOutputStream.ComputeEnumSize($number$, $property_name$);\n"
+      "  size += pb::CodedOutputStream.ComputeEnumSize($number$, (int) $property_name$);\n"
     "}\n");
 }
 
@@ -85,7 +88,7 @@ void EnumOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
   // TODO(jonskeet): What about if we read the default value?
   printer->Print(
     variables_,
-    "$type_name$ enumValue = $default_value$;\n"
+    "int enumValue = 0;\n"
     "if(input.ReadEnum(ref enumValue)) {\n"
     "  $oneof_name$_ = enumValue;\n"
     "  $oneof_name$Case_ = $oneof_property_name$OneofCase.$property_name$;\n"
@@ -96,7 +99,7 @@ void EnumOneofFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
   printer->Print(
     variables_,
     "if ($has_property_check$) {\n"
-    "  output.WriteEnum($number$, fieldNames[$field_ordinal$], (long) $property_name$, $property_name$);\n"
+    "  output.WriteEnum($number$, fieldNames[$field_ordinal$], (int) $property_name$);\n"
     "}\n");
 }
 
@@ -104,7 +107,7 @@ void EnumOneofFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
   printer->Print(
     variables_,
     "if ($has_property_check$) {\n"
-    "  size += pb::CodedOutputStream.ComputeEnumSize($number$, (long) $property_name$);\n"
+    "  size += pb::CodedOutputStream.ComputeEnumSize($number$, (int) $property_name$);\n"
     "}\n");
 }
 
diff --git a/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc b/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
index ebbbf3be..937d675a 100644
--- a/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
@@ -99,7 +99,7 @@ void RepeatedEnumFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer
   printer->Print(
     variables_,
     "foreach ($type_name$ element in $name$_) {\n"
-    "  dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag(element);\n"
+    "  dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element);\n"
     "}\n"
     "size += dataSize;\n");
   int tagSize = internal::WireFormat::TagSize(descriptor_->number(), descriptor_->type());
-- 
cgit v1.2.3