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

Diagnose when @UIApplicationMain tries to coexist with a main.swift file.

Browse Source 
Swift SVN r18072
This commit is contained in:
Joe Groff
2014-05-14 16:10:29 +00:00
parent a8bbc4c89b
commit 6e13190f47
5 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/AST/Module.cpp
View File

@@ -290,7 +290,10 @@ void SourceLookupCache::lookupClassMember(AccessPathTy accessPath,
//===----------------------------------------------------------------------===//
Module::Module(Identifier name, ASTContext &ctx)
: DeclContext(DeclContextKind::Module, nullptr), Ctx(ctx), Name(name) {
: DeclContext(DeclContextKind::Module, nullptr), Ctx(ctx), Name(name),
DiagnosedMultipleMainClasses(false),
DiagnosedMainClassWithScript(false)
{
ctx.addDestructorCleanup(*this);
}
@@ -1090,6 +1093,20 @@ bool Module::registerMainClass(ClassDecl *mainClass, SourceLoc diagLoc) {
return true;
}
// Complain if there is also a script file in this module.
if (!DiagnosedMainClassWithScript) {
DiagnosedMainClassWithScript = true;
for (auto file : getFiles()) {
auto sf = dyn_cast<SourceFile>(file);
if (!sf)
continue;
if (sf->isScriptMode()) {
getASTContext().Diags.diagnose(diagLoc, diag::attr_UIApplicationMain_with_script);
break;
}
}
}
MainClass = mainClass;
MainClassDiagLoc = diagLoc;
return false;