Import LLDB as of upstream SVN 241361 (git 612c075f)

1 files changed, 23 insertions, 7 deletions

diff --git a/source/Interpreter/OptionValueFormatEntity.cpp b/source/Interpreter/OptionValueFormatEntity.cpp
index fb8c682..66d8d84 100644
--- a/source/Interpreter/OptionValueFormatEntity.cpp
+++ b/source/Interpreter/OptionValueFormatEntity.cpp
@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/lldb-python.h"
-
 #include "lldb/Interpreter/OptionValueFormatEntity.h"
 
 // C Includes
@@ -67,8 +65,8 @@ OptionValueFormatEntity::DumpValue (const ExecutionContext *exe_ctx, Stream &str
 }
 
 Error
-OptionValueFormatEntity::SetValueFromCString (const char *value_cstr,
-                                      VarSetOperationType op)
+OptionValueFormatEntity::SetValueFromString (llvm::StringRef value_str,
+                                             VarSetOperationType op)
 {
     Error error;
     switch (op)
@@ -81,13 +79,31 @@ OptionValueFormatEntity::SetValueFromCString (const char *value_cstr,
         case eVarSetOperationReplace:
         case eVarSetOperationAssign:
             {
+                // Check if the string starts with a quote character after removing leading and trailing spaces.
+                // If it does start with a quote character, make sure it ends with the same quote character
+                // and remove the quotes before we parse the format string. If the string doesn't start with
+                // a quote, leave the string alone and parse as is.
+                llvm::StringRef trimmed_value_str = value_str.trim();
+                if (!trimmed_value_str.empty())
+                {
+                    const char first_char = trimmed_value_str[0];
+                    if (first_char == '"' || first_char == '\'')
+                    {
+                        const size_t trimmed_len = trimmed_value_str.size();
+                        if (trimmed_len == 1 || value_str[trimmed_len-1] != first_char)
+                        {
+                            error.SetErrorStringWithFormat("mismatched quotes");
+                            return error;
+                        }
+                        value_str = trimmed_value_str.substr(1,trimmed_len-2);
+                    }
+                }
                 FormatEntity::Entry entry;
-                llvm::StringRef value_str(value_cstr);
                 error = FormatEntity::Parse(value_str, entry);
                 if (error.Success())
                 {
                     m_current_entry = std::move(entry);
-                    m_current_format = value_cstr;
+                    m_current_format = value_str;
                     m_value_was_set = true;
                     NotifyValueChanged();
                 }
@@ -99,7 +115,7 @@ OptionValueFormatEntity::SetValueFromCString (const char *value_cstr,
         case eVarSetOperationRemove:
         case eVarSetOperationAppend:
         case eVarSetOperationInvalid:
-            error = OptionValue::SetValueFromCString (value_cstr, op);
+            error = OptionValue::SetValueFromString (value_str, op);
             break;
     }
     return error;