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

Flip the switch: multiple input files = multiple SourceFiles.

Browse Source 
There is still plenty of fallout to get everything fully correct, but
right now we can build the standard library and run all the tests in
multiple-file mode.

Swift SVN r9673
This commit is contained in:
Jordan Rose
2013-10-25 17:30:45 +00:00
parent 32130d3cc3
commit a333b692b4
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Frontend/Frontend.cpp
View File

@@ -123,11 +123,12 @@ void swift::CompilerInstance::doIt() {
TU = new (*Context) TranslationUnit(ID, *Context);
Context->LoadedModules[ID.str()] = TU;
auto *SingleInputFile =
new (*Context) SourceFile(*TU, Kind, Invocation.getParseStdlib());
TU->addSourceFile(*SingleInputFile);
if (Kind == SourceFile::REPL)
if (Kind == SourceFile::REPL) {
auto *SingleInputFile =
new (*Context) SourceFile(*TU, Kind, Invocation.getParseStdlib());
TU->addSourceFile(*SingleInputFile);
return;
}
std::unique_ptr<DelayedParsingCallbacks> DelayedCB;
if (Invocation.isCodeCompletion()) {
@@ -140,18 +141,26 @@ void swift::CompilerInstance::doIt() {
PersistentParserState PersistentState;
if (Kind == SourceFile::Library) {
// Parse all of the files into one big translation unit.
for (auto &BufferID : BufferIDs) {
auto *NextInput =
new (*Context) SourceFile(*TU, Kind, Invocation.getParseStdlib());
TU->addSourceFile(*NextInput);
bool Done;
parseIntoTranslationUnit(*SingleInputFile, BufferID, &Done,
nullptr, &PersistentState, DelayedCB.get());
parseIntoTranslationUnit(*NextInput, BufferID, &Done, nullptr,
&PersistentState, DelayedCB.get());
assert(Done && "Parser returned early?");
(void) Done;
performNameBinding(*NextInput);
}
// Finally, if enabled, type check the whole thing in one go.
if (!Invocation.getParseOnly())
performTypeChecking(*SingleInputFile);
if (!Invocation.getParseOnly()) {
// Type-check each top-level input.
auto InputSourceFiles = TU->getSourceFiles().slice(0, BufferIDs.size());
for (auto SF : InputSourceFiles)
performTypeChecking(*SF);
}
if (DelayedCB) {
performDelayedParsing(TU, PersistentState,
@@ -169,6 +178,9 @@ void swift::CompilerInstance::doIt() {
SourceMgr.setHashbangBufferID(BufferID);
SILParserState SILContext(TheSILModule.get());
auto *SingleInputFile =
new (*Context) SourceFile(*TU, Kind, Invocation.getParseStdlib());
TU->addSourceFile(*SingleInputFile);
unsigned CurTUElem = 0;
bool Done;