From 0b5c3462d761556f76ee40de585c5d481d689517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <jan.travnicek@fit.cvut.cz>
Date: Mon, 28 Feb 2022 21:48:02 +0100
Subject: [PATCH] cli: fix presentation of return type of algorithm overloads
---
alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp | 9 ---------
alib2abstraction/src/registry/AlgorithmRegistryInfo.hpp | 2 --
.../src/ast/command/OperatorsIntrospectionCommand.cpp | 2 +-
.../src/ast/command/OverloadsIntrospectionCommand.cpp | 2 +-
4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp b/alib2abstraction/src/registry/AlgorithmRegistryInfo.cpp
index 676035b953..8eeb0bb72a 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 d03d3cd63f..9cdccb6ad6 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 5e302d92bf..ad676b55a5 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 f1a396e129..190cc8639d 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 ) {
--
GitLab