averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Frontend] Refactor CompilerInvocation to be a pure settings object.

Browse Source 
This mainly removes the extraneous DiagnosticEngine and SourceMgr from CompilerInvocation.
Instances of these can be found via the CompilerInstance object.

Swift SVN r6496
This commit is contained in:
Argyrios Kyrtzidis
2013-07-23 14:49:29 +00:00
parent 8d92add99b
commit 200e64d8c2
3 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/swift/Frontend/Frontend.h
View File

@@ -36,7 +36,7 @@ namespace llvm {
namespace swift {
class CompilerInvocation : public llvm::RefCountedBase<CompilerInvocation> {
class CompilerInvocation {
std::string TargetTriple;
std::string ClangModuleCachePath;
std::vector<std::string> ImportSearchPaths;
@@ -49,10 +49,6 @@ class CompilerInvocation : public llvm::RefCountedBase<CompilerInvocation> {
bool ParseOnly = false;
TranslationUnit::TUKind TUKind = TranslationUnit::Main;
llvm::SourceMgr DriverDiagsSourceMgr;
DiagnosticEngine DriverDiagnostics;
std::vector<DiagnosticConsumer *> DiagnosticConsumers;
std::string ModuleName;
CodeCompletionCallbacksFactory *CodeCompletionFactory = nullptr;
@@ -136,19 +132,6 @@ public:
return TUKind;
}
DiagnosticEngine &getDriverDiags() {
return DriverDiagnostics;
}
void addDiagnosticConsumer(DiagnosticConsumer *DC) {
DriverDiagnostics.addConsumer(*DC);
DiagnosticConsumers.push_back(DC);
}
ArrayRef<DiagnosticConsumer *> getDiagnosticConsumers() const {
return DiagnosticConsumers;
}
void setModuleName(StringRef Name) {
ModuleName = Name.str();
}
@@ -167,7 +150,7 @@ public:
};
class CompilerInstance {
llvm::IntrusiveRefCntPtr<CompilerInvocation> Invocation;
CompilerInvocation Invocation;
llvm::SourceMgr SourceMgr;
std::vector<unsigned> BufferIDs;
DiagnosticEngine Diagnostics;
@@ -180,12 +163,17 @@ class CompilerInstance {
void createSILModule();
public:
CompilerInstance(llvm::IntrusiveRefCntPtr<CompilerInvocation> Invocation)
: Invocation(Invocation), Diagnostics(SourceMgr), TU(nullptr) {
CompilerInstance() : Diagnostics(SourceMgr), TU(nullptr) {
}
llvm::SourceMgr &getSourceMgr() { return SourceMgr; }
DiagnosticEngine &getDiags() { return Diagnostics; }
void addDiagnosticConsumer(DiagnosticConsumer *DC) {
Diagnostics.addConsumer(*DC);
}
void setBufferIDs(const std::vector<unsigned> &IDs) {
BufferIDs = IDs;
}
@@ -213,7 +201,7 @@ public:
return TU;
}
void setup();
void setup(const CompilerInvocation &Invocation);
void doIt();
};