1 files changed, 17 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/parser.cc b/src/google/protobuf/compiler/parser.cc
index 1144aab7..e1c0d0d1 100644
--- a/src/google/protobuf/compiler/parser.cc
+++ b/src/google/protobuf/compiler/parser.cc
@@ -215,6 +215,11 @@ bool Parser::ConsumeString(string* output, const char* error) {
   if (LookingAtType(io::Tokenizer::TYPE_STRING)) {
     io::Tokenizer::ParseString(input_->current().text, output);
     input_->Next();
+    // Allow C++ like concatenation of adjacent string tokens.
+    while (LookingAtType(io::Tokenizer::TYPE_STRING)) {
+      io::Tokenizer::ParseStringAppend(input_->current().text, output);
+      input_->Next();
+    }
     return true;
   } else {
     AddError(error);
@@ -864,13 +869,24 @@ bool Parser::ParseEnumConstant(EnumValueDescriptorProto* enum_value) {
   if (is_negative) number *= -1;
   enum_value->set_number(number);
 
-  // TODO(kenton):  Options for enum values?
+  DO(ParseEnumConstantOptions(enum_value));
 
   DO(Consume(";"));
 
   return true;
 }
 
+bool Parser::ParseEnumConstantOptions(EnumValueDescriptorProto* value) {
+  if (!TryConsume("[")) return true;
+
+  do {
+    DO(ParseOptionAssignment(value->mutable_options()));
+  } while (TryConsume(","));
+
+  DO(Consume("]"));
+  return true;
+}
+
 // -------------------------------------------------------------------
 // Services