From 3c870a93850d2ae6f99e6948d28dfd91536b9c55 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sun, 13 Aug 2017 21:17:11 +0200
Subject: [PATCH] casing to nonprimitive types in cast abstraction
---
alib2common/src/abstraction/CastRegistry.hpp | 19 +++++++++++++++----
alib2common/src/core/namingApi.hpp | 5 +++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/alib2common/src/abstraction/CastRegistry.hpp b/alib2common/src/abstraction/CastRegistry.hpp
index 00c2041cf4..0d55ef8ab8 100644
--- a/alib2common/src/abstraction/CastRegistry.hpp
+++ b/alib2common/src/abstraction/CastRegistry.hpp
@@ -10,10 +10,13 @@
#include <memory>
#include <string>
+#include <set>
#include <exception/CommonException.h>
#include <abstraction/OperationAbstraction.hpp>
+#include <core/namingApi.hpp>
+
namespace abstraction {
class CastRegistry {
@@ -77,11 +80,19 @@ public:
}
static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( std::string target, std::string param ) {
- auto cast = getEntries ( ).find ( std::make_pair ( target, param ) );
- if ( cast == getEntries ( ).end ( ) )
- throw exception::CommonException ( "Entry from " + param + " to " + target + " not available." );
+ std::set < std::string > targetTypes;
+ if ( alib::namingApi::hasTypes ( target ) )
+ targetTypes = ext::transform < std::string > ( alib::namingApi::getTypes ( target ), [ ] ( const ext::type_index & type ) { return ext::to_string ( type ); } );
+ else
+ targetTypes.insert ( target );
+
+ for ( const std::string & toType : targetTypes ) {
+ auto cast = getEntries ( ).find ( std::make_pair ( toType, param ) );
+ if ( cast != getEntries ( ).end ( ) )
+ return cast->second->getAbstraction ( );
+ }
- return cast->second->getAbstraction ( );
+ throw exception::CommonException ( "Entry from " + param + " to " + target + " not available." );
}
};
diff --git a/alib2common/src/core/namingApi.hpp b/alib2common/src/core/namingApi.hpp
index b4681f14b0..19658b45ad 100644
--- a/alib2common/src/core/namingApi.hpp
+++ b/alib2common/src/core/namingApi.hpp
@@ -40,6 +40,11 @@ public:
return name->second;
}
+ static bool hasTypes ( std::string stringname ) {
+ auto name = getNames ( ).find ( stringname );
+ return name != getNames ( ).end ( );
+ }
+
};
} /* namespace alib */
--
GitLab