Fixed version of r250913, which actually implements all the static functions.
Thanks to Siva Chandra and Oleksiy Vyalov for pouncing on this.
llvm-svn: 250928
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 8619b50..494b762 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -1805,11 +1805,6 @@
{
Error err;
FileSpec repl_executable;
- if (language == eLanguageTypeUnknown)
- {
- err.SetErrorString ("must specify a language for a REPL"); // TODO make it possible to specify a default language
- return err;
- }
Target *const target = nullptr; // passing in an empty target means the REPL must create one
diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp
index 97116dd..a90b576 100644
--- a/lldb/source/Core/PluginManager.cpp
+++ b/lldb/source/Core/PluginManager.cpp
@@ -2662,6 +2662,7 @@
ConstString name;
std::string description;
REPLCreateInstance create_callback;
+ REPLEnumerateSupportedLanguages enumerate_languages_callback;
};
typedef std::vector<REPLInstance> REPLInstances;
@@ -2683,7 +2684,8 @@
bool
PluginManager::RegisterPlugin (const ConstString &name,
const char *description,
- REPLCreateInstance create_callback)
+ REPLCreateInstance create_callback,
+ REPLEnumerateSupportedLanguages enumerate_languages_callback)
{
if (create_callback)
{
@@ -2693,6 +2695,7 @@
if (description && description[0])
instance.description = description;
instance.create_callback = create_callback;
+ instance.enumerate_languages_callback = enumerate_languages_callback;
Mutex::Locker locker (GetREPLMutex ());
GetREPLInstances ().push_back (instance);
}
@@ -2748,6 +2751,35 @@
return NULL;
}
+REPLEnumerateSupportedLanguages
+PluginManager::GetREPLEnumerateSupportedLanguagesCallbackAtIndex (uint32_t idx)
+{
+ Mutex::Locker locker (GetREPLMutex ());
+ REPLInstances &instances = GetREPLInstances ();
+ if (idx < instances.size())
+ return instances[idx].enumerate_languages_callback;
+ return NULL;
+}
+
+
+REPLEnumerateSupportedLanguages
+PluginManager::GetREPLSystemEnumerateSupportedLanguagesCallbackForPluginName (const ConstString &name)
+{
+ if (name)
+ {
+ Mutex::Locker locker (GetREPLMutex ());
+ REPLInstances &instances = GetREPLInstances ();
+
+ REPLInstances::iterator pos, end = instances.end();
+ for (pos = instances.begin(); pos != end; ++ pos)
+ {
+ if (name == pos->name)
+ return pos->enumerate_languages_callback;
+ }
+ }
+ return NULL;
+}
+
#pragma mark PluginManager
void
diff --git a/lldb/source/Target/Language.cpp b/lldb/source/Target/Language.cpp
index 3ca6ae7..a2855b7 100644
--- a/lldb/source/Target/Language.cpp
+++ b/lldb/source/Target/Language.cpp
@@ -299,6 +299,17 @@
}
}
+void
+Language::GetLanguagesSupportingREPLs (std::set<lldb::LanguageType> &languages)
+{
+ uint32_t idx = 0;
+
+ while (REPLEnumerateSupportedLanguages enumerate = PluginManager::GetREPLEnumerateSupportedLanguagesCallbackAtIndex(idx++))
+ {
+ (*enumerate)(languages);
+ }
+}
+
std::unique_ptr<Language::TypeScavenger>
Language::GetTypeScavenger ()
{
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 385ac74..23b82e5 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -218,7 +218,19 @@
{
if (language == eLanguageTypeUnknown)
{
- return REPLSP(); // must provide a language
+ std::set<LanguageType> repl_languages;
+
+ Language::GetLanguagesSupportingREPLs(repl_languages);
+
+ if (repl_languages.size() == 1)
+ {
+ language = *repl_languages.begin();
+ }
+ else
+ {
+ err.SetErrorStringWithFormat("Multiple possible REPL languages. Please specify a language.");
+ return REPLSP(); // must provide a language
+ }
}
REPLMap::iterator pos = m_repl_map.find(language);