From f534760eb075ced5bf1d8c276d94cdd44510c188 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Mon, 18 Jun 2018 00:07:17 +0200 Subject: [PATCH] add override to alphabet classes --- alib2data/src/alphabet/BarSymbol.h | 14 +++++++------- alib2data/src/alphabet/BlankSymbol.h | 14 +++++++------- alib2data/src/alphabet/BottomOfTheStackSymbol.h | 14 +++++++------- alib2data/src/alphabet/EndSymbol.h | 14 +++++++------- alib2data/src/alphabet/InitialSymbol.h | 14 +++++++------- alib2data/src/alphabet/NonlinearVariableSymbol.h | 14 +++++++------- alib2data/src/alphabet/RankedSymbol.h | 14 +++++++------- alib2data/src/alphabet/StartSymbol.h | 14 +++++++------- alib2data/src/alphabet/VariablesBarSymbol.h | 14 +++++++------- alib2data/src/alphabet/WildcardSymbol.h | 14 +++++++------- 10 files changed, 70 insertions(+), 70 deletions(-) diff --git a/alib2data/src/alphabet/BarSymbol.h b/alib2data/src/alphabet/BarSymbol.h index cb44234c8d..34281d18e8 100644 --- a/alib2data/src/alphabet/BarSymbol.h +++ b/alib2data/src/alphabet/BarSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const BarSymbol & other ) const; + int compare ( const BarSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/BlankSymbol.h b/alib2data/src/alphabet/BlankSymbol.h index 963322438e..7f3010f9f3 100644 --- a/alib2data/src/alphabet/BlankSymbol.h +++ b/alib2data/src/alphabet/BlankSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const BlankSymbol & other ) const; + int compare ( const BlankSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/BottomOfTheStackSymbol.h b/alib2data/src/alphabet/BottomOfTheStackSymbol.h index 33ff6b0257..ca6ee0b923 100644 --- a/alib2data/src/alphabet/BottomOfTheStackSymbol.h +++ b/alib2data/src/alphabet/BottomOfTheStackSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const BottomOfTheStackSymbol & other ) const; + int compare ( const BottomOfTheStackSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/EndSymbol.h b/alib2data/src/alphabet/EndSymbol.h index 8556b731a7..1868b652bb 100644 --- a/alib2data/src/alphabet/EndSymbol.h +++ b/alib2data/src/alphabet/EndSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const EndSymbol & other ) const; + int compare ( const EndSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/InitialSymbol.h b/alib2data/src/alphabet/InitialSymbol.h index 2a441a1101..5e39a4b483 100644 --- a/alib2data/src/alphabet/InitialSymbol.h +++ b/alib2data/src/alphabet/InitialSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override{ if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const InitialSymbol & other ) const; + int compare ( const InitialSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & ) const; + virtual void operator >>( std::ostream & ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/NonlinearVariableSymbol.h b/alib2data/src/alphabet/NonlinearVariableSymbol.h index 9907098103..38e975d14f 100644 --- a/alib2data/src/alphabet/NonlinearVariableSymbol.h +++ b/alib2data/src/alphabet/NonlinearVariableSymbol.h @@ -52,12 +52,12 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * Getter of the nonlinear variable's symbol @@ -76,7 +76,7 @@ public: /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -89,22 +89,22 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const NonlinearVariableSymbol & other ) const; + int compare ( const NonlinearVariableSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < class SymbolType > diff --git a/alib2data/src/alphabet/RankedSymbol.h b/alib2data/src/alphabet/RankedSymbol.h index c8945b9eb9..54365e7a39 100644 --- a/alib2data/src/alphabet/RankedSymbol.h +++ b/alib2data/src/alphabet/RankedSymbol.h @@ -58,17 +58,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -81,17 +81,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const RankedSymbol & other ) const; + int compare ( const RankedSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * @copydoc base::CommonBaseMiddle < ObjectBase >::operator == @@ -126,7 +126,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < class SymbolType, class RankType > diff --git a/alib2data/src/alphabet/StartSymbol.h b/alib2data/src/alphabet/StartSymbol.h index 7b73cbc7c7..4123566092 100644 --- a/alib2data/src/alphabet/StartSymbol.h +++ b/alib2data/src/alphabet/StartSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const StartSymbol & other ) const; + int compare ( const StartSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/VariablesBarSymbol.h b/alib2data/src/alphabet/VariablesBarSymbol.h index a64557d07d..869347650a 100644 --- a/alib2data/src/alphabet/VariablesBarSymbol.h +++ b/alib2data/src/alphabet/VariablesBarSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const VariablesBarSymbol & other ) const; + int compare ( const VariablesBarSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > diff --git a/alib2data/src/alphabet/WildcardSymbol.h b/alib2data/src/alphabet/WildcardSymbol.h index dd040ef487..61cbdc31e6 100644 --- a/alib2data/src/alphabet/WildcardSymbol.h +++ b/alib2data/src/alphabet/WildcardSymbol.h @@ -46,17 +46,17 @@ public: /** * @copydoc alphabet::SymbolBase::clone ( ) const & */ - virtual SymbolBase * clone ( ) const &; + virtual SymbolBase * clone ( ) const & override; /** * @copydoc alphabet::SymbolBase::clone ( ) && */ - virtual SymbolBase * clone ( ) &&; + virtual SymbolBase * clone ( ) && override; /** * @copydoc base::CommonBase < ObjectBase >::compare ( const ObjectBase & ) const */ - virtual int compare ( const ObjectBase & other ) const { + virtual int compare ( const ObjectBase & other ) const override { if ( ext::type_index ( typeid ( * this ) ) == ext::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other ); return ext::type_index ( typeid ( * this ) ) - ext::type_index ( typeid ( other ) ); @@ -69,17 +69,17 @@ public: * * \returns the actual relation between two by type same symbols */ - virtual int compare ( const WildcardSymbol & other ) const; + int compare ( const WildcardSymbol & other ) const; /** * @copydoc base::CommonBase < ObjectBase >::operator >> ( std::ostream & ) const */ - virtual void operator >>( std::ostream & out ) const; + virtual void operator >>( std::ostream & out ) const override; /** * @copydoc base::CommonBase < ObjectBase >::operator std::string ( ) const */ - virtual explicit operator std::string ( ) const; + virtual explicit operator std::string ( ) const override; /** * \brief Factory for the symbol construction of the symbol based on given type. @@ -96,7 +96,7 @@ public: /** * @copydoc object::ObjectBase::inc ( ) && */ - virtual object::ObjectBase * inc ( ) &&; + virtual object::ObjectBase * inc ( ) && override; }; template < typename Base > -- GitLab