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

fix binding scheme of qualified values

parent c6ef2f73
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
alib2abstraction/src/abstraction/ValueOperationAbstraction.hpp
+ 124
− 4
View file @ c5828e62
...@@ -25,6 +25,70 @@ class UnspecifiedType { ...@@ -25,6 +25,70 @@ class UnspecifiedType {
template < class ReturnType > template < class ReturnType >
class ValueOperationAbstraction : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < ReturnType & >, public ValueProvider < const ReturnType & >, public ValueProvider < ReturnType && >, public ValueProvider < const ReturnType && > { class ValueOperationAbstraction : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < ReturnType & >, public ValueProvider < const ReturnType & >, public ValueProvider < ReturnType && >, public ValueProvider < const ReturnType && > {
protected: protected:
virtual bool isConst ( ) const override {
return false;
}
virtual bool isRvalueRef ( ) const override {
return false;
}
virtual bool isLvalueRef ( ) const override {
return false;
}
virtual ReturnType & getData ( ) const override {
return m_data.value ( );
}
virtual const ReturnType & getConstData ( ) const override {
return m_data.value ( );
}
mutable std::optional < ReturnType > m_data;
public:
template < typename ... ParamTypes, typename Callable >
inline void run_helper ( Callable callback, const ext::array < std::pair < std::shared_ptr < OperationAbstraction >, bool >, sizeof ... ( ParamTypes ) > & inputs ) {
if ( ! cached ( ) )
m_data = abstraction::apply < ParamTypes ... > ( callback, inputs );
}
virtual ext::type_index getReturnTypeIndex ( ) const override {
return ext::type_index ( typeid ( ReturnType ) );
}
virtual ext::type_index getRuntimeReturnTypeIndex ( ) const override {
if ( cached ( ) )
return ext::type_index ( typeid ( getData ( ) ) );
else
throw std::domain_error ( "Runtime type unknown before evaluation." );
}
virtual bool cached ( ) const override {
return ( bool ) m_data;
}
virtual void reset ( ) override {
m_data.reset ( );
}
};
template < class ReturnType >
class ValueOperationAbstraction < const ReturnType > : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < const ReturnType & >, public ValueProvider < const ReturnType && > {
protected:
virtual bool isConst ( ) const override {
return true;
}
virtual bool isRvalueRef ( ) const override {
return false;
}
virtual bool isLvalueRef ( ) const override {
return false;
}
virtual ReturnType & getData ( ) const override { virtual ReturnType & getData ( ) const override {
return m_data.value ( ); return m_data.value ( );
} }
...@@ -63,8 +127,20 @@ public: ...@@ -63,8 +127,20 @@ public:
}; };
   
template < class ReturnType > template < class ReturnType >
class ValueOperationAbstraction < ReturnType & > : public OperationAbstraction, public ValueProvider < ReturnType & >, public ValueProvider < const ReturnType & >, public ValueProvider < ReturnType && >, public ValueProvider < const ReturnType && > { class ValueOperationAbstraction < ReturnType & > : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < ReturnType & >, public ValueProvider < const ReturnType & >, public ValueProvider < ReturnType && >, public ValueProvider < const ReturnType && > {
protected: protected:
virtual bool isConst ( ) const override {
return false;
}
virtual bool isRvalueRef ( ) const override {
return true;
}
virtual bool isLvalueRef ( ) const override {
return false;
}
virtual ReturnType & getData ( ) const override { virtual ReturnType & getData ( ) const override {
return m_data->get ( ); return m_data->get ( );
} }
...@@ -103,8 +179,24 @@ public: ...@@ -103,8 +179,24 @@ public:
}; };
   
template < class ReturnType > template < class ReturnType >
class ValueOperationAbstraction < const ReturnType & > : public OperationAbstraction, public ValueProvider < const ReturnType & >, public ValueProvider < const ReturnType && > { class ValueOperationAbstraction < const ReturnType & > : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < const ReturnType & >, public ValueProvider < const ReturnType && > {
protected: protected:
virtual bool isConst ( ) const override {
return true;
}
virtual bool isRvalueRef ( ) const override {
return true;
}
virtual bool isLvalueRef ( ) const override {
return false;
}
virtual ReturnType & getData ( ) const override {
return const_cast < ReturnType & > ( m_data->get ( ) );
}
virtual const ReturnType & getConstData ( ) const override { virtual const ReturnType & getConstData ( ) const override {
return m_data->get ( ); return m_data->get ( );
} }
...@@ -139,8 +231,20 @@ public: ...@@ -139,8 +231,20 @@ public:
}; };
   
template < class ReturnType > template < class ReturnType >
class ValueOperationAbstraction < ReturnType && > : public OperationAbstraction, public ValueProvider < ReturnType & >, public ValueProvider < const ReturnType & >, public ValueProvider < ReturnType && >, public ValueProvider < const ReturnType && > { class ValueOperationAbstraction < ReturnType && > : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < const ReturnType & >, public ValueProvider < ReturnType && >, public ValueProvider < const ReturnType && > {
protected: protected:
virtual bool isConst ( ) const override {
return false;
}
virtual bool isRvalueRef ( ) const override {
return false;
}
virtual bool isLvalueRef ( ) const override {
return true;
}
virtual ReturnType & getData ( ) const override { virtual ReturnType & getData ( ) const override {
return m_data->get ( ); return m_data->get ( );
} }
...@@ -181,8 +285,24 @@ public: ...@@ -181,8 +285,24 @@ public:
}; };
   
template < class ReturnType > template < class ReturnType >
class ValueOperationAbstraction < const ReturnType && > : public OperationAbstraction, public ValueProvider < const ReturnType & >, public ValueProvider < const ReturnType && > { class ValueOperationAbstraction < const ReturnType && > : public OperationAbstraction, public ValueProvider < ReturnType >, public ValueProvider < const ReturnType & >, public ValueProvider < const ReturnType && > {
protected: protected:
virtual bool isConst ( ) const override {
return true;
}
virtual bool isRvalueRef ( ) const override {
return false;
}
virtual bool isLvalueRef ( ) const override {
return true;
}
virtual ReturnType & getData ( ) const override {
return const_cast < ReturnType & > ( m_data->get ( ) );
}
virtual const ReturnType & getConstData ( ) const override { virtual const ReturnType & getConstData ( ) const override {
return m_data->get ( ); return m_data->get ( );
} }
......
alib2abstraction/src/abstraction/ValueProvider.hpp
+ 19
− 4
View file @ c5828e62
...@@ -17,12 +17,15 @@ namespace abstraction { ...@@ -17,12 +17,15 @@ namespace abstraction {
template < class Type > template < class Type >
class ValueProvider { class ValueProvider {
protected: protected:
virtual bool isConst ( ) const = 0;
virtual bool isLvalueRef ( ) const = 0;
virtual bool isRvalueRef ( ) const = 0;
virtual Type & getData ( ) const = 0; virtual Type & getData ( ) const = 0;
   
public: public:
template < class T = Type > template < class T = Type >
typename std::enable_if < std::is_copy_constructible < T >::value && std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const { typename std::enable_if < std::is_copy_constructible < T >::value && std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const {
if ( move ) if ( ! isConst ( ) && move )
return std::move ( getData ( ) ); return std::move ( getData ( ) );
else else
return getData ( ); return getData ( );
...@@ -30,7 +33,7 @@ public: ...@@ -30,7 +33,7 @@ public:
   
template < class T = Type > template < class T = Type >
typename std::enable_if < std::is_copy_constructible < T >::value && ! std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const { typename std::enable_if < std::is_copy_constructible < T >::value && ! std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const {
if ( move ) if ( ! isConst ( ) && move )
throw std::domain_error ( "Value not move constructible" ); throw std::domain_error ( "Value not move constructible" );
else else
return getData ( ); return getData ( );
...@@ -38,7 +41,7 @@ public: ...@@ -38,7 +41,7 @@ public:
   
template < class T = Type > template < class T = Type >
typename std::enable_if < ! std::is_copy_constructible < T >::value && std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const { typename std::enable_if < ! std::is_copy_constructible < T >::value && std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const {
if ( move ) if ( ! isConst ( ) && move )
return std::move ( getData ( ) ); return std::move ( getData ( ) );
else else
throw std::domain_error ( "Value not copy constructible" ); throw std::domain_error ( "Value not copy constructible" );
...@@ -46,7 +49,7 @@ public: ...@@ -46,7 +49,7 @@ public:
   
template < class T = Type > template < class T = Type >
typename std::enable_if < ! std::is_copy_constructible < T >::value && ! std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const { typename std::enable_if < ! std::is_copy_constructible < T >::value && ! std::is_move_constructible < T >::value, T >::type getValue ( bool move ) const {
if ( move ) if ( ! isConst ( ) && move )
throw std::domain_error ( "Value not move constructible" ); throw std::domain_error ( "Value not move constructible" );
else else
throw std::domain_error ( "Value not copy constructible" ); throw std::domain_error ( "Value not copy constructible" );
...@@ -58,6 +61,9 @@ public: ...@@ -58,6 +61,9 @@ public:
template < class Type > template < class Type >
class ValueProvider < Type & > { class ValueProvider < Type & > {
protected: protected:
virtual bool isConst ( ) const = 0;
virtual bool isLvalueRef ( ) const = 0;
virtual bool isRvalueRef ( ) const = 0;
virtual Type & getData ( ) const = 0; virtual Type & getData ( ) const = 0;
   
public: public:
...@@ -75,6 +81,9 @@ public: ...@@ -75,6 +81,9 @@ public:
template < class Type > template < class Type >
class ValueProvider < const Type & > { class ValueProvider < const Type & > {
protected: protected:
virtual bool isConst ( ) const = 0;
virtual bool isLvalueRef ( ) const = 0;
virtual bool isRvalueRef ( ) const = 0;
virtual const Type & getConstData ( ) const = 0; virtual const Type & getConstData ( ) const = 0;
   
public: public:
...@@ -92,6 +101,9 @@ public: ...@@ -92,6 +101,9 @@ public:
template < class Type > template < class Type >
class ValueProvider < Type && > { class ValueProvider < Type && > {
protected: protected:
virtual bool isConst ( ) const = 0;
virtual bool isLvalueRef ( ) const = 0;
virtual bool isRvalueRef ( ) const = 0;
virtual Type & getData ( ) const = 0; virtual Type & getData ( ) const = 0;
   
public: public:
...@@ -112,6 +124,9 @@ public: ...@@ -112,6 +124,9 @@ public:
template < class Type > template < class Type >
class ValueProvider < const Type && > { class ValueProvider < const Type && > {
protected: protected:
virtual bool isConst ( ) const = 0;
virtual bool isLvalueRef ( ) const = 0;
virtual bool isRvalueRef ( ) const = 0;
virtual const Type & getConstData ( ) const = 0; virtual const Type & getConstData ( ) const = 0;
   
public: public:
......
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