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

[frontend] Fixed an issue with the default output filename algorithm.

Browse Source 
If the user explicitly specified -module-name, prefer that to the base of the only input filename.
Also fixed an 80-column violation.

Swift SVN r12892
This commit is contained in:
Connor Wakamo
2014-01-24 00:35:17 +00:00
parent 6fa70874fa
commit 1ffcba47e8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Frontend/CompilerInvocation.cpp
View File

@@ -194,11 +194,13 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Opts.OutputFilename = A->getValue();
}
bool UserSpecifiedModuleName = false;
{
const Arg *A = Args.getLastArg(OPT_module_name);
std::string ModuleName;
if (A) {
ModuleName = A->getValue();
UserSpecifiedModuleName = true;
} else {
// The user did not specify a module name, so determine a default fallback
// based on other options.
@@ -313,8 +315,10 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
StringRef BaseName;
if (Opts.PrimaryInput.hasValue() && Opts.PrimaryInput->isFilename()) {
BaseName = llvm::sys::path::stem(Opts.InputFilenames[Opts.PrimaryInput->Index]);
} else if (Opts.InputFilenames.size() == 1) {
unsigned Index = Opts.PrimaryInput->Index;
BaseName = llvm::sys::path::stem(Opts.InputFilenames[Index]);
} else if (!UserSpecifiedModuleName &&
Opts.InputFilenames.size() == 1) {
BaseName = llvm::sys::path::stem(Opts.InputFilenames[0]);
} else {
BaseName = Opts.ModuleName;