admin/build-cpp-cmkr
1
0
Fork 0
mirror of https://github.com/build-cpp/cmkr synced 2026-06-08 13:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve the code related to [options]

Browse Source
This commit is contained in:
Duncan Ogilvie
2023-02-19 20:08:19 +01:00
parent 233cadadd0
commit 0c19c3da0c
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/project_parser.cpp
+10 -8
View File
@@ -347,18 +347,18 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
s.name = itr.first;
const auto &value = itr.second;
if (value.is_boolean()) {
s.val = value.as_boolean();
s.value = value.as_boolean();
} else if (value.is_string()) {
s.val = value.as_string();
s.value = value.as_string();
} else {
auto &setting = checker.create(value);
setting.optional("comment", s.comment);
setting.optional("help", s.help);
if (setting.contains("value")) {
const auto &v = setting.find("value");
if (v.is_boolean()) {
s.val = v.as_boolean();
s.value = v.as_boolean();
} else {
s.val = v.as_string();
s.value = v.as_string();
}
}
setting.optional("cache", s.cache);
@@ -376,13 +376,14 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
o.name = itr.first;
const auto &value = itr.second;
if (value.is_boolean()) {
o.val = value.as_boolean();
o.value = value.as_boolean();
} else {
auto &option = checker.create(value);
option.optional("comment", o.comment);
option.optional("value", o.val);
option.optional("help", o.help);
option.optional("value", o.value);
}
options.push_back(o);
conditions.emplace(o.name, o.name);
}
}
@@ -661,6 +662,7 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
t.optional("add-function", tmplate.add_function);
t.optional("pass-sources-to-add-function", tmplate.pass_sources_to_add_function);
t.optional("pass-sources", tmplate.pass_sources_to_add_function);
templates.push_back(tmplate);
}