Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

DPL: improve DataSpecUtils #4824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Nov 12, 2020
Merged

DPL: improve DataSpecUtils #4824

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions 13 Framework/Core/src/DataSpecUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,11 @@ bool DataSpecUtils::partialMatch(InputSpec const& input, header::DataOrigin cons

bool DataSpecUtils::partialMatch(InputSpec const& input, header::DataDescription const& description)
{
auto dataType = DataSpecUtils::asConcreteDataTypeMatcher(input);
return dataType.description == description;
try {
return DataSpecUtils::asConcreteDataDescription(input) == description;
} catch (...) {
return false;
}
}

bool DataSpecUtils::partialMatch(OutputSpec const& output, header::DataDescription const& description)
Expand Down Expand Up @@ -400,7 +403,7 @@ ConcreteDataTypeMatcher DataSpecUtils::asConcreteDataTypeMatcher(OutputSpec cons
ConcreteDataTypeMatcher DataSpecUtils::asConcreteDataTypeMatcher(InputSpec const& spec)
{
return std::visit(overloaded{
[](ConcreteDataMatcher const& concrete) {
[](auto const& concrete) {
return ConcreteDataTypeMatcher{concrete.origin, concrete.description};
},
[](DataDescriptorMatcher const& matcher) {
Expand All @@ -416,7 +419,7 @@ ConcreteDataTypeMatcher DataSpecUtils::asConcreteDataTypeMatcher(InputSpec const
header::DataOrigin DataSpecUtils::asConcreteOrigin(InputSpec const& spec)
{
return std::visit(overloaded{
[](ConcreteDataMatcher const& concrete) {
[](auto const& concrete) {
return concrete.origin;
},
[](DataDescriptorMatcher const& matcher) {
Expand All @@ -432,7 +435,7 @@ header::DataOrigin DataSpecUtils::asConcreteOrigin(InputSpec const& spec)
header::DataDescription DataSpecUtils::asConcreteDataDescription(InputSpec const& spec)
{
return std::visit(overloaded{
[](ConcreteDataMatcher const& concrete) {
[](auto const& concrete) {
return concrete.description;
},
[](DataDescriptorMatcher const& matcher) {
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.