Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

cmGlobalNinjaGenerator: Clarify semantics of Fortran scanning info

Browse Source 
Use `optional<>` instead of `unique_ptr<>` to hold optional value.
This commit is contained in:
Brad King
2021-05-11 08:47:58 -04:00
parent bd12b97d05
commit db8e0beeac
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -9,6 +9,7 @@
#include <cm/iterator> #include <cm/iterator>
#include <cm/memory> #include <cm/memory>
#include <cm/optional>
#include <cm/string_view> #include <cm/string_view>
#include <cmext/algorithm> #include <cmext/algorithm>
#include <cmext/memory> #include <cmext/memory>
@@ -2255,7 +2256,7 @@ struct cmSourceInfo
std::vector<std::string> Includes; std::vector<std::string> Includes;
}; };
std::unique_ptr<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran( cm::optional<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
std::string const& arg_tdi, std::string const& arg_pp); std::string const& arg_tdi, std::string const& arg_pp);
} }
@@ -2312,7 +2313,7 @@ int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg,
return 1; return 1;
} }
std::unique_ptr<cmSourceInfo> info; cm::optional<cmSourceInfo> info;
if (arg_lang == "Fortran") { if (arg_lang == "Fortran") {
info = cmcmd_cmake_ninja_depends_fortran(arg_tdi, arg_pp); info = cmcmd_cmake_ninja_depends_fortran(arg_tdi, arg_pp);
} else { } else {
@@ -2348,9 +2349,10 @@ int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg,
namespace { namespace {
std::unique_ptr<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran( cm::optional<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
std::string const& arg_tdi, std::string const& arg_pp) std::string const& arg_tdi, std::string const& arg_pp)
{ {
cm::optional<cmSourceInfo> info;
cmFortranCompiler fc; cmFortranCompiler fc;
std::vector<std::string> includes; std::vector<std::string> includes;
{ {
@@ -2363,7 +2365,7 @@ std::unique_ptr<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
cmSystemTools::Error( cmSystemTools::Error(
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_tdi, cmStrCat("-E cmake_ninja_depends failed to parse ", arg_tdi,
reader.getFormattedErrorMessages())); reader.getFormattedErrorMessages()));
return nullptr; return info;
} }
} }
@@ -2390,14 +2392,14 @@ std::unique_ptr<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
if (!cmFortranParser_FilePush(&parser, arg_pp.c_str())) { if (!cmFortranParser_FilePush(&parser, arg_pp.c_str())) {
cmSystemTools::Error( cmSystemTools::Error(
cmStrCat("-E cmake_ninja_depends failed to open ", arg_pp)); cmStrCat("-E cmake_ninja_depends failed to open ", arg_pp));
return nullptr; return info;
} }
if (cmFortran_yyparse(parser.Scanner) != 0) { if (cmFortran_yyparse(parser.Scanner) != 0) {
// Failed to parse the file. // Failed to parse the file.
return nullptr; return info;
} }
auto info = cm::make_unique<cmSourceInfo>(); info = cmSourceInfo();
for (std::string const& provide : finfo.Provides) { for (std::string const& provide : finfo.Provides) {
cmSourceReqInfo src_info; cmSourceReqInfo src_info;
src_info.LogicalName = provide; src_info.LogicalName = provide;