diff --git a/alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp b/alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp index 676035b953dbaaad72fe4cdbe4c65ecae3a4f594..8eeb0bb72a7563b6dc2554ba4322c522dcfa138f 100644 --- a/alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp +++ b/alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp @@ -9,13 +9,4 @@ AlgorithmBaseInfo::AlgorithmBaseInfo ( AlgorithmCategories::AlgorithmCategory ca AlgorithmFullInfo::AlgorithmFullInfo ( AlgorithmBaseInfo baseInfo, ext::vector < std::string > paramNames, ext::pair < core::type_details, abstraction::TypeQualifiers::TypeQualifierSet > result ) : AlgorithmBaseInfo ( std::move ( baseInfo ) ), m_paramNames ( std::move ( paramNames ) ), m_result ( std::move ( result ) ) { } -ext::pair < core::type_details, abstraction::TypeQualifiers::TypeQualifierSet > AlgorithmFullInfo::getNormalizedResult ( ) const { - if ( ! abstraction::Registry::hasNormalize ( m_result.first ) ) - return m_result; - - std::unique_ptr < abstraction::OperationAbstraction > normalized = abstraction::Registry::getNormalizeAbstraction ( m_result.first ); - - return ext::make_pair ( normalized->getReturnType ( ), normalized->getReturnTypeQualifiers ( ) ); -} - } /* namespace abstraction */ diff --git a/alib2abstraction/src/registry/AlgorithmRegistryInfo.hpp b/alib2abstraction/src/registry/AlgorithmRegistryInfo.hpp index d03d3cd63f5ef5c3e3e3f0147639124792c4ee4e..9cdccb6ad65c1b9c2412975b1eefb9e240eeb302 100644 --- a/alib2abstraction/src/registry/AlgorithmRegistryInfo.hpp +++ b/alib2abstraction/src/registry/AlgorithmRegistryInfo.hpp @@ -99,8 +99,6 @@ public: return m_result; } - ext::pair < core::type_details, abstraction::TypeQualifiers::TypeQualifierSet > getNormalizedResult ( ) const; - template < class ObjectType, class ReturnType, class ... ParamTypes > static AlgorithmFullInfo methodEntryInfo ( std::array < std::string, sizeof ... ( ParamTypes ) > paramNames ) { ext::vector < std::string > parameterNames; diff --git a/alib2cli/src/ast/command/OperatorsIntrospectionCommand.cpp b/alib2cli/src/ast/command/OperatorsIntrospectionCommand.cpp index 5e302d92bfc19a75c5ea0a2c298618664d47a7a9..ad676b55a5db1a9bbc356dad201a08a51c027c03 100644 --- a/alib2cli/src/ast/command/OperatorsIntrospectionCommand.cpp +++ b/alib2cli/src/ast/command/OperatorsIntrospectionCommand.cpp @@ -22,7 +22,7 @@ template < class Operators > void OperatorsIntrospectionCommand::printOperators ( const ext::list < ext::pair < Operators, abstraction::AlgorithmFullInfo > > & overloads ) { for ( const ext::pair < Operators, abstraction::AlgorithmFullInfo > & overload : overloads ) { - typePrint ( std::get < 1 > ( overload ).getNormalizedResult ( ), common::Streams::out ); + typePrint ( std::get < 1 > ( overload ).getResult ( ), common::Streams::out ); common::Streams::out << " operator "; common::Streams::out << abstraction::Operators::toString ( std::get < 0 > ( overload ) ); diff --git a/alib2cli/src/ast/command/OverloadsIntrospectionCommand.cpp b/alib2cli/src/ast/command/OverloadsIntrospectionCommand.cpp index f1a396e12904f846707bb5178072e2262d84a882..190cc8639d16d1c1291716dc86b3bd425c6c9b33 100644 --- a/alib2cli/src/ast/command/OverloadsIntrospectionCommand.cpp +++ b/alib2cli/src/ast/command/OverloadsIntrospectionCommand.cpp @@ -36,7 +36,7 @@ CommandResult OverloadsIntrospectionCommand::run ( Environment & environment ) c if ( first ) common::Streams::out << std::endl << "-------------------------------------------------------------------------------------" << std::endl; - typePrint ( std::get < 0 > ( overload ).getNormalizedResult ( ), common::Streams::out ); + typePrint ( std::get < 0 > ( overload ).getResult ( ), common::Streams::out ); common::Streams::out << " ("; for ( size_t i = 0; i < std::get < 0 > ( overload ).getParams ( ).size ( ); ++ i ) {