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

move iterator extensions to ext namespace

parent a3474be3
No related branches found
No related tags found
No related merge requests found
......@@ -297,7 +297,7 @@ std::tuple < bool, StateType, std::set < unsigned >, std::deque < PushdownStoreS
 
for ( unsigned j = 0; j < operation.first.size ( ); j++ ) pushdownStore.pop_back ( );
 
for ( const auto & push : std::make_reverse ( operation.second ) ) pushdownStore.push_back ( push );
for ( const auto & push : ext::make_reverse ( operation.second ) ) pushdownStore.push_back ( push );
 
state = transition->second;
i++;
......@@ -501,7 +501,7 @@ std::tuple < bool, StateType, std::set < unsigned >, std::deque < PushdownStoreS
 
for ( unsigned j = 0; j < std::get < 2 > ( transition->first ).size ( ); j++ ) pushdownStore.pop_back ( );
 
for ( const auto & symbol : std::make_reverse ( transition->second.second ) ) pushdownStore.push_back ( symbol );
for ( const auto & symbol : ext::make_reverse ( transition->second.second ) ) pushdownStore.push_back ( symbol );
 
state = transition->second.first;
 
......@@ -590,7 +590,7 @@ std::tuple < bool, std::set < StateType >, std::set < std::vector < OutputSymbol
stackNodeCopy = stackNodeCopy -> m_parent;
}
if ( j == pop . size () ) {
for ( const auto & elem : std::make_reverse ( std::get<1>(transition . second ) ) ) {
for ( const auto & elem : ext::make_reverse ( std::get<1>(transition . second ) ) ) {
stackNodeCopy = std::make_shared < graphStructuredStack < InputSymbolType > > ( stackNodeCopy, elem );
}
for ( const auto & elem : std::get<2>(transition . second) ) {
......
......@@ -89,7 +89,7 @@ automaton::RealTimeHeightDeterministicDPDA < > PDAToRHPDA::convert ( const autom
 
popPushIndex++;
}
for ( const DefaultSymbolType & push : std::make_reverse ( to.second ) ) {
for ( const DefaultSymbolType & push : ext::make_reverse ( to.second ) ) {
DefaultStateType fromState = ( popPushIndex == 0 ) ? std::get < 0 > ( transition.first ) : lastUS;
 
if ( popPushIndex != 0 ) lastUS = common::createUnique ( DefaultStateType ( us + ext::to_string ( ++i ) ), res.getStates ( ) );
......
......@@ -72,7 +72,7 @@ template < class SymbolType >
std::set < regexp::UnboundedRegExpSymbol < SymbolType > > GlushkovLast::Unbounded < SymbolType >::visit ( const regexp::UnboundedRegExpConcatenation < SymbolType > & node ) {
std::set < regexp::UnboundedRegExpSymbol < SymbolType > > ret;
 
for ( const auto & element : std::make_reverse ( node.getElements ( ) ) ) {
for ( const auto & element : ext::make_reverse ( node.getElements ( ) ) ) {
std::set < regexp::UnboundedRegExpSymbol < SymbolType > > tmp = element->template accept < std::set < regexp::UnboundedRegExpSymbol < SymbolType > >, GlushkovLast::Unbounded < SymbolType > > ( );
ret.insert ( tmp.begin ( ), tmp.end ( ) );
 
......
......@@ -371,7 +371,7 @@ public:
forward_tree ( T && data, Types ... subtrees ) : forward_tree ( std::move ( data ), std::vector < forward_tree > { subtrees ... } ) {
}
 
template < typename Iterator, typename std::enable_if < std::is_iterator < Iterator >::value >::type >
template < typename Iterator, typename std::enable_if < ext::is_iterator < Iterator >::value >::type >
forward_tree ( const T & data, Iterator begin, Iterator end ) : forward_tree ( data, fromIterator ( begin, end ) ) {
}
 
......
......@@ -10,7 +10,7 @@
 
#include <iterator>
 
namespace std {
namespace ext {
 
template<class T>
class reverser {
......@@ -40,6 +40,6 @@ struct is_iterator : std::false_type {};
template < typename T >
struct is_iterator<typename std::iterator_traits<T>> : std::true_type {};
 
} /* namespace std */
} /* namespace ext */
 
#endif /* __ITERATOR_HPP_ */
......@@ -379,7 +379,7 @@ public:
tree ( T && data, Types ... subtrees ) : tree ( std::move ( data ), std::vector < tree > { subtrees ... } ) {
}
 
template < typename Iterator, typename std::enable_if < std::is_iterator < Iterator >::value >::type >
template < typename Iterator, typename std::enable_if < ext::is_iterator < Iterator >::value >::type >
tree ( const T & data, Iterator begin, Iterator end ) : tree ( data, fromIterator ( begin, end ) ) {
}
 
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment