From c76807211af6ae86368bcd7651ca707ee7f12f86 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Sat, 8 Nov 2014 22:59:34 +0000 Subject: typo fixes - https://github.com/vlajos/misspell_fixer --- .../protobuf/compiler/command_line_interface.h | 2 +- src/google/protobuf/compiler/cpp/cpp_unittest.cc | 2 +- src/google/protobuf/compiler/java/java_file.cc | 2 +- src/google/protobuf/compiler/java/java_helpers.h | 2 +- src/google/protobuf/descriptor.cc | 2 +- src/google/protobuf/descriptor.h | 4 +-- src/google/protobuf/io/tokenizer.h | 2 +- src/google/protobuf/stubs/common.h | 4 +-- src/google/protobuf/stubs/template_util.h | 2 +- src/google/protobuf/text_format.cc | 38 +++++++++++----------- src/google/protobuf/text_format_unittest.cc | 12 +++---- src/google/protobuf/unittest_import.proto | 2 +- 12 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/google/protobuf') diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h index 47f28919..74a0adb4 100644 --- a/src/google/protobuf/compiler/command_line_interface.h +++ b/src/google/protobuf/compiler/command_line_interface.h @@ -214,7 +214,7 @@ class LIBPROTOC_EXPORT CommandLineInterface { // true if the next argument in the argv should be used as the value, // false otherwise. // - // Exmaples: + // Examples: // "-Isrc/protos" -> // name = "-I", value = "src/protos" // "--cpp_out=src/foo.pb2.cc" -> diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc index 93e1c3f1..b52ff896 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc @@ -1687,7 +1687,7 @@ TEST_F(OneofTest, SwapBothHasFields) { EXPECT_EQ(message2.foo_string(), "FOO"); } -TEST_F(OneofTest, CopyContructor) { +TEST_F(OneofTest, CopyConstructor) { unittest::TestOneof2 message1; message1.set_foo_bytes("FOO"); diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc index 231b1445..98c1fac9 100644 --- a/src/google/protobuf/compiler/java/java_file.cc +++ b/src/google/protobuf/compiler/java/java_file.cc @@ -186,7 +186,7 @@ bool FileGenerator::Validate(string* error) { // proto2 API without code change. When this happens we'd like to issue an // warning to let the user know that the outer class name has been changed. // Although we only do this automatic naming fix for immutable API, mutable - // outer class name will also be affected as it's contructed from immutable + // outer class name will also be affected as it's constructed from immutable // outer class name with an additional "Mutable" prefix. Since the naming // change in mutable API is not caused by a naming conflict, we generate the // warning for immutable API only. diff --git a/src/google/protobuf/compiler/java/java_helpers.h b/src/google/protobuf/compiler/java/java_helpers.h index 93f23a93..a00aa902 100644 --- a/src/google/protobuf/compiler/java/java_helpers.h +++ b/src/google/protobuf/compiler/java/java_helpers.h @@ -132,7 +132,7 @@ string FieldConstantName(const FieldDescriptor *field); // Returns the type of the FieldDescriptor. // This does nothing interesting for the open source release, but is used for -// hacks that improve compatability with version 1 protocol buffers at Google. +// hacks that improve compatibility with version 1 protocol buffers at Google. FieldDescriptor::Type GetType(const FieldDescriptor* field); enum JavaType { diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 21dda598..10f92427 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -3296,7 +3296,7 @@ const FileDescriptor* DescriptorBuilder::BuildFile( // Note: This only works if the input is canonical -- that is, it // fully-qualifies all type names, has no UninterpretedOptions, etc. // This is fine, because this idempotency "feature" really only exists to - // accomodate one hack in the proto1->proto2 migration layer. + // accommodate one hack in the proto1->proto2 migration layer. const FileDescriptor* existing_file = tables_->FindFile(filename_); if (existing_file != NULL) { // File already in pool. Compare the existing one to the input. diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h index 68013f8e..c3276bdc 100644 --- a/src/google/protobuf/descriptor.h +++ b/src/google/protobuf/descriptor.h @@ -1268,7 +1268,7 @@ class LIBPROTOBUF_EXPORT DescriptorPool { }; // Reports an error in the FileDescriptorProto. Use this function if the - // problem occured should interrupt building the FileDescriptorProto. + // problem occurred should interrupt building the FileDescriptorProto. virtual void AddError( const string& filename, // File name in which the error occurred. const string& element_name, // Full name of the erroneous element. @@ -1278,7 +1278,7 @@ class LIBPROTOBUF_EXPORT DescriptorPool { ) = 0; // Reports a warning in the FileDescriptorProto. Use this function if the - // problem occured should NOT interrupt building the FileDescriptorProto. + // problem occurred should NOT interrupt building the FileDescriptorProto. virtual void AddWarning( const string& /*filename*/, // File name in which the error occurred. const string& /*element_name*/, // Full name of the erroneous element. diff --git a/src/google/protobuf/io/tokenizer.h b/src/google/protobuf/io/tokenizer.h index 8c6220a1..98576f56 100644 --- a/src/google/protobuf/io/tokenizer.h +++ b/src/google/protobuf/io/tokenizer.h @@ -350,7 +350,7 @@ class LIBPROTOBUF_EXPORT Tokenizer { // ----------------------------------------------------------------- // These helper methods make the parsing code more readable. The - // "character classes" refered to are defined at the top of the .cc file. + // "character classes" referred to are defined at the top of the .cc file. // Basically it is a C++ class with one method: // static bool InClass(char c); // The method returns true if c is a member of this "class", like "Letter" diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index dde48f47..4b8cc604 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -449,7 +449,7 @@ class scoped_ptr { // The element type typedef C element_type; - // Constructor. Defaults to intializing with NULL. + // Constructor. Defaults to initializing with NULL. // There is no way to create an uninitialized scoped_ptr. // The input parameter must be allocated with new. explicit scoped_ptr(C* p = NULL) : ptr_(p) { } @@ -536,7 +536,7 @@ class scoped_array { // The element type typedef C element_type; - // Constructor. Defaults to intializing with NULL. + // Constructor. Defaults to initializing with NULL. // There is no way to create an uninitialized scoped_array. // The input parameter must be allocated with new []. explicit scoped_array(C* p = NULL) : array_(p) { } diff --git a/src/google/protobuf/stubs/template_util.h b/src/google/protobuf/stubs/template_util.h index 4f30ffa3..feef904b 100644 --- a/src/google/protobuf/stubs/template_util.h +++ b/src/google/protobuf/stubs/template_util.h @@ -37,7 +37,7 @@ // any changes here, make sure that you're not breaking any platforms. // // -// The names choosen here reflect those used in tr1 and the boost::mpl +// The names chosen here reflect those used in tr1 and the boost::mpl // library, there are similar operations used in the Loki library as // well. I prefer the boost names for 2 reasons: // 1. I think that portions of the Boost libraries are more likely to diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc index 84cdbb57..362d4f27 100644 --- a/src/google/protobuf/text_format.cc +++ b/src/google/protobuf/text_format.cc @@ -319,16 +319,16 @@ class TextFormat::Parser::ParserImpl { message); } - // Consumes the specified message with the given starting delimeter. - // This method checks to see that the end delimeter at the conclusion of - // the consumption matches the starting delimeter passed in here. - bool ConsumeMessage(Message* message, const string delimeter) { + // Consumes the specified message with the given starting delimiter. + // This method checks to see that the end delimiter at the conclusion of + // the consumption matches the starting delimiter passed in here. + bool ConsumeMessage(Message* message, const string delimiter) { while (!LookingAt(">") && !LookingAt("}")) { DO(ConsumeField(message)); } - // Confirm that we have a valid ending delimeter. - DO(Consume(delimeter)); + // Confirm that we have a valid ending delimiter. + DO(Consume(delimiter)); return true; } @@ -428,7 +428,7 @@ class TextFormat::Parser::ParserImpl { // Try to guess the type of this field. // If this field is not a message, there should be a ":" between the // field name and the field value and also the field value should not - // start with "{" or "<" which indicates the begining of a message body. + // start with "{" or "<" which indicates the beginning of a message body. // If there is no ":" or there is a "{" or "<" after ":", this field has // to be a message or the input is ill-formed. if (TryConsume(":") && !LookingAt("{") && !LookingAt("<")) { @@ -526,7 +526,7 @@ class TextFormat::Parser::ParserImpl { // Try to guess the type of this field. // If this field is not a message, there should be a ":" between the // field name and the field value and also the field value should not - // start with "{" or "<" which indicates the begining of a message body. + // start with "{" or "<" which indicates the beginning of a message body. // If there is no ":" or there is a "{" or "<" after ":", this field has // to be a message or the input is ill-formed. if (TryConsume(":") && !LookingAt("{") && !LookingAt("<")) { @@ -551,19 +551,19 @@ class TextFormat::Parser::ParserImpl { parse_info_tree_ = CreateNested(parent, field); } - string delimeter; + string delimiter; if (TryConsume("<")) { - delimeter = ">"; + delimiter = ">"; } else { DO(Consume("{")); - delimeter = "}"; + delimiter = "}"; } if (field->is_repeated()) { - DO(ConsumeMessage(reflection->AddMessage(message, field), delimeter)); + DO(ConsumeMessage(reflection->AddMessage(message, field), delimiter)); } else { DO(ConsumeMessage(reflection->MutableMessage(message, field), - delimeter)); + delimiter)); } // Reset the parse information tree. @@ -571,20 +571,20 @@ class TextFormat::Parser::ParserImpl { return true; } - // Skips the whole body of a message including the begining delimeter and - // the ending delimeter. + // Skips the whole body of a message including the beginning delimiter and + // the ending delimiter. bool SkipFieldMessage() { - string delimeter; + string delimiter; if (TryConsume("<")) { - delimeter = ">"; + delimiter = ">"; } else { DO(Consume("{")); - delimeter = "}"; + delimiter = "}"; } while (!LookingAt(">") && !LookingAt("}")) { DO(SkipField()); } - DO(Consume(delimeter)); + DO(Consume(delimiter)); return true; } diff --git a/src/google/protobuf/text_format_unittest.cc b/src/google/protobuf/text_format_unittest.cc index 55732688..477fdcbd 100644 --- a/src/google/protobuf/text_format_unittest.cc +++ b/src/google/protobuf/text_format_unittest.cc @@ -263,7 +263,7 @@ TEST_F(TextFormatTest, PrintUnknownFields) { } TEST_F(TextFormatTest, PrintUnknownFieldsHidden) { - // Test printing of unknown fields in a message when supressed. + // Test printing of unknown fields in a message when suppressed. unittest::OneString message; message.set_data("data"); @@ -586,7 +586,7 @@ TEST_F(TextFormatTest, ParseConcatenatedString) { // Compare. EXPECT_EQ("foobar", proto_.optional_string()); - // Create a parse string with multiple parts on seperate lines. + // Create a parse string with multiple parts on separate lines. parse_string = "optional_string: \"foo\"\n" "\"bar\"\n"; @@ -1324,12 +1324,12 @@ TEST_F(TextFormatParserTest, InvalidFieldValues) { "Expected \":\", found \"{\".", 1, 22); } -TEST_F(TextFormatParserTest, MessageDelimeters) { - // Non-matching delimeters. +TEST_F(TextFormatParserTest, MessageDelimiters) { + // Non-matching delimiters. ExpectFailure("OptionalGroup <\n \n}\n", "Expected \">\", found \"}\".", 3, 1); - // Invalid delimeters. + // Invalid delimiters. ExpectFailure("OptionalGroup [\n \n]\n", "Expected \"{\", found \"[\".", 1, 15); @@ -1340,7 +1340,7 @@ TEST_F(TextFormatParserTest, MessageDelimeters) { } TEST_F(TextFormatParserTest, UnknownExtension) { - // Non-matching delimeters. + // Non-matching delimiters. ExpectFailure("[blahblah]: 123", "Extension \"blahblah\" is not defined or is not an " "extension of \"protobuf_unittest.TestAllTypes\".", diff --git a/src/google/protobuf/unittest_import.proto b/src/google/protobuf/unittest_import.proto index 38275dc9..2a24671e 100644 --- a/src/google/protobuf/unittest_import.proto +++ b/src/google/protobuf/unittest_import.proto @@ -43,7 +43,7 @@ package protobuf_unittest_import; option optimize_for = SPEED; -// Excercise the java_package option. +// Exercise the java_package option. option java_package = "com.google.protobuf.test"; // Do not set a java_outer_classname here to verify that Proto2 works without -- cgit v1.2.3