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

Remove the non-working implementation of multiplexing callback.

Browse Source
This commit is contained in:
Vassil Vassilev 2014-08-21 15:57:54 +02:00 committed by sftnight
parent 0246d5f0b0
commit b538604dc0
2 changed files with 11 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/cling/Interpreter/InterpreterCallbacks.h
View File

@ -70,26 +70,11 @@ namespace cling {
///
bool m_IsRuntime;
///\brief The next callback in the chain.
///
InterpreterCallbacks* m_Next;
protected:
void UpdateWithNewDecls(const clang::DeclContext *DC,
clang::DeclarationName Name,
llvm::ArrayRef<clang::NamedDecl*> Decls);
public:
///\brief Constructs the callbacks.
///
///\param[in] interp - an interpreter.
///\param[in] IESS - an InterpreterExternalSemaSource (takes the ownership)
///\param[in] IDL - an InterpreterDeserializationListener (owned)
///\param[in] IPPC - an InterpreterPPCallbacks (owned)
///
InterpreterCallbacks(Interpreter* interp,
InterpreterExternalSemaSource* IESS,
InterpreterDeserializationListener* IDL,
InterpreterPPCallbacks* IPPC);
///\brief Constructs the callbacks with default callback adaptors.
///
@ -115,19 +100,6 @@ namespace cling {
clang::ASTDeserializationListener*
getInterpreterDeserializationListener() const;
InterpreterCallbacks* getNext() { return m_Next; }
void setNext(InterpreterCallbacks* C) {
InterpreterCallbacks* current = this;
while (true) {
assert(current != C);
if (!current->m_Next) {
current->m_Next = C;
break;
}
current = current->getNext();
}
}
virtual void InclusionDirective(clang::SourceLocation /*HashLoc*/,
const clang::Token& /*IncludeTok*/,
llvm::StringRef FileName,

55
lib/Interpreter/InterpreterCallbacks.cpp
View File

@ -41,28 +41,16 @@ namespace cling {
llvm::StringRef SearchPath,
llvm::StringRef RelativePath,
const clang::Module *Imported) {
if (m_Callbacks) {
m_Callbacks->InclusionDirective(HashLoc, IncludeTok, FileName,
IsAngled, FilenameRange, File,
SearchPath, RelativePath, Imported);
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
current->InclusionDirective(HashLoc, IncludeTok, FileName,
m_Callbacks->InclusionDirective(HashLoc, IncludeTok, FileName,
IsAngled, FilenameRange, File,
SearchPath, RelativePath, Imported);;
}
SearchPath, RelativePath, Imported);
}
virtual bool FileNotFound(llvm::StringRef FileName,
llvm::SmallVectorImpl<char>& RecoveryPath) {
if (m_Callbacks) {
bool result = m_Callbacks->FileNotFound(FileName, RecoveryPath);
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
result = current->FileNotFound(FileName, RecoveryPath) || result;
return result;
}
if (m_Callbacks)
return m_Callbacks->FileNotFound(FileName, RecoveryPath);
// Returning true would mean that the preprocessor should try to recover.
return false;
}
@ -79,21 +67,13 @@ namespace cling {
: m_Callbacks(C) {}
virtual void DeclRead(serialization::DeclID, const Decl *D) {
if (m_Callbacks) {
if (m_Callbacks)
m_Callbacks->DeclDeserialized(D);
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
current->DeclDeserialized(D);
}
}
virtual void TypeRead(serialization::TypeIdx, QualType T) {
if (m_Callbacks) {
if (m_Callbacks)
m_Callbacks->TypeDeserialized(T.getTypePtr());
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
current->TypeDeserialized(T.getTypePtr());
}
}
};
@ -148,11 +128,7 @@ namespace cling {
///
virtual bool LookupUnqualified(clang::LookupResult& R, clang::Scope* S) {
if (m_Callbacks) {
bool result = m_Callbacks->LookupObject(R, S);
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
result = current->LookupObject(R, S) || result;
return result;
return m_Callbacks->LookupObject(R, S);
}
return false;
@ -160,13 +136,8 @@ namespace cling {
virtual bool FindExternalVisibleDeclsByName(const clang::DeclContext* DC,
clang::DeclarationName Name) {
if (m_Callbacks) {
bool result = m_Callbacks->LookupObject(DC, Name);
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
result = current->LookupObject(DC, Name) || result;
return result;
}
if (m_Callbacks)
return m_Callbacks->LookupObject(DC, Name);
return false;
}
@ -174,12 +145,8 @@ namespace cling {
// Silence warning virtual function was hidden.
using ExternalASTSource::CompleteType;
virtual void CompleteType(TagDecl* Tag) {
if (m_Callbacks) {
if (m_Callbacks)
m_Callbacks->LookupObject(Tag);
InterpreterCallbacks* current = m_Callbacks;
while ((current = current->getNext()))
current->LookupObject(Tag);
}
}
void UpdateWithNewDeclsFwd(const DeclContext *DC, DeclarationName Name,