gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UserInterface: Enforce destruction order with TextInputHolder.

Browse Source
This commit is contained in:
Frederich Munch 2017-06-28 11:19:59 -04:00 committed by sftnight
parent cdf5c72f1d
commit 808cd70864
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/UserInterface/UserInterface.cpp
View File

@ -46,6 +46,27 @@ namespace {
return true;
}
};
///\brief Delays ~TextInput until after ~StreamReader and ~TerminalDisplay
///
class TextInputHolder {
textinput::StreamReader* m_Reader;
textinput::TerminalDisplay* m_Display;
textinput::TextInput m_Input;
public:
TextInputHolder(llvm::SmallString<512>& Hist)
: m_Reader(textinput::StreamReader::Create()),
m_Display(textinput::TerminalDisplay::Create()),
m_Input(*m_Reader, *m_Display, Hist.empty() ? 0 : Hist.c_str()) {}
~TextInputHolder() {
delete m_Reader;
delete m_Display;
}
textinput::TextInput* operator -> () { return &m_Input; }
};
}
namespace cling {
@ -69,16 +90,13 @@ namespace cling {
llvm::sys::path::append(histfilePath, ".cling_history");
}
using namespace textinput;
std::unique_ptr<StreamReader> R(StreamReader::Create());
std::unique_ptr<TerminalDisplay> D(TerminalDisplay::Create());
TextInput TI(*R, *D, histfilePath.empty() ? 0 : histfilePath.c_str());
TextInputHolder TI(histfilePath);
// Inform text input about the code complete consumer
// TextInput owns the TabCompletion.
UITabCompletion* Completion =
new UITabCompletion(m_MetaProcessor->getInterpreter());
TI.SetCompletion(Completion);
TI->SetCompletion(Completion);
bool Done = false;
std::string Line;
@ -89,9 +107,9 @@ namespace cling {
m_MetaProcessor->getOuts().flush();
{
MetaProcessor::MaybeRedirectOutputRAII RAII(*m_MetaProcessor);
TI.SetPrompt(Prompt.c_str());
Done = TI.ReadInput() == TextInput::kRREOF;
TI.TakeInput(Line);
TI->SetPrompt(Prompt.c_str());
Done = TI->ReadInput() == textinput::TextInput::kRREOF;
TI->TakeInput(Line);
if (Done && Line.empty())
break;
}