Skip to content
Snippets Groups Projects
Commit d841790e authored by Jan Trávníček's avatar Jan Trávníček
Browse files

fix tuple vs pair inconsistency

parent 1ac160e9
No related branches found
No related tags found
1 merge request!142Fix most of libstdc++ vs libc++ incompatibilty
Hide whitespace changes
Inline Side-by-side
alib2abstraction/src/abstraction/RawAbstraction.hpp
+ 2
− 2
View file @ d841790e
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
namespace abstraction { namespace abstraction {
   
class RawAbstraction : virtual public OperationAbstraction { class RawAbstraction : virtual public OperationAbstraction {
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > m_paramSpecs; ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > m_paramSpecs; //FIXME is it needed?
std::function < std::shared_ptr < abstraction::Value > ( std::vector < std::shared_ptr < abstraction::Value > > ) > m_callback; std::function < std::shared_ptr < abstraction::Value > ( std::vector < std::shared_ptr < abstraction::Value > > ) > m_callback;
ext::vector < std::shared_ptr < abstraction::Value > > m_params; ext::vector < std::shared_ptr < abstraction::Value > > m_params;
   
public: public:
RawAbstraction ( ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > paramSpecs, std::function < std::shared_ptr < abstraction::Value > ( std::vector < std::shared_ptr < abstraction::Value > > ) > callback ) : m_paramSpecs ( paramSpecs ), m_callback ( std::move ( callback ) ), m_params ( m_paramSpecs.size ( ) ) { RawAbstraction ( ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > paramSpecs, std::function < std::shared_ptr < abstraction::Value > ( std::vector < std::shared_ptr < abstraction::Value > > ) > callback ) : m_paramSpecs ( paramSpecs ), m_callback ( std::move ( callback ) ), m_params ( m_paramSpecs.size ( ) ) {
} }
   
private: private:
......
alib2abstraction/src/registry/AlgorithmRegistry.hpp
+ 1
− 1
View file @ d841790e
...@@ -161,7 +161,7 @@ public: ...@@ -161,7 +161,7 @@ public:
} }
   
template < class Algo > template < class Algo >
static void unregisterRaw ( ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > parameterSpecs ) { static void unregisterRaw ( ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > parameterSpecs ) {
std::string algorithm = ext::to_string < Algo > ( ); std::string algorithm = ext::to_string < Algo > ( );
ext::vector < std::string > templateParams = ext::get_template_info ( algorithm ); ext::vector < std::string > templateParams = ext::get_template_info ( algorithm );
algorithm = ext::erase_template_info ( algorithm ); algorithm = ext::erase_template_info ( algorithm );
......
alib2abstraction/src/registry/AlgorithmRegistryInfo.hpp
+ 11
− 11
View file @ d841790e
...@@ -21,12 +21,12 @@ namespace abstraction { ...@@ -21,12 +21,12 @@ namespace abstraction {
class AlgorithmBaseInfo { class AlgorithmBaseInfo {
AlgorithmCategories::AlgorithmCategory m_category; AlgorithmCategories::AlgorithmCategory m_category;
   
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > m_params; ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > m_params;
   
protected: protected:
template < class ... ParamTypes > template < class ... ParamTypes >
static ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > convertTypes ( ) { static ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > convertTypes ( ) {
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params { convertType < ParamTypes > ( ) ... }; ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params { convertType < ParamTypes > ( ) ... };
   
return params; return params;
} }
...@@ -37,14 +37,14 @@ protected: ...@@ -37,14 +37,14 @@ protected:
} }
   
public: public:
AlgorithmBaseInfo ( AlgorithmCategories::AlgorithmCategory category, ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params ) : m_category ( category ), m_params ( std::move ( params ) ) { AlgorithmBaseInfo ( AlgorithmCategories::AlgorithmCategory category, ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params ) : m_category ( category ), m_params ( std::move ( params ) ) {
} }
   
AlgorithmCategories::AlgorithmCategory getCategory ( ) const { AlgorithmCategories::AlgorithmCategory getCategory ( ) const {
return m_category; return m_category;
} }
   
const ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > & getParams ( ) const { const ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > & getParams ( ) const {
return m_params; return m_params;
} }
   
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
static AlgorithmBaseInfo methodEntryInfo ( ) { static AlgorithmBaseInfo methodEntryInfo ( ) {
AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT; AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT;
   
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( ); ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( );
params.insert ( params.begin ( ), convertType < ObjectType & > ( ) ); params.insert ( params.begin ( ), convertType < ObjectType & > ( ) );
   
return AlgorithmBaseInfo ( category, std::move ( params ) ); return AlgorithmBaseInfo ( category, std::move ( params ) );
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
   
template < class ... ParamTypes > template < class ... ParamTypes >
static AlgorithmBaseInfo algorithmEntryInfo ( AlgorithmCategories::AlgorithmCategory category ) { static AlgorithmBaseInfo algorithmEntryInfo ( AlgorithmCategories::AlgorithmCategory category ) {
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( ); ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( );
   
return AlgorithmBaseInfo ( category, std::move ( params ) ); return AlgorithmBaseInfo ( category, std::move ( params ) );
} }
...@@ -69,12 +69,12 @@ public: ...@@ -69,12 +69,12 @@ public:
static AlgorithmBaseInfo wrapperEntryInfo ( ) { static AlgorithmBaseInfo wrapperEntryInfo ( ) {
AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT; AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT;
   
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( ); ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( );
   
return AlgorithmBaseInfo ( category, std::move ( params ) ); return AlgorithmBaseInfo ( category, std::move ( params ) );
} }
   
static AlgorithmBaseInfo rawEntryInfo ( ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > paramSpec ) { static AlgorithmBaseInfo rawEntryInfo ( ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > paramSpec ) {
AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT; AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT;
   
return AlgorithmBaseInfo ( category, std::move ( paramSpec ) ); return AlgorithmBaseInfo ( category, std::move ( paramSpec ) );
...@@ -84,7 +84,7 @@ public: ...@@ -84,7 +84,7 @@ public:
static AlgorithmBaseInfo operatorEntryInfo ( ) { static AlgorithmBaseInfo operatorEntryInfo ( ) {
AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT; AlgorithmCategories::AlgorithmCategory category = AlgorithmCategories::AlgorithmCategory::DEFAULT;
   
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( ); ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > params = convertTypes < ParamTypes ... > ( );
   
return AlgorithmBaseInfo ( category, std::move ( params ) ); return AlgorithmBaseInfo ( category, std::move ( params ) );
} }
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
   
static AlgorithmFullInfo rawEntryInfo ( ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > result, ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet, std::string > > paramSpecs ) { static AlgorithmFullInfo rawEntryInfo ( ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > result, ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet, std::string > > paramSpecs ) {
ext::vector < std::string > parameterNames; ext::vector < std::string > parameterNames;
ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > parameterSpecs; ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > parameterSpecs;
for ( ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet, std::string > & paramSpec : paramSpecs ) { for ( ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet, std::string > & paramSpec : paramSpecs ) {
parameterNames.push_back ( std::move ( std::get < 2 > ( paramSpec ) ) ); parameterNames.push_back ( std::move ( std::get < 2 > ( paramSpec ) ) );
parameterSpecs.push_back ( ext::make_pair ( std::move ( std::get < 0 > ( paramSpec ) ), std::get < 1 > ( paramSpec ) ) ); parameterSpecs.push_back ( ext::make_pair ( std::move ( std::get < 0 > ( paramSpec ) ), std::get < 1 > ( paramSpec ) ) );
......
alib2cli/src/builtin/Move.cpp
+ 1
− 1
View file @ d841790e
...@@ -14,7 +14,7 @@ namespace { ...@@ -14,7 +14,7 @@ namespace {
auto move = ext::Register < void > ( [ ] ( ) { auto move = ext::Register < void > ( [ ] ( ) {
abstraction::AlgorithmRegistry::registerRaw < cli::builtin::Move > ( cli::builtin::Move::move, ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > { "auto", abstraction::TypeQualifiers::TypeQualifierSet::RREF }, ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet, std::string > > { { "auto", abstraction::TypeQualifiers::TypeQualifierSet::LREF, "arg0" } } ); abstraction::AlgorithmRegistry::registerRaw < cli::builtin::Move > ( cli::builtin::Move::move, ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > { "auto", abstraction::TypeQualifiers::TypeQualifierSet::RREF }, ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet, std::string > > { { "auto", abstraction::TypeQualifiers::TypeQualifierSet::LREF, "arg0" } } );
}, [ ] ( ) { }, [ ] ( ) {
abstraction::AlgorithmRegistry::unregisterRaw < cli::builtin::Move > ( ext::vector < ext::tuple < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > { { "auto", abstraction::TypeQualifiers::TypeQualifierSet::LREF } } ); abstraction::AlgorithmRegistry::unregisterRaw < cli::builtin::Move > ( ext::vector < ext::pair < std::string, abstraction::TypeQualifiers::TypeQualifierSet > > { { "auto", abstraction::TypeQualifiers::TypeQualifierSet::LREF } } );
} ); } );
   
} /* namespace */ } /* namespace */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment