Support for deprecation annotations (Andrey Nigmatulin).

git-svn-id: https://protobuf-c.googlecode.com/svn/trunk@241 00440858-1255-0410-a3e6-75ea37f81c3a

ChangeLog

@@ -4,6 +4,8 @@
       - support for packed repeated fields (Dave Benson)
       - bug in dsk_dispatch_close_fd(), which usually only
         showed up in later function calls.
+      - support for deprecated fields -- enable a GCC warning
+        if a field has the "deprecated" option enabled. (Andrey Nigmatulin)
 
 0.13:
       - Fix for when the number of connections gets too great in RPC.

src/google/protobuf-c/protobuf-c.h

@@ -29,6 +29,12 @@
 # define PROTOBUF_C_END_DECLS
 #endif
 
+#if !defined(PROTOBUF_C_NO_DEPRECATED) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#define PROTOBUF_C_DEPRECATED __attribute__((__deprecated__))
+#else
+#define PROTOBUF_C_DEPRECATED
+#endif
+
 /* Define int32_t, int64_t, uint32_t, uint64_t, uint8_t.
 
    Usually, just include <inttypes.h> to do the work.

src/google/protobuf/compiler/c/c_bytes_field.cc

@@ -38,6 +38,7 @@ void SetBytesVariables(const FieldDescriptor* descriptor,
   (*variables)["name"] = FieldName(descriptor);
   (*variables)["default"] =
     "\"" + CEscape(descriptor->default_value_string()) + "\"";
+  (*variables)["deprecated"] = FieldDeprecated(descriptor);
 }
 
 // ===================================================================
@@ -57,15 +58,15 @@ void BytesFieldGenerator::GenerateStructMembers(io::Printer* printer) const
 {
   switch (descriptor_->label()) {
     case FieldDescriptor::LABEL_REQUIRED:
-      printer->Print(variables_, "ProtobufCBinaryData $name$;\n");
+      printer->Print(variables_, "ProtobufCBinaryData $name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_OPTIONAL:
-      printer->Print(variables_, "protobuf_c_boolean has_$name$;\n");
-      printer->Print(variables_, "ProtobufCBinaryData $name$;\n");
+      printer->Print(variables_, "protobuf_c_boolean has_$name$$deprecated$;\n");
+      printer->Print(variables_, "ProtobufCBinaryData $name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_REPEATED:
-      printer->Print(variables_, "size_t n_$name$;\n");
-      printer->Print(variables_, "ProtobufCBinaryData *$name$;\n");
+      printer->Print(variables_, "size_t n_$name$$deprecated$;\n");
+      printer->Print(variables_, "ProtobufCBinaryData *$name$$deprecated$;\n");
       break;
   }
 }

src/google/protobuf/compiler/c/c_enum_field.cc

@@ -45,6 +45,7 @@ void SetEnumVariables(const FieldDescriptor* descriptor,
 			    + "__" + ToUpper(default_value->name());
   } else
     (*variables)["default"] = "0";
+  (*variables)["deprecated"] = FieldDeprecated(descriptor);
 }
 
 // ===================================================================
@@ -62,15 +63,15 @@ void EnumFieldGenerator::GenerateStructMembers(io::Printer* printer) const
 {
   switch (descriptor_->label()) {
     case FieldDescriptor::LABEL_REQUIRED:
-      printer->Print(variables_, "$type$ $name$;\n");
+      printer->Print(variables_, "$type$ $name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_OPTIONAL:
-      printer->Print(variables_, "protobuf_c_boolean has_$name$;\n");
-      printer->Print(variables_, "$type$ $name$;\n");
+      printer->Print(variables_, "protobuf_c_boolean has_$name$$deprecated$;\n");
+      printer->Print(variables_, "$type$ $name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_REPEATED:
-      printer->Print(variables_, "size_t n_$name$;\n");
-      printer->Print(variables_, "$type$ *$name$;\n");
+      printer->Print(variables_, "size_t n_$name$$deprecated$;\n");
+      printer->Print(variables_, "$type$ *$name$$deprecated$;\n");
       break;
   }
 }

src/google/protobuf/compiler/c/c_file.cc

@@ -181,6 +181,11 @@ void FileGenerator::GenerateSource(io::Printer* printer) {
   printer->Print(
     "/* Generated by the protocol buffer compiler.  DO NOT EDIT! */\n"
     "\n"
+    "/* Do not generate deprecated warnings for self */\n"
+    "#ifndef PROTOBUF_C_NO_DEPRECATED\n"
+    "#define PROTOBUF_C_NO_DEPRECATED\n"
+    "#endif\n"
+    "\n"
     "#include \"$basename$.pb-c.h\"\n",
     "basename", StripProto(file_->name()));
 

src/google/protobuf/compiler/c/c_helpers.cc

@@ -238,6 +238,13 @@ string FieldName(const FieldDescriptor* field) {
   return result;
 }
 
+string FieldDeprecated(const FieldDescriptor* field) {
+  if (field->options().deprecated()) {
+    return " PROTOBUF_C_DEPRECATED";
+  }
+  return "";
+}
+
 string StripProto(const string& filename) {
   if (HasSuffixString(filename, ".protodevel")) {
     return StripSuffixString(filename, ".protodevel");

src/google/protobuf/compiler/c/c_helpers.h

@@ -26,6 +26,7 @@
 #include <string>
 #include <vector>
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/printer.h>
 
 namespace google {
@@ -62,6 +63,9 @@ char* FastHexToBuffer(int i, char* buffer);
 // anyway, so normally this just returns field->name().
 string FieldName(const FieldDescriptor* field);
 
+// Get macro string for deprecated field
+string FieldDeprecated(const FieldDescriptor* field);
+
 // Returns the scope where the field was defined (for extensions, this is
 // different from the message type to which the field applies).
 inline const Descriptor* FieldScope(const FieldDescriptor* field) {

src/google/protobuf/compiler/c/c_message_field.cc

@@ -46,14 +46,15 @@ void MessageFieldGenerator::GenerateStructMembers(io::Printer* printer) const
   map<string, string> vars;
   vars["name"] = FieldName(descriptor_);
   vars["type"] = FullNameToC(descriptor_->message_type()->full_name());
+  vars["deprecated"] = FieldDeprecated(descriptor_);
   switch (descriptor_->label()) {
     case FieldDescriptor::LABEL_REQUIRED:
     case FieldDescriptor::LABEL_OPTIONAL:
-      printer->Print(vars, "$type$ *$name$;\n");
+      printer->Print(vars, "$type$ *$name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_REPEATED:
-      printer->Print(vars, "size_t n_$name$;\n");
-      printer->Print(vars, "$type$ **$name$;\n");
+      printer->Print(vars, "size_t n_$name$$deprecated$;\n");
+      printer->Print(vars, "$type$ **$name$$deprecated$;\n");
       break;
   }
 }

src/google/protobuf/compiler/c/c_primitive_field.cc

@@ -66,18 +66,19 @@ void PrimitiveFieldGenerator::GenerateStructMembers(io::Printer* printer) const
   }
   vars["c_type"] = c_type;
   vars["name"] = FieldName(descriptor_);
+  vars["deprecated"] = FieldDeprecated(descriptor_);
 
   switch (descriptor_->label()) {
     case FieldDescriptor::LABEL_REQUIRED:
-      printer->Print(vars, "$c_type$ $name$;\n");
+      printer->Print(vars, "$c_type$ $name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_OPTIONAL:
-      printer->Print(vars, "protobuf_c_boolean has_$name$;\n");
-      printer->Print(vars, "$c_type$ $name$;\n");
+      printer->Print(vars, "protobuf_c_boolean has_$name$$deprecated$;\n");
+      printer->Print(vars, "$c_type$ $name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_REPEATED:
-      printer->Print(vars, "size_t n_$name$;\n");
-      printer->Print(vars, "$c_type$ *$name$;\n");
+      printer->Print(vars, "size_t n_$name$$deprecated$;\n");
+      printer->Print(vars, "$c_type$ *$name$$deprecated$;\n");
       break;
   }
 }

src/google/protobuf/compiler/c/c_string_field.cc

@@ -38,6 +38,7 @@ void SetStringVariables(const FieldDescriptor* descriptor,
   (*variables)["name"] = FieldName(descriptor);
   (*variables)["default"] = FullNameToLower(descriptor->full_name())
 	+ "__default_value";
+  (*variables)["deprecated"] = FieldDeprecated(descriptor);
 }
 
 // ===================================================================
@@ -55,11 +56,11 @@ void StringFieldGenerator::GenerateStructMembers(io::Printer* printer) const
   switch (descriptor_->label()) {
     case FieldDescriptor::LABEL_REQUIRED:
     case FieldDescriptor::LABEL_OPTIONAL:
-      printer->Print(variables_, "char *$name$;\n");
+      printer->Print(variables_, "char *$name$$deprecated$;\n");
       break;
     case FieldDescriptor::LABEL_REPEATED:
-      printer->Print(variables_, "size_t n_$name$;\n");
-      printer->Print(variables_, "char **$name$;\n");
+      printer->Print(variables_, "size_t n_$name$$deprecated$;\n");
+      printer->Print(variables_, "char **$name$$deprecated$;\n");
       break;
   }
 }