diff --git a/alib2abstraction/src/common/AlgorithmHelper.h b/alib2abstraction/src/common/AlgorithmHelper.h
index 5a9f26c8814502c6ea676e22a8db9a3149cbfdf9..59033af8e1372d3730a5b99e8d964f7d6ab285a5 100644
--- a/alib2abstraction/src/common/AlgorithmHelper.h
+++ b/alib2abstraction/src/common/AlgorithmHelper.h
@@ -18,7 +18,7 @@ namespace abstraction {
class AlgorithmHelper {
public:
- static std::shared_ptr < abstraction::OperationAbstraction > eval ( const std::string & algo, const ext::vector < std::string > & templateParams, const ext::vector < std::shared_ptr < abstraction::OperationAbstraction > > & params, std::vector < bool > & moves, AlgorithmCategories::AlgorithmCategory category );
+ static std::shared_ptr < abstraction::OperationAbstraction > eval ( const std::string & name, const ext::vector < std::string > & templateParams, const ext::vector < std::shared_ptr < abstraction::OperationAbstraction > > & params, std::vector < bool > & moves, AlgorithmCategories::AlgorithmCategory category );
};
diff --git a/alib2abstraction/src/registry/AlgorithmRegistry.hpp b/alib2abstraction/src/registry/AlgorithmRegistry.hpp
index 344644bd9523791aec398da41b78ab52deae1124..39218546f7a3bc442df31d9c9ab0d8b9ba103e6a 100644
--- a/alib2abstraction/src/registry/AlgorithmRegistry.hpp
+++ b/alib2abstraction/src/registry/AlgorithmRegistry.hpp
@@ -112,7 +112,7 @@ private:
static void setDocumentation ( std::string algorithm, ext::vector < std::string > templateParams, const AlgorithmBaseInfo & entryInfo, std::string documentation );
- static ext::map < ext::pair < std::string, ext::vector < std::string > >, ext::list < std::unique_ptr < Entry > > >::const_iterator findAbstractionGroup ( const std::string & algorithm, const ext::vector < std::string > & templateParams );
+ static ext::map < ext::pair < std::string, ext::vector < std::string > >, ext::list < std::unique_ptr < Entry > > >::const_iterator findAbstractionGroup ( const std::string & name, const ext::vector < std::string > & templateParams );
public:
template < class Algo, class ObjectType, class ... ParamTypes >
diff --git a/alib2abstraction/src/registry/ContainerRegistry.hpp b/alib2abstraction/src/registry/ContainerRegistry.hpp
index 7e1430940189b0ac0799ede2713953f64f246c8e..b08b3dd111aa990b668e352770b84238d986f4be 100644
--- a/alib2abstraction/src/registry/ContainerRegistry.hpp
+++ b/alib2abstraction/src/registry/ContainerRegistry.hpp
@@ -82,7 +82,7 @@ public:
static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & container, const std::string & param );
- static ext::set < std::string > listOverloads ( const std::string & algorithm );
+ static ext::set < std::string > listOverloads ( const std::string & container );
static ext::set < std::string > list ( );
};
diff --git a/alib2algo/src/arbology/indexing/CompressedBitParallelIndexConstruction.h b/alib2algo/src/arbology/indexing/CompressedBitParallelIndexConstruction.h
index cb96d297723d99d7d03f551376d8e15a8ed5ea6a..5667099af01972b05d9e8be31b690a1b01875435 100644
--- a/alib2algo/src/arbology/indexing/CompressedBitParallelIndexConstruction.h
+++ b/alib2algo/src/arbology/indexing/CompressedBitParallelIndexConstruction.h
@@ -31,10 +31,10 @@ public:
* @return the index
*/
template < class SymbolType, class RankType >
- static indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > construct ( const tree::PrefixRankedTree < SymbolType, RankType > & tree );
+ static indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > construct ( const tree::PrefixRankedTree < SymbolType, RankType > & w );
template < class SymbolType, class RankType >
- static indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & tree );
+ static indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & w );
};
template < class SymbolType, class RankType >
diff --git a/alib2algo/src/arbology/indexing/FullAndLinearIndexConstruction.h b/alib2algo/src/arbology/indexing/FullAndLinearIndexConstruction.h
index e1300bbe64835d1a787ba14553bf3f94ea18c312..fb461c2c402891803f9cd4651577695246df8450 100644
--- a/alib2algo/src/arbology/indexing/FullAndLinearIndexConstruction.h
+++ b/alib2algo/src/arbology/indexing/FullAndLinearIndexConstruction.h
@@ -31,10 +31,10 @@ public:
* @return the index
*/
template < class SymbolType, class RankType, template < typename > class StringIndex = indexes::stringology::PositionHeap, class StringIndexConstructionAlgo = stringology::indexing::PositionHeapNaive >
- static indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedTree < SymbolType, RankType > & tree );
+ static indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedTree < SymbolType, RankType > & w );
template < class SymbolType, class RankType, template < typename > class StringIndex = indexes::stringology::PositionHeap, class StringIndexConstructionAlgo = stringology::indexing::PositionHeapNaive >
- static indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & tree );
+ static indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & w );
};
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexConstructionAlgo >
diff --git a/alib2algo/src/arbology/indexing/NonlinearCompressedBitParallelIndexConstruction.h b/alib2algo/src/arbology/indexing/NonlinearCompressedBitParallelIndexConstruction.h
index 1ccf335c47b95f88f0e755dd2ca4c85c6624711a..be5c2da46f9ecae5f91a5afd24ef5a0ad5c33663 100644
--- a/alib2algo/src/arbology/indexing/NonlinearCompressedBitParallelIndexConstruction.h
+++ b/alib2algo/src/arbology/indexing/NonlinearCompressedBitParallelIndexConstruction.h
@@ -31,7 +31,7 @@ public:
* @return the index
*/
template < class SymbolType, class RankType >
- static indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & tree );
+ static indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & w );
};
template < class SymbolType, class RankType >
diff --git a/alib2algo/src/arbology/indexing/NonlinearFullAndLinearIndexConstruction.h b/alib2algo/src/arbology/indexing/NonlinearFullAndLinearIndexConstruction.h
index 34cc2bd245667fd21a1f7561036f24f68d5b5886..194f880087ce12e4b4c499b238184c93abc01cb5 100644
--- a/alib2algo/src/arbology/indexing/NonlinearFullAndLinearIndexConstruction.h
+++ b/alib2algo/src/arbology/indexing/NonlinearFullAndLinearIndexConstruction.h
@@ -31,10 +31,10 @@ public:
* @return the index
*/
template < class SymbolType, class RankType, template < typename > class StringIndex = indexes::stringology::PositionHeap, class StringIndexConstructionAlgo = stringology::indexing::PositionHeapNaive >
- static indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedTree < SymbolType, RankType > & tree );
+ static indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedTree < SymbolType, RankType > & w );
template < class SymbolType, class RankType, template < typename > class StringIndex = indexes::stringology::PositionHeap, class StringIndexConstructionAlgo = stringology::indexing::PositionHeapNaive >
- static indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & tree );
+ static indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > construct ( const tree::PrefixRankedBarTree < SymbolType, RankType > & w );
};
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexConstructionAlgo >
diff --git a/alib2algo/src/arbology/query/CompressedBitParallelismPatterns.h b/alib2algo/src/arbology/query/CompressedBitParallelismPatterns.h
index fe8d6b5e5e3f73cd2b6b97b3b6ce7f287c5cf409..6d41e233abeb549e573f6630b443b1998c774607 100644
--- a/alib2algo/src/arbology/query/CompressedBitParallelismPatterns.h
+++ b/alib2algo/src/arbology/query/CompressedBitParallelismPatterns.h
@@ -32,10 +32,10 @@ public:
* @return occurences of factors
*/
template < class SymbolType, class RankType >
- static ext::set < unsigned > query ( const indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > & compressedBitParallelTreeIndex, const tree::PrefixRankedPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > & compressedBitParallelIndex, const tree::PrefixRankedPattern < SymbolType, RankType > & pattern );
template < class SymbolType, class RankType >
- static ext::set < unsigned > query ( const indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > & compressedBitParallelTreeIndex, const tree::PrefixRankedBarPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > & compressedBitParallelIndex, const tree::PrefixRankedBarPattern < SymbolType, RankType > & pattern );
};
template < class SymbolType, class RankType >
diff --git a/alib2algo/src/arbology/query/FullAndLinearIndexPatterns.h b/alib2algo/src/arbology/query/FullAndLinearIndexPatterns.h
index 96c502815cb9538b92c1c20b48420fedd257fe5f..9956931e0de5380e7a7a4b4a9b3861cd7a5bf586 100644
--- a/alib2algo/src/arbology/query/FullAndLinearIndexPatterns.h
+++ b/alib2algo/src/arbology/query/FullAndLinearIndexPatterns.h
@@ -60,10 +60,10 @@ public:
* @return occurences of factors
*/
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo = stringology::query::PositionHeapFactors >
- static ext::set < unsigned > query ( const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & compressedBitParallelTreeIndex, const tree::PrefixRankedPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedPattern < SymbolType, RankType > & pattern );
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo = stringology::query::PositionHeapFactors >
- static ext::set < unsigned > query ( const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & compressedBitParallelTreeIndex, const tree::PrefixRankedBarPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedBarPattern < SymbolType, RankType > & pattern );
};
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo >
diff --git a/alib2algo/src/arbology/query/NonlinearCompressedBitParallelismPatterns.h b/alib2algo/src/arbology/query/NonlinearCompressedBitParallelismPatterns.h
index b6d10446bfb0491339b591263149b491d33df6de..6f726f72e587bcd5f5d5239cc5aaf3ed14f023ba 100644
--- a/alib2algo/src/arbology/query/NonlinearCompressedBitParallelismPatterns.h
+++ b/alib2algo/src/arbology/query/NonlinearCompressedBitParallelismPatterns.h
@@ -31,7 +31,7 @@ public:
* @return occurences of factors
*/
template < class SymbolType, class RankType >
- static ext::set < unsigned > query ( const indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > & nonlinearCompressedBitParallelTreeIndex, const tree::PrefixRankedBarNonlinearPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > & nonlinearCompressedBitParallelIndex, const tree::PrefixRankedBarNonlinearPattern < SymbolType, RankType > & pattern );
};
template < class SymbolType, class RankType >
diff --git a/alib2algo/src/arbology/query/NonlinearFullAndLinearIndexPatterns.h b/alib2algo/src/arbology/query/NonlinearFullAndLinearIndexPatterns.h
index 3413dd4f79672be051871455b5b4b297e5ead3e1..2759ed671e2cdc605494fceb8b62d986e2ecca1f 100644
--- a/alib2algo/src/arbology/query/NonlinearFullAndLinearIndexPatterns.h
+++ b/alib2algo/src/arbology/query/NonlinearFullAndLinearIndexPatterns.h
@@ -60,10 +60,10 @@ public:
* @return occurences of factors
*/
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo = stringology::query::PositionHeapFactors >
- static ext::set < unsigned > query ( const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & compressedBitParallelTreeIndex, const tree::PrefixRankedNonlinearPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedNonlinearPattern < SymbolType, RankType > & pattern );
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo = stringology::query::PositionHeapFactors >
- static ext::set < unsigned > query ( const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & compressedBitParallelTreeIndex, const tree::PrefixRankedBarNonlinearPattern < SymbolType, RankType > & pattern );
+ static ext::set < unsigned > query ( const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & fullAndLinearIndex, const tree::PrefixRankedBarNonlinearPattern < SymbolType, RankType > & pattern );
};
template < class SymbolType, class RankType, template < typename > class StringIndex, class StringIndexQueryAlgo >
diff --git a/alib2algo/src/automaton/convert/ToRegExpStateElimination.h b/alib2algo/src/automaton/convert/ToRegExpStateElimination.h
index 0e9dd94b022dce6dc2a353f85807e93c56fbc1a7..18f41317ea44778fd54e001b2b3272d3cf86a9af 100644
--- a/alib2algo/src/automaton/convert/ToRegExpStateElimination.h
+++ b/alib2algo/src/automaton/convert/ToRegExpStateElimination.h
@@ -94,7 +94,7 @@ private:
* @return the @p extendedAutomaton after the elimination of a state @state.
*/
template < class SymbolType, class StateType >
- static automaton::ExtendedNFA < SymbolType, StateType > eliminateState ( const automaton::ExtendedNFA < SymbolType, StateType > & extendedAutomaton, const StateType & state );
+ static automaton::ExtendedNFA < SymbolType, StateType > eliminateState ( const automaton::ExtendedNFA < SymbolType, StateType > & extendedAutomaton, const StateType & q );
};
template < class T >
diff --git a/alib2algo/src/automaton/determinize/Determinize.h b/alib2algo/src/automaton/determinize/Determinize.h
index 067aec2628540c24fdfe7efb3781a451c90c5d06..dc049a03b1678ac5df79428a48a368258bb1f221 100644
--- a/alib2algo/src/automaton/determinize/Determinize.h
+++ b/alib2algo/src/automaton/determinize/Determinize.h
@@ -67,7 +67,7 @@ public:
* @return deterministic finite automaton equivalent to @p dfa
*/
template < class SymbolType, class StateType >
- static automaton::DFA < SymbolType, StateType > determinize ( const automaton::DFA < SymbolType, StateType > & dfa );
+ static automaton::DFA < SymbolType, StateType > determinize ( const automaton::DFA < SymbolType, StateType > & automaton );
/**
* Implementation of subset determinization for nondeterministic finite automata.
@@ -102,7 +102,7 @@ public:
* @return deterministic finite tree automaton equivalent to @p dfta
*/
template < class SymbolType, class RankType, class StateType >
- static automaton::DFTA < SymbolType, RankType, StateType > determinize ( const automaton::DFTA < SymbolType, RankType, StateType > & dfta );
+ static automaton::DFTA < SymbolType, RankType, StateType > determinize ( const automaton::DFTA < SymbolType, RankType, StateType > & automaton );
/**
* Implementation of subset determinization for nondeterministic finite tree automata.
@@ -127,7 +127,7 @@ public:
* @return deterministic input-driven pushdown automaton equivalent to @p dpda
*/
template < class InputSymbolType, class PushdownSymbolType, class StateType >
- static automaton::InputDrivenDPDA < InputSymbolType, PushdownSymbolType, StateType > determinize ( const automaton::InputDrivenDPDA < InputSymbolType, PushdownSymbolType, StateType > & dpda );
+ static automaton::InputDrivenDPDA < InputSymbolType, PushdownSymbolType, StateType > determinize ( const automaton::InputDrivenDPDA < InputSymbolType, PushdownSymbolType, StateType > & automaton );
/**
* Implementation of determinization for input-driven pushdown automata.
@@ -152,7 +152,7 @@ public:
* @return deterministic pushdown automaton equivalent to @p dpda
*/
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & dpda );
+ static automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & automaton );
/**
* Determinization of nondeterministic visibly pushdown automata.
@@ -177,7 +177,7 @@ public:
* @return deterministic pushdown automaton equivalent to @p dpda
*/
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & dpda );
+ static automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & automaton );
/**
* Determinization of nondeterministic real-time height-deterministic pushdown automata.
@@ -202,7 +202,7 @@ public:
* @return deterministic single pop deterministic pushdown automaton equivalent do @p dpda
*/
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & dpda );
+ static automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & automaton );
/**
* Determinization of deterministic pushdown automata.
@@ -215,7 +215,7 @@ public:
* @return deterministic pushdown automaton equivalent to @p dpda
*/
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & dpda );
+ static automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & automaton );
/**
* Determinization of nondeterministic pushdown automata is implemented as a cast of such automaton to RhPDA.
@@ -227,7 +227,7 @@ public:
* @return nondeterministic pushdown automaton equivalent to @p npda
*/
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::NPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & npda );
+ static automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > determinize ( const automaton::NPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & automaton );
/**
* Determinization of deterministic pushdown automata.
@@ -239,7 +239,7 @@ public:
* @return deterministic one-tape turing machine equivalent to @p dtm
*/
template < class SymbolType, class StateType >
- static automaton::OneTapeDTM < SymbolType, StateType > determinize ( const automaton::OneTapeDTM < SymbolType, StateType > & dtm );
+ static automaton::OneTapeDTM < SymbolType, StateType > determinize ( const automaton::OneTapeDTM < SymbolType, StateType > & automaton );
};
template < class SymbolType, class StateType >
diff --git a/alib2algo/src/automaton/properties/EpsilonClosure.h b/alib2algo/src/automaton/properties/EpsilonClosure.h
index 8dc7f14414766b254c5d3d2e1e7989a921e7fee9..b6c976a10d352f298a5bd4abe19fa45ae74eb090 100644
--- a/alib2algo/src/automaton/properties/EpsilonClosure.h
+++ b/alib2algo/src/automaton/properties/EpsilonClosure.h
@@ -59,7 +59,7 @@ public:
* @throws exception::CommonException if state is not in the set of @p fsm states
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> epsilonClosure( const automaton::EpsilonNFA < SymbolType, StateType > & fsm, const StateType & state );
+ static ext::set<StateType> epsilonClosure( const automaton::EpsilonNFA < SymbolType, StateType > & fsm, const StateType & q );
/**
* Computes epsilon closure for a state of a nondeterministic finite automaton with multiple initial states.
@@ -73,7 +73,7 @@ public:
* @throws exception::CommonException if state is not in the set of @p fsm states
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> epsilonClosure( const automaton::MultiInitialStateNFA < SymbolType, StateType > & fsm, const StateType & state );
+ static ext::set<StateType> epsilonClosure( const automaton::MultiInitialStateNFA < SymbolType, StateType > & fsm, const StateType & q );
/**
* Computes epsilon closure for a state of a nondeterministic finite automaton.
@@ -87,7 +87,7 @@ public:
* @throws exception::CommonException if state is not in the set of @p fsm states
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> epsilonClosure( const automaton::NFA < SymbolType, StateType > & fsm, const StateType & state );
+ static ext::set<StateType> epsilonClosure( const automaton::NFA < SymbolType, StateType > & fsm, const StateType & q );
/**
* Computes epsilon closure for a state of a deterministic finite automaton.
@@ -101,7 +101,7 @@ public:
* @throws exception::CommonException if state is not in the set of @p fsm states
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> epsilonClosure( const automaton::DFA < SymbolType, StateType > & fsm, const StateType & state );
+ static ext::set<StateType> epsilonClosure( const automaton::DFA < SymbolType, StateType > & fsm, const StateType & q );
/**
* Computes epsilon closure for a state of an extended nondeterministic finite automaton.
@@ -115,7 +115,7 @@ public:
* @throws exception::CommonException if state is not in the set of @p fsm states
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> epsilonClosure( const automaton::ExtendedNFA < SymbolType, StateType > & fsm, const StateType & state );
+ static ext::set<StateType> epsilonClosure( const automaton::ExtendedNFA < SymbolType, StateType > & fsm, const StateType & q );
/**
* Computes epsilon closure for a state of an compact nondeterministic finite automaton.
@@ -129,7 +129,7 @@ public:
* @throws exception::CommonException if state is not in the set of @p fsm states
*/
template < class SymbolType, class StateType >
- static ext::set<StateType> epsilonClosure( const automaton::CompactNFA < SymbolType, StateType > & fsm, const StateType & state );
+ static ext::set<StateType> epsilonClosure( const automaton::CompactNFA < SymbolType, StateType > & fsm, const StateType & q );
};
template < class SymbolType, class StateType >
diff --git a/alib2algo/src/automaton/properties/UndistinguishableStates.h b/alib2algo/src/automaton/properties/UndistinguishableStates.h
index 75fe11d8c8a399a0f95d96f3f866dc9802727b03..8d1379eb18873fc528f92d5d53a1931c416c495a 100644
--- a/alib2algo/src/automaton/properties/UndistinguishableStates.h
+++ b/alib2algo/src/automaton/properties/UndistinguishableStates.h
@@ -84,7 +84,7 @@ public:
* @return state partitioning of undistinguishable states
*/
template < class SymbolType, class StateType >
- static ext::set < ext::set < StateType > > undistinguishable ( const automaton::DFA < SymbolType, StateType > & dft );
+ static ext::set < ext::set < StateType > > undistinguishable ( const automaton::DFA < SymbolType, StateType > & dfa );
/**
* Creates state partitioning of undistinguishable states-
diff --git a/alib2algo/src/automaton/simplify/Normalize.h b/alib2algo/src/automaton/simplify/Normalize.h
index c44d2c66f121418af7f3694e411ff4811c844168..26868bdce220707e528744b938e69850fafed8b4 100644
--- a/alib2algo/src/automaton/simplify/Normalize.h
+++ b/alib2algo/src/automaton/simplify/Normalize.h
@@ -55,7 +55,7 @@ public:
* @throws exception::CommonException if the passed dfa was not minimal connected dfa
*/
template < class SymbolType, class StateType >
- static automaton::DFA < SymbolType, unsigned > normalize(const automaton::DFA < SymbolType, StateType > & dfa);
+ static automaton::DFA < SymbolType, unsigned > normalize(const automaton::DFA < SymbolType, StateType > & fsm);
/**
* Normalization of compact deterministic finite automata.
@@ -69,7 +69,7 @@ public:
* @throws exception::CommonException if the passed dfa was not minimal connected dfa
*/
template < class SymbolType, class StateType >
- static automaton::CompactDFA < SymbolType, unsigned > normalize ( const automaton::CompactDFA < SymbolType, StateType > & dfa );
+ static automaton::CompactDFA < SymbolType, unsigned > normalize ( const automaton::CompactDFA < SymbolType, StateType > & fsm );
/**
* Normalization of deterministic pushdown automata.
diff --git a/alib2algo/src/automaton/simplify/UnreachableStatesRemover.h b/alib2algo/src/automaton/simplify/UnreachableStatesRemover.h
index 0fe329100b60aa66eb62c1a09404f495e59c759d..4239932554e00c98557cb0b06c3c796fdc611fd5 100644
--- a/alib2algo/src/automaton/simplify/UnreachableStatesRemover.h
+++ b/alib2algo/src/automaton/simplify/UnreachableStatesRemover.h
@@ -61,7 +61,7 @@ public:
* @return @p automaton without unreachable states
*/
template < class T >
- static T remove( const T & automaton );
+ static T remove( const T & fsm );
/**
* @overload
diff --git a/alib2algo/src/automaton/simplify/UselessStatesRemover.h b/alib2algo/src/automaton/simplify/UselessStatesRemover.h
index 6b9ce0fe4f8ba53ef8d311992e5c727df4486d58..46ab0d0ce83c7e090e54f969ae91644a3448bb11 100644
--- a/alib2algo/src/automaton/simplify/UselessStatesRemover.h
+++ b/alib2algo/src/automaton/simplify/UselessStatesRemover.h
@@ -57,7 +57,7 @@ public:
* @return @p automaton without useless states
*/
template < class T >
- static T remove( const T & automaton );
+ static T remove( const T & fsm );
/**
* @overload
diff --git a/alib2algo/src/grammar/generate/RandomGrammarFactory.h b/alib2algo/src/grammar/generate/RandomGrammarFactory.h
index 0c965ea7a48647baf440ac0302b9c78dd4b57a29..e4d095dd4b3a71153f74d5b1642f38f7e0b7e9e8 100644
--- a/alib2algo/src/grammar/generate/RandomGrammarFactory.h
+++ b/alib2algo/src/grammar/generate/RandomGrammarFactory.h
@@ -52,7 +52,7 @@ public:
*
* \return random context free grammar
*/
- static grammar::CFG < std::string, std::string > generateCFG( size_t nonterminalsCount, size_t terminalsSize, bool randomizedAlphabet, double density );
+ static grammar::CFG < std::string, std::string > generateCFG( size_t nonterminalsCount, size_t terminalsCount, bool randomizedAlphabet, double density );
private:
template < class TerminalSymbolType, class NonterminalSymbolType >
diff --git a/alib2algo/src/grammar/simplify/Rename.h b/alib2algo/src/grammar/simplify/Rename.h
index 2cc1cce88c59185b12da8b2638be4df8fc62c632..cc485ba251d352eef4c11516ba78d96c763b5641 100644
--- a/alib2algo/src/grammar/simplify/Rename.h
+++ b/alib2algo/src/grammar/simplify/Rename.h
@@ -32,13 +32,13 @@ public:
* \return grammar with nonterminal symbols renamed
*/
template < class TerminalSymbolType, class NonterminalSymbolType >
- static grammar::RightRG < TerminalSymbolType, unsigned > rename ( const grammar::RightRG < TerminalSymbolType, NonterminalSymbolType > & grammar );
+ static grammar::RightRG < TerminalSymbolType, unsigned > rename ( const grammar::RightRG < TerminalSymbolType, NonterminalSymbolType > & rrg );
/**
* \override
*/
template < class TerminalSymbolType, class NonterminalSymbolType >
- static grammar::LeftRG < TerminalSymbolType, unsigned > rename ( const grammar::LeftRG < TerminalSymbolType, NonterminalSymbolType > & grammar );
+ static grammar::LeftRG < TerminalSymbolType, unsigned > rename ( const grammar::LeftRG < TerminalSymbolType, NonterminalSymbolType > & lrg );
};
template < class TerminalSymbolType, class NonterminalSymbolType >
diff --git a/alib2algo/src/regexp/glushkov/GlushkovFollow.h b/alib2algo/src/regexp/glushkov/GlushkovFollow.h
index 1707f22d3ea2ebadc881d8f564a8a25d3142bb9a..ec243d27598a0739f071fdfe6fd05a2f7bad2590 100644
--- a/alib2algo/src/regexp/glushkov/GlushkovFollow.h
+++ b/alib2algo/src/regexp/glushkov/GlushkovFollow.h
@@ -47,9 +47,9 @@ public:
template < class SymbolType >
class Unbounded {
public:
- static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpAlternation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbFollow );
- static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpConcatenation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbFollow );
- static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpIteration < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbFollow );
+ static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpAlternation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbolptr );
+ static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpConcatenation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbolptr );
+ static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpIteration < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbolptr );
static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpSymbol < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbFollow );
static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpEmpty < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbFollow );
static ext::set < regexp::UnboundedRegExpSymbol < SymbolType > > visit ( const regexp::UnboundedRegExpEpsilon < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbFollow );
diff --git a/alib2algo/src/regexp/glushkov/GlushkovPos.h b/alib2algo/src/regexp/glushkov/GlushkovPos.h
index 18ca52bf7a8582c520683e2d41d7ceb25ff953ca..127bc4ed74a504ab6261ce0fd4799a5fb803faf6 100644
--- a/alib2algo/src/regexp/glushkov/GlushkovPos.h
+++ b/alib2algo/src/regexp/glushkov/GlushkovPos.h
@@ -36,10 +36,10 @@ public:
template < class SymbolType >
class Unbounded {
public:
- static bool visit ( const regexp::UnboundedRegExpAlternation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbSearch );
- static bool visit ( const regexp::UnboundedRegExpConcatenation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbSearch );
- static bool visit ( const regexp::UnboundedRegExpIteration < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbSearch );
- static bool visit ( const regexp::UnboundedRegExpSymbol < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbSearch );
+ static bool visit ( const regexp::UnboundedRegExpAlternation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbol );
+ static bool visit ( const regexp::UnboundedRegExpConcatenation < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbol );
+ static bool visit ( const regexp::UnboundedRegExpIteration < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbol );
+ static bool visit ( const regexp::UnboundedRegExpSymbol < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbol );
static bool visit ( const regexp::UnboundedRegExpEmpty < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbSearch );
static bool visit ( const regexp::UnboundedRegExpEpsilon < SymbolType > & node, const regexp::UnboundedRegExpSymbol < SymbolType > & symbSearch );
};
diff --git a/alib2algo/src/regexp/simplify/RegExpOptimize.h b/alib2algo/src/regexp/simplify/RegExpOptimize.h
index decca8a8c990cf1c7543b1f6ce286fa9509711e6..33eeff2245b6916d31d5a84a56978f1ec6468f28 100644
--- a/alib2algo/src/regexp/simplify/RegExpOptimize.h
+++ b/alib2algo/src/regexp/simplify/RegExpOptimize.h
@@ -85,33 +85,33 @@ public:
* \override
*/
template < class SymbolType >
- static void optimize( regexp::UnboundedRegExpAlternation < SymbolType > & regexp );
+ static void optimize( regexp::UnboundedRegExpAlternation < SymbolType > & alt );
/**
* \override
*/
template < class SymbolType >
- static void optimize( regexp::UnboundedRegExpConcatenation < SymbolType > & regexp );
+ static void optimize( regexp::UnboundedRegExpConcatenation < SymbolType > & concat );
/**
* \override
*/
template < class SymbolType >
- static void optimize( regexp::UnboundedRegExpIteration < SymbolType > & regexp );
+ static void optimize( regexp::UnboundedRegExpIteration < SymbolType > & iter );
template < class SymbolType >
static regexp::FormalRegExp < SymbolType > optimize( const regexp::FormalRegExp < SymbolType > & regexp );
template < class SymbolType >
static regexp::FormalRegExpStructure < SymbolType > optimize( const regexp::FormalRegExpStructure < SymbolType > & regexp );
template < class SymbolType >
- static void optimize( regexp::FormalRegExpElement < SymbolType > & regexp );
+ static void optimize( regexp::FormalRegExpElement < SymbolType > & element );
private:
template < class SymbolType >
class Unbounded {
public:
- static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpAlternation < SymbolType > && node, bool recursive );
- static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpConcatenation < SymbolType > && node, bool recursive );
- static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpIteration < SymbolType > && node, bool recursive );
+ static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpAlternation < SymbolType > && alt, bool recursive );
+ static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpConcatenation < SymbolType > && concat, bool recursive );
+ static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpIteration < SymbolType > && iter, bool recursive );
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpSymbol < SymbolType > && node, bool recursive );
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpEmpty < SymbolType > && node, bool recursive );
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > visit ( regexp::UnboundedRegExpEpsilon < SymbolType > && node, bool recursive );
diff --git a/alib2algo/src/rte/glushkov/GlushkovFirst.h b/alib2algo/src/rte/glushkov/GlushkovFirst.h
index 86b43019d1cedca435e3b487df7688cb2f0961c7..027e73c08a4da4d82bb589292bd09c6dfae18a78 100644
--- a/alib2algo/src/rte/glushkov/GlushkovFirst.h
+++ b/alib2algo/src/rte/glushkov/GlushkovFirst.h
@@ -22,7 +22,7 @@ public:
* @return all rteSymbols which can be root of the tree.
*/
template < class SymbolType, class RankType >
- static ext::set < common::ranked_symbol < SymbolType, RankType > > first ( const rte::FormalRTE < SymbolType, RankType > & re );
+ static ext::set < common::ranked_symbol < SymbolType, RankType > > first ( const rte::FormalRTE < SymbolType, RankType > & rte );
template < class SymbolType, class RankType >
class Formal {
diff --git a/alib2algo/src/rte/glushkov/GlushkovFollow.h b/alib2algo/src/rte/glushkov/GlushkovFollow.h
index 684003bc72d1a8329afb6916b809180c49922440..4f9b5d36fea941d66285adc360b26342cd6137e3 100644
--- a/alib2algo/src/rte/glushkov/GlushkovFollow.h
+++ b/alib2algo/src/rte/glushkov/GlushkovFollow.h
@@ -54,12 +54,12 @@ public:
class Formal {
public:
static void visit ( const FormalRTEElement < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
- static void visit ( const FormalRTEAlternation < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
- static void visit ( const FormalRTESubstitution < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
- static void visit ( const FormalRTEIteration < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
- static void visit ( const FormalRTESymbolAlphabet < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
- static void visit ( const FormalRTESymbolSubst < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
- static void visit ( const FormalRTEEmpty < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & substMap, TFollowMap < SymbolType, RankType > & res );
+ static void visit ( const FormalRTEAlternation < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & subMap, TFollowMap < SymbolType, RankType > & res );
+ static void visit ( const FormalRTESubstitution < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & subMap, TFollowMap < SymbolType, RankType > & res );
+ static void visit ( const FormalRTEIteration < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & subMap, TFollowMap < SymbolType, RankType > & res );
+ static void visit ( const FormalRTESymbolAlphabet < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & subMap, TFollowMap < SymbolType, RankType > & res );
+ static void visit ( const FormalRTESymbolSubst < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & subMap, TFollowMap < SymbolType, RankType > & res );
+ static void visit ( const FormalRTEEmpty < ext::pair < SymbolType, unsigned >, RankType > & node, const rte::FormalRTE < ext::pair < SymbolType, unsigned >, RankType > & rte, TSubstMap < SymbolType, RankType > & subMap, TFollowMap < SymbolType, RankType > & res );
};
};
diff --git a/alib2algo/src/rte/glushkov/GlushkovFollowNaive.h b/alib2algo/src/rte/glushkov/GlushkovFollowNaive.h
index d0627ded775ff0a18b3c6ad340a7c0185f56c547..29b26b5fc0a99dd300c20309cfd37fa61ba427eb 100644
--- a/alib2algo/src/rte/glushkov/GlushkovFollowNaive.h
+++ b/alib2algo/src/rte/glushkov/GlushkovFollowNaive.h
@@ -52,7 +52,7 @@ public:
* @return all symbols that can follow specific symbol in word
*/
template < class SymbolType, class RankType >
- static ext::set < ext::vector < common::ranked_symbol < SymbolType, RankType > > > follow ( const rte::FormalRTE < SymbolType, RankType > & re, const common::ranked_symbol < SymbolType, RankType > & symbol );
+ static ext::set < ext::vector < common::ranked_symbol < SymbolType, RankType > > > follow ( const rte::FormalRTE < SymbolType, RankType > & rte, const common::ranked_symbol < SymbolType, RankType > & symbol );
template < class SymbolType, class RankType >
class Formal {
diff --git a/alib2algo/src/rte/glushkov/GlushkovPos.h b/alib2algo/src/rte/glushkov/GlushkovPos.h
index ca405e45db039aa16258f75884aa5f71aa97ef31..3d436af595c54f993040f687e5b13834d0c0ee0e 100644
--- a/alib2algo/src/rte/glushkov/GlushkovPos.h
+++ b/alib2algo/src/rte/glushkov/GlushkovPos.h
@@ -21,16 +21,16 @@ public:
* @return bool true if symbol pointer is in this subtree
*/
template < class SymbolType, class RankType >
- static bool pos ( const common::ranked_symbol < SymbolType, RankType > & symbol, const rte::FormalRTE < SymbolType, RankType > & node );
+ static bool pos ( const common::ranked_symbol < SymbolType, RankType > & symbol, const rte::FormalRTE < SymbolType, RankType > & rte );
template < class SymbolType, class RankType >
class Formal {
public:
- static bool visit ( const rte::FormalRTEAlternation < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbSearch );
- static bool visit ( const rte::FormalRTESubstitution < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbSearch );
- static bool visit ( const rte::FormalRTEIteration < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbSearch );
- static bool visit ( const rte::FormalRTESymbolAlphabet < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbSearch );
- static bool visit ( const rte::FormalRTESymbolSubst < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbSearch );
+ static bool visit ( const rte::FormalRTEAlternation < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbolF );
+ static bool visit ( const rte::FormalRTESubstitution < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbolF );
+ static bool visit ( const rte::FormalRTEIteration < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbolF );
+ static bool visit ( const rte::FormalRTESymbolAlphabet < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbolF );
+ static bool visit ( const rte::FormalRTESymbolSubst < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbolF );
static bool visit ( const rte::FormalRTEEmpty < SymbolType, RankType > & node, const common::ranked_symbol < SymbolType, RankType > & symbSearch );
};
};
diff --git a/alib2algo/src/rte/simplify/RTEOptimize.h b/alib2algo/src/rte/simplify/RTEOptimize.h
index 0b411f88b83220c96728640a8905c5d82933b61c..7042be05108a0c60f7da8cfc650a8fcedf120263 100644
--- a/alib2algo/src/rte/simplify/RTEOptimize.h
+++ b/alib2algo/src/rte/simplify/RTEOptimize.h
@@ -28,7 +28,7 @@ public:
template < class SymbolType, class RankType >
static rte::FormalRTEStructure < SymbolType, RankType > optimize( const rte::FormalRTEStructure < SymbolType, RankType > & rte );
template < class SymbolType, class RankType >
- static void optimize( rte::FormalRTEElement < SymbolType, RankType > & rte );
+ static void optimize( rte::FormalRTEElement < SymbolType, RankType > & element );
private:
template < class SymbolType, class RankType >
static ext::smart_ptr < rte::FormalRTEElement < SymbolType, RankType > > optimizeInner( const rte::FormalRTEElement < SymbolType, RankType > & node );
diff --git a/alib2algo/src/stringology/exact/BoyerMoore.h b/alib2algo/src/stringology/exact/BoyerMoore.h
index 1fa39fbd567ee500b51b36e08f7e24d2c417cef2..94ab8d343c57623180cda81e583a33107224adb0 100644
--- a/alib2algo/src/stringology/exact/BoyerMoore.h
+++ b/alib2algo/src/stringology/exact/BoyerMoore.h
@@ -34,7 +34,7 @@ public:
* @return set set of occurences
*/
template < class SymbolType >
- static ext::set < unsigned > match ( const string::LinearString < SymbolType > & subject, const string::LinearString < SymbolType > & pattern );
+ static ext::set < unsigned > match ( const string::LinearString < SymbolType > & string, const string::LinearString < SymbolType > & pattern );
};
diff --git a/alib2algo/src/stringology/exact/BoyerMooreHorspool.h b/alib2algo/src/stringology/exact/BoyerMooreHorspool.h
index 18d6fbfbd5dc643d93d4f12fa967bc3401dc2341..1d88e7c894a45ae589584ee96b630f6c491d5e07 100644
--- a/alib2algo/src/stringology/exact/BoyerMooreHorspool.h
+++ b/alib2algo/src/stringology/exact/BoyerMooreHorspool.h
@@ -33,7 +33,7 @@ public:
* @return set set of occurences
*/
template < class SymbolType >
- static ext::set < unsigned > match ( const string::LinearString < SymbolType > & subject, const string::LinearString < SymbolType > & pattern );
+ static ext::set < unsigned > match ( const string::LinearString < SymbolType > & string, const string::LinearString < SymbolType > & pattern );
};
diff --git a/alib2algo/src/stringology/exact/DeadZoneUsingBadCharacterShift.h b/alib2algo/src/stringology/exact/DeadZoneUsingBadCharacterShift.h
index 48c6571a2cdc79ed665fde3f8af0d7b4e8a7995a..fdb5fe4bac908b624ec901e175f557da68c86ecc 100644
--- a/alib2algo/src/stringology/exact/DeadZoneUsingBadCharacterShift.h
+++ b/alib2algo/src/stringology/exact/DeadZoneUsingBadCharacterShift.h
@@ -33,7 +33,7 @@ public:
* @return set set of occurences
*/
template < class SymbolType >
- static ext::set < unsigned > match ( const string::LinearString < SymbolType > & subject, const string::LinearString < SymbolType > & pattern );
+ static ext::set < unsigned > match ( const string::LinearString < SymbolType > & string, const string::LinearString < SymbolType > & pattern );
};
template < class SymbolType >
diff --git a/alib2algo/src/stringology/exact/QuickSearch.h b/alib2algo/src/stringology/exact/QuickSearch.h
index 58b984f266888d59e83b86ba1331549f67f59964..af47eb9305ba137c2015e4286e59ee3472e7d32c 100644
--- a/alib2algo/src/stringology/exact/QuickSearch.h
+++ b/alib2algo/src/stringology/exact/QuickSearch.h
@@ -32,7 +32,7 @@ public:
* @return set of occurences
*/
template < class SymbolType >
- static ext::set < unsigned > match ( const string::LinearString < SymbolType > & subject, const string::LinearString < SymbolType > & pattern );
+ static ext::set < unsigned > match ( const string::LinearString < SymbolType > & string, const string::LinearString < SymbolType > & pattern );
};
diff --git a/alib2algo/src/stringology/exact/ReversedBoyerMooreHorspool.h b/alib2algo/src/stringology/exact/ReversedBoyerMooreHorspool.h
index 8c83fa36cc81372a7a98ef460a6f67609fd43560..cdf05d50d33223dd143697b7ba1164e3ee16cfd7 100644
--- a/alib2algo/src/stringology/exact/ReversedBoyerMooreHorspool.h
+++ b/alib2algo/src/stringology/exact/ReversedBoyerMooreHorspool.h
@@ -30,7 +30,7 @@ public:
* @return set set of occurences
*/
template < class SymbolType >
- static ext::set < unsigned > match ( const string::LinearString < SymbolType > & subject, const string::LinearString < SymbolType > & pattern );
+ static ext::set < unsigned > match ( const string::LinearString < SymbolType > & string, const string::LinearString < SymbolType > & pattern );
};
diff --git a/alib2algo/src/stringology/indexing/BitParallelIndexConstruction.h b/alib2algo/src/stringology/indexing/BitParallelIndexConstruction.h
index f5a583f4a7db3783aaed597d3cb40a664f24156c..eda59ad587a79ec196d147fbb9f2c632aae62a02 100644
--- a/alib2algo/src/stringology/indexing/BitParallelIndexConstruction.h
+++ b/alib2algo/src/stringology/indexing/BitParallelIndexConstruction.h
@@ -29,7 +29,7 @@ public:
* @return automaton
*/
template < class SymbolType >
- static indexes::stringology::BitParallelIndex < SymbolType > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::BitParallelIndex < SymbolType > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo/src/stringology/indexing/CompressedBitParallelIndexConstruction.h b/alib2algo/src/stringology/indexing/CompressedBitParallelIndexConstruction.h
index 32b35757d7c27a119acb4d740bab951d9ca9c2c6..85625fb8d8e8a742266b907f526ececd57db44ac 100644
--- a/alib2algo/src/stringology/indexing/CompressedBitParallelIndexConstruction.h
+++ b/alib2algo/src/stringology/indexing/CompressedBitParallelIndexConstruction.h
@@ -29,7 +29,7 @@ public:
* @return automaton
*/
template < class SymbolType >
- static indexes::stringology::CompressedBitParallelIndex < SymbolType > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::CompressedBitParallelIndex < SymbolType > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo/src/stringology/indexing/PositionHeapNaive.h b/alib2algo/src/stringology/indexing/PositionHeapNaive.h
index e9fb751ce4e9982b7ebf218ebcb30eeb8da12c9f..0d3512616a4e913a6e0353720a18006fe83a7a2d 100644
--- a/alib2algo/src/stringology/indexing/PositionHeapNaive.h
+++ b/alib2algo/src/stringology/indexing/PositionHeapNaive.h
@@ -31,7 +31,7 @@ public:
* @return automaton
*/
template < class SymbolType >
- static indexes::stringology::PositionHeap < SymbolType > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::PositionHeap < SymbolType > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo/src/stringology/indexing/SuffixArrayNaive.h b/alib2algo/src/stringology/indexing/SuffixArrayNaive.h
index df004a59ebba2ddae5131b83691c310d51f2a3ee..4a68570f116a4161498a02a4b997a925730161d5 100644
--- a/alib2algo/src/stringology/indexing/SuffixArrayNaive.h
+++ b/alib2algo/src/stringology/indexing/SuffixArrayNaive.h
@@ -28,7 +28,7 @@ public:
* @return automaton
*/
template < class SymbolType >
- static indexes::stringology::SuffixArray < SymbolType > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::SuffixArray < SymbolType > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo/src/stringology/indexing/SuffixTrieNaive.h b/alib2algo/src/stringology/indexing/SuffixTrieNaive.h
index 2b33b7d89a172e4fbd6c5a389eb0cc7eb77c6f64..999f894eb57b4931765697882a599ae8ab764e7b 100644
--- a/alib2algo/src/stringology/indexing/SuffixTrieNaive.h
+++ b/alib2algo/src/stringology/indexing/SuffixTrieNaive.h
@@ -29,7 +29,7 @@ public:
* @return automaton
*/
template < class SymbolType >
- static indexes::stringology::SuffixTrie < SymbolType > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::SuffixTrie < SymbolType > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo/src/stringology/matching/BNDMMatcherConstruction.h b/alib2algo/src/stringology/matching/BNDMMatcherConstruction.h
index a1016c1f869d2c9b191be0367510f1f434163dbb..f1e2300d8862bd1e78963e2d2aef0c7ff3030628 100644
--- a/alib2algo/src/stringology/matching/BNDMMatcherConstruction.h
+++ b/alib2algo/src/stringology/matching/BNDMMatcherConstruction.h
@@ -29,7 +29,7 @@ public:
* @return automaton
*/
template < class SymbolType, size_t BitmaskBitCount = 64 >
- static indexes::stringology::BitSetIndex < SymbolType, BitmaskBitCount > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::BitSetIndex < SymbolType, BitmaskBitCount > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo/src/stringology/matching/WideBNDMMatcherConstruction.h b/alib2algo/src/stringology/matching/WideBNDMMatcherConstruction.h
index 98a13a56f5aa91dbcbcb53acd9953b08fae59999..807bcd59d183b1e5efefb01c6c834a3fabb6ddc6 100644
--- a/alib2algo/src/stringology/matching/WideBNDMMatcherConstruction.h
+++ b/alib2algo/src/stringology/matching/WideBNDMMatcherConstruction.h
@@ -28,7 +28,7 @@ public:
* @return automaton
*/
template < class SymbolType >
- static indexes::stringology::BitParallelIndex < SymbolType > construct ( const string::LinearString < SymbolType > & string );
+ static indexes::stringology::BitParallelIndex < SymbolType > construct ( const string::LinearString < SymbolType > & w );
};
diff --git a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h
index 95ca15571d6c528b475057fb791a129b11db25fd..c9262d311e8b3a9ab4538b6fc531de86e30f1b48 100644
--- a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h
+++ b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h
@@ -18,7 +18,7 @@ namespace parsing {
class AbsorbTerminalSymbol {
public:
- static void handleAbsobtion ( const grammar::CFG < > & orig, grammar::CFG < > & res, const DefaultSymbolType & terminal, const ext::set < DefaultSymbolType > & nonterminals, const ext::map < DefaultSymbolType, DefaultSymbolType > & nonterminalPrimed );
+ static void handleAbsobtion ( const grammar::CFG < > & orig, grammar::CFG < > & res, const DefaultSymbolType & terminal, const ext::set < DefaultSymbolType > & nonterminals, const ext::map < DefaultSymbolType, DefaultSymbolType > & nonterminalsPrimed );
static void absorbTerminalSymbol ( grammar::CFG < > & grammar, const DefaultSymbolType & terminal, const ext::set < DefaultSymbolType > & nonterminals );
};
diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.h b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.h
index 8a34cae48112cefdcaafab9224cf1689dab40e74..d04977dd761bb02da3845dd02a81d18f79fbbebe 100644
--- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.h
+++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.h
@@ -16,7 +16,7 @@ namespace parsing {
class DeterministicLL1Grammar {
public:
- static grammar::CFG < > convert ( const grammar::CFG < > & grammar );
+ static grammar::CFG < > convert ( const grammar::CFG < > & param );
};
diff --git a/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.h b/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.h
index d6c901c7158d58874c509a063b9608012cb5ccef..6f391088e4cec23c31798868987a0f898b7c1849 100644
--- a/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.h
+++ b/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.h
@@ -28,7 +28,7 @@ public:
* @param string string to construct suffix trie for
* @return automaton
*/
- static indexes::SuffixTrieTerminatingSymbol construct ( const string::LinearStringTerminatingSymbol & string );
+ static indexes::SuffixTrieTerminatingSymbol construct ( const string::LinearStringTerminatingSymbol & w );
};
diff --git a/alib2aux/src/convert/DotConverter.h b/alib2aux/src/convert/DotConverter.h
index 51979ca81ed71aeced672bdadcf9d3b0fee154f9..b5c77a6a0a53ee988362382232395f5ef02b971c 100644
--- a/alib2aux/src/convert/DotConverter.h
+++ b/alib2aux/src/convert/DotConverter.h
@@ -70,13 +70,13 @@ class DotConverter {
static void transitions(const automaton::CompactNFA < SymbolType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class RankType, class StateType >
- static void transitions(const automaton::NFTA < SymbolType, RankType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::NFTA < SymbolType, RankType, StateType > & fta, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class RankType, class StateType >
- static void transitions(const automaton::ExtendedNFTA < SymbolType, RankType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::ExtendedNFTA < SymbolType, RankType, StateType > & fta, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class RankType, class StateType >
- static void transitions(const automaton::DFTA < SymbolType, RankType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::DFTA < SymbolType, RankType, StateType > & fta, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
static void transitions(const automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
@@ -85,10 +85,10 @@ class DotConverter {
static void transitions(const automaton::NPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::SinglePopNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::SinglePopNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
static void transitions(const automaton::InputDrivenDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
@@ -97,16 +97,16 @@ class DotConverter {
static void transitions(const automaton::InputDrivenNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class StateType >
static void transitions(const automaton::OneTapeDTM < SymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
diff --git a/alib2aux/src/convert/GasTexConverter.h b/alib2aux/src/convert/GasTexConverter.h
index 187a121c759c81aa05ca275b1fe40151e6b1bb3e..a5bfd8c19838e3ee67657751f243c0003272557e 100644
--- a/alib2aux/src/convert/GasTexConverter.h
+++ b/alib2aux/src/convert/GasTexConverter.h
@@ -83,10 +83,10 @@ class GasTexConverter {
static void transitions(const automaton::NPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, std::ostream & out);
+ static void transitions(const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::SinglePopNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, std::ostream & out);
+ static void transitions(const automaton::SinglePopNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
static void transitions(const automaton::InputDrivenDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
@@ -95,16 +95,16 @@ class GasTexConverter {
static void transitions(const automaton::InputDrivenNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, std::ostream & out);
+ static void transitions(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, std::ostream & out);
+ static void transitions(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, std::ostream & out);
+ static void transitions(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, std::ostream & out);
+ static void transitions(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, std::ostream & out);
template < class SymbolType, class StateType >
static void transitions(const automaton::OneTapeDTM < SymbolType, StateType > & tm, std::ostream & out);
diff --git a/alib2aux/src/convert/TikZConverter.h b/alib2aux/src/convert/TikZConverter.h
index c1c4851e8effcd9b93a8496b1436e4a308da53c1..fa0e0e395a83b9c4a8091985bf0d1f74cb14753b 100644
--- a/alib2aux/src/convert/TikZConverter.h
+++ b/alib2aux/src/convert/TikZConverter.h
@@ -68,10 +68,10 @@ class TikZConverter {
static void transitions(const automaton::CompactNFA < SymbolType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class RankType, class StateType >
- static void transitions(const automaton::NFTA < SymbolType, RankType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::NFTA < SymbolType, RankType, StateType > & fta, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class RankType, class StateType >
- static void transitions(const automaton::DFTA < SymbolType, RankType, StateType > & fsm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::DFTA < SymbolType, RankType, StateType > & fta, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
static void transitions(const automaton::DPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
@@ -80,10 +80,10 @@ class TikZConverter {
static void transitions(const automaton::NPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::SinglePopDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::SinglePopNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::SinglePopNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
static void transitions(const automaton::InputDrivenDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
@@ -92,16 +92,16 @@ class TikZConverter {
static void transitions(const automaton::InputDrivenNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::VisiblyPushdownDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::VisiblyPushdownNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::RealTimeHeightDeterministicDPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class InputSymbolType, class PushdownStoreSymbolType, class StateType >
- static void transitions(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
+ static void transitions(const automaton::RealTimeHeightDeterministicNPDA < InputSymbolType, PushdownStoreSymbolType, StateType > & pda, const ext::map < StateType, int > & states, std::ostream & out);
template < class SymbolType, class StateType >
static void transitions(const automaton::OneTapeDTM < SymbolType, StateType > & tm, const ext::map < StateType, int > & states, std::ostream & out);
diff --git a/alib2cli/src/ast/statements/SingleStatement.h b/alib2cli/src/ast/statements/SingleStatement.h
index 63003ab85f01a5bd35a2192c14ac24cccc51d1eb..8502a5b031929076540a3a3a1e5dd1f420934654 100644
--- a/alib2cli/src/ast/statements/SingleStatement.h
+++ b/alib2cli/src/ast/statements/SingleStatement.h
@@ -15,7 +15,7 @@ class SingleStatement final : public Statement {
ext::vector < bool > m_moves;
public:
- SingleStatement ( std::unique_ptr < cli::Arg > name, ext::vector < std::unique_ptr < cli::Arg > > templateParams, ext::vector < std::shared_ptr < Statement > > params, std::unique_ptr < CategoryOption > options, ext::vector < bool > moves );
+ SingleStatement ( std::unique_ptr < cli::Arg > name, ext::vector < std::unique_ptr < cli::Arg > > templateParams, ext::vector < std::shared_ptr < Statement > > params, std::unique_ptr < CategoryOption > category, ext::vector < bool > moves );
std::shared_ptr < abstraction::OperationAbstraction > translateAndEval ( const std::shared_ptr < abstraction::OperationAbstraction > & prev, Environment & environment ) const override;
diff --git a/alib2cli/src/builtin/Dot.h b/alib2cli/src/builtin/Dot.h
index 95b0bdd3e466ada67d3f0568a08b11deb60c0fdf..3fb922caf020274524f43249593108247bd1bd3b 100644
--- a/alib2cli/src/builtin/Dot.h
+++ b/alib2cli/src/builtin/Dot.h
@@ -30,7 +30,7 @@ public:
*
* \param dot a string containing dot data
*/
- static void dot ( const std::string & dot );
+ static void dot ( const std::string & data );
/**
* Cli builtin command for DOT format visualization
@@ -55,7 +55,7 @@ public:
*
* \param dot a string containing dot data
*/
- static void dot ( const std::string & dot );
+ static void dot ( const std::string & data );
};
} /* namespace builtin */
diff --git a/alib2common/src/exception/CommonException.h b/alib2common/src/exception/CommonException.h
index d264198e87b4b61d3ae3988b84364a8ce5ed1ec8..59f6c219237ebf83bf6c9d5c552a235db4580bfc 100644
--- a/alib2common/src/exception/CommonException.h
+++ b/alib2common/src/exception/CommonException.h
@@ -76,7 +76,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator <<( std::ostream & out, const CommonException & );
+ friend std::ostream & operator <<( std::ostream & os, const CommonException & );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/BarSymbol.h b/alib2data/src/alphabet/BarSymbol.h
index 6da7fc0f60d3e04905b2f6246e2d5d044b23e138..8d4ed8af842643d0f5ee35810ede83682e757d59 100644
--- a/alib2data/src/alphabet/BarSymbol.h
+++ b/alib2data/src/alphabet/BarSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const BarSymbol & instnace );
+ friend std::ostream & operator << ( std::ostream & out, const BarSymbol & instnace );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/BlankSymbol.h b/alib2data/src/alphabet/BlankSymbol.h
index 6399009ebf0c2e13504919ad85bc7ce00770720d..d9210f45777da713c49f864f000ccaa2a6fccb19 100644
--- a/alib2data/src/alphabet/BlankSymbol.h
+++ b/alib2data/src/alphabet/BlankSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const BlankSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const BlankSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/BottomOfTheStackSymbol.h b/alib2data/src/alphabet/BottomOfTheStackSymbol.h
index 21ea81bb972e6b9b14b9b172de652ea6b2f3bc34..bd38d417177fa2799b99c803843f4653e7b683b5 100644
--- a/alib2data/src/alphabet/BottomOfTheStackSymbol.h
+++ b/alib2data/src/alphabet/BottomOfTheStackSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const BottomOfTheStackSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const BottomOfTheStackSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/EndSymbol.h b/alib2data/src/alphabet/EndSymbol.h
index b0ab079c93bc0873a301525bb63b22749e34a881..022c914e5fb44ab8104231ffc85b72ca6e0209f0 100644
--- a/alib2data/src/alphabet/EndSymbol.h
+++ b/alib2data/src/alphabet/EndSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const EndSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const EndSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/InitialSymbol.h b/alib2data/src/alphabet/InitialSymbol.h
index 7c5c74691d14af6fd3bf0c3c3fcbd6db7c0a03d2..2a7e67b2d6353ad72c178d615b5613bbee2af8a6 100644
--- a/alib2data/src/alphabet/InitialSymbol.h
+++ b/alib2data/src/alphabet/InitialSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const InitialSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const InitialSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/StartSymbol.h b/alib2data/src/alphabet/StartSymbol.h
index 0de4fdbd4cfaf0ef1e246c237a0dcf07de65fad4..3b3d2926129821c7b949bb14018669f8d18ecd76 100644
--- a/alib2data/src/alphabet/StartSymbol.h
+++ b/alib2data/src/alphabet/StartSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const StartSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const StartSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/VariablesBarSymbol.h b/alib2data/src/alphabet/VariablesBarSymbol.h
index 801a82916987da35949070c8d1a1de400b39683e..10c4e5f7e9fed9ad037bc9b8bdfb65f8d1321ef0 100644
--- a/alib2data/src/alphabet/VariablesBarSymbol.h
+++ b/alib2data/src/alphabet/VariablesBarSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const VariablesBarSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const VariablesBarSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/WildcardSymbol.h b/alib2data/src/alphabet/WildcardSymbol.h
index f674b455fdac77a063eaa118f7b91da713b0c699..a5ba3f78b1d47a2cd4d17267280c689d9b90a074 100644
--- a/alib2data/src/alphabet/WildcardSymbol.h
+++ b/alib2data/src/alphabet/WildcardSymbol.h
@@ -59,7 +59,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const WildcardSymbol & instance );
+ friend std::ostream & operator << ( std::ostream & out, const WildcardSymbol & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/alphabet/xml/NonlinearVariableSymbol.h b/alib2data/src/alphabet/xml/NonlinearVariableSymbol.h
index c09e23d44b56835ba20b24a4ad7a4d4920fa789f..c46580519255f2c98afdfceb390748b1bf097058 100644
--- a/alib2data/src/alphabet/xml/NonlinearVariableSymbol.h
+++ b/alib2data/src/alphabet/xml/NonlinearVariableSymbol.h
@@ -18,7 +18,7 @@ struct xmlApi < alphabet::NonlinearVariableSymbol < T > > {
static alphabet::NonlinearVariableSymbol < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const alphabet::NonlinearVariableSymbol < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const alphabet::NonlinearVariableSymbol < T > & input );
};
template < typename T >
diff --git a/alib2data/src/alphabet/xml/RankedSymbol.h b/alib2data/src/alphabet/xml/RankedSymbol.h
index 8400d8e286e1023b56400abe047a730a7c87a58a..bb6254eb9f88ab73c0d09fb32ca8226a3932ea7a 100644
--- a/alib2data/src/alphabet/xml/RankedSymbol.h
+++ b/alib2data/src/alphabet/xml/RankedSymbol.h
@@ -19,7 +19,7 @@ struct xmlApi < common::ranked_symbol < T, R > > {
static common::ranked_symbol < T, R > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const common::ranked_symbol < T, R > & data );
+ static void compose ( ext::deque < sax::Token > & output, const common::ranked_symbol < T, R > & input );
};
template < typename T, typename R >
diff --git a/alib2data/src/automaton/FSM/CompactDFA.h b/alib2data/src/automaton/FSM/CompactDFA.h
index d76da10a7b0a36e8a6756c97cf5081b83818375f..459b87e1748291ea1d3ceef9a057d5b6fed0379d 100644
--- a/alib2data/src/automaton/FSM/CompactDFA.h
+++ b/alib2data/src/automaton/FSM/CompactDFA.h
@@ -306,7 +306,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, ext::vector < SymbolType > input, StateType next );
+ bool addTransition ( StateType from, ext::vector < SymbolType > input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -319,7 +319,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const ext::vector < SymbolType > & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const ext::vector < SymbolType > & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -351,7 +351,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::map < ext::pair < StateType, ext::vector < SymbolType > >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::map < ext::pair < StateType, ext::vector < SymbolType > >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* The actual compare method
diff --git a/alib2data/src/automaton/FSM/CompactNFA.h b/alib2data/src/automaton/FSM/CompactNFA.h
index 920cb77d3923dd669550fc6bbda747bdb536dd0d..bbfc685b9c7ff4aaff45518af4dcff8898b29549 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.h
+++ b/alib2data/src/automaton/FSM/CompactNFA.h
@@ -346,7 +346,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, ext::vector < SymbolType > input, StateType next );
+ bool addTransition ( StateType from, ext::vector < SymbolType > input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -359,7 +359,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const ext::vector < SymbolType > & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const ext::vector < SymbolType > & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -391,7 +391,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::multimap < ext::pair < StateType, ext::vector < SymbolType > >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::multimap < ext::pair < StateType, ext::vector < SymbolType > >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* The actual compare method
diff --git a/alib2data/src/automaton/FSM/DFA.h b/alib2data/src/automaton/FSM/DFA.h
index 8da96a8d069980fffe1d5bc63290f28293be705a..25c03a8116aa2e78411fbad241b85d9b7905e1fe 100644
--- a/alib2data/src/automaton/FSM/DFA.h
+++ b/alib2data/src/automaton/FSM/DFA.h
@@ -297,7 +297,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, SymbolType input, const StateType next );
+ bool addTransition ( StateType from, SymbolType input, const StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -310,7 +310,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const SymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const SymbolType & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.h b/alib2data/src/automaton/FSM/EpsilonNFA.h
index 0e6ea65dec7f018c2ba374a85aefb2e88329ebdf..e32b1ec679609182cb16d66e6f0fdb039bea5650 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.h
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.h
@@ -378,7 +378,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const SymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const SymbolType & input, const StateType & to );
/**
* \brief Removes a transition from the automaton.
@@ -390,7 +390,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const StateType & next );
+ bool removeTransition ( const StateType & from, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -454,7 +454,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::multimap < ext::pair < StateType, common::symbol_or_epsilon < SymbolType > >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::multimap < ext::pair < StateType, common::symbol_or_epsilon < SymbolType > >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* Get a subset of epsilon transitions of the automaton, with the target state fixed in the transitions natural representation.
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.h b/alib2data/src/automaton/FSM/ExtendedNFA.h
index 8a4cacf499396f32e14f2bd0f3b41f346c46cfed..a9302ea3a3ed4cbb9f3c702e3cf275332ca65ac8 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.h
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.h
@@ -348,7 +348,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, regexp::UnboundedRegExpStructure < SymbolType > input, StateType next );
+ bool addTransition ( StateType from, regexp::UnboundedRegExpStructure < SymbolType > input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -361,7 +361,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const regexp::UnboundedRegExpStructure < SymbolType > & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const regexp::UnboundedRegExpStructure < SymbolType > & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -393,7 +393,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::multimap < ext::pair < StateType, regexp::UnboundedRegExpStructure < SymbolType > >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::multimap < ext::pair < StateType, regexp::UnboundedRegExpStructure < SymbolType > >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* The actual compare method
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateEpsilonNFA.h b/alib2data/src/automaton/FSM/MultiInitialStateEpsilonNFA.h
index 5af2d1f52d4b6bc53313593b08a2ac741c4d2f84..a092e22542a12394e72858a8a1512b54776eb1f3 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateEpsilonNFA.h
+++ b/alib2data/src/automaton/FSM/MultiInitialStateEpsilonNFA.h
@@ -405,7 +405,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const SymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const SymbolType & input, const StateType & to );
/**
* \brief Removes a transition from the automaton.
@@ -417,7 +417,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const StateType & next );
+ bool removeTransition ( const StateType & from, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -481,7 +481,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::multimap < ext::pair < StateType, common::symbol_or_epsilon < SymbolType > >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::multimap < ext::pair < StateType, common::symbol_or_epsilon < SymbolType > >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* Get a subset of epsilon transitions of the automaton, with the target state fixed in the transitions natural representation.
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
index 847eab355219bcce26c64c4624b8b47c44a2c2cd..530938c3094caaf385587d6d17e2a24a7cff03fe 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
@@ -330,7 +330,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, SymbolType input, StateType next );
+ bool addTransition ( StateType from, SymbolType input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -343,7 +343,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const SymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const SymbolType & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -375,7 +375,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::multimap < ext::pair < StateType, SymbolType >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::multimap < ext::pair < StateType, SymbolType >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* \brief Determines whether the automaton is deterministic.
diff --git a/alib2data/src/automaton/FSM/NFA.h b/alib2data/src/automaton/FSM/NFA.h
index 2f874ef1488b9990e99a2a56a51efb4dcd066cf2..962df1ddf9b166e75392672d87d947296b1ab89b 100644
--- a/alib2data/src/automaton/FSM/NFA.h
+++ b/alib2data/src/automaton/FSM/NFA.h
@@ -299,7 +299,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, SymbolType input, StateType next );
+ bool addTransition ( StateType from, SymbolType input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -312,7 +312,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const SymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const SymbolType & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
@@ -344,7 +344,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::multimap < ext::pair < StateType, SymbolType >, StateType > getTransitionsToState ( const StateType & from ) const;
+ ext::multimap < ext::pair < StateType, SymbolType >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* \brief Determines whether the automaton is deterministic.
diff --git a/alib2data/src/automaton/PDA/DPDA.h b/alib2data/src/automaton/PDA/DPDA.h
index f17e1f93d6f3e1029cab2516d859e1e5e0421b65..e6a18a3db2e4a8bb4e8153b482ed0fcd16079f93 100644
--- a/alib2data/src/automaton/PDA/DPDA.h
+++ b/alib2data/src/automaton/PDA/DPDA.h
@@ -99,7 +99,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit DPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit DPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
@@ -511,7 +511,7 @@ public:
*
* \returns a subset of the transition function of the automaton with the target state fixed
*/
- ext::map < ext::tuple < StateType, common::symbol_or_epsilon < InputSymbolType >, ext::vector < PushdownStoreSymbolType > >, ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > getTransitionsToState ( const StateType & from ) const;
+ ext::map < ext::tuple < StateType, common::symbol_or_epsilon < InputSymbolType >, ext::vector < PushdownStoreSymbolType > >, ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > getTransitionsToState ( const StateType & to ) const;
/**
* The actual compare method
diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.h b/alib2data/src/automaton/PDA/InputDrivenDPDA.h
index 0e64c5f19771b5d5d93d2bd07cb85bb422fd26fc..0fcf36f1b64845d35fdedceff595b73e9e868498 100644
--- a/alib2data/src/automaton/PDA/InputDrivenDPDA.h
+++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.h
@@ -114,7 +114,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit InputDrivenDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit InputDrivenDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
@@ -451,7 +451,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, InputSymbolType input, StateType next );
+ bool addTransition ( StateType from, InputSymbolType input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -464,7 +464,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const InputSymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const InputSymbolType & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.h b/alib2data/src/automaton/PDA/InputDrivenNPDA.h
index 9dadfe17e6a6209acb61c0a00e8921b6d39c7623..1797dcf0138a600c0fa0511d2554a7ce20f0b5d7 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.h
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.h
@@ -114,7 +114,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit InputDrivenNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAphabet, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit InputDrivenNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
@@ -451,7 +451,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( StateType current, InputSymbolType input, StateType next );
+ bool addTransition ( StateType from, InputSymbolType input, StateType to );
/**
* \brief Removes a transition from the automaton.
@@ -464,7 +464,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeTransition ( const StateType & current, const InputSymbolType & input, const StateType & next );
+ bool removeTransition ( const StateType & from, const InputSymbolType & input, const StateType & to );
/**
* Get the transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/PDA/NPDA.h b/alib2data/src/automaton/PDA/NPDA.h
index 49d5aac03153a489e6e78d9a6a1daf3b9bf1b172..e5703460f872003d6e30a857892c1e98f7bd8ce9 100644
--- a/alib2data/src/automaton/PDA/NPDA.h
+++ b/alib2data/src/automaton/PDA/NPDA.h
@@ -94,7 +94,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit NPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit NPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
diff --git a/alib2data/src/automaton/PDA/NPDTA.h b/alib2data/src/automaton/PDA/NPDTA.h
index d1ee19c118825d84965ad9b238a9fa1664bddf80..8ce1f8c636592918b87c9c67c3a0f26d3b456a0b 100644
--- a/alib2data/src/automaton/PDA/NPDTA.h
+++ b/alib2data/src/automaton/PDA/NPDTA.h
@@ -98,7 +98,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit NPDTA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < OutputSymbolType > outputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit NPDTA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < OutputSymbolType > outputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
index a958525f8052e1bf5fe963aed3f32f96a3d7ef0e..8e3ce3047bef1703e984df4bf1fdaddd2e8c5ceb 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
@@ -132,7 +132,7 @@ public:
* \param bottomOfTheStackSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit RealTimeHeightDeterministicDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, StateType initialState, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
+ explicit RealTimeHeightDeterministicDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and bottom of the stack symbol.
@@ -428,7 +428,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, common::symbol_or_epsilon < InputSymbolType > input, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a call transition to the automaton.
@@ -444,7 +444,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, InputSymbolType input, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, InputSymbolType input, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a call transition to the automaton.
@@ -459,7 +459,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a return transition to the automaton.
@@ -475,7 +475,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, common::symbol_or_epsilon < InputSymbolType > input, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a return transition to the automaton.
@@ -491,7 +491,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, InputSymbolType input, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, InputSymbolType input, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a return transition to the automaton.
@@ -506,7 +506,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -521,7 +521,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, common::symbol_or_epsilon < InputSymbolType > input, StateType next );
+ bool addLocalTransition ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -536,7 +536,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, InputSymbolType input, StateType next );
+ bool addLocalTransition ( StateType from, InputSymbolType input, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -550,7 +550,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, StateType next );
+ bool addLocalTransition ( StateType from, StateType to );
/**
* \brief Removes a call transition from the automaton.
@@ -566,7 +566,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a call transition from the automaton.
@@ -582,7 +582,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const InputSymbolType & input, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const InputSymbolType & input, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a call transition from the automaton.
@@ -597,7 +597,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a return transition from the automaton.
@@ -613,7 +613,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const common::symbol_or_epsilon < InputSymbolType > & input, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const common::symbol_or_epsilon < InputSymbolType > & input, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a return transition from the automaton.
@@ -629,7 +629,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a return transition from the automaton.
@@ -644,7 +644,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -659,7 +659,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -674,7 +674,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const InputSymbolType & input, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const InputSymbolType & input, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -688,7 +688,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const StateType & to );
/**
* Get the call transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
index 310d8cb37d1f15f4002520cbd641fb23f225d219..1f029ff07e7712906746e5098ae904395f679faa 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
@@ -110,7 +110,7 @@ public:
* \param bottomOfTheStackSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit RealTimeHeightDeterministicNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, ext::set < StateType > initialStates, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
+ explicit RealTimeHeightDeterministicNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, ext::set < StateType > initialStates, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and bottom of the stack symbol.
@@ -426,7 +426,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, common::symbol_or_epsilon < InputSymbolType > input, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a call transition to the automaton.
@@ -442,7 +442,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, InputSymbolType input, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, InputSymbolType input, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a call transition to the automaton.
@@ -457,7 +457,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a return transition to the automaton.
@@ -473,7 +473,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, common::symbol_or_epsilon < InputSymbolType > input, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a return transition to the automaton.
@@ -489,7 +489,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, InputSymbolType input, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, InputSymbolType input, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a return transition to the automaton.
@@ -504,7 +504,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -519,7 +519,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, common::symbol_or_epsilon < InputSymbolType > input, StateType next );
+ bool addLocalTransition ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -534,7 +534,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, InputSymbolType input, StateType next );
+ bool addLocalTransition ( StateType from, InputSymbolType input, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -548,7 +548,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, StateType next );
+ bool addLocalTransition ( StateType from, StateType to );
/**
* \brief Removes a call transition from the automaton.
@@ -564,7 +564,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a call transition from the automaton.
@@ -580,7 +580,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const InputSymbolType & input, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const InputSymbolType & input, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a call transition from the automaton.
@@ -595,7 +595,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a return transition from the automaton.
@@ -611,7 +611,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const common::symbol_or_epsilon < InputSymbolType > & input, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const common::symbol_or_epsilon < InputSymbolType > & input, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a return transition from the automaton.
@@ -627,7 +627,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a return transition from the automaton.
@@ -642,7 +642,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -657,7 +657,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const common::symbol_or_epsilon < InputSymbolType > & input, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -672,7 +672,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const InputSymbolType & input, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const InputSymbolType & input, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -686,7 +686,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const StateType & to );
/**
* Get the call transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.h b/alib2data/src/automaton/PDA/SinglePopDPDA.h
index cd61683d8aef035cdeabba7ff484b2af19812379..bee844096f4fbf15cbb1e8b9316370c139f25c78 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.h
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.h
@@ -99,7 +99,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit SinglePopDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit SinglePopDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.h b/alib2data/src/automaton/PDA/SinglePopNPDA.h
index e2a28d1efd07af362c607e9bae0de922a817135e..11b80f8ceb23b1886081ea2805c78e92204213c8 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.h
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.h
@@ -94,7 +94,7 @@ public:
* \param initialPushdownSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit SinglePopNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, StateType initialState, PushdownStoreSymbolType initialPushdownSymbol, ext::set < StateType > finalStates );
+ explicit SinglePopNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > inputAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType initialSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and initial pushdown store symbol.
@@ -438,7 +438,7 @@ public:
*
* \throws AutomatonException when transition contains state or symbol not present in the automaton components
*/
- void addTransitions ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, PushdownStoreSymbolType pop, ext::set < ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > push );
+ void addTransitions ( StateType from, common::symbol_or_epsilon < InputSymbolType > input, PushdownStoreSymbolType pop, ext::set < ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > targets );
/**
* \brief Adds transitions to the automaton.
@@ -452,7 +452,7 @@ public:
*
* \throws AutomatonException when transition contains state or symbol not present in the automaton components
*/
- void addTransitions ( StateType from, InputSymbolType input, PushdownStoreSymbolType pop, ext::set < ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > push );
+ void addTransitions ( StateType from, InputSymbolType input, PushdownStoreSymbolType pop, ext::set < ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > targets );
/**
* \brief Adds transitions to the automaton.
@@ -465,7 +465,7 @@ public:
*
* \throws AutomatonException when transition contains state or symbol not present in the automaton components
*/
- void addTransitions ( StateType from, PushdownStoreSymbolType pop, ext::set < ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > push );
+ void addTransitions ( StateType from, PushdownStoreSymbolType pop, ext::set < ext::pair < StateType, ext::vector < PushdownStoreSymbolType > > > targets );
/**
* \brief Removes a transition from the automaton.
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
index 6270712f55a3f912ed10d36442e0e6ea2f000663..a6519fe013ca32389d2ca1e09d36038c70980a86 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
@@ -130,7 +130,7 @@ public:
* \param bottomOfTheStackSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit VisiblyPushdownDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > callAlphabet, ext::set < InputSymbolType > returnAlphabet, ext::set < InputSymbolType > localAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, StateType initialState, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
+ explicit VisiblyPushdownDPDA ( ext::set < StateType > states, ext::set < InputSymbolType > callAlphabet, ext::set < InputSymbolType > returnAlphabet, ext::set < InputSymbolType > localAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, StateType initialState, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and bottom of the stack symbol.
@@ -138,7 +138,7 @@ public:
* \param initialState the initial state of the automaton
* \param bottomOfTheStackSymbol the bottom of the stack symbol of the automaton
*/
- explicit VisiblyPushdownDPDA ( StateType initialSymbol, PushdownStoreSymbolType bottomOfTheStackSymbol );
+ explicit VisiblyPushdownDPDA ( StateType initialState, PushdownStoreSymbolType bottomOfTheStackSymbol );
/**
* Getter of the initial state.
@@ -553,7 +553,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, InputSymbolType input, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, InputSymbolType input, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a return transition to the automaton.
@@ -569,7 +569,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, InputSymbolType input, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, InputSymbolType input, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -584,7 +584,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, InputSymbolType input, StateType next );
+ bool addLocalTransition ( StateType from, InputSymbolType input, StateType to );
/**
* \brief Removes a call transition from the automaton.
@@ -600,7 +600,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const InputSymbolType & input, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const InputSymbolType & input, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a return transition from the automaton.
@@ -616,7 +616,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -631,7 +631,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const InputSymbolType & input, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const InputSymbolType & input, const StateType & to );
/**
* Get the call transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
index f943e3feacdff0411f864a85ca9597a3e4436172..87131882b5c3f83c9d3ed876eb05b54c86df8c21 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
@@ -115,7 +115,7 @@ public:
* \param bottomOfTheStackSymbol the initial pushdown symbol of the automaton
* \param finalStates the initial set of final states of the automaton
*/
- explicit VisiblyPushdownNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > callAlphabet, ext::set < InputSymbolType > returnAlphabet, ext::set < InputSymbolType > localAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreSymbol, ext::set < StateType > initialStates, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
+ explicit VisiblyPushdownNPDA ( ext::set < StateType > states, ext::set < InputSymbolType > callAlphabet, ext::set < InputSymbolType > returnAlphabet, ext::set < InputSymbolType > localAlphabet, ext::set < PushdownStoreSymbolType > pushdownStoreAlphabet, ext::set < StateType > initialStates, PushdownStoreSymbolType bottomOfTheStackSymbol, ext::set < StateType > finalStates );
/**
* \brief Creates a new instance of the automaton with a concrete initial state and bottom of the stack symbol.
@@ -558,7 +558,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addCallTransition ( StateType current, InputSymbolType input, StateType next, PushdownStoreSymbolType push );
+ bool addCallTransition ( StateType from, InputSymbolType input, StateType to, PushdownStoreSymbolType push );
/**
* \brief Adds a return transition to the automaton.
@@ -574,7 +574,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addReturnTransition ( StateType current, InputSymbolType input, PushdownStoreSymbolType pop, StateType next );
+ bool addReturnTransition ( StateType from, InputSymbolType input, PushdownStoreSymbolType pop, StateType to );
/**
* \brief Adds a local transition to the automaton.
@@ -589,7 +589,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addLocalTransition ( StateType current, InputSymbolType input, StateType next );
+ bool addLocalTransition ( StateType from, InputSymbolType input, StateType to );
/**
* \brief Removes a call transition from the automaton.
@@ -605,7 +605,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeCallTransition ( const StateType & current, const InputSymbolType & input, const StateType & next, const PushdownStoreSymbolType & push );
+ bool removeCallTransition ( const StateType & from, const InputSymbolType & input, const StateType & to, const PushdownStoreSymbolType & push );
/**
* \brief Removes a return transition from the automaton.
@@ -621,7 +621,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeReturnTransition ( const StateType & current, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & next );
+ bool removeReturnTransition ( const StateType & from, const InputSymbolType & input, const PushdownStoreSymbolType & pop, const StateType & to );
/**
* \brief Removes a local transition from the automaton.
@@ -636,7 +636,7 @@ public:
*
* \returns true if the transition was indeed removed
*/
- bool removeLocalTransition ( const StateType & current, const InputSymbolType & input, const StateType & next );
+ bool removeLocalTransition ( const StateType & from, const InputSymbolType & input, const StateType & to );
/**
* Get the call transition function of the automaton in its natural form.
diff --git a/alib2data/src/automaton/TA/DFTA.h b/alib2data/src/automaton/TA/DFTA.h
index 5b3cb3aa58bbdf8b7ffc44ebac3543d040a8ef5f..aa04f7f6fda2285b50cc9b9e30c7c3cfe2b134d1 100644
--- a/alib2data/src/automaton/TA/DFTA.h
+++ b/alib2data/src/automaton/TA/DFTA.h
@@ -271,7 +271,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( common::ranked_symbol < SymbolType, RankType > current, ext::vector < StateType > children, StateType next );
+ bool addTransition ( common::ranked_symbol < SymbolType, RankType > symbol, ext::vector < StateType > prevStates, StateType next );
/**
* \brief Removes a transition from the automaton.
diff --git a/alib2data/src/automaton/TA/ExtendedNFTA.h b/alib2data/src/automaton/TA/ExtendedNFTA.h
index 817f488f658e5505b9a1d591ea0512cb006e2f91..971ade8d2e725d13d350b7c0becfe64f41a3d3ce 100644
--- a/alib2data/src/automaton/TA/ExtendedNFTA.h
+++ b/alib2data/src/automaton/TA/ExtendedNFTA.h
@@ -281,7 +281,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType > current, ext::vector < StateType >, StateType next );
+ bool addTransition ( rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType > rte, ext::vector < StateType >, StateType next );
/**
* \brief Add a transition to the automaton.
@@ -296,7 +296,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- void addTransitions ( rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType > current, ext::vector < StateType >, ext::set < StateType > next );
+ void addTransitions ( rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType > rte, ext::vector < StateType >, ext::set < StateType > next );
/**
* \brief Removes a transition from the automaton.
@@ -332,12 +332,12 @@ public:
/**
* \returns the subset of transitions where the state @p q is a target state
*/
- ext::map < ext::pair < rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType >, ext::vector < StateType > >, StateType > getTransitionsToState ( const StateType & q ) const;
+ ext::map < ext::pair < rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType >, ext::vector < StateType > >, StateType > getTransitionsToState ( const StateType & to ) const;
/**
* \returns the subset of transitions where the state @p q is a source state
*/
- ext::map < ext::pair < rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType >, ext::vector < StateType > >, ext::set < StateType > > getTransitionsFromState ( const StateType & q ) const;
+ ext::map < ext::pair < rte::FormalRTEStructure < ext::variant < SymbolType, StateType >, RankType >, ext::vector < StateType > >, ext::set < StateType > > getTransitionsFromState ( const StateType & from ) const;
/**
* \brief Determines whether the automaton is deterministic.
diff --git a/alib2data/src/automaton/TA/NFTA.h b/alib2data/src/automaton/TA/NFTA.h
index 45e87864fb4c078d7732bf2ac05e3e7c0707a6bc..b167b29da1a31e07b6c4acf5b6b4364c8860a004 100644
--- a/alib2data/src/automaton/TA/NFTA.h
+++ b/alib2data/src/automaton/TA/NFTA.h
@@ -276,7 +276,7 @@ public:
*
* \returns true if the transition was indeed added
*/
- bool addTransition ( common::ranked_symbol < SymbolType, RankType > current, ext::vector < StateType > children, StateType next );
+ bool addTransition ( common::ranked_symbol < SymbolType, RankType > symbol, ext::vector < StateType > prevStates, StateType next );
/**
* \brief Removes a transition from the automaton.
diff --git a/alib2data/src/common/xml/SparseBoolVector.hpp b/alib2data/src/common/xml/SparseBoolVector.hpp
index 3dba8130f6a72eeaf32583e89258fbde91bf9908..ae2d218150c74ad41a3b97a658d93abb19ace72d 100644
--- a/alib2data/src/common/xml/SparseBoolVector.hpp
+++ b/alib2data/src/common/xml/SparseBoolVector.hpp
@@ -25,7 +25,7 @@ struct xmlApi < common::SparseBoolVector > {
return sax::FromXMLParserHelper::isToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
}
- static void compose ( ext::deque < sax::Token > & output, const common::SparseBoolVector & data );
+ static void compose ( ext::deque < sax::Token > & output, const common::SparseBoolVector & input );
};
} /* namespace core */
diff --git a/alib2data/src/common/xml/SymbolOrEpsilon.h b/alib2data/src/common/xml/SymbolOrEpsilon.h
index af6cadcb14bf2a3140908c05e8d11692fb9c1ac2..53de1db31236ff7979b6253ad877add1572068e2 100644
--- a/alib2data/src/common/xml/SymbolOrEpsilon.h
+++ b/alib2data/src/common/xml/SymbolOrEpsilon.h
@@ -18,7 +18,7 @@ struct xmlApi < common::symbol_or_epsilon < T > > {
static common::symbol_or_epsilon < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const common::symbol_or_epsilon < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const common::symbol_or_epsilon < T > & input );
};
template < typename T >
diff --git a/alib2data/src/grammar/ContextFree/CFG.h b/alib2data/src/grammar/ContextFree/CFG.h
index 4c7a5596b65edbad05a014c81744fb1c9e9af826..f9f8ce4bbdc5b4501cb27f4671604e70f7c9df10 100644
--- a/alib2data/src/grammar/ContextFree/CFG.h
+++ b/alib2data/src/grammar/ContextFree/CFG.h
@@ -87,7 +87,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit CFG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit CFG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/*
* \brief Creates a new instance of the grammar based on the Epsilon free context free grammar.
diff --git a/alib2data/src/grammar/ContextFree/CNF.h b/alib2data/src/grammar/ContextFree/CNF.h
index 09c39e46aec67c65b95ff47ed74f1dff160b1a7b..fbd9c3c659b11fca7aa781af14a5fce90b6f4cdd 100644
--- a/alib2data/src/grammar/ContextFree/CNF.h
+++ b/alib2data/src/grammar/ContextFree/CNF.h
@@ -91,7 +91,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit CNF ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit CNF ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
index 5cc6fea1894883a80a2edfb0ac133823113108c6..8d5d3efe2e183d4a8f1715b25321bca57283caeb 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
@@ -90,7 +90,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit EpsilonFreeCFG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit EpsilonFreeCFG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/ContextFree/GNF.h b/alib2data/src/grammar/ContextFree/GNF.h
index 767fe3e8404891b26d8f6cc15879b6db415a9306..d990d5a453f61419f0cb654abfcdd09bd524272b 100644
--- a/alib2data/src/grammar/ContextFree/GNF.h
+++ b/alib2data/src/grammar/ContextFree/GNF.h
@@ -90,7 +90,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit GNF ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit GNF ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/ContextFree/LG.h b/alib2data/src/grammar/ContextFree/LG.h
index 30caf0804d9363df2d44b5b9c4cbfa8d8b160800..42b226607792f256ed43249887a364d0a3962c5e 100644
--- a/alib2data/src/grammar/ContextFree/LG.h
+++ b/alib2data/src/grammar/ContextFree/LG.h
@@ -86,7 +86,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit LG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit LG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.h b/alib2data/src/grammar/ContextSensitive/CSG.h
index 520ffabc5be6abbe1dd21f287eab4222e84e4e37..0768b4840dc72631b34a7051b097457503ff3bb2 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.h
+++ b/alib2data/src/grammar/ContextSensitive/CSG.h
@@ -88,7 +88,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit CSG ( ext::set < SymbolType > nonTerminalSymbols, ext::set < SymbolType > terminalSymbols, SymbolType initialSymbol );
+ explicit CSG ( ext::set < SymbolType > nonterminalAlphabet, ext::set < SymbolType > terminalAlphabet, SymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
index 408c624450065b86518594c61e742c1685c51722..01a1310a1e8ec85a4d944be3e7871566c2309202 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
@@ -89,7 +89,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit NonContractingGrammar ( ext::set < SymbolType > nonTerminalSymbols, ext::set < SymbolType > terminalSymbols, SymbolType initialSymbol );
+ explicit NonContractingGrammar ( ext::set < SymbolType > nonterminalAlphabet, ext::set < SymbolType > terminalAlphabet, SymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/Regular/LeftLG.h b/alib2data/src/grammar/Regular/LeftLG.h
index 01af8c986a157710cabb7f85a2bafa1e86609932..41bebf368ee6c09abe607e563528644a42e3686a 100644
--- a/alib2data/src/grammar/Regular/LeftLG.h
+++ b/alib2data/src/grammar/Regular/LeftLG.h
@@ -86,7 +86,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit LeftLG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit LeftLG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/Regular/LeftRG.h b/alib2data/src/grammar/Regular/LeftRG.h
index 56e10f2d3945a28210d1957409388db273aefa20..7ea3450120e0e13aede0db725ed73604b8efe6e1 100644
--- a/alib2data/src/grammar/Regular/LeftRG.h
+++ b/alib2data/src/grammar/Regular/LeftRG.h
@@ -95,7 +95,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit LeftRG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit LeftRG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/Regular/RightLG.h b/alib2data/src/grammar/Regular/RightLG.h
index 29286d7c0494bcc3c9a0c7af2208456369b8b270..dd9de3730d56f7bfcb4fe16797ae8f49d864e6da 100644
--- a/alib2data/src/grammar/Regular/RightLG.h
+++ b/alib2data/src/grammar/Regular/RightLG.h
@@ -85,7 +85,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit RightLG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit RightLG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/Regular/RightRG.h b/alib2data/src/grammar/Regular/RightRG.h
index 841f599c64b7b3154f2319b521f773f3c0f2f0db..6c1980ee56c8f1dd32dcd87665ff60c87f7f6777 100644
--- a/alib2data/src/grammar/Regular/RightRG.h
+++ b/alib2data/src/grammar/Regular/RightRG.h
@@ -95,7 +95,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit RightRG ( ext::set < NonterminalSymbolType > nonTerminalSymbols, ext::set < TerminalSymbolType > terminalSymbols, NonterminalSymbolType initialSymbol );
+ explicit RightRG ( ext::set < NonterminalSymbolType > nonterminalAlphabet, ext::set < TerminalSymbolType > terminalAlphabet, NonterminalSymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
index 52401004898bad201dc194a7fdbc12a873eb520f..dd1e80548b9506efd084b07290da162986c25170 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
@@ -84,7 +84,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit ContextPreservingUnrestrictedGrammar ( ext::set < SymbolType > nonTerminalSymbols, ext::set < SymbolType > terminalSymbols, SymbolType initialSymbol );
+ explicit ContextPreservingUnrestrictedGrammar ( ext::set < SymbolType > nonterminalAlphabet, ext::set < SymbolType > terminalAlphabet, SymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
index 0686053162b8a3d043ca1a4299a853aaa18cb989..12eaa640d9c47a3ff0de0d76fbba16c57b28a7c7 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
@@ -84,7 +84,7 @@ public:
* \param terminalSymbols the initial terminal alphabet
* \param initialSymbol the initial symbol of the grammar
*/
- explicit UnrestrictedGrammar ( ext::set < SymbolType > nonTerminalSymbols, ext::set < SymbolType > terminalSymbols, SymbolType initialSymbol );
+ explicit UnrestrictedGrammar ( ext::set < SymbolType > nonterminalAlphabet, ext::set < SymbolType > terminalAlphabet, SymbolType initialSymbol );
/**
* \brief Add a new rule of a grammar.
diff --git a/alib2data/src/indexes/stringology/PositionHeap.h b/alib2data/src/indexes/stringology/PositionHeap.h
index c76dd03e843732f7174b653d2966397c860e0761..5d4e96f6b5fb045dd5c453e894906c251400d0f7 100644
--- a/alib2data/src/indexes/stringology/PositionHeap.h
+++ b/alib2data/src/indexes/stringology/PositionHeap.h
@@ -132,7 +132,7 @@ public:
*
* \param tree root node to set
*/
- void setTree ( ext::trie < SymbolType, unsigned > tree );
+ void setTree ( ext::trie < SymbolType, unsigned > trie );
/**
* Remover of a symbol from the alphabet.
diff --git a/alib2data/src/indexes/stringology/SuffixTrie.h b/alib2data/src/indexes/stringology/SuffixTrie.h
index 120cf8c0881069c145dc17d0b83fbd0b20803f0b..fc10e7e8eb21dd34cf949328b78ce1616d69a09d 100644
--- a/alib2data/src/indexes/stringology/SuffixTrie.h
+++ b/alib2data/src/indexes/stringology/SuffixTrie.h
@@ -126,7 +126,7 @@ public:
*
* \param tree root node to set
*/
- void setTree ( ext::trie < SymbolType, ext::optional < unsigned > > tree );
+ void setTree ( ext::trie < SymbolType, ext::optional < unsigned > > trie );
/**
* Remover of a symbol from the alphabet.
diff --git a/alib2data/src/indexes/xml/arbology/CompressedBitParallelTreeIndex.h b/alib2data/src/indexes/xml/arbology/CompressedBitParallelTreeIndex.h
index 67ddf1dcdc0f581463b1b06af9b68b3646ab8f32..76cfbac07fe82c204f9893dcb6b710e3b6bcc501 100644
--- a/alib2data/src/indexes/xml/arbology/CompressedBitParallelTreeIndex.h
+++ b/alib2data/src/indexes/xml/arbology/CompressedBitParallelTreeIndex.h
@@ -45,7 +45,7 @@ struct xmlApi < indexes::arbology::CompressedBitParallelTreeIndex < SymbolType,
static indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::CompressedBitParallelTreeIndex < SymbolType, RankType > & index );
};
template < class SymbolType, class RankType >
diff --git a/alib2data/src/indexes/xml/arbology/FullAndLinearIndex.h b/alib2data/src/indexes/xml/arbology/FullAndLinearIndex.h
index ccd263fff8c2ee612ad677141414eba8ae17e815..1add7b35f7de0dd4e5c13b4c05a209ff33644588 100644
--- a/alib2data/src/indexes/xml/arbology/FullAndLinearIndex.h
+++ b/alib2data/src/indexes/xml/arbology/FullAndLinearIndex.h
@@ -43,7 +43,7 @@ struct xmlApi < indexes::arbology::FullAndLinearIndex < SymbolType, RankType, St
static indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::FullAndLinearIndex < SymbolType, RankType, StringIndex > & index );
};
template < class SymbolType, class RankType, template < typename > class StringIndex >
diff --git a/alib2data/src/indexes/xml/arbology/NonlinearCompressedBitParallelTreeIndex.h b/alib2data/src/indexes/xml/arbology/NonlinearCompressedBitParallelTreeIndex.h
index 11a75f3da5700404d636d3bdccdaffde3efdc8f6..a4f156f596f9ddc1490ce4919619b22f5d4799ea 100644
--- a/alib2data/src/indexes/xml/arbology/NonlinearCompressedBitParallelTreeIndex.h
+++ b/alib2data/src/indexes/xml/arbology/NonlinearCompressedBitParallelTreeIndex.h
@@ -45,7 +45,7 @@ struct xmlApi < indexes::arbology::NonlinearCompressedBitParallelTreeIndex < Sym
static indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::NonlinearCompressedBitParallelTreeIndex < SymbolType, RankType > & index );
};
template < class SymbolType, class RankType >
diff --git a/alib2data/src/indexes/xml/arbology/NonlinearFullAndLinearIndex.h b/alib2data/src/indexes/xml/arbology/NonlinearFullAndLinearIndex.h
index 4fde2cb1afa288df6d58e63f75d8f5d25f0821b4..7bd5c9bec846a4fd778f2f11104dc60586b7f11b 100644
--- a/alib2data/src/indexes/xml/arbology/NonlinearFullAndLinearIndex.h
+++ b/alib2data/src/indexes/xml/arbology/NonlinearFullAndLinearIndex.h
@@ -43,7 +43,7 @@ struct xmlApi < indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, Ran
static indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::arbology::NonlinearFullAndLinearIndex < SymbolType, RankType, StringIndex > & index );
};
template < class SymbolType, class RankType, template < typename > class StringIndex >
diff --git a/alib2data/src/indexes/xml/stringology/BitParallelIndex.h b/alib2data/src/indexes/xml/stringology/BitParallelIndex.h
index 3b86f43452627a233ddcbfcaab83d66efaf5be42..a8861b8bdebd578dd234f2316b206e7fb51c3a80 100644
--- a/alib2data/src/indexes/xml/stringology/BitParallelIndex.h
+++ b/alib2data/src/indexes/xml/stringology/BitParallelIndex.h
@@ -41,7 +41,7 @@ struct xmlApi < indexes::stringology::BitParallelIndex < SymbolType > > {
static indexes::stringology::BitParallelIndex < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::BitParallelIndex < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::BitParallelIndex < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/indexes/xml/stringology/BitSetIndex.h b/alib2data/src/indexes/xml/stringology/BitSetIndex.h
index 45493b818b1cc8f367f4fc57a58f47bb78bc8354..70e594ba38ff17ebb42bea4d2e2bba06ea9b5535 100644
--- a/alib2data/src/indexes/xml/stringology/BitSetIndex.h
+++ b/alib2data/src/indexes/xml/stringology/BitSetIndex.h
@@ -42,7 +42,7 @@ struct xmlApi < indexes::stringology::BitSetIndex < SymbolType, BitmaskBitCount
static indexes::stringology::BitSetIndex < SymbolType, BitmaskBitCount > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::BitSetIndex < SymbolType, BitmaskBitCount > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::BitSetIndex < SymbolType, BitmaskBitCount > & index );
};
template < class SymbolType, size_t BitmaskBitCount >
diff --git a/alib2data/src/indexes/xml/stringology/CompressedBitParallelIndex.h b/alib2data/src/indexes/xml/stringology/CompressedBitParallelIndex.h
index fed762937a866e814ed08a7d8ab5a52784f1dabc..02df82c5184790ede3014586807eef854730560e 100644
--- a/alib2data/src/indexes/xml/stringology/CompressedBitParallelIndex.h
+++ b/alib2data/src/indexes/xml/stringology/CompressedBitParallelIndex.h
@@ -42,7 +42,7 @@ struct xmlApi < indexes::stringology::CompressedBitParallelIndex < SymbolType >
static indexes::stringology::CompressedBitParallelIndex < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::CompressedBitParallelIndex < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::CompressedBitParallelIndex < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/indexes/xml/stringology/FactorOracleAutomaton.h b/alib2data/src/indexes/xml/stringology/FactorOracleAutomaton.h
index bc672d74d873953be841f56ed39206a4b369b17e..91989268311602c615cb5e23c9bb4a5135b6b4b9 100644
--- a/alib2data/src/indexes/xml/stringology/FactorOracleAutomaton.h
+++ b/alib2data/src/indexes/xml/stringology/FactorOracleAutomaton.h
@@ -40,7 +40,7 @@ struct xmlApi < indexes::stringology::FactorOracleAutomaton < SymbolType > > {
static indexes::stringology::FactorOracleAutomaton < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::FactorOracleAutomaton < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::FactorOracleAutomaton < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/indexes/xml/stringology/PositionHeap.h b/alib2data/src/indexes/xml/stringology/PositionHeap.h
index f6599b1c6cb8ea23c8b8d8a59b9076c9e060b2db..2cd408b50ac0f72fc5700f8fd21e2d940e23803d 100644
--- a/alib2data/src/indexes/xml/stringology/PositionHeap.h
+++ b/alib2data/src/indexes/xml/stringology/PositionHeap.h
@@ -41,7 +41,7 @@ struct xmlApi < indexes::stringology::PositionHeap < SymbolType > > {
static indexes::stringology::PositionHeap < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::PositionHeap < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::PositionHeap < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/indexes/xml/stringology/SuffixArray.h b/alib2data/src/indexes/xml/stringology/SuffixArray.h
index 5ec7d61392815648a15167856b146fa069e5f7d9..f3367cf9dcf40b1a62aeb4144c2db74dd12917da 100644
--- a/alib2data/src/indexes/xml/stringology/SuffixArray.h
+++ b/alib2data/src/indexes/xml/stringology/SuffixArray.h
@@ -41,7 +41,7 @@ struct xmlApi < indexes::stringology::SuffixArray < SymbolType > > {
static indexes::stringology::SuffixArray < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::SuffixArray < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::SuffixArray < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/indexes/xml/stringology/SuffixAutomaton.h b/alib2data/src/indexes/xml/stringology/SuffixAutomaton.h
index 541cab358b7d3bed0557fa1765434ae6fad678aa..c990c232b18d8d879d0cbab87e2ce0ec6a359381 100644
--- a/alib2data/src/indexes/xml/stringology/SuffixAutomaton.h
+++ b/alib2data/src/indexes/xml/stringology/SuffixAutomaton.h
@@ -40,7 +40,7 @@ struct xmlApi < indexes::stringology::SuffixAutomaton < SymbolType > > {
static indexes::stringology::SuffixAutomaton < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::SuffixAutomaton < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::SuffixAutomaton < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/indexes/xml/stringology/SuffixTrie.h b/alib2data/src/indexes/xml/stringology/SuffixTrie.h
index a29862b99601ba8edf81df1dc9926e50eed06147..f0c3b7f8a8aa76fce0b42a08d31bbe91b6b4b82c 100644
--- a/alib2data/src/indexes/xml/stringology/SuffixTrie.h
+++ b/alib2data/src/indexes/xml/stringology/SuffixTrie.h
@@ -42,7 +42,7 @@ struct xmlApi < indexes::stringology::SuffixTrie < SymbolType > > {
static indexes::stringology::SuffixTrie < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::SuffixTrie < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::SuffixTrie < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data/src/label/FailStateLabel.h b/alib2data/src/label/FailStateLabel.h
index f78796cd70944358545aef46de1d3305d6cd7ca1..e74cf65dbdaf16955ad4612f660c7bfb28a721e7 100644
--- a/alib2data/src/label/FailStateLabel.h
+++ b/alib2data/src/label/FailStateLabel.h
@@ -58,7 +58,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const FailStateLabel & instance );
+ friend std::ostream & operator << ( std::ostream & out, const FailStateLabel & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/label/FinalStateLabel.h b/alib2data/src/label/FinalStateLabel.h
index f24f2a7f93272246c7d4bfa5c02bb0656edac431..b6136229531a90e5f78df7a7f6b2dbba01ac7cac 100644
--- a/alib2data/src/label/FinalStateLabel.h
+++ b/alib2data/src/label/FinalStateLabel.h
@@ -58,7 +58,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const FinalStateLabel & instance );
+ friend std::ostream & operator << ( std::ostream & out, const FinalStateLabel & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/label/InitialStateLabel.h b/alib2data/src/label/InitialStateLabel.h
index b1422f45b6f368291726e220baefe42b5d22b178..c031f3ec22f92be0fa1b13bcbcc7110f14b055c2 100644
--- a/alib2data/src/label/InitialStateLabel.h
+++ b/alib2data/src/label/InitialStateLabel.h
@@ -58,7 +58,7 @@ public:
*
* \returns modified output stream
*/
- friend std::ostream & operator << ( std::ostream & os, const InitialStateLabel & instance );
+ friend std::ostream & operator << ( std::ostream & out, const InitialStateLabel & instance );
/**
* Casts this instance to as compact as possible string representation.
diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h
index 03403256c8fde911d6eb41ffeacc4a4c10a1ff53..d4905ea57b6d9c8bfeb4b354075d7b5bea7fb27a 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.h
+++ b/alib2data/src/regexp/formal/FormalRegExp.h
@@ -151,7 +151,7 @@ public:
*
* \param regExp the new structure of the expression.
*/
- void setRegExp ( FormalRegExpStructure < SymbolType > regExp );
+ void setRegExp ( FormalRegExpStructure < SymbolType > param );
/**
* The actual compare method
diff --git a/alib2data/src/regexp/formal/FormalRegExpStructure.h b/alib2data/src/regexp/formal/FormalRegExpStructure.h
index e0add34121d7dfbab88ba4d94f7fda3b0b93036b..0d1fd21a34a3dcc7b5afdd646129686370d881cd 100644
--- a/alib2data/src/regexp/formal/FormalRegExpStructure.h
+++ b/alib2data/src/regexp/formal/FormalRegExpStructure.h
@@ -95,7 +95,7 @@ public:
*
* \param structure new root node of the structure
*/
- void setStructure ( FormalRegExpElement < SymbolType > && structure );
+ void setStructure ( FormalRegExpElement < SymbolType > && param );
/**
* Sets the root node of the expression structure
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
index 6d7078d6b78eb3659add9e21454545224b90e5c6..06c503cbca8bbc71ef86c368caa1862a2fa70dba 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
@@ -153,7 +153,7 @@ public:
*
* \param regExp the new structure of the expression.
*/
- void setRegExp ( UnboundedRegExpStructure < SymbolType > regExp );
+ void setRegExp ( UnboundedRegExpStructure < SymbolType > param );
/**
* The actual compare method
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
index 30f055130cd7f6a50bac3261b5e98b2823fcff74..4166b325f1e3b3faf973feeece99ceba38c32c02 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpIteration.h
@@ -192,13 +192,13 @@ UnboundedRegExpElement < SymbolType > & UnboundedRegExpIteration < SymbolType >:
}
template < class SymbolType >
-void UnboundedRegExpIteration < SymbolType >::setElement ( UnboundedRegExpElement < SymbolType > && elementParam ) {
- this->setChild ( std::move ( elementParam ) );
+void UnboundedRegExpIteration < SymbolType >::setElement ( UnboundedRegExpElement < SymbolType > && element ) {
+ this->setChild ( std::move ( element ) );
}
template < class SymbolType >
-void UnboundedRegExpIteration < SymbolType >::setElement ( const UnboundedRegExpElement < SymbolType > & elementParam ) {
- setElement ( ext::move_copy ( elementParam ) );
+void UnboundedRegExpIteration < SymbolType >::setElement ( const UnboundedRegExpElement < SymbolType > & element ) {
+ setElement ( ext::move_copy ( element ) );
}
template < class SymbolType >
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h b/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
index d5d288b54f0f7606f50e88cda387afec7638cc74..39e63176ee0970f835a629015731f935c0e54b73 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
@@ -97,7 +97,7 @@ public:
*
* \param structure new root node of the structure
*/
- void setStructure ( UnboundedRegExpElement < SymbolType > && structure );
+ void setStructure ( UnboundedRegExpElement < SymbolType > && param );
/**
* Sets the root node of the expression structure
diff --git a/alib2data/src/regexp/xml/FormalRegExp.h b/alib2data/src/regexp/xml/FormalRegExp.h
index 4e01b7beef169107d4a957495cccd5e4353b8c60..10b530506a1e7b7bd18d77fa4c00301582dadd7e 100644
--- a/alib2data/src/regexp/xml/FormalRegExp.h
+++ b/alib2data/src/regexp/xml/FormalRegExp.h
@@ -22,7 +22,7 @@ struct xmlApi < regexp::FormalRegExp < SymbolType > > {
static regexp::FormalRegExp < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const regexp::FormalRegExp < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const regexp::FormalRegExp < SymbolType > & input );
};
template < typename SymbolType >
diff --git a/alib2data/src/regexp/xml/UnboundedRegExp.h b/alib2data/src/regexp/xml/UnboundedRegExp.h
index 52652e2f11cbff90f184c6ec99a0ccd0e96153b1..55fbf001791889c34aa51f6ff45a5ed1a132aa8f 100644
--- a/alib2data/src/regexp/xml/UnboundedRegExp.h
+++ b/alib2data/src/regexp/xml/UnboundedRegExp.h
@@ -22,7 +22,7 @@ struct xmlApi < regexp::UnboundedRegExp < SymbolType > > {
static regexp::UnboundedRegExp < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const regexp::UnboundedRegExp < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const regexp::UnboundedRegExp < SymbolType > & input );
};
template < typename SymbolType >
diff --git a/alib2data/src/regexp/xml/UnboundedRegExpStructure.h b/alib2data/src/regexp/xml/UnboundedRegExpStructure.h
index 18216adfed398d314d25c84c07a8b9dc0a96d682..601d7a442b3822ca1904e74cdcabb5833555d585 100644
--- a/alib2data/src/regexp/xml/UnboundedRegExpStructure.h
+++ b/alib2data/src/regexp/xml/UnboundedRegExpStructure.h
@@ -54,7 +54,7 @@ struct xmlApi < regexp::UnboundedRegExpStructure < SymbolType > > {
* \param output the sink for new xml tokens representing the automaton
* \param input the automaton to compose
*/
- static void compose ( ext::deque < sax::Token > & output, const regexp::UnboundedRegExpStructure < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const regexp::UnboundedRegExpStructure < SymbolType > & input );
};
template < class SymbolType >
diff --git a/alib2data/src/regexp/xml/common/RegExpToXmlComposer.h b/alib2data/src/regexp/xml/common/RegExpToXmlComposer.h
index 2b0a145ffcfb427479f57d2f9e37ad164d1d92b3..080e93fe28e030e56d9b2f0fc64df1eb8a442058 100644
--- a/alib2data/src/regexp/xml/common/RegExpToXmlComposer.h
+++ b/alib2data/src/regexp/xml/common/RegExpToXmlComposer.h
@@ -23,7 +23,7 @@ namespace regexp {
class RegExpToXmlComposer {
public:
template < class SymbolType >
- static void composeAlphabet(ext::deque<sax::Token>& out, const ext::set<SymbolType>& alphabet);
+ static void composeAlphabet(ext::deque<sax::Token>& output, const ext::set<SymbolType>& alphabet);
class Unbounded {
public:
@@ -59,94 +59,94 @@ public:
};
template < class SymbolType >
-void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpAlternation < SymbolType > & alternation, ext::deque<sax::Token>& out) {
- out.emplace_back("alternation", sax::Token::TokenType::START_ELEMENT);
+void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpAlternation < SymbolType > & alternation, ext::deque<sax::Token>& output) {
+ output.emplace_back("alternation", sax::Token::TokenType::START_ELEMENT);
for (const UnboundedRegExpElement < SymbolType > & element : alternation.getElements()) {
- element.template accept < void, RegExpToXmlComposer::Unbounded > ( out );
+ element.template accept < void, RegExpToXmlComposer::Unbounded > ( output );
}
- out.emplace_back("alternation", sax::Token::TokenType::END_ELEMENT);
+ output.emplace_back("alternation", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpConcatenation < SymbolType > & concatenation, ext::deque<sax::Token>& out) {
- out.emplace_back("concatenation", sax::Token::TokenType::START_ELEMENT);
+void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpConcatenation < SymbolType > & concatenation, ext::deque<sax::Token>& output) {
+ output.emplace_back("concatenation", sax::Token::TokenType::START_ELEMENT);
for (const UnboundedRegExpElement < SymbolType > & element : concatenation.getElements()) {
- element.template accept < void, RegExpToXmlComposer::Unbounded > ( out );
+ element.template accept < void, RegExpToXmlComposer::Unbounded > ( output );
}
- out.emplace_back("concatenation", sax::Token::TokenType::END_ELEMENT);
+ output.emplace_back("concatenation", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpIteration < SymbolType > & iteration, ext::deque<sax::Token>& out) {
- out.emplace_back("iteration", sax::Token::TokenType::START_ELEMENT);
- iteration.getElement().template accept < void, RegExpToXmlComposer::Unbounded > ( out );
- out.emplace_back("iteration", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpIteration < SymbolType > & iteration, ext::deque<sax::Token>& output) {
+ output.emplace_back("iteration", sax::Token::TokenType::START_ELEMENT);
+ iteration.getElement().template accept < void, RegExpToXmlComposer::Unbounded > ( output );
+ output.emplace_back("iteration", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpSymbol < SymbolType > & symbol, ext::deque<sax::Token>& out) {
- core::xmlApi<SymbolType>::compose(out, symbol.getSymbol());
+void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpSymbol < SymbolType > & symbol, ext::deque<sax::Token>& output) {
+ core::xmlApi<SymbolType>::compose(output, symbol.getSymbol());
}
template < class SymbolType >
-void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpEpsilon < SymbolType > &, ext::deque<sax::Token>& out) {
- out.emplace_back("epsilon", sax::Token::TokenType::START_ELEMENT);
- out.emplace_back("epsilon", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpEpsilon < SymbolType > &, ext::deque<sax::Token>& output) {
+ output.emplace_back("epsilon", sax::Token::TokenType::START_ELEMENT);
+ output.emplace_back("epsilon", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpEmpty < SymbolType > &, ext::deque<sax::Token>& out) {
- out.emplace_back("empty", sax::Token::TokenType::START_ELEMENT);
- out.emplace_back("empty", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Unbounded::visit(const UnboundedRegExpEmpty < SymbolType > &, ext::deque<sax::Token>& output) {
+ output.emplace_back("empty", sax::Token::TokenType::START_ELEMENT);
+ output.emplace_back("empty", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Formal::visit(const FormalRegExpAlternation < SymbolType > & alternation, ext::deque<sax::Token>& out) {
- out.emplace_back("alternation", sax::Token::TokenType::START_ELEMENT);
- alternation.getLeftElement().template accept < void, RegExpToXmlComposer::Formal > ( out );
- alternation.getRightElement().template accept < void, RegExpToXmlComposer::Formal > ( out );
- out.emplace_back("alternation", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Formal::visit(const FormalRegExpAlternation < SymbolType > & alternation, ext::deque<sax::Token>& output) {
+ output.emplace_back("alternation", sax::Token::TokenType::START_ELEMENT);
+ alternation.getLeftElement().template accept < void, RegExpToXmlComposer::Formal > ( output );
+ alternation.getRightElement().template accept < void, RegExpToXmlComposer::Formal > ( output );
+ output.emplace_back("alternation", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Formal::visit(const FormalRegExpConcatenation < SymbolType > & concatenation, ext::deque<sax::Token>& out) {
- out.emplace_back("concatenation", sax::Token::TokenType::START_ELEMENT);
- concatenation.getLeftElement().template accept < void, RegExpToXmlComposer::Formal > ( out );
- concatenation.getRightElement().template accept < void, RegExpToXmlComposer::Formal > ( out );
- out.emplace_back("concatenation", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Formal::visit(const FormalRegExpConcatenation < SymbolType > & concatenation, ext::deque<sax::Token>& output) {
+ output.emplace_back("concatenation", sax::Token::TokenType::START_ELEMENT);
+ concatenation.getLeftElement().template accept < void, RegExpToXmlComposer::Formal > ( output );
+ concatenation.getRightElement().template accept < void, RegExpToXmlComposer::Formal > ( output );
+ output.emplace_back("concatenation", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Formal::visit(const FormalRegExpIteration < SymbolType > & iteration, ext::deque<sax::Token>& out) {
- out.emplace_back("iteration", sax::Token::TokenType::START_ELEMENT);
- iteration.getElement().template accept < void, RegExpToXmlComposer::Formal > ( out );
- out.emplace_back("iteration", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Formal::visit(const FormalRegExpIteration < SymbolType > & iteration, ext::deque<sax::Token>& output) {
+ output.emplace_back("iteration", sax::Token::TokenType::START_ELEMENT);
+ iteration.getElement().template accept < void, RegExpToXmlComposer::Formal > ( output );
+ output.emplace_back("iteration", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Formal::visit(const FormalRegExpSymbol < SymbolType > & symbol, ext::deque<sax::Token>& out) {
- core::xmlApi<SymbolType>::compose(out, symbol.getSymbol());
+void RegExpToXmlComposer::Formal::visit(const FormalRegExpSymbol < SymbolType > & symbol, ext::deque<sax::Token>& output) {
+ core::xmlApi<SymbolType>::compose(output, symbol.getSymbol());
}
template < class SymbolType >
-void RegExpToXmlComposer::Formal::visit(const FormalRegExpEpsilon < SymbolType > &, ext::deque<sax::Token>& out) {
- out.emplace_back("epsilon", sax::Token::TokenType::START_ELEMENT);
- out.emplace_back("epsilon", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Formal::visit(const FormalRegExpEpsilon < SymbolType > &, ext::deque<sax::Token>& output) {
+ output.emplace_back("epsilon", sax::Token::TokenType::START_ELEMENT);
+ output.emplace_back("epsilon", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::Formal::visit(const FormalRegExpEmpty < SymbolType > &, ext::deque<sax::Token>& out) {
- out.emplace_back("empty", sax::Token::TokenType::START_ELEMENT);
- out.emplace_back("empty", sax::Token::TokenType::END_ELEMENT);
+void RegExpToXmlComposer::Formal::visit(const FormalRegExpEmpty < SymbolType > &, ext::deque<sax::Token>& output) {
+ output.emplace_back("empty", sax::Token::TokenType::START_ELEMENT);
+ output.emplace_back("empty", sax::Token::TokenType::END_ELEMENT);
}
template < class SymbolType >
-void RegExpToXmlComposer::composeAlphabet(ext::deque<sax::Token>& out, const ext::set<SymbolType>& alphabet) {
- out.emplace_back("alphabet", sax::Token::TokenType::START_ELEMENT);
+void RegExpToXmlComposer::composeAlphabet(ext::deque<sax::Token>& output, const ext::set<SymbolType>& alphabet) {
+ output.emplace_back("alphabet", sax::Token::TokenType::START_ELEMENT);
for (const SymbolType & symbol : alphabet) {
- core::xmlApi<SymbolType>::compose(out, symbol);
+ core::xmlApi<SymbolType>::compose(output, symbol);
}
- out.emplace_back("alphabet", sax::Token::TokenType::END_ELEMENT);
+ output.emplace_back("alphabet", sax::Token::TokenType::END_ELEMENT);
}
} /* namespace regexp */
diff --git a/alib2data/src/rte/formal/FormalRTE.h b/alib2data/src/rte/formal/FormalRTE.h
index 83b52dcfd7f668b9c665016fa89ca1d39c4acd38..df200e90e61a50354094789e589572ea79b97964 100644
--- a/alib2data/src/rte/formal/FormalRTE.h
+++ b/alib2data/src/rte/formal/FormalRTE.h
@@ -243,7 +243,7 @@ public:
*
* \param regExp the new structure of the expression.
*/
- void setRTE ( FormalRTEStructure < SymbolType, RankType > regExp );
+ void setRTE ( FormalRTEStructure < SymbolType, RankType > param );
/**
* The actual compare method
diff --git a/alib2data/src/rte/formal/FormalRTEIteration.h b/alib2data/src/rte/formal/FormalRTEIteration.h
index 865d1d7e35b4b4226077089f38fb33f15fbf5405..3a1cd59552763e22d025a5bf9d1630ac29040a61 100644
--- a/alib2data/src/rte/formal/FormalRTEIteration.h
+++ b/alib2data/src/rte/formal/FormalRTEIteration.h
@@ -72,7 +72,7 @@ public:
* \param element the tree to iterate
* \param substitutionSymbol the symbol representing the substitution place
*/
- explicit FormalRTEIteration ( FormalRTEElement < SymbolType, RankType > && element, FormalRTESymbolSubst < SymbolType, RankType > substitionSymbol );
+ explicit FormalRTEIteration ( FormalRTEElement < SymbolType, RankType > && element, FormalRTESymbolSubst < SymbolType, RankType > substitutionSymbol );
/**
* \brief Creates a new instance of the substitution node with explicit tree to iterate and a symbol representing place of substitution
@@ -154,7 +154,7 @@ public:
*
* \param element the substitution symbol
*/
- void setSubstitutionSymbol ( FormalRTESymbolSubst < SymbolType, RankType > element );
+ void setSubstitutionSymbol ( FormalRTESymbolSubst < SymbolType, RankType > symbol );
/**
* @copydoc base::CommonBase < FormalRTEElement < SymbolType, RankType > >::compare ( const FormalRTEElement < SymbolType, RankType > & ) const
diff --git a/alib2data/src/rte/formal/FormalRTEStructure.h b/alib2data/src/rte/formal/FormalRTEStructure.h
index 1ef464bc0152d4d8dca28edb117498ca7944d846..061e9c056b08f791512ce83e35b6d1b6ed9cd82d 100644
--- a/alib2data/src/rte/formal/FormalRTEStructure.h
+++ b/alib2data/src/rte/formal/FormalRTEStructure.h
@@ -85,7 +85,7 @@ public:
*
* \param structure new root node of the structure
*/
- void setStructure ( FormalRTEElement < SymbolType, RankType > && structure );
+ void setStructure ( FormalRTEElement < SymbolType, RankType > && param );
/**
* Sets the root node of the expression structure
diff --git a/alib2data/src/rte/formal/FormalRTESubstitution.h b/alib2data/src/rte/formal/FormalRTESubstitution.h
index 180a2b2a12bbddbb1b8957c401792f26bc6a7fb3..cf2f069a0936742befe16c82058a22405560c616 100644
--- a/alib2data/src/rte/formal/FormalRTESubstitution.h
+++ b/alib2data/src/rte/formal/FormalRTESubstitution.h
@@ -183,7 +183,7 @@ public:
*
* \param element the substitution symbol
*/
- void setSubstitutionSymbol ( FormalRTESymbolSubst < SymbolType, RankType > element );
+ void setSubstitutionSymbol ( FormalRTESymbolSubst < SymbolType, RankType > symbol );
/**
* @copydoc base::CommonBase < FormalRTEElement < SymbolType, RankType > >::compare ( const FormalRTEElement < SymbolType, RankType > & ) const
diff --git a/alib2data/src/rte/xml/FormalRTE.h b/alib2data/src/rte/xml/FormalRTE.h
index c650d538571275ac56f5dcda4b67902d5454fc3b..d3819e47fef434cc0243786b29e362263b5f1001 100644
--- a/alib2data/src/rte/xml/FormalRTE.h
+++ b/alib2data/src/rte/xml/FormalRTE.h
@@ -22,7 +22,7 @@ struct xmlApi < rte::FormalRTE < SymbolType, RankType > > {
static rte::FormalRTE < SymbolType, RankType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const rte::FormalRTE < SymbolType, RankType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const rte::FormalRTE < SymbolType, RankType > & input );
};
template < typename SymbolType, class RankType >
diff --git a/alib2data/src/rte/xml/common/RTEToXmlComposer.h b/alib2data/src/rte/xml/common/RTEToXmlComposer.h
index 8e9f31dcaadf3dee785eb8ed2e2980d35880c633..c7a112825d724b2de2aabd37f61d4c05f45e0c85 100644
--- a/alib2data/src/rte/xml/common/RTEToXmlComposer.h
+++ b/alib2data/src/rte/xml/common/RTEToXmlComposer.h
@@ -32,7 +32,7 @@ public:
template < class SymbolType, class RankType >
static void visit ( const FormalRTEIteration < SymbolType, RankType > & iteration, ext::deque < sax::Token > & output );
template < class SymbolType, class RankType >
- static void visit ( const FormalRTESubstitution < SymbolType, RankType > & concatenation, ext::deque < sax::Token > & output );
+ static void visit ( const FormalRTESubstitution < SymbolType, RankType > & substitution, ext::deque < sax::Token > & output );
template < class SymbolType, class RankType >
static void visit ( const FormalRTESymbolAlphabet < SymbolType, RankType > & symbol, ext::deque < sax::Token > & output );
template < class SymbolType, class RankType >
diff --git a/alib2data/src/string/xml/CyclicString.h b/alib2data/src/string/xml/CyclicString.h
index 10fa0dd015e00a30d62ffe27539388c0031e07f8..70bc4941b6514300cdfadcf71849624efab6eeb6 100644
--- a/alib2data/src/string/xml/CyclicString.h
+++ b/alib2data/src/string/xml/CyclicString.h
@@ -21,7 +21,7 @@ struct xmlApi < string::CyclicString < SymbolType > > {
static string::CyclicString < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const string::CyclicString < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const string::CyclicString < SymbolType > & input );
};
template < typename SymbolType >
diff --git a/alib2data/src/string/xml/LinearString.h b/alib2data/src/string/xml/LinearString.h
index 04cbf27002580d82c2fe79e005ef30ea9bb12464..69452c2a6509292394fbe5b7ebffd85195fdc175 100644
--- a/alib2data/src/string/xml/LinearString.h
+++ b/alib2data/src/string/xml/LinearString.h
@@ -21,7 +21,7 @@ struct xmlApi < string::LinearString < SymbolType > > {
static string::LinearString < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const string::LinearString < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const string::LinearString < SymbolType > & input );
};
template < typename SymbolType >
diff --git a/alib2data/src/string/xml/WildcardLinearString.h b/alib2data/src/string/xml/WildcardLinearString.h
index 603f5a1d7def7b3194352aa536b62f190b2301c6..9cec0a012ac61633f381dc2564456102656e3dca 100644
--- a/alib2data/src/string/xml/WildcardLinearString.h
+++ b/alib2data/src/string/xml/WildcardLinearString.h
@@ -21,7 +21,7 @@ struct xmlApi < string::WildcardLinearString < SymbolType > > {
static string::WildcardLinearString < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const string::WildcardLinearString < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const string::WildcardLinearString < SymbolType > & input );
};
template < typename SymbolType >
diff --git a/alib2data/src/tree/common/TreeAuxiliary.h b/alib2data/src/tree/common/TreeAuxiliary.h
index b2a900fd0dc6f9b65b9d0b8bedcbd9a2329bb891..a670538979d889e90e82c1f926b30894541d4898 100644
--- a/alib2data/src/tree/common/TreeAuxiliary.h
+++ b/alib2data/src/tree/common/TreeAuxiliary.h
@@ -33,9 +33,9 @@ public:
static ext::set < common::ranked_symbol < SymbolType, RankType > > computeBars ( const ext::set < common::ranked_symbol < SymbolType, RankType > > & alphabet, const SymbolType & barBase );
template < class SymbolType, class RankType >
- static ext::tree < common::ranked_symbol < SymbolType, RankType > > unrankedToRanked ( const ext::tree < SymbolType > & from );
+ static ext::tree < common::ranked_symbol < SymbolType, RankType > > unrankedToRanked ( const ext::tree < SymbolType > & tree );
template < class SymbolType, class RankType >
- static ext::tree < SymbolType > rankedToUnranked ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & from );
+ static ext::tree < SymbolType > rankedToUnranked ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & tree );
template < class SymbolType, class RankType >
static ext::tree < common::ranked_symbol < SymbolType, RankType > > postfixToTree (const ext::vector < common::ranked_symbol < SymbolType, RankType > > & from);
diff --git a/alib2data/src/tree/ranked/RankedNonlinearPattern.h b/alib2data/src/tree/ranked/RankedNonlinearPattern.h
index 78c9ee2c6d0c424ecc0722056f18bc101466ec9a..d539f3ee40bcf20bd44c5bd7c64ebfd46a18c343 100644
--- a/alib2data/src/tree/ranked/RankedNonlinearPattern.h
+++ b/alib2data/src/tree/ranked/RankedNonlinearPattern.h
@@ -87,7 +87,7 @@ class RankedNonlinearPattern final : public ext::CompareOperators < RankedNonlin
*
* \param data the pattern in its natural representation
*/
- void checkAlphabet ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & pattern ) const;
+ void checkAlphabet ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & data ) const;
/**
* Checks that the rank of each symbol of a pattern node corresponds to the number of child nodes of that same node.
diff --git a/alib2data/src/tree/ranked/RankedPattern.h b/alib2data/src/tree/ranked/RankedPattern.h
index 99a9b2a978dbbe12220850a143487a31fe52ded0..9e26686e32aec8e44d14f7aa43792faf4fc2a224 100644
--- a/alib2data/src/tree/ranked/RankedPattern.h
+++ b/alib2data/src/tree/ranked/RankedPattern.h
@@ -85,7 +85,7 @@ class RankedPattern final : public ext::CompareOperators < RankedPattern < Symbo
*
* \param data the pattern in its natural representation
*/
- void checkAlphabet ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & pattern ) const;
+ void checkAlphabet ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & data ) const;
/**
* Checks that the rank of each symbol of a pattern node corresponds to the number of child nodes of that same node.
diff --git a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h
index db718bd1318c65c8b871f0887b0e537d6ec5f4da..e807ec51d7001a93ea18841d93b98aca54f4fbfc 100644
--- a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h
+++ b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.h
@@ -85,7 +85,7 @@ class UnrankedNonlinearPattern final : public ext::CompareOperators < UnrankedNo
*
* \param data the pattern in its natural representation
*/
- void checkAlphabet ( const ext::tree < SymbolType > & pattern ) const;
+ void checkAlphabet ( const ext::tree < SymbolType > & data ) const;
public:
/**
diff --git a/alib2data/src/tree/unranked/UnrankedPattern.h b/alib2data/src/tree/unranked/UnrankedPattern.h
index a3a6a6c90ac579d8288f3bbafb411d273c150ad1..0933bece9da532cf2fa9dcf65f6fff4b7477c74d 100644
--- a/alib2data/src/tree/unranked/UnrankedPattern.h
+++ b/alib2data/src/tree/unranked/UnrankedPattern.h
@@ -83,7 +83,7 @@ class UnrankedPattern final : public ext::CompareOperators < UnrankedPattern < S
*
* \param data the pattern in its natural representation
*/
- void checkAlphabet ( const ext::tree < SymbolType > & pattern ) const;
+ void checkAlphabet ( const ext::tree < SymbolType > & data ) const;
public:
/**
diff --git a/alib2data/src/tree/unranked/UnrankedTree.h b/alib2data/src/tree/unranked/UnrankedTree.h
index e8f452b09cb2c759c8846133273d7092eb63b72f..af0756313d1d0be29c703f9d74f19a8a4dba1c56 100644
--- a/alib2data/src/tree/unranked/UnrankedTree.h
+++ b/alib2data/src/tree/unranked/UnrankedTree.h
@@ -82,7 +82,7 @@ class UnrankedTree final : public ext::CompareOperators < UnrankedTree < SymbolT
*
* \param data the pattern in its natural representation
*/
- void checkAlphabet ( const ext::tree < SymbolType > & pattern ) const;
+ void checkAlphabet ( const ext::tree < SymbolType > & data ) const;
public:
/**
@@ -98,7 +98,7 @@ public:
*
* \param pattern the initial content in it's natural representation
*/
- explicit UnrankedTree ( ext::tree < SymbolType > tree );
+ explicit UnrankedTree ( ext::tree < SymbolType > pattern );
/**
* \brief Creates a new instance of the pattern based on RankedTree, the alphabet is created from the content of the RankedTree.
diff --git a/alib2data_experimental/src/indexes/stringology/CompactSuffixAutomatonTerminatingSymbol.h b/alib2data_experimental/src/indexes/stringology/CompactSuffixAutomatonTerminatingSymbol.h
index 20ae7812b402c76ab5a57eb1da9aae049494e579..c9757fedbfe29efa77578d3dd300cf8fafebd370 100644
--- a/alib2data_experimental/src/indexes/stringology/CompactSuffixAutomatonTerminatingSymbol.h
+++ b/alib2data_experimental/src/indexes/stringology/CompactSuffixAutomatonTerminatingSymbol.h
@@ -192,7 +192,7 @@ struct xmlApi < indexes::stringology::CompactSuffixAutomatonTerminatingSymbol <
static indexes::stringology::CompactSuffixAutomatonTerminatingSymbol < SymbolType > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::CompactSuffixAutomatonTerminatingSymbol < SymbolType > & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::stringology::CompactSuffixAutomatonTerminatingSymbol < SymbolType > & index );
};
template < class SymbolType >
diff --git a/alib2data_experimental/src/indexes/stringology/SuffixTrieTerminatingSymbol.h b/alib2data_experimental/src/indexes/stringology/SuffixTrieTerminatingSymbol.h
index 4eec7976d83c13514316087df0b8ca5c64d592dc..d189f3c329f61c6fe901a15afd93c16d490f171f 100644
--- a/alib2data_experimental/src/indexes/stringology/SuffixTrieTerminatingSymbol.h
+++ b/alib2data_experimental/src/indexes/stringology/SuffixTrieTerminatingSymbol.h
@@ -110,7 +110,7 @@ struct xmlApi < indexes::SuffixTrieTerminatingSymbol > {
static indexes::SuffixTrieTerminatingSymbol parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const indexes::SuffixTrieTerminatingSymbol & data );
+ static void compose ( ext::deque < sax::Token > & output, const indexes::SuffixTrieTerminatingSymbol & index );
};
} /* namespace core */
diff --git a/alib2elgo/src/automaton/simplify/efficient/UnreachableStatesRemover.h b/alib2elgo/src/automaton/simplify/efficient/UnreachableStatesRemover.h
index d2564f784da424323659bbbdaa125eb616f2ca3e..a80334d8b194c83e7d4d4da0a54cb3c335e6040e 100644
--- a/alib2elgo/src/automaton/simplify/efficient/UnreachableStatesRemover.h
+++ b/alib2elgo/src/automaton/simplify/efficient/UnreachableStatesRemover.h
@@ -33,7 +33,7 @@ public:
* Removes dead states from FSM. Melichar 2.29
*/
template < class T >
- static T remove( const T & automaton );
+ static T remove( const T & fsm );
template < class SymbolType, class StateType >
static automaton::MultiInitialStateNFA < SymbolType, StateType > remove( const automaton::MultiInitialStateNFA < SymbolType, StateType > & fsm );
};
diff --git a/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h b/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h
index 7cd551e9dbbb9d6ab7ad4b4a8e19b851d55f8634..3ce47d360c263c19817dc8a09a8a76e0abebef0c 100644
--- a/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h
+++ b/alib2elgo/src/automaton/simplify/efficient/UselessStatesRemover.h
@@ -33,7 +33,7 @@ public:
* Removes dead states from FSM. Melichar 2.29
*/
template < class T >
- static T remove( const T & automaton );
+ static T remove( const T & fsm );
template < class SymbolType, class StateType >
static automaton::MultiInitialStateNFA < SymbolType, StateType > remove( const automaton::MultiInitialStateNFA < SymbolType, StateType > & fsm );
};
diff --git a/alib2graph_data/src/edge/capacity/CapacityEdge.hpp b/alib2graph_data/src/edge/capacity/CapacityEdge.hpp
index 1b9a1730f3067d5157d76132ca5e53823effcb6b..64c6ed1904b6a005dfd3089f56655ee5a9d71932 100644
--- a/alib2graph_data/src/edge/capacity/CapacityEdge.hpp
+++ b/alib2graph_data/src/edge/capacity/CapacityEdge.hpp
@@ -42,7 +42,7 @@ class CapacityEdge : public ext::pair<TNode, TNode>, public EdgeBase {
// ---------------------------------------------------------------------------------------------------------------------
TCapacity capacity() const;
- void capacity(TCapacity &&weight);
+ void capacity(TCapacity &&capacity);
// =====================================================================================================================
// EdgeBase interface
diff --git a/alib2gui/src/Graphics/Connection/Connection.hpp b/alib2gui/src/Graphics/Connection/Connection.hpp
index 13e29f33bb867eb5e042ebc87dcf44e41d0545b6..48a15274d6bab43e27641ae4de1759b8485c177b 100644
--- a/alib2gui/src/Graphics/Connection/Connection.hpp
+++ b/alib2gui/src/Graphics/Connection/Connection.hpp
@@ -22,7 +22,7 @@ public:
private:
void drawDirectConnection(QPainter* painter, const QPointF& originPoint, const QPointF& targetPoint);
void drawAroundConnection(QPainter* painter, const QPointF& originPoint, const QPointF& targetPoint);
- void recalculateBoundingRect(const QPointF& topLeft, const QPointF& bottomRight);
+ void recalculateBoundingRect(const QPointF& a, const QPointF& bottomRight);
QRectF boundRect;
diff --git a/alib2gui/src/GraphvizIntegrator.hpp b/alib2gui/src/GraphvizIntegrator.hpp
index e76378847c34c81c07843d33b0213649226d1731..fe91ade1b51f6cf1c807de33f00f88947b8a4518 100644
--- a/alib2gui/src/GraphvizIntegrator.hpp
+++ b/alib2gui/src/GraphvizIntegrator.hpp
@@ -12,7 +12,7 @@ namespace GraphvizIntegrator
QImage createImage(const QString& dotData , PictureFormat format);
bool createImageFile(const QString& dotData, QString filename , PictureFormat format);
- PictureFormat formatFromFilename(const QString& qString);
+ PictureFormat formatFromFilename(const QString& format);
}
diff --git a/alib2gui/src/Models/ModelBox.hpp b/alib2gui/src/Models/ModelBox.hpp
index 9742aa2173f341963984ae721039617ca5c2dea0..cdebbc67dcc75f78ce53ab854d60c1ef41a50b6f 100644
--- a/alib2gui/src/Models/ModelBox.hpp
+++ b/alib2gui/src/Models/ModelBox.hpp
@@ -41,8 +41,8 @@ public:
private:
void setInput(size_t slot, ModelBox* model);
- void addOutput(ModelBox* model, size_t slot);
- void removeOutput(ModelBox* model, size_t slot);
+ void addOutput(ModelBox* target, size_t slot);
+ void removeOutput(ModelBox* target, size_t slot);
protected:
ModelType type;
diff --git a/alib2raw/src/registry/RawReaderRegistry.hpp b/alib2raw/src/registry/RawReaderRegistry.hpp
index 0ed8b66b5908d768540e4652b983edd58b2f9989..3f820e97c06c09067df6193b3b2c4032e6336a3c 100644
--- a/alib2raw/src/registry/RawReaderRegistry.hpp
+++ b/alib2raw/src/registry/RawReaderRegistry.hpp
@@ -62,7 +62,7 @@ public:
registerRawReader < ReturnType > ( std::move ( type ) );
}
- static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & group );
+ static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & type );
};
} /* namespace abstraction */
diff --git a/alib2std/src/extensions/container/string.hpp b/alib2std/src/extensions/container/string.hpp
index 15aa3fd14afe31bb19cf14ada9af61cefc9e258a..fd043935a3653c63b57af073f0702f73527f58ce 100644
--- a/alib2std/src/extensions/container/string.hpp
+++ b/alib2std/src/extensions/container/string.hpp
@@ -250,7 +250,7 @@ std::string to_string ( char value );
*
* \return string representation of cstring
*/
-std::string to_string ( char * value );
+std::string to_string ( char * param );
diff --git a/alib2std/src/extensions/fdstream.hpp b/alib2std/src/extensions/fdstream.hpp
index 737abaecac72beae161afe244a95a53deee645da..faadeedbff0142c9bacc20a638f07ddbe910ea3a 100644
--- a/alib2std/src/extensions/fdstream.hpp
+++ b/alib2std/src/extensions/fdstream.hpp
@@ -146,7 +146,7 @@ public:
*
* \param fd the file descriptor number
*/
- explicit fdstreambuf ( int fd );
+ explicit fdstreambuf ( int fileDescriptor );
/**
* \brief
@@ -235,7 +235,7 @@ public:
* \param preferedFD the prefered destination file descriptor
* \param fallbackFD the fallback destination file descriptor
*/
- explicit ofdstream ( int preferedFD, int fallbackFD = FAIL_FD);
+ explicit ofdstream ( int preferedFD, int fallback_fd = FAIL_FD);
/**
* \brief
diff --git a/alib2str/src/regexp/string/UnboundedRegExp.h b/alib2str/src/regexp/string/UnboundedRegExp.h
index c0322f5c0a8e75d7a0f769e00465b79f3fa713ea..79adfc44196edf43ecd2e3bf31016f4938510934 100644
--- a/alib2str/src/regexp/string/UnboundedRegExp.h
+++ b/alib2str/src/regexp/string/UnboundedRegExp.h
@@ -28,11 +28,11 @@ struct stringApi < regexp::UnboundedRegExpStructure < SymbolType > > {
private:
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > alternation(std::istream & input);
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > alternationCont(std::istream & input, ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > left);
- static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > alternationContCont(std::istream & input, regexp::UnboundedRegExpAlternation < SymbolType > left);
+ static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > alternationContCont(std::istream & input, regexp::UnboundedRegExpAlternation < SymbolType > res);
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > concatenation(std::istream & input);
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > concatenationCont(std::istream & input, ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > left);
- static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > concatenationContCont(std::istream & input, regexp::UnboundedRegExpConcatenation < SymbolType > left);
+ static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > concatenationContCont(std::istream & input, regexp::UnboundedRegExpConcatenation < SymbolType > res);
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > factor(std::istream & input);
static ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > star(std::istream & input, regexp::UnboundedRegExpElement < SymbolType > && elem);
diff --git a/alib2str/src/registry/StringReaderRegistry.hpp b/alib2str/src/registry/StringReaderRegistry.hpp
index 2c2e3f32ff50e871b1abc1ebc54cb46376fb23a8..7cba1c41b69b7153a5a0add3b4520a7863db1d51 100644
--- a/alib2str/src/registry/StringReaderRegistry.hpp
+++ b/alib2str/src/registry/StringReaderRegistry.hpp
@@ -64,7 +64,7 @@ public:
return entry.insert ( entry.end ( ), std::make_pair ( core::stringApi < ReturnType >::first, std::unique_ptr < Entry > ( new EntryImpl < ReturnType > ( ) ) ) );
}
- static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & group, const std::string & data );
+ static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & group, const std::string & str );
};
} /* namespace abstraction */
diff --git a/alib2str/src/rte/string/FormalRTE.h b/alib2str/src/rte/string/FormalRTE.h
index 172b12ba52bf52b68e88ae4bb99c2a0686a37335..d70fd267ba10eeefdc46282327f20a832774f441 100644
--- a/alib2str/src/rte/string/FormalRTE.h
+++ b/alib2str/src/rte/string/FormalRTE.h
@@ -49,7 +49,7 @@ private:
static void visit( const rte::FormalRTESubstitution < SymbolType, RankType > & substitution, ext::tuple < Priority &, std::ostream & > & output);
static void visit( const rte::FormalRTEIteration < SymbolType, RankType > & iteration, ext::tuple < Priority &, std::ostream & > & output);
static void visit( const rte::FormalRTESymbolAlphabet < SymbolType, RankType > & symbol, ext::tuple < Priority &, std::ostream & > & output);
- static void visit( const rte::FormalRTESymbolSubst < SymbolType, RankType > & epsilon, ext::tuple < Priority &, std::ostream & > & output);
+ static void visit( const rte::FormalRTESymbolSubst < SymbolType, RankType > & symbol, ext::tuple < Priority &, std::ostream & > & output);
static void visit( const rte::FormalRTEEmpty < SymbolType, RankType > & empty, ext::tuple < Priority &, std::ostream & > & output);
};
diff --git a/alib2str/src/string/string/common/StringToStringComposerCommon.h b/alib2str/src/string/string/common/StringToStringComposerCommon.h
index 87e10188ee9255d3ace62afcfddd262d2cc30672..be01a617b4e74cc070dc9627d3b137344591b23d 100644
--- a/alib2str/src/string/string/common/StringToStringComposerCommon.h
+++ b/alib2str/src/string/string/common/StringToStringComposerCommon.h
@@ -18,7 +18,7 @@ namespace string {
class StringToStringComposerCommon {
public:
template < class SymbolType >
- static void composeContent ( std::ostream & output, const std::vector < SymbolType > & string );
+ static void composeContent ( std::ostream & output, const std::vector < SymbolType > & content );
};
template < class SymbolType >
diff --git a/alib2xml/src/container/xml/ObjectsBitset.h b/alib2xml/src/container/xml/ObjectsBitset.h
index 490489da756b9ff9985d97d2e4b7ac6ed40f86ae..dc0182a1a29a6a2799a6ed522e9fe470d6b62d92 100644
--- a/alib2xml/src/container/xml/ObjectsBitset.h
+++ b/alib2xml/src/container/xml/ObjectsBitset.h
@@ -20,7 +20,7 @@ struct xmlApi < ext::bitset < N > > {
static ext::bitset < N > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::bitset < N > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::bitset < N > & input );
};
template < size_t N >
diff --git a/alib2xml/src/container/xml/ObjectsDeque.h b/alib2xml/src/container/xml/ObjectsDeque.h
index f2227ae651d2e5d2d6588a612152b07fa1cdf344..dd3d8cad1dd503842ebf703618b329711b89376a 100644
--- a/alib2xml/src/container/xml/ObjectsDeque.h
+++ b/alib2xml/src/container/xml/ObjectsDeque.h
@@ -18,7 +18,7 @@ struct xmlApi < ext::deque < T > > {
static ext::deque < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::deque < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::deque < T > & input );
};
template < typename T >
diff --git a/alib2xml/src/container/xml/ObjectsList.h b/alib2xml/src/container/xml/ObjectsList.h
index d0a16cc2fff5107e56b3b9dccdb92cd379ec3495..304d75eba8a9a0568f4ba665add0a379b070beeb 100644
--- a/alib2xml/src/container/xml/ObjectsList.h
+++ b/alib2xml/src/container/xml/ObjectsList.h
@@ -18,7 +18,7 @@ struct xmlApi < ext::list < T > > {
static ext::list < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::list < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::list < T > & input );
};
template < typename T >
diff --git a/alib2xml/src/container/xml/ObjectsMap.h b/alib2xml/src/container/xml/ObjectsMap.h
index 4394a3ce6c766f657d84f4b819c7e4130183fc33..5f616091bcc1ff9c5844cbbed1c9b6bab8cc1385 100644
--- a/alib2xml/src/container/xml/ObjectsMap.h
+++ b/alib2xml/src/container/xml/ObjectsMap.h
@@ -19,7 +19,7 @@ struct xmlApi < ext::map < T, R > > {
static ext::map < T, R > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::map < T, R > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::map < T, R > & input );
};
template < typename T, typename R >
diff --git a/alib2xml/src/container/xml/ObjectsMultimap.h b/alib2xml/src/container/xml/ObjectsMultimap.h
index 5c00af552785132a5f4bfce5bc2d39d18459f71b..7df15efee07947c231b4b32287c6172dc61a2092 100644
--- a/alib2xml/src/container/xml/ObjectsMultimap.h
+++ b/alib2xml/src/container/xml/ObjectsMultimap.h
@@ -19,7 +19,7 @@ struct xmlApi < ext::multimap < T, R > > {
static ext::multimap < T, R > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::multimap < T, R > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::multimap < T, R > & input );
};
template < typename T, typename R >
diff --git a/alib2xml/src/container/xml/ObjectsOptional.h b/alib2xml/src/container/xml/ObjectsOptional.h
index 9dc16e2aa86c0bf553531aafa52dbfc8833b6ce5..6f7b7e8b8cb33355d8d6ae78da3b9765cfa58aa6 100644
--- a/alib2xml/src/container/xml/ObjectsOptional.h
+++ b/alib2xml/src/container/xml/ObjectsOptional.h
@@ -19,7 +19,7 @@ struct xmlApi < ext::optional < T > > {
static ext::optional < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::optional < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::optional < T > & input );
};
template < typename T >
diff --git a/alib2xml/src/container/xml/ObjectsPair.h b/alib2xml/src/container/xml/ObjectsPair.h
index bbe137dc377e12f07520eb7cac7750d1e8275319..8f61a8884b7a1c5f7cf61db24e91dcf8133023ce 100644
--- a/alib2xml/src/container/xml/ObjectsPair.h
+++ b/alib2xml/src/container/xml/ObjectsPair.h
@@ -18,7 +18,7 @@ struct xmlApi < std::pair < T, R > > {
static std::pair < T, R > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const std::pair < T, R > & data );
+ static void compose ( ext::deque < sax::Token > & output, const std::pair < T, R > & input );
};
template < typename T, typename R >
@@ -58,7 +58,7 @@ struct xmlApi < ext::pair < T, R > > {
static ext::pair < T, R > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::pair < T, R > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::pair < T, R > & input );
};
template < typename T, typename R >
diff --git a/alib2xml/src/container/xml/ObjectsSet.h b/alib2xml/src/container/xml/ObjectsSet.h
index d9e02af024c7bb0e5014aad88772f64bfcb0456a..c0879fb75cd84aec54544c2fe83e7ab90dc148a6 100644
--- a/alib2xml/src/container/xml/ObjectsSet.h
+++ b/alib2xml/src/container/xml/ObjectsSet.h
@@ -18,7 +18,7 @@ struct xmlApi < ext::set < T > > {
static ext::set < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::set < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::set < T > & input );
};
template < typename T >
diff --git a/alib2xml/src/container/xml/ObjectsTree.h b/alib2xml/src/container/xml/ObjectsTree.h
index 9cc677d2a3487093f351dac1592bb3063fffe235..1eea4ebb1b5c566f400cb53ad420a233e85f12aa 100644
--- a/alib2xml/src/container/xml/ObjectsTree.h
+++ b/alib2xml/src/container/xml/ObjectsTree.h
@@ -18,7 +18,7 @@ struct xmlApi < ext::tree < T > > {
static ext::tree < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::tree < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::tree < T > & input );
};
template < typename T >
diff --git a/alib2xml/src/container/xml/ObjectsTrie.h b/alib2xml/src/container/xml/ObjectsTrie.h
index bc774cd5dc8d12050cb452fc864fa419c532887f..2d757a01c89fbf9e5e60d1f3d0bec6e137a2aebf 100644
--- a/alib2xml/src/container/xml/ObjectsTrie.h
+++ b/alib2xml/src/container/xml/ObjectsTrie.h
@@ -18,7 +18,7 @@ struct xmlApi < ext::trie < T, R > > {
static ext::trie < T, R > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::trie < T, R > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::trie < T, R > & input );
private:
static ext::map < T, ext::trie < T, R > > parseChildren ( ext::deque < sax::Token >::iterator & input );
diff --git a/alib2xml/src/container/xml/ObjectsVariant.h b/alib2xml/src/container/xml/ObjectsVariant.h
index 3ce1fa1c16a70a9aa74a622a94ee20fc8f5e01f6..05f021ffab32ac784106b61998ba500c63878728 100644
--- a/alib2xml/src/container/xml/ObjectsVariant.h
+++ b/alib2xml/src/container/xml/ObjectsVariant.h
@@ -51,7 +51,7 @@ struct xmlApi < ext::variant < Ts ... > > {
static ext::variant < Ts ... > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::variant < Ts ... > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::variant < Ts ... > & input );
};
template < typename ... Ts >
diff --git a/alib2xml/src/container/xml/ObjectsVector.h b/alib2xml/src/container/xml/ObjectsVector.h
index eade51b9ce7c1c19e2d4190aa7530b5909e4587d..93e9859b1414698ed074e0ec3ee2d78c3054e659 100644
--- a/alib2xml/src/container/xml/ObjectsVector.h
+++ b/alib2xml/src/container/xml/ObjectsVector.h
@@ -18,7 +18,7 @@ struct xmlApi < ext::vector < T > > {
static ext::vector < T > parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const ext::vector < T > & data );
+ static void compose ( ext::deque < sax::Token > & output, const ext::vector < T > & input );
};
template < typename T >
diff --git a/alib2xml/src/measure/xml/MeasurementResults.hpp b/alib2xml/src/measure/xml/MeasurementResults.hpp
index 0c09e69cc453937c6c4792236897051d9dca2798..cc2a0ef802a44ed6be5c20d121a556b6c3e13720 100644
--- a/alib2xml/src/measure/xml/MeasurementResults.hpp
+++ b/alib2xml/src/measure/xml/MeasurementResults.hpp
@@ -15,7 +15,7 @@ struct xmlApi < measurements::MeasurementResults > {
static measurements::MeasurementResults parse ( ext::deque < sax::Token >::iterator & input );
static bool first ( const ext::deque < sax::Token >::const_iterator & input );
static std::string xmlTagName ( );
- static void compose ( ext::deque < sax::Token > & output, const measurements::MeasurementResults & data );
+ static void compose ( ext::deque < sax::Token > & output, const measurements::MeasurementResults & input );
private:
static std::string MEASUREMENT_RESULTS_TAG;
diff --git a/alib2xml/src/registry/XmlContainerParserRegistry.hpp b/alib2xml/src/registry/XmlContainerParserRegistry.hpp
index 6104009a911877fab5842f04d7ee2b21cd821575..f012834c5550e9f183107f21ed85abf990cbeb3d 100644
--- a/alib2xml/src/registry/XmlContainerParserRegistry.hpp
+++ b/alib2xml/src/registry/XmlContainerParserRegistry.hpp
@@ -83,7 +83,7 @@ public:
static std::shared_ptr < abstraction::OperationAbstraction > getAbstraction ( const std::string & container, const std::string & type );
- static ext::set < std::string > listOverloads ( const std::string & algorithm );
+ static ext::set < std::string > listOverloads ( const std::string & container );
static ext::set < std::string > list ( );
};
diff --git a/alib2xml/src/registry/XmlRegistry.h b/alib2xml/src/registry/XmlRegistry.h
index 7fc56ef229c96910262f47ebe075a8735fae8cf8..0534f6a362ff1aefa13195323367eb9c9e116e05 100644
--- a/alib2xml/src/registry/XmlRegistry.h
+++ b/alib2xml/src/registry/XmlRegistry.h
@@ -25,7 +25,7 @@ public:
static ext::set < std::string > listDataTypes ( );
static ext::set < std::string > listDataTypeGroup ( const std::string & group );
- static std::shared_ptr < abstraction::OperationAbstraction > getXmlComposerAbstraction ( const std::string & type );
+ static std::shared_ptr < abstraction::OperationAbstraction > getXmlComposerAbstraction ( const std::string & param );
static std::shared_ptr < abstraction::OperationAbstraction > getXmlParserAbstraction ( const std::string & type );
static std::shared_ptr < abstraction::OperationAbstraction > getXmlContainerParserAbstraction ( const std::string & container, const std::string & type );
diff --git a/alib2xml/src/sax/SaxParseInterface.h b/alib2xml/src/sax/SaxParseInterface.h
index 8a0f886ad53f07953dcf237a6a2d46bcd0c5e78b..7d8b54d4289c837f1e3d25c11c3efc5c4a7ae52b 100644
--- a/alib2xml/src/sax/SaxParseInterface.h
+++ b/alib2xml/src/sax/SaxParseInterface.h
@@ -19,7 +19,7 @@ namespace sax {
* method for libxml SAX parser.
*/
class SaxParseInterface {
- static int xmlSAXUserParse(xmlTextReaderPtr writer, ext::deque<Token>& out);
+ static int xmlSAXUserParse(xmlTextReaderPtr reader, ext::deque<Token>& out);
public:
/**
* Parses the string containing XML.