Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 1 of 2.

1 files changed, 85 insertions, 85 deletions

diff --git a/contrib/libs/protoc/src/google/protobuf/compiler/parser.h b/contrib/libs/protoc/src/google/protobuf/compiler/parser.h
index ca42449a957..93f1f0ea13d 100644
--- a/contrib/libs/protoc/src/google/protobuf/compiler/parser.h
+++ b/contrib/libs/protoc/src/google/protobuf/compiler/parser.h
@@ -37,24 +37,24 @@
 #ifndef GOOGLE_PROTOBUF_COMPILER_PARSER_H__
 #define GOOGLE_PROTOBUF_COMPILER_PARSER_H__
 
-#include <cstdint>
+#include <cstdint> 
 #include <map>
-#include <string>
+#include <string> 
 #include <utility>
-
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/repeated_field.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
+ 
+#include <google/protobuf/descriptor.pb.h> 
+#include <google/protobuf/io/tokenizer.h> 
+#include <google/protobuf/descriptor.h> 
+#include <google/protobuf/repeated_field.h> 
+
+// Must be included last. 
+#include <google/protobuf/port_def.inc> 
+ 
 namespace google {
-namespace protobuf {
-
-class Message;
+namespace protobuf { 
 
+class Message; 
+ 
 namespace compiler {
 
 // Defined in this file.
@@ -68,7 +68,7 @@ class SourceLocationTable;
 // to a FileDescriptorProto.  It does not resolve import directives or perform
 // many other kinds of validation needed to construct a complete
 // FileDescriptor.
-class PROTOBUF_EXPORT Parser {
+class PROTOBUF_EXPORT Parser { 
  public:
   Parser();
   ~Parser();
@@ -98,7 +98,7 @@ class PROTOBUF_EXPORT Parser {
 
   // Returns the identifier used in the "syntax = " declaration, if one was
   // seen during the last call to Parse(), or the empty string otherwise.
-  const TProtoStringType& GetSyntaxIdentifier() { return syntax_identifier_; }
+  const TProtoStringType& GetSyntaxIdentifier() { return syntax_identifier_; } 
 
   // If set true, input files will be required to begin with a syntax
   // identifier.  Otherwise, files may omit this.  If a syntax identifier
@@ -168,20 +168,20 @@ class PROTOBUF_EXPORT Parser {
   // where "text" is the expected token text.
   bool Consume(const char* text);
   // Consume a token of type IDENTIFIER and store its text in "output".
-  bool ConsumeIdentifier(TProtoStringType* output, const char* error);
+  bool ConsumeIdentifier(TProtoStringType* output, const char* error); 
   // Consume an integer and store its value in "output".
   bool ConsumeInteger(int* output, const char* error);
   // Consume a signed integer and store its value in "output".
   bool ConsumeSignedInteger(int* output, const char* error);
   // Consume a 64-bit integer and store its value in "output".  If the value
   // is greater than max_value, an error will be reported.
-  bool ConsumeInteger64(uint64_t max_value, uint64_t* output,
-                        const char* error);
+  bool ConsumeInteger64(uint64_t max_value, uint64_t* output, 
+                        const char* error); 
   // Consume a number and store its value in "output".  This will accept
   // tokens of either INTEGER or FLOAT type.
   bool ConsumeNumber(double* output, const char* error);
   // Consume a string literal and store its (unescaped) value in "output".
-  bool ConsumeString(TProtoStringType* output, const char* error);
+  bool ConsumeString(TProtoStringType* output, const char* error); 
 
   // Consume a token representing the end of the statement.  Comments between
   // this token and the next will be harvested for documentation.  The given
@@ -192,34 +192,34 @@ class PROTOBUF_EXPORT Parser {
   //   have been passed around by const reference, for no particularly good
   //   reason.  We should probably go through and change them all to mutable
   //   pointer to make this more intuitive.
-  bool TryConsumeEndOfDeclaration(const char* text,
-                                  const LocationRecorder* location);
-  bool TryConsumeEndOfDeclarationFinishScope(const char* text,
-                                             const LocationRecorder* location);
+  bool TryConsumeEndOfDeclaration(const char* text, 
+                                  const LocationRecorder* location); 
+  bool TryConsumeEndOfDeclarationFinishScope(const char* text, 
+                                             const LocationRecorder* location); 
 
-  bool ConsumeEndOfDeclaration(const char* text,
-                               const LocationRecorder* location);
+  bool ConsumeEndOfDeclaration(const char* text, 
+                               const LocationRecorder* location); 
 
   // -----------------------------------------------------------------
   // Error logging helpers
 
   // Invokes error_collector_->AddError(), if error_collector_ is not NULL.
-  void AddError(int line, int column, const TProtoStringType& error);
+  void AddError(int line, int column, const TProtoStringType& error); 
 
   // Invokes error_collector_->AddError() with the line and column number
   // of the current token.
-  void AddError(const TProtoStringType& error);
-
-  // Invokes error_collector_->AddWarning() with the line and column number
-  // of the current token.
-  void AddWarning(const TProtoStringType& warning);
+  void AddError(const TProtoStringType& error); 
 
+  // Invokes error_collector_->AddWarning() with the line and column number 
+  // of the current token. 
+  void AddWarning(const TProtoStringType& warning); 
+ 
   // Records a location in the SourceCodeInfo.location table (see
   // descriptor.proto).  We use RAII to ensure that the start and end locations
   // are recorded -- the constructor records the start location and the
   // destructor records the end location.  Since the parser is
   // recursive-descent, this works out beautifully.
-  class PROTOBUF_EXPORT LocationRecorder {
+  class PROTOBUF_EXPORT LocationRecorder { 
    public:
     // Construct the file's "root" location.
     LocationRecorder(Parser* parser);
@@ -235,10 +235,10 @@ class PROTOBUF_EXPORT Parser {
     LocationRecorder(const LocationRecorder& parent, int path1);
     LocationRecorder(const LocationRecorder& parent, int path1, int path2);
 
-    // Creates a recorder that generates locations into given source code info.
-    LocationRecorder(const LocationRecorder& parent, int path1,
-                     SourceCodeInfo* source_code_info);
-
+    // Creates a recorder that generates locations into given source code info. 
+    LocationRecorder(const LocationRecorder& parent, int path1, 
+                     SourceCodeInfo* source_code_info); 
+ 
     ~LocationRecorder();
 
     // Add a path component.  See SourceCodeInfo.Location.path in
@@ -262,33 +262,33 @@ class PROTOBUF_EXPORT Parser {
     // was passed to RecordSourceLocationsTo(), if any.  SourceLocationTable
     // is an older way of keeping track of source locations which is still
     // used in some places.
-    void RecordLegacyLocation(
-        const Message* descriptor,
+    void RecordLegacyLocation( 
+        const Message* descriptor, 
         DescriptorPool::ErrorCollector::ErrorLocation location);
-    void RecordLegacyImportLocation(const Message* descriptor,
-                                    const TProtoStringType& name);
-
-    // Returns the number of path components in the recorder's current location.
-    int CurrentPathSize() const;
+    void RecordLegacyImportLocation(const Message* descriptor, 
+                                    const TProtoStringType& name); 
 
+    // Returns the number of path components in the recorder's current location. 
+    int CurrentPathSize() const; 
+ 
     // Attaches leading and trailing comments to the location.  The two strings
     // will be swapped into place, so after this is called *leading and
     // *trailing will be empty.
     //
     // TODO(kenton):  See comment on TryConsumeEndOfDeclaration(), above, for
     //   why this is const.
-    void AttachComments(TProtoStringType* leading, TProtoStringType* trailing,
-                        std::vector<TProtoStringType>* detached_comments) const;
+    void AttachComments(TProtoStringType* leading, TProtoStringType* trailing, 
+                        std::vector<TProtoStringType>* detached_comments) const; 
 
    private:
     // Indexes of parent and current location in the parent
     // SourceCodeInfo.location repeated field. For top-level elements,
     // parent_index_ is -1.
     Parser* parser_;
-    SourceCodeInfo* source_code_info_;
+    SourceCodeInfo* source_code_info_; 
     SourceCodeInfo::Location* location_;
 
-    void Init(const LocationRecorder& parent, SourceCodeInfo* source_code_info);
+    void Init(const LocationRecorder& parent, SourceCodeInfo* source_code_info); 
   };
 
   // =================================================================
@@ -326,9 +326,9 @@ class PROTOBUF_EXPORT Parser {
   bool ParsePackage(FileDescriptorProto* file,
                     const LocationRecorder& root_location,
                     const FileDescriptorProto* containing_file);
-  bool ParseImport(RepeatedPtrField<TProtoStringType>* dependency,
-                   RepeatedField<int32_t>* public_dependency,
-                   RepeatedField<int32_t>* weak_dependency,
+  bool ParseImport(RepeatedPtrField<TProtoStringType>* dependency, 
+                   RepeatedField<int32_t>* public_dependency, 
+                   RepeatedField<int32_t>* weak_dependency, 
                    const LocationRecorder& root_location,
                    const FileDescriptorProto* containing_file);
 
@@ -393,12 +393,12 @@ class PROTOBUF_EXPORT Parser {
                           const LocationRecorder& parent_location);
   bool ParseReservedNumbers(DescriptorProto* message,
                             const LocationRecorder& parent_location);
-  bool ParseReserved(EnumDescriptorProto* message,
-                     const LocationRecorder& message_location);
-  bool ParseReservedNames(EnumDescriptorProto* message,
-                          const LocationRecorder& parent_location);
-  bool ParseReservedNumbers(EnumDescriptorProto* message,
-                            const LocationRecorder& parent_location);
+  bool ParseReserved(EnumDescriptorProto* message, 
+                     const LocationRecorder& message_location); 
+  bool ParseReservedNames(EnumDescriptorProto* message, 
+                          const LocationRecorder& parent_location); 
+  bool ParseReservedNumbers(EnumDescriptorProto* message, 
+                            const LocationRecorder& parent_location); 
 
   // Parse an "extend" declaration.  (See also comments for
   // ParseMessageField().)
@@ -413,7 +413,7 @@ class PROTOBUF_EXPORT Parser {
   // oneof_decl->label() since it will have had to parse the label before it
   // knew it was parsing a oneof.
   bool ParseOneof(OneofDescriptorProto* oneof_decl,
-                  DescriptorProto* containing_type, int oneof_index,
+                  DescriptorProto* containing_type, int oneof_index, 
                   const LocationRecorder& oneof_location,
                   const LocationRecorder& containing_type_location,
                   const FileDescriptorProto* containing_file);
@@ -444,15 +444,15 @@ class PROTOBUF_EXPORT Parser {
   // Parse "required", "optional", or "repeated" and fill in "label"
   // with the value. Returns true if such a label is consumed.
   bool ParseLabel(FieldDescriptorProto::Label* label,
-                  const LocationRecorder& field_location,
+                  const LocationRecorder& field_location, 
                   const FileDescriptorProto* containing_file);
 
   // Parse a type name and fill in "type" (if it is a primitive) or
   // "type_name" (if it is not) with the type parsed.
-  bool ParseType(FieldDescriptorProto::Type* type, TProtoStringType* type_name);
+  bool ParseType(FieldDescriptorProto::Type* type, TProtoStringType* type_name); 
   // Parse a user-defined type and fill in "type_name" with the name.
   // If a primitive type is named, it is treated as an error.
-  bool ParseUserDefinedType(TProtoStringType* type_name);
+  bool ParseUserDefinedType(TProtoStringType* type_name); 
 
   // Parses field options, i.e. the stuff in square brackets at the end
   // of a field definition.  Also parses default value.
@@ -478,7 +478,7 @@ class PROTOBUF_EXPORT Parser {
   // Parse a single option name/value pair, e.g. "ctype = CORD".  The name
   // identifies a field of the given Message, and the value of that field
   // is set to the parsed value.
-  bool ParseOption(Message* options, const LocationRecorder& options_location,
+  bool ParseOption(Message* options, const LocationRecorder& options_location, 
                    const FileDescriptorProto* containing_file,
                    OptionStyle style);
 
@@ -500,7 +500,7 @@ class PROTOBUF_EXPORT Parser {
   // REQUIRES: LookingAt("{")
   // When finished successfully, we are looking at the first token past
   // the ending brace.
-  bool ParseUninterpretedBlock(TProtoStringType* value);
+  bool ParseUninterpretedBlock(TProtoStringType* value); 
 
   struct MapField {
     // Whether the field is a map field.
@@ -509,8 +509,8 @@ class PROTOBUF_EXPORT Parser {
     FieldDescriptorProto::Type key_type;
     FieldDescriptorProto::Type value_type;
     // Or the type names string if the types are customized types.
-    TProtoStringType key_type_name;
-    TProtoStringType value_type_name;
+    TProtoStringType key_type_name; 
+    TProtoStringType value_type_name; 
 
     MapField() : is_map_field(false) {}
   };
@@ -534,18 +534,18 @@ class PROTOBUF_EXPORT Parser {
   bool had_errors_;
   bool require_syntax_identifier_;
   bool stop_after_syntax_identifier_;
-  TProtoStringType syntax_identifier_;
+  TProtoStringType syntax_identifier_; 
 
   // Leading doc comments for the next declaration.  These are not complete
   // yet; use ConsumeEndOfDeclaration() to get the complete comments.
-  TProtoStringType upcoming_doc_comments_;
+  TProtoStringType upcoming_doc_comments_; 
 
   // Detached comments are not connected to any syntax entities. Elements in
   // this vector are paragraphs of comments separated by empty lines. The
   // detached comments will be put into the leading_detached_comments field for
   // the next element (See SourceCodeInfo.Location in descriptor.proto), when
   // ConsumeEndOfDeclaration() is called.
-  std::vector<TProtoStringType> upcoming_detached_comments_;
+  std::vector<TProtoStringType> upcoming_detached_comments_; 
 
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Parser);
 };
@@ -558,7 +558,7 @@ class PROTOBUF_EXPORT Parser {
 // far more complete information about source locations.  However, as of this
 // writing you still need to use SourceLocationTable when integrating with
 // DescriptorPool.
-class PROTOBUF_EXPORT SourceLocationTable {
+class PROTOBUF_EXPORT SourceLocationTable { 
  public:
   SourceLocationTable();
   ~SourceLocationTable();
@@ -569,35 +569,35 @@ class PROTOBUF_EXPORT SourceLocationTable {
   // location" in the ErrorCollector interface).  Returns true if found, false
   // otherwise.
   bool Find(const Message* descriptor,
-            DescriptorPool::ErrorCollector::ErrorLocation location, int* line,
-            int* column) const;
-  bool FindImport(const Message* descriptor, const TProtoStringType& name, int* line,
-                  int* column) const;
+            DescriptorPool::ErrorCollector::ErrorLocation location, int* line, 
+            int* column) const; 
+  bool FindImport(const Message* descriptor, const TProtoStringType& name, int* line, 
+                  int* column) const; 
 
   // Adds a location to the table.
   void Add(const Message* descriptor,
-           DescriptorPool::ErrorCollector::ErrorLocation location, int line,
-           int column);
-  void AddImport(const Message* descriptor, const TProtoStringType& name, int line,
-                 int column);
+           DescriptorPool::ErrorCollector::ErrorLocation location, int line, 
+           int column); 
+  void AddImport(const Message* descriptor, const TProtoStringType& name, int line, 
+                 int column); 
 
   // Clears the contents of the table.
   void Clear();
 
  private:
   typedef std::map<
-      std::pair<const Message*, DescriptorPool::ErrorCollector::ErrorLocation>,
-      std::pair<int, int> >
-      LocationMap;
+      std::pair<const Message*, DescriptorPool::ErrorCollector::ErrorLocation>, 
+      std::pair<int, int> > 
+      LocationMap; 
   LocationMap location_map_;
-  std::map<std::pair<const Message*, TProtoStringType>, std::pair<int, int> >
-      import_location_map_;
+  std::map<std::pair<const Message*, TProtoStringType>, std::pair<int, int> > 
+      import_location_map_; 
 };
 
 }  // namespace compiler
 }  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
+}  // namespace google 
 
+#include <google/protobuf/port_undef.inc> 
+ 
 #endif  // GOOGLE_PROTOBUF_COMPILER_PARSER_H__