Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 04:24:36 +08:00
Code Issues Projects Releases Wiki Activity

cmScanDepFormat: P1689R4: Diagnose invalid provides/requires json type

Browse Source
This commit is contained in:
Ben Boeckel
2021-06-08 11:27:39 -04:00
committed by Brad King
parent 82c867ad85
commit b0a8fa959c
1 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Source/cmScanDepFormat.cxx
View File

@@ -133,46 +133,56 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp,
if (rule.isMember("provides")) { if (rule.isMember("provides")) {
Json::Value const& provides = rule["provides"]; Json::Value const& provides = rule["provides"];
if (provides.isArray()) { if (!provides.isArray()) {
for (auto const& provide : provides) { cmSystemTools::Error(
cmSourceReqInfo provide_info; cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
": provides is not an array"));
return false;
}
Json::Value const& logical_name = provide["logical-name"]; for (auto const& provide : provides) {
PARSE_BLOB(logical_name, provide_info.LogicalName); cmSourceReqInfo provide_info;
if (provide.isMember("compiled-module-path")) { Json::Value const& logical_name = provide["logical-name"];
Json::Value const& compiled_module_path = PARSE_BLOB(logical_name, provide_info.LogicalName);
provide["compiled-module-path"];
PARSE_FILENAME(compiled_module_path,
provide_info.CompiledModulePath);
} else {
provide_info.CompiledModulePath =
cmStrCat(provide_info.LogicalName, ".mod");
}
info->Provides.push_back(provide_info); if (provide.isMember("compiled-module-path")) {
Json::Value const& compiled_module_path =
provide["compiled-module-path"];
PARSE_FILENAME(compiled_module_path,
provide_info.CompiledModulePath);
} else {
provide_info.CompiledModulePath =
cmStrCat(provide_info.LogicalName, ".mod");
} }
info->Provides.push_back(provide_info);
} }
} }
if (rule.isMember("requires")) { if (rule.isMember("requires")) {
Json::Value const& reqs = rule["requires"]; Json::Value const& reqs = rule["requires"];
if (reqs.isArray()) { if (!reqs.isArray()) {
for (auto const& require : reqs) { cmSystemTools::Error(
cmSourceReqInfo require_info; cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
": requires is not an array"));
return false;
}
Json::Value const& logical_name = require["logical-name"]; for (auto const& require : reqs) {
PARSE_BLOB(logical_name, require_info.LogicalName); cmSourceReqInfo require_info;
if (require.isMember("compiled-module-path")) { Json::Value const& logical_name = require["logical-name"];
Json::Value const& compiled_module_path = PARSE_BLOB(logical_name, require_info.LogicalName);
require["compiled-module-path"];
PARSE_FILENAME(compiled_module_path,
require_info.CompiledModulePath);
}
info->Requires.push_back(require_info); if (require.isMember("compiled-module-path")) {
Json::Value const& compiled_module_path =
require["compiled-module-path"];
PARSE_FILENAME(compiled_module_path,
require_info.CompiledModulePath);
} }
info->Requires.push_back(require_info);
} }
} }
} }