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

[driver] Standardized the names of output-specifying options for secondary outputs.

Browse Source 
The new format is "-<option>" and "-<option>-path". As a result:
  - Renamed -serialized-diagnostics-path to -serialize-diagnostics-path.
  - Renamed -module-output-path to -emit-module-path.

Swift SVN r12614
This commit is contained in:
Connor Wakamo
2014-01-20 23:16:22 +00:00
parent 66d4c813d4
commit 0a3202a46a
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Frontend/CompilerInvocation.cpp
View File

@@ -161,7 +161,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
if (Opts.InputFilenames.empty()) {
// We don't have any input files, so default to the REPL.
Action = FrontendOptions::REPL;
} else if (Args.hasArg(OPT_emit_module, OPT_module_output_path)) {
} else if (Args.hasArg(OPT_emit_module, OPT_emit_module_path)) {
// We've been told to emit a module, but have no other mode indicators.
// As a result, put the frontend into EmitModuleOnly mode.
// (Setting up module output will be handled below.)
@@ -255,24 +255,24 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
return Path.str();
};
if (const Arg *A = Args.getLastArg(OPT_serialized_diagnostics_path)) {
if (const Arg *A = Args.getLastArg(OPT_serialize_diagnostics_path)) {
// Claim -serialize-diagnostics, if present.
Args.ClaimAllArgs(OPT_serialize_diagnostics);
Opts.SerializedDiagnosticsPath = A->getValue();
} else if (Args.hasArg(OPT_serialize_diagnostics)) {
// -serialize-diagnostics has been passed without
// -serialized-diagnostics-path, so determine a path based on other inputs.
// -serialize-diagnostics-path, so determine a path based on other inputs.
static const char *const DiagnosticsFilePathExtension = "dia";
Opts.SerializedDiagnosticsPath =
determineOutputFilename(DiagnosticsFilePathExtension);
}
if (const Arg *A = Args.getLastArg(OPT_module_output_path)) {
if (const Arg *A = Args.getLastArg(OPT_emit_module_path)) {
// Claim -emit-module, if present.
Args.ClaimAllArgs(OPT_emit_module);
Opts.ModuleOutputPath = A->getValue();
} else if (Args.hasArg(OPT_emit_module)) {
// -emit-module has been passed without -module-output-path, so determine
// -emit-module has been passed without -emit-module-path, so determine
// a path based on other inputs.
if (Opts.RequestedAction == FrontendOptions::EmitModuleOnly &&
!Opts.OutputFilename.empty())