commit 1624a2d3c8a9558840b5e17623d232c0aa3c01cd
author Jim Ingham <jingham@apple.com> Mon May 05 02:26:40 2014 +0000
committer Jim Ingham <jingham@apple.com> Mon May 05 02:26:40 2014 +0000
tree d11f0105a8cca2f3a4c887fbe278b570281ab367
parent e8a7afef86220229a872b78b5e3dd212574d741a

Make the Expression Execution result enum available to the SB API layer.
Add a callback that will allow an expression to be cancelled between the
expression evaluation stages (for the ClangUserExpressions.)

<rdar://problem/16790467>, <rdar://problem/16573440>

llvm-svn: 207944

lldb/source/API/SBExpressionOptions.cpp

diff --git a/lldb/source/API/SBExpressionOptions.cpp b/lldb/source/API/SBExpressionOptions.cpp
index 3ba9ab0..0c26a45 100644
--- a/lldb/source/API/SBExpressionOptions.cpp
+++ b/lldb/source/API/SBExpressionOptions.cpp
@@ -149,6 +149,12 @@
     m_opaque_ap->SetTrapExceptions (trap_exceptions);
 }
 
+void
+SBExpressionOptions::SetCancelCallback (lldb::ExpressionCancelCallback callback, void *baton)
+{
+    m_opaque_ap->SetCancelCallback (callback, baton);
+}
+
 EvaluateExpressionOptions *
 SBExpressionOptions::get() const
 {

lldb/source/API/SBFrame.cpp

diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index 8448bd2..937f2c6 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -1372,7 +1372,7 @@
 
     Log *expr_log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
 
-    ExecutionResults exe_results = eExecutionSetupError;
+    ExpressionResults exe_results = eExecutionSetupError;
     SBValue expr_result;
 
     if (expr == NULL || expr[0] == '\0')

lldb/source/API/SBTarget.cpp

diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp
index 817f1bc..bae4b76 100644
--- a/lldb/source/API/SBTarget.cpp
+++ b/lldb/source/API/SBTarget.cpp
@@ -2611,7 +2611,7 @@
     Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     Log * expr_log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     SBValue expr_result;
-    ExecutionResults exe_results = eExecutionSetupError;
+    ExpressionResults exe_results = eExecutionSetupError;
     ValueObjectSP expr_value_sp;
     TargetSP target_sp(GetSP());
     StackFrame *frame = NULL;