Revert "Revert "I had recently added a new SBFrame::GetVariables() overload with yet another bool argument""

Reverting this commit led to other failures which I did not see at
first.  This turned out to be an easy problem to fix, so I added
SBVariablesOptions.cpp to the CMakeLists.txt.  In the future please
try to make sure new files are added to CMake.

llvm-svn: 229516

3 files changed, 64 insertions, 6 deletions

diff --git a/lldb/scripts/Python/build-swig-Python.sh b/lldb/scripts/Python/build-swig-Python.sh
index 32c80c9..833845e 100755
--- a/lldb/scripts/Python/build-swig-Python.sh
+++ b/lldb/scripts/Python/build-swig-Python.sh
@@ -127,6 +127,7 @@ HEADER_FILES="${SRC_ROOT}/include/lldb/lldb.h"\
 " ${SRC_ROOT}/include/lldb/API/SBTypeSynthetic.h"\
 " ${SRC_ROOT}/include/lldb/API/SBValue.h"\
 " ${SRC_ROOT}/include/lldb/API/SBValueList.h"\
+" ${SRC_ROOT}/include/lldb/API/SBVariablesOptions.h"\
 " ${SRC_ROOT}/include/lldb/API/SBWatchpoint.h"\
 " ${SRC_ROOT}/include/lldb/API/SBUnixSignals.h"
 
@@ -180,6 +181,7 @@ INTERFACE_FILES="${SRC_ROOT}/scripts/Python/interface/SBAddress.i"\
 " ${SRC_ROOT}/scripts/Python/interface/SBTypeSynthetic.i"\
 " ${SRC_ROOT}/scripts/Python/interface/SBValue.i"\
 " ${SRC_ROOT}/scripts/Python/interface/SBValueList.i"\
+" ${SRC_ROOT}/scripts/Python/interface/SBVariablesOptions.i"\
 " ${SRC_ROOT}/scripts/Python/interface/SBWatchpoint.i"\
 " ${SRC_ROOT}/scripts/Python/interface/SBUnixSignals.i"
 
diff --git a/lldb/scripts/Python/interface/SBFrame.i b/lldb/scripts/Python/interface/SBFrame.i
index 5cacb5e..b1d1e4e 100644
--- a/lldb/scripts/Python/interface/SBFrame.i
+++ b/lldb/scripts/Python/interface/SBFrame.i
@@ -199,12 +199,7 @@ public:
                   lldb::DynamicValueType  use_dynamic);
 
     lldb::SBValueList
-    GetVariables (bool arguments,
-                  bool locals,
-                  bool statics,
-                  bool in_scope_only,
-                  bool include_runtime_support_values,
-                  lldb::DynamicValueType  use_dynamic);
+    GetVariables (const lldb::SBVariablesOptions& options);
              
     lldb::SBValueList
     GetRegisters ();
diff --git a/lldb/scripts/Python/interface/SBVariablesOptions.i b/lldb/scripts/Python/interface/SBVariablesOptions.i
new file mode 100644
index 0000000..3941a58
--- /dev/null
+++ b/lldb/scripts/Python/interface/SBVariablesOptions.i
@@ -0,0 +1,61 @@
+//===-- SWIG Interface for SBVariablesOptions ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+namespace lldb {
+    
+class SBVariablesOptions
+{
+public:
+    SBVariablesOptions ();
+    
+    SBVariablesOptions (const SBVariablesOptions& options);
+    
+    ~SBVariablesOptions ();
+    
+    bool
+    IsValid () const;
+    
+    bool
+    GetIncludeArguments ()  const;
+    
+    void
+    SetIncludeArguments (bool);
+    
+    bool
+    GetIncludeLocals ()  const;
+    
+    void
+    SetIncludeLocals (bool);
+    
+    bool
+    GetIncludeStatics ()  const;
+    
+    void
+    SetIncludeStatics (bool);
+    
+    bool
+    GetInScopeOnly ()  const;
+    
+    void
+    SetInScopeOnly (bool);
+    
+    bool
+    GetIncludeRuntimeSupportValues () const;
+    
+    void
+    SetIncludeRuntimeSupportValues (bool);
+    
+    lldb::DynamicValueType
+    GetUseDynamic () const;
+    
+    void
+    SetUseDynamic (lldb::DynamicValueType);
+};
+    
+} // namespace lldb