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

Pull out parseMainAndTypeCheckTopLevelFiles.

Browse Source
This commit is contained in:
David Ungar
2017-08-28 10:27:59 -07:00
parent 4cc16f4590
commit f63cb71196
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/Frontend/Frontend.cpp
View File

@@ -379,30 +379,8 @@ void CompilerInstance::performSema() {
if (hadLoadError)
return;
OptionSet<TypeCheckingFlags> TypeCheckOptions = computeTypeCheckingOptions();
// Parse the main file last.
if (MainBufferID != NO_SUCH_BUFFER) {
parseTheMainFile(PersistentState, DelayedCB.get(), TypeCheckOptions);
}
typeCheckTopLevelInputsExcludingMain(PersistentState, TypeCheckOptions);
// Even if there were no source files, we should still record known
// protocols.
if (auto *stdlib = Context->getStdlibModule())
Context->recordKnownProtocols(stdlib);
if (DelayedCB) {
performDelayedParsing(MainModule, PersistentState,
Invocation.getCodeCompletionFactory());
}
if (TypeCheckOptions & TypeCheckingFlags::DelayWholeModuleChecking) {
performWholeModuleTypeCheckingOnMainModule();
}
finishTypeCheckingMainModule();
parseMainAndTypeCheckTopLevelFiles(PersistentState, DelayedCB.get());
}
void CompilerInstance::loadStdlibAndMaybeSwiftOnoneSupport() {
@@ -582,7 +560,30 @@ OptionSet<TypeCheckingFlags> CompilerInstance::computeTypeCheckingOptions() {
return TypeCheckOptions;
}
void CompilerInstance::parseTheMainFile(PersistentParserState &PersistentState,
void CompilerInstance::parseMainAndTypeCheckTopLevelFiles(PersistentParserState &PersistentState,
DelayedParsingCallbacks *DelayedParseCB) {
OptionSet<TypeCheckingFlags> TypeCheckOptions = computeTypeCheckingOptions();
// Parse the main file last.
if (MainBufferID != NO_SUCH_BUFFER) {
parseAndTypeCheckTheMainFile(PersistentState, DelayedParseCB, TypeCheckOptions);
}
typeCheckTopLevelInputsExcludingMain(PersistentState, TypeCheckOptions);
// Even if there were no source files, we should still record known
// protocols.
if (auto *stdlib = Context->getStdlibModule())
Context->recordKnownProtocols(stdlib);
if (DelayedParseCB) {
performDelayedParsing(MainModule, PersistentState,
Invocation.getCodeCompletionFactory());
}
typeCheckMainModule(TypeCheckOptions);
}
void CompilerInstance::parseAndTypeCheckTheMainFile(PersistentParserState &PersistentState,
DelayedParsingCallbacks *DelayedParseCB,
const OptionSet<TypeCheckingFlags> TypeCheckOptions) {
bool mainIsPrimary =
@@ -645,6 +646,13 @@ void CompilerInstance::typeCheckTopLevelInputsExcludingMain(PersistentParserStat
options.SolverExpressionTimeThreshold);
}
void CompilerInstance::typeCheckMainModule(OptionSet<TypeCheckingFlags> TypeCheckOptions) {
if (TypeCheckOptions & TypeCheckingFlags::DelayWholeModuleChecking) {
performWholeModuleTypeCheckingOnMainModule();
}
finishTypeCheckingMainModule();
}
void CompilerInstance::performWholeModuleTypeCheckingOnMainModule() {
for (auto File : MainModule->getFiles())
if (auto SF = dyn_cast<SourceFile>(File))