1 files changed, 63 insertions, 70 deletions
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp b/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp
index f1ec50e..d87d24e 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp
@@ -9,9 +9,9 @@
 
 #include "lldb/Interpreter/ScriptInterpreter.h"
 
-#include <string>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string>
 
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Stream.h"
@@ -22,88 +22,81 @@
 using namespace lldb;
 using namespace lldb_private;
 
-ScriptInterpreter::ScriptInterpreter (CommandInterpreter &interpreter, lldb::ScriptLanguage script_lang) :
-    m_interpreter (interpreter),
-    m_script_lang (script_lang)
-{
-}
+ScriptInterpreter::ScriptInterpreter(CommandInterpreter &interpreter,
+                                     lldb::ScriptLanguage script_lang)
+    : m_interpreter(interpreter), m_script_lang(script_lang) {}
 
-ScriptInterpreter::~ScriptInterpreter ()
-{
-}
+ScriptInterpreter::~ScriptInterpreter() {}
 
-CommandInterpreter &
-ScriptInterpreter::GetCommandInterpreter ()
-{
-    return m_interpreter;
+CommandInterpreter &ScriptInterpreter::GetCommandInterpreter() {
+  return m_interpreter;
 }
 
-void 
-ScriptInterpreter::CollectDataForBreakpointCommandCallback 
-(
+void ScriptInterpreter::CollectDataForBreakpointCommandCallback(
     std::vector<BreakpointOptions *> &bp_options_vec,
-    CommandReturnObject &result
-)
-{
-    result.SetStatus (eReturnStatusFailed);
-    result.AppendError ("ScriptInterpreter::GetScriptCommands(StringList &) is not implemented.");
+    CommandReturnObject &result) {
+  result.SetStatus(eReturnStatusFailed);
+  result.AppendError(
+      "ScriptInterpreter::GetScriptCommands(StringList &) is not implemented.");
 }
 
-void 
-ScriptInterpreter::CollectDataForWatchpointCommandCallback 
-(
-    WatchpointOptions *bp_options,
-    CommandReturnObject &result
-)
-{
-    result.SetStatus (eReturnStatusFailed);
-    result.AppendError ("ScriptInterpreter::GetScriptCommands(StringList &) is not implemented.");
+void ScriptInterpreter::CollectDataForWatchpointCommandCallback(
+    WatchpointOptions *bp_options, CommandReturnObject &result) {
+  result.SetStatus(eReturnStatusFailed);
+  result.AppendError(
+      "ScriptInterpreter::GetScriptCommands(StringList &) is not implemented.");
 }
 
-std::string
-ScriptInterpreter::LanguageToString (lldb::ScriptLanguage language)
-{
-    std::string return_value;
-
-    switch (language)
-    {
-        case eScriptLanguageNone:
-            return_value = "None";
-            break;
-        case eScriptLanguagePython:
-            return_value = "Python";
-            break;
-    }
-
-    return return_value;
+std::string ScriptInterpreter::LanguageToString(lldb::ScriptLanguage language) {
+  std::string return_value;
+
+  switch (language) {
+  case eScriptLanguageNone:
+    return_value = "None";
+    break;
+  case eScriptLanguagePython:
+    return_value = "Python";
+    break;
+  case eScriptLanguageUnknown:
+    return_value = "Unknown";
+    break;
+  }
+
+  return return_value;
+}
+
+lldb::ScriptLanguage
+ScriptInterpreter::StringToLanguage(const llvm::StringRef &language) {
+  if (language.equals_lower(LanguageToString(eScriptLanguageNone)))
+    return eScriptLanguageNone;
+  else if (language.equals_lower(LanguageToString(eScriptLanguagePython)))
+    return eScriptLanguagePython;
+  else
+    return eScriptLanguageUnknown;
 }
 
-Error
-ScriptInterpreter::SetBreakpointCommandCallback (std::vector<BreakpointOptions *> &bp_options_vec,
-                                                 const char *callback_text)
-{
-    Error return_error;
-    for (BreakpointOptions *bp_options : bp_options_vec)
-    {
-        return_error = SetBreakpointCommandCallback(bp_options, callback_text);
-        if (return_error.Success())
-            break;
-    }
-    return return_error;
+Error ScriptInterpreter::SetBreakpointCommandCallback(
+    std::vector<BreakpointOptions *> &bp_options_vec,
+    const char *callback_text) {
+  Error return_error;
+  for (BreakpointOptions *bp_options : bp_options_vec) {
+    return_error = SetBreakpointCommandCallback(bp_options, callback_text);
+    if (return_error.Success())
+      break;
+  }
+  return return_error;
 }
 
-void
-ScriptInterpreter::SetBreakpointCommandCallbackFunction (std::vector<BreakpointOptions *> &bp_options_vec,
-                                                         const char *function_name)
-{
-    for (BreakpointOptions *bp_options : bp_options_vec)
-    {
-        SetBreakpointCommandCallbackFunction(bp_options, function_name);
-    }
+void ScriptInterpreter::SetBreakpointCommandCallbackFunction(
+    std::vector<BreakpointOptions *> &bp_options_vec,
+    const char *function_name) {
+  for (BreakpointOptions *bp_options : bp_options_vec) {
+    SetBreakpointCommandCallbackFunction(bp_options, function_name);
+  }
 }
 
 std::unique_ptr<ScriptInterpreterLocker>
-ScriptInterpreter::AcquireInterpreterLock ()
-{
-    return std::unique_ptr<ScriptInterpreterLocker>(new ScriptInterpreterLocker());
+ScriptInterpreter::AcquireInterpreterLock() {
+  return std::unique_ptr<ScriptInterpreterLocker>(
+      new ScriptInterpreterLocker());
 }