diff options
author | Zachary Turner <zturner@google.com> | 2015-03-17 20:04:04 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2015-03-17 20:04:04 +0000 |
commit | 0641ca1a2dc2d4923ee702651aab2a9704d563b5 (patch) | |
tree | 702d70f8895c939cf047fbd1d31f9909faa4d85a /lldb/source/Commands/CommandObjectCommands.cpp | |
parent | c888dd0cb8b6cc3f1f33674189aea59d0938f2b4 (diff) | |
download | llvm-0641ca1a2dc2d4923ee702651aab2a9704d563b5.zip llvm-0641ca1a2dc2d4923ee702651aab2a9704d563b5.tar.gz llvm-0641ca1a2dc2d4923ee702651aab2a9704d563b5.tar.bz2 |
Remove ScriptInterpreterObject.
This removes ScriptInterpreterObject from the codebase completely.
Places that used to rely on ScriptInterpreterObject now use
StructuredData::Object and its derived classes. To support this,
a new type of StructuredData object is introduced, called
StructuredData::Generic, which stores a void*. Internally within
the python library, StructuredPythonObject subclasses this
StructuredData::Generic class so that it can addref and decref
the python object on construction and destruction.
Additionally, all of the classes in PythonDataObjects.h such
as PythonList, PythonDictionary, etc now provide a method to
create an instance of the corresponding StructuredData type. For
example, there is PythonDictionary::CreateStructuredDictionary.
To eliminate dependencies on PythonDataObjects for external
callers, all ScriptInterpreter methods now return only
StructuredData classes
The rest of the changes in this CL are focused on fixing up
users of PythonDataObjects classes to use the new StructuredData
classes.
llvm-svn: 232534
Diffstat (limited to 'lldb/source/Commands/CommandObjectCommands.cpp')
-rw-r--r-- | lldb/source/Commands/CommandObjectCommands.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index 99aed33..2946a0b 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -29,7 +29,6 @@ #include "lldb/Interpreter/OptionValueUInt64.h" #include "lldb/Interpreter/Options.h" #include "lldb/Interpreter/ScriptInterpreter.h" -#include "lldb/Interpreter/ScriptInterpreterPython.h" using namespace lldb; using namespace lldb_private; @@ -1433,7 +1432,7 @@ protected: class CommandObjectScriptingObject : public CommandObjectRaw { private: - lldb::ScriptInterpreterObjectSP m_cmd_obj_sp; + StructuredData::GenericSP m_cmd_obj_sp; ScriptedCommandSynchronicity m_synchro; bool m_fetched_help_short:1; bool m_fetched_help_long:1; @@ -1442,7 +1441,7 @@ public: CommandObjectScriptingObject (CommandInterpreter &interpreter, std::string name, - lldb::ScriptInterpreterObjectSP cmd_obj_sp, + StructuredData::GenericSP cmd_obj_sp, ScriptedCommandSynchronicity synch) : CommandObjectRaw (interpreter, name.c_str(), @@ -1469,7 +1468,7 @@ public: return true; } - lldb::ScriptInterpreterObjectSP + StructuredData::GenericSP GetImplementingObject () { return m_cmd_obj_sp; |