epics/normativeTypes
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Validator: '{maybe,}has<fn>' becomes {maybe,}has<fn, T=Field> to allow for optional specific type checking

Browse Source
This commit is contained in:
Bruno Martins
2019-05-28 10:11:13 -04:00
committed by mdavidsaver
parent 5a0b42fec7
commit 28ca7ac1ab
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/validator.h
View File

@ -29,8 +29,8 @@ struct Result {
IncorrectId,
} type;
Error(std::string const & ref_path, Type type)
: path(), type(type) {}
Error(std::string const & path, Type type)
: path(path), type(type) {}
bool operator==(const Error& other) const {
return type == other.type && path == other.path;
@ -93,14 +93,14 @@ struct Result {
return *this;
}
template<Result& (*fn)(Result&)>
template<Result& (*fn)(Result&), typename T=epics::pvData::Field>
Result& has(const std::string& name) {
return has<epics::pvData::Field>(name, false, fn);
return has<T>(name, false, fn);
}
template<Result& (*fn)(Result&)>
template<Result& (*fn)(Result&), typename T=epics::pvData::Field>
Result& maybeHas(const std::string& name) {
return has<epics::pvData::Field>(name, true, fn);
return has<T>(name, true, fn);
}
template<typename T>
@ -114,7 +114,7 @@ struct Result {
}
std::ostream& dump(std::ostream& os) const {
os << "Result(valid=" << valid() << ", errors=[ ";
os << "Result(valid=" << (result == Pass) << ", errors=[ ";
std::vector<Error>::const_iterator it;
for (it = errors.cbegin(); it != errors.cend(); ++it) {