Import LLDB as of upstream SVN r216948 (git 50f7fe44)vendor/lldb/lldb-r216948

This corresponds with the branchpoint for the 3.5 release.
A number of files not required for the FreeBSD build have been removed.

Sponsored by:	DARPA, AFRL

1 files changed, 25 insertions, 10 deletions

diff --git a/source/Interpreter/ScriptInterpreter.cpp b/source/Interpreter/ScriptInterpreter.cpp
index 1b751afb135e..b6c46f83bd92 100644
--- a/source/Interpreter/ScriptInterpreter.cpp
+++ b/source/Interpreter/ScriptInterpreter.cpp
@@ -44,7 +44,7 @@ ScriptInterpreter::GetCommandInterpreter ()
 void 
 ScriptInterpreter::CollectDataForBreakpointCommandCallback 
 (
-    BreakpointOptions *bp_options,
+    std::vector<BreakpointOptions *> &bp_options_vec,
     CommandReturnObject &result
 )
 {
@@ -81,6 +81,30 @@ ScriptInterpreter::LanguageToString (lldb::ScriptLanguage language)
     return return_value;
 }
 
+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);
+    }
+}
+
 std::unique_ptr<ScriptInterpreterLocker>
 ScriptInterpreter::AcquireInterpreterLock ()
 {
@@ -132,12 +156,3 @@ ScriptInterpreter::InitializeInterpreter (SWIGInitCallback python_swig_init_call
                                                     swig_plugin_get);
 #endif // #ifndef LLDB_DISABLE_PYTHON
 }
-
-void
-ScriptInterpreter::TerminateInterpreter ()
-{
-#ifndef LLDB_DISABLE_PYTHON
-    ScriptInterpreterPython::TerminateInterpreter ();
-#endif // #ifndef LLDB_DISABLE_PYTHON
-}
-