Submit recent changes from internal branch, including "lite mode" for

C++ and Java.  See CHANGES.txt for more details.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/google/protobuf/text_format.h b/src/google/protobuf/text_format.h
index e2b27c68..39a039d9 100644
--- a/src/google/protobuf/text_format.h
+++ b/src/google/protobuf/text_format.h
@@ -165,6 +165,13 @@ class LIBPROTOBUF_EXPORT TextFormat {
   // Like Merge(), but reads directly from a string.
   static bool MergeFromString(const string& input, Message* output);
 
+  // Parse the given text as a single field value and store it into the
+  // given field of the given message. If the field is a repeated field,
+  // the new value will be added to the end
+  static bool ParseFieldValueFromString(const string& input,
+                                        const FieldDescriptor* field,
+                                        Message* message);
+
   // For more control over parsing, use this class.
   class LIBPROTOBUF_EXPORT Parser {
    public:
@@ -192,6 +199,11 @@ class LIBPROTOBUF_EXPORT TextFormat {
       allow_partial_ = allow;
     }
 
+    // Like TextFormat::ParseFieldValueFromString
+    bool ParseFieldValueFromString(const string& input,
+                                   const FieldDescriptor* field,
+                                   Message* output);
+
    private:
     // Forward declaration of an internal class used to parse text
     // representations (see text_format.cc for implementation).