std::vector<std::string> Targets;
llvm::raw_ostream *OS;
+ // FIXME: This functionality should be moved into a common class for
+ // chaining callbacks.
+ PPCallbacks *PrevCallbacks;
+
private:
bool FileMatchesDepCriteria(const char *Filename,
SrcMgr::CharacteristicKind FileType);
public:
DependencyFileCallback(const Preprocessor *_PP,
llvm::raw_ostream *_OS,
- const std::vector<std::string> &_Targets)
- : PP(_PP), Targets(_Targets), OS(_OS) {
+ const std::vector<std::string> &_Targets,
+ PPCallbacks *_PrevCallbacks)
+ : PP(_PP), Targets(_Targets), OS(_OS), PrevCallbacks(_PrevCallbacks) {
}
~DependencyFileCallback() {
+ if (PrevCallbacks)
+ delete PrevCallbacks;
OutputDependencyFile();
OS->flush();
delete OS;
virtual void FileChanged(SourceLocation Loc, FileChangeReason Reason,
SrcMgr::CharacteristicKind FileType);
+
+ virtual void Ident(SourceLocation Loc, const std::string &str) {
+ if (PrevCallbacks)
+ PrevCallbacks->Ident(Loc, str);
+ }
+
+ virtual void PragmaComment(SourceLocation Loc, const IdentifierInfo *Kind,
+ const std::string &Str) {
+ if (PrevCallbacks)
+ PrevCallbacks->PragmaComment(Loc, Kind, Str);
+ }
+
+ virtual void MacroExpands(const Token &Id, const MacroInfo* MI) {
+ if (PrevCallbacks)
+ PrevCallbacks->MacroExpands(Id, MI);
+ }
+
+ virtual void MacroDefined(const IdentifierInfo *II, const MacroInfo *MI) {
+ if (PrevCallbacks)
+ PrevCallbacks->MacroDefined(II, MI);
+ }
+
+ virtual void MacroUndefined(const IdentifierInfo *II, const MacroInfo *MI) {
+ if (PrevCallbacks)
+ PrevCallbacks->MacroUndefined(II, MI);
+ }
};
}
}
}
+ // Claim any previous callbacks.
+ PPCallbacks *Prev = PP->getPPCallbacks();
+ if (Prev)
+ PP->setPPCallbacks(0);
+
DependencyFileCallback *PPDep =
- new DependencyFileCallback(PP, OS, DependencyTargets);
+ new DependencyFileCallback(PP, OS, DependencyTargets, Prev);
PP->setPPCallbacks(PPDep);
return true;
}
void DependencyFileCallback::FileChanged(SourceLocation Loc,
FileChangeReason Reason,
SrcMgr::CharacteristicKind FileType) {
+ if (PrevCallbacks)
+ PrevCallbacks->FileChanged(Loc, Reason, FileType);
+
if (Reason != PPCallbacks::EnterFile)
return;
if (InitializePreprocessor(*PP, InFile, InitOpts))
return 0;
- /// FIXME: PP can only handle one callback
- if (ProgAction != PrintPreprocessedInput) {
- std::string ErrStr;
- bool DFG = CreateDependencyFileGen(PP.get(), ErrStr);
- if (!DFG && !ErrStr.empty()) {
- fprintf(stderr, "%s", ErrStr.c_str());
- return 0;
- }
+ std::string ErrStr;
+ bool DFG = CreateDependencyFileGen(PP.get(), ErrStr);
+ if (!DFG && !ErrStr.empty()) {
+ fprintf(stderr, "%s", ErrStr.c_str());
+ return 0;
}
return PP.take();