Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/src/google/protobuf/compiler/parser.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 507 matching lines @@
   had_errors_ = false;
   syntax_identifier_.clear();
 
   // Note that |file| could be NULL at this point if
   // stop_after_syntax_identifier_ is true.  So, we conservatively allocate
   // SourceCodeInfo on the stack, then swap it into the FileDescriptorProto
   // later on.
   SourceCodeInfo source_code_info;
   source_code_info_ = &source_code_info;
 
+  vector<string> top_doc_comments;
   if (LookingAtType(io::Tokenizer::TYPE_START)) {
     // Advance to first token.
     input_->NextWithComments(NULL, &upcoming_detached_comments_,
                              &upcoming_doc_comments_);
   }
 
   {
     LocationRecorder root_location(this);
 
     if (require_syntax_identifier_ || LookingAt("syntax")) {
@@ skipping 25 matching lines @@
           AddError("Unmatched \"}\".");
           input_->NextWithComments(NULL, &upcoming_detached_comments_,
                                    &upcoming_doc_comments_);
         }
       }
     }
   }
 
   input_ = NULL;
   source_code_info_ = NULL;
-  assert(file != NULL);
   source_code_info.Swap(file->mutable_source_code_info());
   return !had_errors_;
 }
 
 bool Parser::ParseSyntaxIdentifier(const LocationRecorder& parent) {
   LocationRecorder syntax_location(parent,
                                    FileDescriptorProto::kSyntaxFieldNumber);
   DO(Consume(
       "syntax",
       "File must begin with a syntax statement, e.g. 'syntax = \"proto2\";'."));
@@ skipping 1039 matching lines @@
   }
 
   DO(ConsumeEndOfDeclaration("{", &oneof_location));
 
   do {
     if (AtEnd()) {
       AddError("Reached end of input in oneof definition (missing '}').");
       return false;
     }
 
-    if (LookingAt("option")) {
-      LocationRecorder option_location(
-          oneof_location, OneofDescriptorProto::kOptionsFieldNumber);
-      if (!ParseOption(oneof_decl->mutable_options(), option_location,
-                       containing_file, OPTION_STATEMENT)) {
-        return false;
-      }
-      continue;
-    }
-
     // Print a nice error if the user accidentally tries to place a label
     // on an individual member of a oneof.
     if (LookingAt("required") ||
         LookingAt("optional") ||
         LookingAt("repeated")) {
       AddError("Fields in oneofs must not have labels (required / optional "
                "/ repeated).");
       // We can continue parsing here because we understand what the user
       // meant.  The error report will still make parsing fail overall.
       input_->Next();
@@ skipping 457 matching lines @@
       std::make_pair(line, column);
 }
 
 void SourceLocationTable::Clear() {
   location_map_.clear();
 }
 
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google