aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/text_format.cc
diff options
context:
space:
mode:
authorGravatar Veres Lajos <vlajos@gmail.com>2014-11-08 22:59:34 +0000
committerGravatar Veres Lajos <vlajos@gmail.com>2014-11-08 22:59:34 +0000
commitc76807211af6ae86368bcd7651ca707ee7f12f86 (patch)
tree1e19080935d7845ff06facd846ff863d273290e3 /src/google/protobuf/text_format.cc
parentbaca1a8a1aa180c42de6278d3b8286c4496c6a10 (diff)
Diffstat (limited to 'src/google/protobuf/text_format.cc')
-rw-r--r--src/google/protobuf/text_format.cc38
1 files changed, 19 insertions, 19 deletions
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;
}