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

Abstract forEachFileToTypeCheck

Browse Source 
# Conflicts:
#	lib/Frontend/Frontend.cpp
This commit is contained in:
David Ungar
2017-09-07 18:18:37 -07:00
parent 8057dea43e
commit 7b7c62917d
3 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/Frontend/Frontend.cpp
View File

@@ -575,11 +575,14 @@ void CompilerInstance::checkTypesWhileParsingMain(
TypeCheckOptions);
}
if (generateOutputForTheWholeModule())
typeCheckEveryFile(PersistentState, TypeCheckOptions);
else
typeCheckThePrimaryFile(PersistentState, TypeCheckOptions);
forEachFileToTypeCheck([&](SourceFile &SF) {
performTypeChecking(SF, PersistentState.getTopLevelContext(),
TypeCheckOptions, /*curElem*/ 0,
options.WarnLongFunctionBodies,
options.WarnLongExpressionTypeChecking,
options.SolverExpressionTimeThreshold);
});
// Even if there were no source files, we should still record known
// protocols.
if (auto *stdlib = Context->getStdlibModule())
@@ -647,44 +650,25 @@ void CompilerInstance::parseAndTypeCheckMainFile(
}
}
void CompilerInstance::typeCheckEveryFile(
PersistentParserState &PersistentState,
OptionSet<TypeCheckingFlags> TypeCheckOptions) {
for (auto File : MainModule->getFiles()) {
if (auto SF = dyn_cast<SourceFile>(File)) {
performTypeChecking(*SF, PersistentState.getTopLevelContext(),
TypeCheckOptions, /*curElem*/ 0,
options.WarnLongFunctionBodies,
options.WarnLongExpressionTypeChecking,
options.SolverExpressionTimeThreshold);
}
void CompilerInstance::forEachFileToTypeCheck(const std::function<void(SourceFile &)> &fn) {
if (generateOutputForTheWholeModule()) {
MainModule->forEachSourceFile([&] (SourceFile &SF) { fn(SF); });
}
else {
fn(*PrimarySourceFile);
}
}
void CompilerInstance::typeCheckThePrimaryFile(
PersistentParserState &PersistentState,
const OptionSet<TypeCheckingFlags> TypeCheckOptions) {
assert (PrimarySourceFile != nullptr && "No primary file?");
performTypeChecking(*PrimarySourceFile, PersistentState.getTopLevelContext(),
TypeCheckOptions, /*curElem*/ 0,
options.WarnLongFunctionBodies,
options.WarnLongExpressionTypeChecking,
options.SolverExpressionTimeThreshold);
}
void CompilerInstance::typeCheckMainModule(
OptionSet<TypeCheckingFlags> TypeCheckOptions) {
if (TypeCheckOptions & TypeCheckingFlags::DelayWholeModuleChecking) {
for (auto File : MainModule->getFiles())
if (auto SF = dyn_cast<SourceFile>(File))
performWholeModuleTypeChecking(*SF);
}
if (generateOutputForTheWholeModule()) {
for (auto File : MainModule->getFiles())
if (auto SF = dyn_cast<SourceFile>(File))
finishTypeChecking(*SF);
} else {
finishTypeChecking(*PrimarySourceFile);
MainModule->forEachSourceFile([&](SourceFile &SF) {
performWholeModuleTypeChecking(SF);
});
}
forEachFileToTypeCheck([&](SourceFile &SF) {
finishTypeChecking(SF);
});
}
void CompilerInstance::performParseOnly(bool EvaluateConditionals) {