s/parsable/parseable/

pull/7751/head
Peter Newman 5 years ago
parent 905681b7b1
commit 534ecf7675
  1. 6
      conformance/binary_json_conformance_suite.cc
  2. 6
      conformance/text_format_conformance_suite.cc
  3. 2
      csharp/src/Google.Protobuf/JsonFormatter.cs
  4. 4
      python/google/protobuf/internal/reflection_test.py
  5. 2
      src/google/protobuf/compiler/parser_unittest.cc
  6. 2
      src/google/protobuf/compiler/plugin.cc
  7. 2
      src/google/protobuf/compiler/plugin.proto
  8. 4
      src/google/protobuf/compiler/subprocess.cc
  9. 2
      src/google/protobuf/descriptor.h

@ -364,7 +364,7 @@ bool BinaryAndJsonConformanceSuite::ParseJsonResponse(
if (!test_message->ParseFromString(binary_protobuf)) { if (!test_message->ParseFromString(binary_protobuf)) {
GOOGLE_LOG(FATAL) << "INTERNAL ERROR: internal JSON->protobuf transcode " GOOGLE_LOG(FATAL) << "INTERNAL ERROR: internal JSON->protobuf transcode "
<< "yielded unparsable proto."; << "yielded unparseable proto.";
return false; return false;
} }
@ -393,7 +393,7 @@ bool BinaryAndJsonConformanceSuite::ParseResponse(
if (!test_message->ParseFromString(response.protobuf_payload())) { if (!test_message->ParseFromString(response.protobuf_payload())) {
ReportFailure(test_name, level, request, response, ReportFailure(test_name, level, request, response,
"Protobuf output we received from test was unparsable."); "Protobuf output we received from test was unparseable.");
return false; return false;
} }
@ -412,7 +412,7 @@ bool BinaryAndJsonConformanceSuite::ParseResponse(
if (!ParseJsonResponse(response, test_message)) { if (!ParseJsonResponse(response, test_message)) {
ReportFailure(test_name, level, request, response, ReportFailure(test_name, level, request, response,
"JSON output we received from test was unparsable."); "JSON output we received from test was unparseable.");
return false; return false;
} }

@ -65,7 +65,7 @@ bool TextFormatConformanceTestSuite::ParseTextFormatResponse(
} }
if (!parser.ParseFromString(response.text_payload(), test_message)) { if (!parser.ParseFromString(response.text_payload(), test_message)) {
GOOGLE_LOG(ERROR) << "INTERNAL ERROR: internal text->protobuf transcode " GOOGLE_LOG(ERROR) << "INTERNAL ERROR: internal text->protobuf transcode "
<< "yielded unparsable proto. Text payload: " << "yielded unparseable proto. Text payload: "
<< response.text_payload(); << response.text_payload();
return false; return false;
} }
@ -94,7 +94,7 @@ bool TextFormatConformanceTestSuite::ParseResponse(
if (!test_message->ParseFromString(response.protobuf_payload())) { if (!test_message->ParseFromString(response.protobuf_payload())) {
ReportFailure(test_name, level, request, response, ReportFailure(test_name, level, request, response,
"Protobuf output we received from test was unparsable."); "Protobuf output we received from test was unparseable.");
return false; return false;
} }
@ -114,7 +114,7 @@ bool TextFormatConformanceTestSuite::ParseResponse(
if (!ParseTextFormatResponse(response, setting, test_message)) { if (!ParseTextFormatResponse(response, setting, test_message)) {
ReportFailure( ReportFailure(
test_name, level, request, response, test_name, level, request, response,
"TEXT_FORMAT output we received from test was unparsable."); "TEXT_FORMAT output we received from test was unparseable.");
return false; return false;
} }

@ -181,7 +181,7 @@ namespace Google.Protobuf
/// is included with the base64 data from the <see cref="Any.Value"/> property of the message. /// is included with the base64 data from the <see cref="Any.Value"/> property of the message.
/// </para> /// </para>
/// <para>The value returned by this method is only designed to be used for diagnostic /// <para>The value returned by this method is only designed to be used for diagnostic
/// purposes. It may not be parsable by <see cref="JsonParser"/>, and may not be parsable /// purposes. It may not be parseable by <see cref="JsonParser"/>, and may not be parseable
/// by other Protocol Buffer implementations.</para> /// by other Protocol Buffer implementations.</para>
/// </remarks> /// </remarks>
/// <param name="message">The message to format for diagnostic purposes.</param> /// <param name="message">The message to format for diagnostic purposes.</param>

@ -2791,7 +2791,7 @@ class SerializationTest(unittest.TestCase):
serialized = proto.SerializeToString() serialized = proto.SerializeToString()
# The empty message should be parsable with all of the fields # The empty message should be parseable with all of the fields
# unknown. # unknown.
proto2 = unittest_pb2.TestEmptyMessage() proto2 = unittest_pb2.TestEmptyMessage()
@ -2804,7 +2804,7 @@ class SerializationTest(unittest.TestCase):
proto = unittest_pb2.TestAllTypes() proto = unittest_pb2.TestAllTypes()
proto.optional_int64 = 0x0fffffffffffffff proto.optional_int64 = 0x0fffffffffffffff
serialized = proto.SerializeToString() serialized = proto.SerializeToString()
# The empty message should be parsable with all of the fields # The empty message should be parseable with all of the fields
# unknown. # unknown.
proto2 = unittest_pb2.TestEmptyMessage() proto2 = unittest_pb2.TestEmptyMessage()
# Parsing this message should succeed. # Parsing this message should succeed.

@ -2432,7 +2432,7 @@ TEST_F(ParseDescriptorDebugTest, TestMaps) {
EXPECT_TRUE(debug_string.find("option map_entry") == std::string::npos); EXPECT_TRUE(debug_string.find("option map_entry") == std::string::npos);
EXPECT_TRUE(debug_string.find("MapEntry") == std::string::npos); EXPECT_TRUE(debug_string.find("MapEntry") == std::string::npos);
// Make sure the descriptor debug string is parsable. // Make sure the descriptor debug string is parseable.
FileDescriptorProto parsed; FileDescriptorProto parsed;
SetupParser(debug_string.c_str()); SetupParser(debug_string.c_str());
parsed.set_name("foo.proto"); parsed.set_name("foo.proto");

@ -160,7 +160,7 @@ int PluginMain(int argc, char* argv[], const CodeGenerator* generator) {
CodeGeneratorRequest request; CodeGeneratorRequest request;
if (!request.ParseFromFileDescriptor(STDIN_FILENO)) { if (!request.ParseFromFileDescriptor(STDIN_FILENO)) {
std::cerr << argv[0] << ": protoc sent unparsable request to plugin." std::cerr << argv[0] << ": protoc sent unparseable request to plugin."
<< std::endl; << std::endl;
return 1; return 1;
} }

@ -103,7 +103,7 @@ message CodeGeneratorResponse {
// This should be used to indicate errors in .proto files which prevent the // This should be used to indicate errors in .proto files which prevent the
// code generator from generating correct code. Errors which indicate a // code generator from generating correct code. Errors which indicate a
// problem in protoc itself -- such as the input CodeGeneratorRequest being // problem in protoc itself -- such as the input CodeGeneratorRequest being
// unparsable -- should be reported by writing a message to stderr and // unparseable -- should be reported by writing a message to stderr and
// exiting with a non-zero status code. // exiting with a non-zero status code.
optional string error = 1; optional string error = 1;

@ -260,7 +260,7 @@ bool Subprocess::Communicate(const Message& input, Message* output,
} }
if (!output->ParseFromString(output_data)) { if (!output->ParseFromString(output_data)) {
*error = "Plugin output is unparsable: " + CEscape(output_data); *error = "Plugin output is unparseable: " + CEscape(output_data);
return false; return false;
} }
@ -461,7 +461,7 @@ bool Subprocess::Communicate(const Message& input, Message* output,
} }
if (!output->ParseFromString(output_data)) { if (!output->ParseFromString(output_data)) {
*error = "Plugin output is unparsable: " + CEscape(output_data); *error = "Plugin output is unparseable: " + CEscape(output_data);
return false; return false;
} }

@ -157,7 +157,7 @@ struct SourceLocation {
std::vector<std::string> leading_detached_comments; std::vector<std::string> leading_detached_comments;
}; };
// Options when generating machine-parsable output from a descriptor with // Options when generating machine-parseable output from a descriptor with
// DebugString(). // DebugString().
struct DebugStringOptions { struct DebugStringOptions {
// include original user comments as recorded in SourceLocation entries. N.B. // include original user comments as recorded in SourceLocation entries. N.B.

Loading…
Cancel
Save