From 426224f6332dceede3b192173910c023e234c899 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 8 Nov 2016 10:19:40 +0100
Subject: [PATCH] enable and fix additional warnings for alib2data
---
alib2data/makefile | 4 ++-
alib2data/src/alphabet/LabeledSymbol.cpp | 24 +++++++--------
alib2data/src/alphabet/LabeledSymbol.h | 2 +-
.../src/alphabet/NonlinearVariableSymbol.cpp | 20 ++++++-------
.../src/alphabet/NonlinearVariableSymbol.h | 2 +-
alib2data/src/alphabet/RankedSymbol.h | 4 +--
alib2data/src/alphabet/SymbolPairSymbol.cpp | 2 +-
alib2data/src/alphabet/SymbolPairSymbol.h | 2 +-
alib2data/src/alphabet/SymbolSetSymbol.cpp | 2 +-
alib2data/src/alphabet/SymbolSetSymbol.h | 2 +-
alib2data/src/alphabet/UniqueSymbol.cpp | 26 ++++++++--------
alib2data/src/alphabet/UniqueSymbol.h | 4 +--
alib2data/src/alphabet/ranked_symbol.hpp | 24 +++++++--------
alib2data/src/label/HexavigesimalLabel.cpp | 18 +++++------
alib2data/src/label/HexavigesimalLabel.h | 2 +-
alib2data/src/label/LR0ItemsLabel.cpp | 10 +++----
alib2data/src/label/LR0ItemsLabel.h | 6 ++--
alib2data/src/label/LabelPairLabel.cpp | 2 +-
alib2data/src/label/LabelPairLabel.h | 2 +-
alib2data/src/label/LabelSetLabel.cpp | 2 +-
alib2data/src/label/LabelSetLabel.h | 2 +-
alib2data/src/label/ObjectLabel.cpp | 12 ++++----
alib2data/src/label/ObjectLabel.h | 2 +-
alib2data/src/label/PrimitiveLabel.cpp | 18 +++++------
alib2data/src/label/PrimitiveLabel.h | 2 +-
alib2data/src/label/UniqueLabel.cpp | 26 ++++++++--------
alib2data/src/label/UniqueLabel.h | 4 +--
alib2data/src/regexp/formal/FormalRegExp.h | 18 +++++------
.../src/regexp/formal/FormalRegExpStructure.h | 10 +++----
.../src/regexp/formal/FormalRegExpSymbol.h | 24 +++++++--------
.../src/regexp/unbounded/UnboundedRegExp.h | 18 +++++------
.../unbounded/UnboundedRegExpStructure.h | 10 +++----
.../regexp/unbounded/UnboundedRegExpSymbol.h | 24 +++++++--------
alib2data/src/rte/formal/FormalRTE.h | 18 +++++------
alib2data/src/rte/formal/FormalRTEIteration.h | 14 ++++-----
alib2data/src/rte/formal/FormalRTEStructure.h | 10 +++----
.../src/rte/formal/FormalRTESubstitution.h | 16 +++++-----
alib2data/src/rte/formal/FormalRTESymbol.h | 6 ++--
.../src/rte/formal/FormalRTESymbolAlphabet.h | 2 +-
.../src/rte/formal/FormalRTESymbolSubst.h | 2 +-
alib2data/src/string/CyclicString.h | 30 +++++++++----------
alib2data/src/string/LinearString.h | 30 +++++++++----------
42 files changed, 230 insertions(+), 228 deletions(-)
diff --git a/alib2data/makefile b/alib2data/makefile
index 38bca86b66..bf9f76e926 100644
--- a/alib2data/makefile
+++ b/alib2data/makefile
@@ -10,6 +10,8 @@ endef
export NEW_LINE
+CXX_FLAGS := -Wall -pedantic -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls
+
space := $(eval) $(eval)
LDFLAGS_DEBUG:=-rdynamic -shared
@@ -54,7 +56,7 @@ FORCE:
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -pipe -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC \$$(addprefix -I, \$$(realpath $(INCLUDE_PATHS))) -I\$$(realpath \$$(SOURCES_BASE_DIR)/../src/)$${NEW_LINE}\
+ CXXFLAGS:= -pipe -std=c++11 \$$(CXX_OTHER_FLAGS) -c $(CXX_FLAGS) -fPIC \$$(addprefix -I, \$$(realpath $(INCLUDE_PATHS))) -I\$$(realpath \$$(SOURCES_BASE_DIR)/../src/)$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find \$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst \$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/alib2data/src/alphabet/LabeledSymbol.cpp b/alib2data/src/alphabet/LabeledSymbol.cpp
index 3733c33106..dde8bf7d73 100644
--- a/alib2data/src/alphabet/LabeledSymbol.cpp
+++ b/alib2data/src/alphabet/LabeledSymbol.cpp
@@ -13,19 +13,19 @@
namespace alphabet {
-LabeledSymbol::LabeledSymbol(int number) : label(label::labelFrom(number)) {
+LabeledSymbol::LabeledSymbol(int number) : m_label(label::labelFrom(number)) {
}
-LabeledSymbol::LabeledSymbol(char character) : label(label::labelFrom(character)) {
+LabeledSymbol::LabeledSymbol(char character) : m_label(label::labelFrom(character)) {
}
-LabeledSymbol::LabeledSymbol(std::string label) : label(label::labelFrom(std::move(label))) {
+LabeledSymbol::LabeledSymbol(std::string label) : m_label(label::labelFrom(std::move(label))) {
}
-LabeledSymbol::LabeledSymbol(label::Label label) : label(std::move(label)) {
+LabeledSymbol::LabeledSymbol(label::Label label) : m_label(std::move(label)) {
}
@@ -38,23 +38,23 @@ SymbolBase* LabeledSymbol::plunder() && {
}
const label::Label& LabeledSymbol::getLabel() const {
- return label;
+ return m_label;
}
label::Label& LabeledSymbol::getLabel() {
- return label;
+ return m_label;
}
int LabeledSymbol::compare(const LabeledSymbol& other) const {
- return this->label.getData().compare(other.label.getData());
+ return this->m_label.getData().compare(other.m_label.getData());
}
void LabeledSymbol::operator>>(std::ostream& out) const {
- out << "(LabeledSymbol " << this->label << ")";
+ out << "(LabeledSymbol " << this->m_label << ")";
}
LabeledSymbol::operator std::string () const {
- return (std::string) label;
+ return (std::string) m_label;
}
LabeledSymbol LabeledSymbol::parse(std::deque<sax::Token>::iterator& input) {
@@ -66,16 +66,16 @@ LabeledSymbol LabeledSymbol::parse(std::deque<sax::Token>::iterator& input) {
void LabeledSymbol::compose(std::deque<sax::Token>& out) const {
out.emplace_back(LabeledSymbol::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
- alib::xmlApi<label::Label>::compose(out, label);
+ alib::xmlApi<label::Label>::compose(out, m_label);
out.emplace_back(LabeledSymbol::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
}
SymbolBase* LabeledSymbol::next() const {
- return new LabeledSymbol(label.next());
+ return new LabeledSymbol(m_label.next());
}
SymbolBase* LabeledSymbol::inc() && {
- label.inc();
+ m_label.inc();
return NULL;
}
diff --git a/alib2data/src/alphabet/LabeledSymbol.h b/alib2data/src/alphabet/LabeledSymbol.h
index a3dda5d2a3..bdefe486dd 100644
--- a/alib2data/src/alphabet/LabeledSymbol.h
+++ b/alib2data/src/alphabet/LabeledSymbol.h
@@ -18,7 +18,7 @@ namespace alphabet {
*/
class LabeledSymbol : public SymbolBase {
protected:
- label::Label label;
+ label::Label m_label;
public:
explicit LabeledSymbol ( int number );
diff --git a/alib2data/src/alphabet/NonlinearVariableSymbol.cpp b/alib2data/src/alphabet/NonlinearVariableSymbol.cpp
index 0ec7aee838..7315b0d968 100644
--- a/alib2data/src/alphabet/NonlinearVariableSymbol.cpp
+++ b/alib2data/src/alphabet/NonlinearVariableSymbol.cpp
@@ -14,16 +14,16 @@
namespace alphabet {
-NonlinearVariableSymbol::NonlinearVariableSymbol ( int number ) : symbol ( alphabet::symbolFrom ( number ) ) {
+NonlinearVariableSymbol::NonlinearVariableSymbol ( int number ) : m_symbol ( alphabet::symbolFrom ( number ) ) {
}
-NonlinearVariableSymbol::NonlinearVariableSymbol ( char character ) : symbol ( alphabet::symbolFrom ( character ) ) {
+NonlinearVariableSymbol::NonlinearVariableSymbol ( char character ) : m_symbol ( alphabet::symbolFrom ( character ) ) {
}
-NonlinearVariableSymbol::NonlinearVariableSymbol ( std::string symbol ) : symbol ( alphabet::symbolFrom ( std::move ( symbol ) ) ) {
+NonlinearVariableSymbol::NonlinearVariableSymbol ( std::string symbol ) : m_symbol ( alphabet::symbolFrom ( std::move ( symbol ) ) ) {
}
-NonlinearVariableSymbol::NonlinearVariableSymbol ( alphabet::Symbol symbol ) : symbol ( std::move ( symbol ) ) {
+NonlinearVariableSymbol::NonlinearVariableSymbol ( alphabet::Symbol symbol ) : m_symbol ( std::move ( symbol ) ) {
}
SymbolBase * NonlinearVariableSymbol::clone ( ) const {
@@ -35,19 +35,19 @@ SymbolBase * NonlinearVariableSymbol::plunder ( ) && {
}
const alphabet::Symbol& NonlinearVariableSymbol::getSymbol() const {
- return symbol;
+ return m_symbol;
}
int NonlinearVariableSymbol::compare ( const NonlinearVariableSymbol & other ) const {
- return this->symbol.getData ( ).compare ( other.symbol.getData ( ) );
+ return this->m_symbol.getData ( ).compare ( other.m_symbol.getData ( ) );
}
void NonlinearVariableSymbol::operator >>( std::ostream & out ) const {
- out << "(NonlinearVariableSymbol " << symbol << ")";
+ out << "(NonlinearVariableSymbol " << m_symbol << ")";
}
NonlinearVariableSymbol::operator std::string ( ) const {
- return "$" + std::to_string ( symbol );
+ return "$" + std::to_string ( m_symbol );
}
NonlinearVariableSymbol NonlinearVariableSymbol::parse ( std::deque < sax::Token >::iterator & input ) {
@@ -60,7 +60,7 @@ NonlinearVariableSymbol NonlinearVariableSymbol::parse ( std::deque < sax::Token
void NonlinearVariableSymbol::compose ( std::deque < sax::Token > & out ) const {
out.emplace_back ( NonlinearVariableSymbol::getXmlTagName(), sax::Token::TokenType::START_ELEMENT );
- alib::xmlApi < alphabet::Symbol >::compose ( out, symbol );
+ alib::xmlApi < alphabet::Symbol >::compose ( out, m_symbol );
out.emplace_back ( NonlinearVariableSymbol::getXmlTagName(), sax::Token::TokenType::END_ELEMENT );
}
@@ -76,7 +76,7 @@ SymbolBase * NonlinearVariableSymbol::inc ( ) && {
namespace alib {
-auto nonlinearVariableSymbolParserRegister = xmlApi < alphabet::Symbol >::ParserRegister < alphabet::NonlinearVariableSymbol > ( );
+auto nonlinearVariableSymbolParserRegister = xmlApi < alphabet::Symbol >::ParserRegister < alphabet::NonlinearVariableSymbol > ( );
auto nonlinearVariableSymbolParserRegister2 = xmlApi < alib::Object >::ParserRegister < alphabet::NonlinearVariableSymbol > ( );
} /* namespace alib */
diff --git a/alib2data/src/alphabet/NonlinearVariableSymbol.h b/alib2data/src/alphabet/NonlinearVariableSymbol.h
index f02d61e255..abf2125fc4 100644
--- a/alib2data/src/alphabet/NonlinearVariableSymbol.h
+++ b/alib2data/src/alphabet/NonlinearVariableSymbol.h
@@ -16,7 +16,7 @@ namespace alphabet {
* Represents subtreeWildcard symbol for tree linearization.
*/
class NonlinearVariableSymbol : public SymbolBase {
- alphabet::Symbol symbol;
+ alphabet::Symbol m_symbol;
public:
explicit NonlinearVariableSymbol ( int number );
diff --git a/alib2data/src/alphabet/RankedSymbol.h b/alib2data/src/alphabet/RankedSymbol.h
index 1e86088731..282234ac40 100644
--- a/alib2data/src/alphabet/RankedSymbol.h
+++ b/alib2data/src/alphabet/RankedSymbol.h
@@ -114,12 +114,12 @@ void RankedSymbol < SymbolType, RankType >::compose( std::deque<sax::Token>& out
template < class SymbolType, class RankType >
SymbolBase* RankedSymbol < SymbolType, RankType >::next() const {
- return new RankedSymbol(this->symbol.next(), this->rank);
+ return new RankedSymbol(this->m_symbol.next(), this->m_rank);
}
template < class SymbolType, class RankType >
SymbolBase* RankedSymbol < SymbolType, RankType >::inc() && {
- this->symbol.inc();
+ this->m_symbol.inc();
return NULL;
}
diff --git a/alib2data/src/alphabet/SymbolPairSymbol.cpp b/alib2data/src/alphabet/SymbolPairSymbol.cpp
index cade1c4aa7..9f46881487 100644
--- a/alib2data/src/alphabet/SymbolPairSymbol.cpp
+++ b/alib2data/src/alphabet/SymbolPairSymbol.cpp
@@ -15,7 +15,7 @@
namespace alphabet {
-SymbolPairSymbol::SymbolPairSymbol(std::pair<Symbol, Symbol> symbol) : symbol(std::move(symbol)) {
+SymbolPairSymbol::SymbolPairSymbol(std::pair<Symbol, Symbol> raw) : symbol(std::move(raw)) {
}
diff --git a/alib2data/src/alphabet/SymbolPairSymbol.h b/alib2data/src/alphabet/SymbolPairSymbol.h
index 9d35125a04..af1e8fc494 100644
--- a/alib2data/src/alphabet/SymbolPairSymbol.h
+++ b/alib2data/src/alphabet/SymbolPairSymbol.h
@@ -25,7 +25,7 @@ public:
* Creates new symbol with given name.
* @param symbol name of the symbol
*/
- explicit SymbolPairSymbol ( std::pair < Symbol, Symbol > symbol );
+ explicit SymbolPairSymbol ( std::pair < Symbol, Symbol > raw );
virtual SymbolBase * clone ( ) const;
diff --git a/alib2data/src/alphabet/SymbolSetSymbol.cpp b/alib2data/src/alphabet/SymbolSetSymbol.cpp
index 261e6983cd..e3d90fc8b1 100644
--- a/alib2data/src/alphabet/SymbolSetSymbol.cpp
+++ b/alib2data/src/alphabet/SymbolSetSymbol.cpp
@@ -14,7 +14,7 @@
namespace alphabet {
-SymbolSetSymbol::SymbolSetSymbol(std::set<Symbol> symbol) : symbol(std::move(symbol)) {
+SymbolSetSymbol::SymbolSetSymbol(std::set<Symbol> raw) : symbol(std::move(raw)) {
}
diff --git a/alib2data/src/alphabet/SymbolSetSymbol.h b/alib2data/src/alphabet/SymbolSetSymbol.h
index 1fcf170a1a..0cb4005698 100644
--- a/alib2data/src/alphabet/SymbolSetSymbol.h
+++ b/alib2data/src/alphabet/SymbolSetSymbol.h
@@ -25,7 +25,7 @@ public:
* Creates new symbol with given name.
* @param symbol name of the symbol
*/
- explicit SymbolSetSymbol ( std::set < Symbol > symbol );
+ explicit SymbolSetSymbol ( std::set < Symbol > raw );
virtual SymbolBase * clone ( ) const;
diff --git a/alib2data/src/alphabet/UniqueSymbol.cpp b/alib2data/src/alphabet/UniqueSymbol.cpp
index d02dc7c750..0286ea525a 100644
--- a/alib2data/src/alphabet/UniqueSymbol.cpp
+++ b/alib2data/src/alphabet/UniqueSymbol.cpp
@@ -14,7 +14,7 @@
namespace alphabet {
-UniqueSymbol::UniqueSymbol(Symbol symbol, primitive::Integer id) : symbol(std::move(symbol)), id(std::move(id)) {
+UniqueSymbol::UniqueSymbol(Symbol symbol, primitive::Integer id) : m_symbol(std::move(symbol)), m_id(std::move(id)) {
}
@@ -27,33 +27,33 @@ SymbolBase* UniqueSymbol::plunder() && {
}
const Symbol& UniqueSymbol::getSymbol() const {
- return symbol;
+ return m_symbol;
}
const primitive::Integer& UniqueSymbol::getId() const {
- return id;
+ return m_id;
}
primitive::Integer& UniqueSymbol::getId() {
- return id;
+ return m_id;
}
int UniqueSymbol::compare(const UniqueSymbol& other) const {
- int res = symbol.getData().compare(other.symbol.getData());
- if(res == 0) res = id.compare(other.id);
+ int res = m_symbol.getData().compare(other.m_symbol.getData());
+ if(res == 0) res = m_id.compare(other.m_id);
return res;
}
void UniqueSymbol::operator>>(std::ostream& out) const {
- out << "(UniqueSymbol " << symbol << ", " << id << ")";
+ out << "(UniqueSymbol " << m_symbol << ", " << m_id << ")";
}
UniqueSymbol::operator std::string() const {
std::stringstream ss;
ss << "{";
- ss << symbol;
+ ss << m_symbol;
ss << ", ";
- ss << id;
+ ss << m_id;
ss << "}";
return std::move(ss).str();
}
@@ -71,17 +71,17 @@ UniqueSymbol UniqueSymbol::parse(std::deque<sax::Token>::iterator& input) {
void UniqueSymbol::compose(std::deque<sax::Token>& out) const {
out.emplace_back(UniqueSymbol::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
- alib::xmlApi<alphabet::Symbol>::compose(out, symbol);
- alib::xmlApi<primitive::Integer>::compose(out, id);
+ alib::xmlApi<alphabet::Symbol>::compose(out, m_symbol);
+ alib::xmlApi<primitive::Integer>::compose(out, m_id);
out.emplace_back(UniqueSymbol::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
}
SymbolBase* UniqueSymbol::next() const {
- return new UniqueSymbol(symbol, id.next());
+ return new UniqueSymbol(m_symbol, m_id.next());
}
SymbolBase* UniqueSymbol::inc() && {
- id.inc();
+ m_id.inc();
return NULL;
}
diff --git a/alib2data/src/alphabet/UniqueSymbol.h b/alib2data/src/alphabet/UniqueSymbol.h
index f9289b9d1c..2194b8c396 100644
--- a/alib2data/src/alphabet/UniqueSymbol.h
+++ b/alib2data/src/alphabet/UniqueSymbol.h
@@ -18,8 +18,8 @@ namespace alphabet {
*/
class UniqueSymbol : public SymbolBase {
protected:
- Symbol symbol;
- primitive::Integer id;
+ Symbol m_symbol;
+ primitive::Integer m_id;
public:
/**
diff --git a/alib2data/src/alphabet/ranked_symbol.hpp b/alib2data/src/alphabet/ranked_symbol.hpp
index 97704cab40..192fed6860 100644
--- a/alib2data/src/alphabet/ranked_symbol.hpp
+++ b/alib2data/src/alphabet/ranked_symbol.hpp
@@ -20,8 +20,8 @@ namespace std {
template < class SymbolType = alphabet::Symbol, class RankType = primitive::Unsigned >
class ranked_symbol {
protected:
- SymbolType symbol;
- RankType rank;
+ SymbolType m_symbol;
+ RankType m_rank;
public:
explicit ranked_symbol ( int number, unsigned rank );
@@ -76,44 +76,44 @@ public:
};
template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(int number, unsigned rank) : symbol(alphabet::symbolFrom(number)), rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(int number, unsigned rank) : m_symbol(alphabet::symbolFrom(number)), m_rank(RankType(rank)) {
}
template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(char character, unsigned rank) : symbol(alphabet::symbolFrom(character)), rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(char character, unsigned rank) : m_symbol(alphabet::symbolFrom(character)), m_rank(RankType(rank)) {
}
template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(std::string symbol, unsigned rank) : symbol(alphabet::symbolFrom(std::move(symbol))), rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(std::string symbol, unsigned rank) : m_symbol(alphabet::symbolFrom(std::move(symbol))), m_rank(RankType(rank)) {
}
template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(SymbolType symbol, RankType rank) : symbol(std::move(symbol)), rank(std::move(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(SymbolType symbol, RankType rank) : m_symbol(std::move(symbol)), m_rank(std::move(rank)) {
}
template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(SymbolType symbol, unsigned rank) : symbol(std::move(symbol)), rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(SymbolType symbol, unsigned rank) : m_symbol(std::move(symbol)), m_rank(RankType(rank)) {
}
template < class SymbolType, class RankType >
const SymbolType& ranked_symbol < SymbolType, RankType >::getSymbol() const {
- return symbol;
+ return m_symbol;
}
template < class SymbolType, class RankType >
const RankType& ranked_symbol < SymbolType, RankType >::getRank() const {
- return rank;
+ return m_rank;
}
template < class SymbolType, class RankType >
int ranked_symbol < SymbolType, RankType >::compare(const ranked_symbol& other) const {
- auto first = std::tie ( symbol, rank );
- auto second = std::tie ( other.symbol, other.rank );
+ auto first = std::tie ( m_symbol, m_rank );
+ auto second = std::tie ( other.m_symbol, other.m_rank );
std::compare<decltype(first)> comp;
return comp(first, second);
@@ -121,7 +121,7 @@ int ranked_symbol < SymbolType, RankType >::compare(const ranked_symbol& other)
template < class SymbolType, class RankType >
ranked_symbol < SymbolType, RankType >::operator std::string () const {
- return (std::string) symbol + "_" + (std::string) rank;
+ return (std::string) m_symbol + "_" + (std::string) m_rank;
}
} /* namespace std */
diff --git a/alib2data/src/label/HexavigesimalLabel.cpp b/alib2data/src/label/HexavigesimalLabel.cpp
index b120a6c74b..2ba50c0c02 100644
--- a/alib2data/src/label/HexavigesimalLabel.cpp
+++ b/alib2data/src/label/HexavigesimalLabel.cpp
@@ -13,7 +13,7 @@
namespace label {
-HexavigesimalLabel::HexavigesimalLabel(int hexavigesimal) : hexavigesimal(hexavigesimal) {
+HexavigesimalLabel::HexavigesimalLabel(int hexavigesimal) : m_hexavigesimal(hexavigesimal) {
}
@@ -26,23 +26,23 @@ LabelBase* HexavigesimalLabel::plunder() && {
}
int HexavigesimalLabel::getData() const {
- return hexavigesimal;
+ return m_hexavigesimal;
}
void HexavigesimalLabel::setData(int data) {
- this->hexavigesimal = data;
+ this->m_hexavigesimal = data;
}
int HexavigesimalLabel::compare(const HexavigesimalLabel& other) const {
- return hexavigesimal - other.hexavigesimal;
+ return m_hexavigesimal - other.m_hexavigesimal;
}
void HexavigesimalLabel::operator>>(std::ostream& out) const {
- out << "(HexavigesimalLabel " << std::toBase26(hexavigesimal) << ")";
+ out << "(HexavigesimalLabel " << std::toBase26(m_hexavigesimal) << ")";
}
HexavigesimalLabel::operator std::string() const {
- return std::toBase26(hexavigesimal);
+ return std::toBase26(m_hexavigesimal);
}
HexavigesimalLabel HexavigesimalLabel::parse(std::deque<sax::Token>::iterator& input) {
@@ -54,16 +54,16 @@ HexavigesimalLabel HexavigesimalLabel::parse(std::deque<sax::Token>::iterator& i
void HexavigesimalLabel::compose(std::deque<sax::Token>& out) const {
out.emplace_back(HexavigesimalLabel::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
- out.emplace_back(std::to_string(hexavigesimal), sax::Token::TokenType::CHARACTER);
+ out.emplace_back(std::to_string(m_hexavigesimal), sax::Token::TokenType::CHARACTER);
out.emplace_back(HexavigesimalLabel::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
}
LabelBase* HexavigesimalLabel::next() const {
- return new HexavigesimalLabel(hexavigesimal + 1);
+ return new HexavigesimalLabel(m_hexavigesimal + 1);
}
LabelBase* HexavigesimalLabel::inc() && {
- hexavigesimal++;
+ m_hexavigesimal++;
return NULL;
}
diff --git a/alib2data/src/label/HexavigesimalLabel.h b/alib2data/src/label/HexavigesimalLabel.h
index c611c607f9..f3135e7e7b 100644
--- a/alib2data/src/label/HexavigesimalLabel.h
+++ b/alib2data/src/label/HexavigesimalLabel.h
@@ -19,7 +19,7 @@ namespace label {
*/
class HexavigesimalLabel : public LabelBase {
protected:
- int hexavigesimal;
+ int m_hexavigesimal;
public:
/**
diff --git a/alib2data/src/label/LR0ItemsLabel.cpp b/alib2data/src/label/LR0ItemsLabel.cpp
index 9d064605e5..aeed4b08a8 100644
--- a/alib2data/src/label/LR0ItemsLabel.cpp
+++ b/alib2data/src/label/LR0ItemsLabel.cpp
@@ -18,7 +18,7 @@
namespace label {
-LR0ItemsLabel::LR0ItemsLabel ( grammar::parsing::LR0Items items ) : items ( items ) {
+LR0ItemsLabel::LR0ItemsLabel ( grammar::parsing::LR0Items items ) : m_items ( items ) {
}
LR0ItemsLabel::LR0ItemsLabel ( ) {
@@ -37,9 +37,9 @@ bool LR0ItemsLabel::operator < ( const LR0ItemsLabel & other ) const {
}
int LR0ItemsLabel::compare ( const LR0ItemsLabel & other ) const {
- if ( items < other.items ) {
+ if ( m_items < other.m_items ) {
return -1;
- } else if ( items > other.items ) {
+ } else if ( m_items > other.m_items ) {
return 1;
} else {
return 0;
@@ -47,7 +47,7 @@ int LR0ItemsLabel::compare ( const LR0ItemsLabel & other ) const {
}
void LR0ItemsLabel::operator>>(std::ostream & out) const {
- out << "(LR0ItemsLabel " << items << ")";
+ out << "(LR0ItemsLabel " << m_items << ")";
}
LR0ItemsLabel::operator std::string ( ) const {
@@ -65,7 +65,7 @@ LR0ItemsLabel LR0ItemsLabel::parse ( std::deque<sax::Token>::iterator& input ) {
void LR0ItemsLabel::compose(std::deque<sax::Token>& out) const {
out.emplace_back ( LR0ItemsLabel::getXmlTagName(), sax::Token::TokenType::START_ELEMENT );
- alib::xmlApi < grammar::parsing::LR0Items > ::compose ( out, items );
+ alib::xmlApi < grammar::parsing::LR0Items > ::compose ( out, m_items );
out.emplace_back ( LR0ItemsLabel::getXmlTagName(), sax::Token::TokenType::END_ELEMENT );
}
diff --git a/alib2data/src/label/LR0ItemsLabel.h b/alib2data/src/label/LR0ItemsLabel.h
index cdd22a49f4..78deb39946 100644
--- a/alib2data/src/label/LR0ItemsLabel.h
+++ b/alib2data/src/label/LR0ItemsLabel.h
@@ -25,7 +25,7 @@ namespace label {
*/
class LR0ItemsLabel : public LabelBase {
protected:
- grammar::parsing::LR0Items items;
+ grammar::parsing::LR0Items m_items;
public:
/**
@@ -45,11 +45,11 @@ public:
virtual LabelBase * plunder ( ) &&;
const grammar::parsing::LR0Items & getItems ( ) const {
- return items;
+ return m_items;
}
grammar::parsing::LR0Items & getItems ( ) {
- return items;
+ return m_items;
}
virtual int compare ( const ObjectBase & other ) const {
diff --git a/alib2data/src/label/LabelPairLabel.cpp b/alib2data/src/label/LabelPairLabel.cpp
index 13f2655d19..21fe6068b9 100644
--- a/alib2data/src/label/LabelPairLabel.cpp
+++ b/alib2data/src/label/LabelPairLabel.cpp
@@ -15,7 +15,7 @@
namespace label {
-LabelPairLabel::LabelPairLabel(std::pair<Label, Label> label) : label(std::move(label)) {
+LabelPairLabel::LabelPairLabel(std::pair<Label, Label> raw) : label(std::move(raw)) {
}
diff --git a/alib2data/src/label/LabelPairLabel.h b/alib2data/src/label/LabelPairLabel.h
index 48671e63d1..e57d94b9ae 100644
--- a/alib2data/src/label/LabelPairLabel.h
+++ b/alib2data/src/label/LabelPairLabel.h
@@ -25,7 +25,7 @@ public:
* Creates new symbol with given name.
* @param symbol name of the symbol
*/
- explicit LabelPairLabel ( std::pair < Label, Label > label );
+ explicit LabelPairLabel ( std::pair < Label, Label > raw );
virtual LabelBase * clone ( ) const;
diff --git a/alib2data/src/label/LabelSetLabel.cpp b/alib2data/src/label/LabelSetLabel.cpp
index 5da9dc4ac0..b42840dbf4 100644
--- a/alib2data/src/label/LabelSetLabel.cpp
+++ b/alib2data/src/label/LabelSetLabel.cpp
@@ -15,7 +15,7 @@
namespace label {
-LabelSetLabel::LabelSetLabel(std::set<Label> label) : label(std::move(label)) {
+LabelSetLabel::LabelSetLabel(std::set<Label> raw) : label(std::move(raw)) {
}
diff --git a/alib2data/src/label/LabelSetLabel.h b/alib2data/src/label/LabelSetLabel.h
index 28eab1853f..4fe385513d 100644
--- a/alib2data/src/label/LabelSetLabel.h
+++ b/alib2data/src/label/LabelSetLabel.h
@@ -25,7 +25,7 @@ public:
* Creates new symbol with given name.
* @param symbol name of the symbol
*/
- explicit LabelSetLabel ( std::set < Label > label );
+ explicit LabelSetLabel ( std::set < Label > raw );
virtual LabelBase * clone ( ) const;
diff --git a/alib2data/src/label/ObjectLabel.cpp b/alib2data/src/label/ObjectLabel.cpp
index 6a34912d47..bbdfbb518a 100644
--- a/alib2data/src/label/ObjectLabel.cpp
+++ b/alib2data/src/label/ObjectLabel.cpp
@@ -14,7 +14,7 @@
namespace label {
-ObjectLabel::ObjectLabel(alib::Object label) : label(std::move(label)) {
+ObjectLabel::ObjectLabel(alib::Object label) : m_label(std::move(label)) {
}
@@ -27,19 +27,19 @@ LabelBase* ObjectLabel::plunder() && {
}
const alib::Object& ObjectLabel::getData() const {
- return label;
+ return m_label;
}
int ObjectLabel::compare(const ObjectLabel& other) const {
- return label.getData().compare(other.label.getData());
+ return m_label.getData().compare(other.m_label.getData());
}
void ObjectLabel::operator>>(std::ostream& out) const {
- out << "(ObjectLabel " << label << ")";
+ out << "(ObjectLabel " << m_label << ")";
}
ObjectLabel::operator std::string() const {
- return (std::string) label;
+ return (std::string) m_label;
}
ObjectLabel ObjectLabel::parse(std::deque<sax::Token>::iterator& input) {
@@ -51,7 +51,7 @@ ObjectLabel ObjectLabel::parse(std::deque<sax::Token>::iterator& input) {
void ObjectLabel::compose(std::deque<sax::Token>& out) const {
out.emplace_back(ObjectLabel::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
- alib::xmlApi<alib::Object>::compose(out, label);
+ alib::xmlApi<alib::Object>::compose(out, m_label);
out.emplace_back(ObjectLabel::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
}
diff --git a/alib2data/src/label/ObjectLabel.h b/alib2data/src/label/ObjectLabel.h
index 3d0f625db8..ffc449de3e 100644
--- a/alib2data/src/label/ObjectLabel.h
+++ b/alib2data/src/label/ObjectLabel.h
@@ -19,7 +19,7 @@ namespace label {
*/
class ObjectLabel : public LabelBase {
protected:
- alib::Object label;
+ alib::Object m_label;
public:
/**
diff --git a/alib2data/src/label/PrimitiveLabel.cpp b/alib2data/src/label/PrimitiveLabel.cpp
index 0481012791..da424a14d8 100644
--- a/alib2data/src/label/PrimitiveLabel.cpp
+++ b/alib2data/src/label/PrimitiveLabel.cpp
@@ -14,7 +14,7 @@
namespace label {
-PrimitiveLabel::PrimitiveLabel(primitive::Primitive primitive) : primitive(std::move(primitive)) {
+PrimitiveLabel::PrimitiveLabel(primitive::Primitive primitive) : m_primitive(std::move(primitive)) {
}
@@ -27,23 +27,23 @@ LabelBase* PrimitiveLabel::plunder() && {
}
const primitive::Primitive& PrimitiveLabel::getData() const {
- return primitive;
+ return m_primitive;
}
primitive::Primitive& PrimitiveLabel::getData() {
- return primitive;
+ return m_primitive;
}
int PrimitiveLabel::compare(const PrimitiveLabel& other) const {
- return primitive.getData().compare(other.primitive.getData());
+ return m_primitive.getData().compare(other.m_primitive.getData());
}
void PrimitiveLabel::operator>>(std::ostream& out) const {
- out << "(PrimitiveLabel " << primitive << ")";
+ out << "(PrimitiveLabel " << m_primitive << ")";
}
PrimitiveLabel::operator std::string() const {
- return (std::string) primitive;
+ return (std::string) m_primitive;
}
PrimitiveLabel PrimitiveLabel::parse(std::deque<sax::Token>::iterator& input) {
@@ -55,16 +55,16 @@ PrimitiveLabel PrimitiveLabel::parse(std::deque<sax::Token>::iterator& input) {
void PrimitiveLabel::compose(std::deque<sax::Token>& out) const {
out.emplace_back(PrimitiveLabel::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
- alib::xmlApi<primitive::Primitive>::compose(out, primitive);
+ alib::xmlApi<primitive::Primitive>::compose(out, m_primitive);
out.emplace_back(PrimitiveLabel::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
}
LabelBase* PrimitiveLabel::next() const {
- return new PrimitiveLabel(primitive.next());
+ return new PrimitiveLabel(m_primitive.next());
}
LabelBase* PrimitiveLabel::inc() && {
- primitive.inc();
+ m_primitive.inc();
return NULL;
}
diff --git a/alib2data/src/label/PrimitiveLabel.h b/alib2data/src/label/PrimitiveLabel.h
index d116b6e230..889abfda31 100644
--- a/alib2data/src/label/PrimitiveLabel.h
+++ b/alib2data/src/label/PrimitiveLabel.h
@@ -19,7 +19,7 @@ namespace label {
*/
class PrimitiveLabel : public LabelBase {
protected:
- primitive::Primitive primitive;
+ primitive::Primitive m_primitive;
public:
/**
diff --git a/alib2data/src/label/UniqueLabel.cpp b/alib2data/src/label/UniqueLabel.cpp
index 320eb161cb..5e5a82834c 100644
--- a/alib2data/src/label/UniqueLabel.cpp
+++ b/alib2data/src/label/UniqueLabel.cpp
@@ -14,7 +14,7 @@
namespace label {
-UniqueLabel::UniqueLabel(Label label, primitive::Integer id) : label(std::move(label)), id(std::move(id)) {
+UniqueLabel::UniqueLabel(Label label, primitive::Integer id) : m_label(std::move(label)), m_id(std::move(id)) {
}
@@ -27,33 +27,33 @@ LabelBase* UniqueLabel::plunder() && {
}
const Label& UniqueLabel::getLabel() const {
- return label;
+ return m_label;
}
const primitive::Integer& UniqueLabel::getId() const {
- return id;
+ return m_id;
}
primitive::Integer& UniqueLabel::getId() {
- return id;
+ return m_id;
}
int UniqueLabel::compare(const UniqueLabel& other) const {
- int res = label.getData().compare(other.label.getData());
- if(res == 0) res = id.compare(other.id);
+ int res = m_label.getData().compare(other.m_label.getData());
+ if(res == 0) res = m_id.compare(other.m_id);
return res;
}
void UniqueLabel::operator>>(std::ostream& out) const {
- out << "(UniqueLabel " << label << ", " << id << ")";
+ out << "(UniqueLabel " << m_label << ", " << m_id << ")";
}
UniqueLabel::operator std::string() const {
std::stringstream ss;
ss << "{";
- ss << label;
+ ss << m_label;
ss << ", ";
- ss << id;
+ ss << m_id;
ss << "}";
return std::move(ss).str();
}
@@ -71,17 +71,17 @@ UniqueLabel UniqueLabel::parse(std::deque<sax::Token>::iterator& input) {
void UniqueLabel::compose(std::deque<sax::Token>& out) const {
out.emplace_back(UniqueLabel::getXmlTagName(), sax::Token::TokenType::START_ELEMENT);
- alib::xmlApi<label::Label>::compose(out, label);
- alib::xmlApi<primitive::Integer>::compose(out, id);
+ alib::xmlApi<label::Label>::compose(out, m_label);
+ alib::xmlApi<primitive::Integer>::compose(out, m_id);
out.emplace_back(UniqueLabel::getXmlTagName(), sax::Token::TokenType::END_ELEMENT);
}
LabelBase* UniqueLabel::next() const {
- return new UniqueLabel(label, id.next());
+ return new UniqueLabel(m_label, m_id.next());
}
LabelBase* UniqueLabel::inc() && {
- id.inc();
+ m_id.inc();
return NULL;
}
diff --git a/alib2data/src/label/UniqueLabel.h b/alib2data/src/label/UniqueLabel.h
index 420e78dc92..63cd3e7799 100644
--- a/alib2data/src/label/UniqueLabel.h
+++ b/alib2data/src/label/UniqueLabel.h
@@ -18,8 +18,8 @@ namespace label {
*/
class UniqueLabel : public LabelBase {
protected:
- Label label;
- primitive::Integer id;
+ Label m_label;
+ primitive::Integer m_id;
public:
/**
diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h
index 7fe51d1571..516e1242fc 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.h
+++ b/alib2data/src/regexp/formal/FormalRegExp.h
@@ -36,7 +36,7 @@ class GeneralAlphabet;
template < class SymbolType >
class FormalRegExp : public RegExpBase, public std::Components < FormalRegExp < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > {
protected:
- FormalRegExpStructure < SymbolType > regExp;
+ FormalRegExpStructure < SymbolType > m_regExp;
public:
/**
@@ -110,8 +110,8 @@ public:
namespace regexp {
template < class SymbolType >
-FormalRegExp < SymbolType >::FormalRegExp ( std::set < SymbolType > alphabet, FormalRegExpStructure < SymbolType > regExp ) : std::Components < FormalRegExp < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ), regExp ( std::move ( regExp ) ) {
- if ( !this->regExp.getStructure ( ).checkAlphabet ( getAlphabet ( ) ) )
+FormalRegExp < SymbolType >::FormalRegExp ( std::set < SymbolType > alphabet, FormalRegExpStructure < SymbolType > regExp ) : std::Components < FormalRegExp < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ), m_regExp ( std::move ( regExp ) ) {
+ if ( !this->m_regExp.getStructure ( ).checkAlphabet ( getAlphabet ( ) ) )
throw exception::CommonException ( "Input symbols not in the alphabet." );
}
@@ -139,12 +139,12 @@ RegExpBase * FormalRegExp < SymbolType >::plunder ( ) && {
template < class SymbolType >
const FormalRegExpStructure < SymbolType > & FormalRegExp < SymbolType >::getRegExp ( ) const {
- return regExp;
+ return m_regExp;
}
template < class SymbolType >
FormalRegExpStructure < SymbolType > & FormalRegExp < SymbolType >::getRegExp ( ) {
- return regExp;
+ return m_regExp;
}
template < class SymbolType >
@@ -152,18 +152,18 @@ void FormalRegExp < SymbolType >::setRegExp ( FormalRegExpStructure < SymbolType
if ( !param.getStructure ( ).checkAlphabet ( getAlphabet ( ) ) )
throw exception::CommonException ( "Input symbols not in the alphabet." );
- this->regExp = std::move ( param );
+ this->m_regExp = std::move ( param );
}
template < class SymbolType >
void FormalRegExp < SymbolType >::operator >>( std::ostream & out ) const {
- out << "(FormalRegExp " << this->regExp.getStructure ( ) << ")";
+ out << "(FormalRegExp " << this->m_regExp.getStructure ( ) << ")";
}
template < class SymbolType >
int FormalRegExp < SymbolType >::compare ( const FormalRegExp & other ) const {
- auto first = std::tie ( regExp.getStructure ( ), getAlphabet ( ) );
- auto second = std::tie ( other.regExp.getStructure ( ), other.getAlphabet ( ) );
+ auto first = std::tie ( m_regExp.getStructure ( ), getAlphabet ( ) );
+ auto second = std::tie ( other.m_regExp.getStructure ( ), other.getAlphabet ( ) );
std::compare < decltype ( first ) > comp;
diff --git a/alib2data/src/regexp/formal/FormalRegExpStructure.h b/alib2data/src/regexp/formal/FormalRegExpStructure.h
index c59ad9a742..46e2984db7 100644
--- a/alib2data/src/regexp/formal/FormalRegExpStructure.h
+++ b/alib2data/src/regexp/formal/FormalRegExpStructure.h
@@ -25,7 +25,7 @@ namespace regexp {
template < class SymbolType >
class FormalRegExpStructure {
protected:
- std::smart_ptr < FormalRegExpElement < SymbolType > > structure;
+ std::smart_ptr < FormalRegExpElement < SymbolType > > m_structure;
public:
explicit FormalRegExpStructure ( );
@@ -94,7 +94,7 @@ struct compare < regexp::FormalRegExpStructure < SymbolType > > {
namespace regexp {
template < class SymbolType >
-FormalRegExpStructure < SymbolType >::FormalRegExpStructure ( FormalRegExpElement < SymbolType > && structure ) : structure ( NULL ) {
+FormalRegExpStructure < SymbolType >::FormalRegExpStructure ( FormalRegExpElement < SymbolType > && structure ) : m_structure ( NULL ) {
setStructure ( std::move ( structure ) );
}
@@ -112,12 +112,12 @@ FormalRegExpStructure < SymbolType >::FormalRegExpStructure ( const UnboundedReg
template < class SymbolType >
const FormalRegExpElement < SymbolType > & FormalRegExpStructure < SymbolType >::getStructure ( ) const {
- return * structure;
+ return * m_structure;
}
template < class SymbolType >
FormalRegExpElement < SymbolType > & FormalRegExpStructure < SymbolType >::getStructure ( ) {
- return * structure;
+ return * m_structure;
}
template < class SymbolType >
@@ -127,7 +127,7 @@ void FormalRegExpStructure < SymbolType >::setStructure ( const FormalRegExpElem
template < class SymbolType >
void FormalRegExpStructure < SymbolType >::setStructure ( FormalRegExpElement < SymbolType > && param ) {
- this->structure = std::smart_ptr < FormalRegExpElement < SymbolType > > ( std::move ( param ).plunder ( ) );
+ this->m_structure = std::smart_ptr < FormalRegExpElement < SymbolType > > ( std::move ( param ).plunder ( ) );
}
} /* namespace regexp */
diff --git a/alib2data/src/regexp/formal/FormalRegExpSymbol.h b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
index fa8c727aed..25b2528750 100644
--- a/alib2data/src/regexp/formal/FormalRegExpSymbol.h
+++ b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
@@ -19,7 +19,7 @@ namespace regexp {
*/
template < class SymbolType >
class FormalRegExpSymbol : public FormalRegExpElement < SymbolType >, public std::NullaryNode < std::smart_ptr < FormalRegExpElement < SymbolType > >, std::smart_ptr < const FormalRegExpElement < SymbolType > >, FormalRegExpSymbol < SymbolType > > {
- SymbolType symbol;
+ SymbolType m_symbol;
public:
void accept ( typename FormalRegExpElement < SymbolType >::Visitor & visitor ) const override {
@@ -90,19 +90,19 @@ public:
namespace regexp {
template < class SymbolType >
-FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( int number ) : symbol ( alphabet::symbolFrom ( number ) ) {
+FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( int number ) : m_symbol ( alphabet::symbolFrom ( number ) ) {
}
template < class SymbolType >
-FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( char character ) : symbol ( alphabet::symbolFrom ( character ) ) {
+FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( char character ) : m_symbol ( alphabet::symbolFrom ( character ) ) {
}
template < class SymbolType >
-FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( const std::string & label ) : symbol ( alphabet::symbolFrom ( label ) ) {
+FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( const std::string & label ) : m_symbol ( alphabet::symbolFrom ( label ) ) {
}
template < class SymbolType >
-FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( SymbolType symbol ) : symbol ( std::move ( symbol ) ) {
+FormalRegExpSymbol < SymbolType >::FormalRegExpSymbol ( SymbolType symbol ) : m_symbol ( std::move ( symbol ) ) {
}
template < class SymbolType >
@@ -117,37 +117,37 @@ FormalRegExpSymbol < SymbolType > * FormalRegExpSymbol < SymbolType >::plunder (
template < class SymbolType >
std::smart_ptr < UnboundedRegExpElement < SymbolType > > FormalRegExpSymbol < SymbolType >::asUnbounded ( ) const {
- return std::smart_ptr < UnboundedRegExpElement < SymbolType > > ( new UnboundedRegExpSymbol < SymbolType > ( this->symbol ) );
+ return std::smart_ptr < UnboundedRegExpElement < SymbolType > > ( new UnboundedRegExpSymbol < SymbolType > ( this->m_symbol ) );
}
template < class SymbolType >
int FormalRegExpSymbol < SymbolType >::compare ( const FormalRegExpSymbol & other ) const {
- return symbol.getData ( ).compare ( other.symbol.getData ( ) );
+ return m_symbol.getData ( ).compare ( other.m_symbol.getData ( ) );
}
template < class SymbolType >
void FormalRegExpSymbol < SymbolType >::operator >>( std::ostream & out ) const {
- out << "(FormalRegExpSymbol " << symbol << ")";
+ out << "(FormalRegExpSymbol " << m_symbol << ")";
}
template < class SymbolType >
bool FormalRegExpSymbol < SymbolType >::testSymbol ( const SymbolType & symbol ) const {
- return symbol == this->symbol;
+ return symbol == this->m_symbol;
}
template < class SymbolType >
void FormalRegExpSymbol < SymbolType >::computeMinimalAlphabet ( std::set < SymbolType > & alphabet ) const {
- alphabet.insert ( symbol );
+ alphabet.insert ( m_symbol );
}
template < class SymbolType >
bool FormalRegExpSymbol < SymbolType >::checkAlphabet ( const std::set < SymbolType > & alphabet ) const {
- return alphabet.count ( symbol );
+ return alphabet.count ( m_symbol );
}
template < class SymbolType >
const SymbolType & FormalRegExpSymbol < SymbolType >::getSymbol ( ) const {
- return symbol;
+ return m_symbol;
}
template < class SymbolType >
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
index c7682ef1d8..dc701f5c2b 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
@@ -36,7 +36,7 @@ class GeneralAlphabet;
template < class SymbolType >
class UnboundedRegExp : public RegExpBase, public std::Components < UnboundedRegExp < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > {
protected:
- UnboundedRegExpStructure < SymbolType > regExp;
+ UnboundedRegExpStructure < SymbolType > m_regExp;
public:
/**
@@ -110,8 +110,8 @@ public:
namespace regexp {
template < class SymbolType >
-UnboundedRegExp < SymbolType >::UnboundedRegExp ( std::set < SymbolType > alphabet, UnboundedRegExpStructure < SymbolType > regExp ) : std::Components < UnboundedRegExp, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ), regExp ( std::move ( regExp ) ) {
- if ( !this->regExp.getStructure ( ).checkAlphabet ( getAlphabet ( ) ) )
+UnboundedRegExp < SymbolType >::UnboundedRegExp ( std::set < SymbolType > alphabet, UnboundedRegExpStructure < SymbolType > regExp ) : std::Components < UnboundedRegExp, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ), m_regExp ( std::move ( regExp ) ) {
+ if ( !this->m_regExp.getStructure ( ).checkAlphabet ( getAlphabet ( ) ) )
throw exception::CommonException ( "Input symbols not in the alphabet." );
}
@@ -139,12 +139,12 @@ RegExpBase * UnboundedRegExp < SymbolType >::plunder ( ) && {
template < class SymbolType >
const UnboundedRegExpStructure < SymbolType > & UnboundedRegExp < SymbolType >::getRegExp ( ) const {
- return regExp;
+ return m_regExp;
}
template < class SymbolType >
UnboundedRegExpStructure < SymbolType > & UnboundedRegExp < SymbolType >::getRegExp ( ) {
- return regExp;
+ return m_regExp;
}
template < class SymbolType >
@@ -152,18 +152,18 @@ void UnboundedRegExp < SymbolType >::setRegExp ( UnboundedRegExpStructure < Symb
if ( !param.getStructure ( ).checkAlphabet ( getAlphabet ( ) ) )
throw exception::CommonException ( "Input symbols not in the alphabet." );
- this->regExp = std::move ( param );
+ this->m_regExp = std::move ( param );
}
template < class SymbolType >
void UnboundedRegExp < SymbolType >::operator >>( std::ostream & out ) const {
- out << "(UnboundedRegExp " << this->regExp.getStructure ( ) << ")";
+ out << "(UnboundedRegExp " << this->m_regExp.getStructure ( ) << ")";
}
template < class SymbolType >
int UnboundedRegExp < SymbolType >::compare ( const UnboundedRegExp & other ) const {
- auto first = std::tie ( regExp.getStructure ( ), getAlphabet ( ) );
- auto second = std::tie ( other.regExp.getStructure ( ), other.getAlphabet ( ) );
+ auto first = std::tie ( m_regExp.getStructure ( ), getAlphabet ( ) );
+ auto second = std::tie ( other.m_regExp.getStructure ( ), other.getAlphabet ( ) );
std::compare < decltype ( first ) > comp;
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h b/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
index 14e699b939..ba2111a77b 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpStructure.h
@@ -25,7 +25,7 @@ namespace regexp {
template < class SymbolType >
class UnboundedRegExpStructure {
protected:
- std::smart_ptr < UnboundedRegExpElement < SymbolType > > structure;
+ std::smart_ptr < UnboundedRegExpElement < SymbolType > > m_structure;
public:
explicit UnboundedRegExpStructure ( );
@@ -94,7 +94,7 @@ struct compare < regexp::UnboundedRegExpStructure < SymbolType > > {
namespace regexp {
template < class SymbolType >
-UnboundedRegExpStructure < SymbolType >::UnboundedRegExpStructure ( UnboundedRegExpElement < SymbolType > && structure ) : structure ( NULL ) {
+UnboundedRegExpStructure < SymbolType >::UnboundedRegExpStructure ( UnboundedRegExpElement < SymbolType > && structure ) : m_structure ( NULL ) {
setStructure ( std::move ( structure ) );
}
@@ -112,12 +112,12 @@ UnboundedRegExpStructure < SymbolType >::UnboundedRegExpStructure ( const Formal
template < class SymbolType >
const UnboundedRegExpElement < SymbolType > & UnboundedRegExpStructure < SymbolType >::getStructure ( ) const {
- return * structure;
+ return * m_structure;
}
template < class SymbolType >
UnboundedRegExpElement < SymbolType > & UnboundedRegExpStructure < SymbolType >::getStructure ( ) {
- return * structure;
+ return * m_structure;
}
template < class SymbolType >
@@ -127,7 +127,7 @@ void UnboundedRegExpStructure < SymbolType >::setStructure ( const UnboundedRegE
template < class SymbolType >
void UnboundedRegExpStructure < SymbolType >::setStructure ( UnboundedRegExpElement < SymbolType > && param ) {
- this->structure = std::smart_ptr < UnboundedRegExpElement < SymbolType > > ( std::move ( param ).plunder ( ) );
+ this->m_structure = std::smart_ptr < UnboundedRegExpElement < SymbolType > > ( std::move ( param ).plunder ( ) );
}
} /* namespace regexp */
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
index a261dbed13..a21e8bf342 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
@@ -19,7 +19,7 @@ namespace regexp {
*/
template < class SymbolType >
class UnboundedRegExpSymbol : public UnboundedRegExpElement < SymbolType >, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement < SymbolType > >, std::smart_ptr < const UnboundedRegExpElement < SymbolType > >, UnboundedRegExpSymbol < SymbolType > > {
- SymbolType symbol;
+ SymbolType m_symbol;
public:
void accept ( typename UnboundedRegExpElement < SymbolType >::Visitor & visitor ) const override {
@@ -92,19 +92,19 @@ public:
namespace regexp {
template < class SymbolType >
-UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( int number ) : symbol ( alphabet::symbolFrom ( number ) ) {
+UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( int number ) : m_symbol ( alphabet::symbolFrom ( number ) ) {
}
template < class SymbolType >
-UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( char character ) : symbol ( alphabet::symbolFrom ( character ) ) {
+UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( char character ) : m_symbol ( alphabet::symbolFrom ( character ) ) {
}
template < class SymbolType >
-UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( const std::string & label ) : symbol ( alphabet::symbolFrom ( label ) ) {
+UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( const std::string & label ) : m_symbol ( alphabet::symbolFrom ( label ) ) {
}
template < class SymbolType >
-UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( SymbolType symbol ) : symbol ( std::move ( symbol ) ) {
+UnboundedRegExpSymbol < SymbolType >::UnboundedRegExpSymbol ( SymbolType symbol ) : m_symbol ( std::move ( symbol ) ) {
}
template < class SymbolType >
@@ -119,37 +119,37 @@ UnboundedRegExpSymbol < SymbolType > * UnboundedRegExpSymbol < SymbolType >::plu
template < class SymbolType >
std::smart_ptr < FormalRegExpElement < SymbolType > > UnboundedRegExpSymbol < SymbolType >::asFormal ( ) const {
- return std::smart_ptr < FormalRegExpElement < SymbolType > > ( new FormalRegExpSymbol < SymbolType > ( this->symbol ) );
+ return std::smart_ptr < FormalRegExpElement < SymbolType > > ( new FormalRegExpSymbol < SymbolType > ( this->m_symbol ) );
}
template < class SymbolType >
int UnboundedRegExpSymbol < SymbolType >::compare ( const UnboundedRegExpSymbol & other ) const {
- return symbol.getData ( ).compare ( other.symbol.getData ( ) );
+ return m_symbol.getData ( ).compare ( other.m_symbol.getData ( ) );
}
template < class SymbolType >
void UnboundedRegExpSymbol < SymbolType >::operator >>( std::ostream & out ) const {
- out << "(UnboundedRegExpSymbol " << symbol << ")";
+ out << "(UnboundedRegExpSymbol " << m_symbol << ")";
}
template < class SymbolType >
bool UnboundedRegExpSymbol < SymbolType >::testSymbol ( const SymbolType & symbol ) const {
- return symbol == this->symbol;
+ return symbol == this->m_symbol;
}
template < class SymbolType >
bool UnboundedRegExpSymbol < SymbolType >::checkAlphabet ( const std::set < SymbolType > & alphabet ) const {
- return alphabet.count ( symbol );
+ return alphabet.count ( m_symbol );
}
template < class SymbolType >
void UnboundedRegExpSymbol < SymbolType >::computeMinimalAlphabet ( std::set < SymbolType > & alphabet ) const {
- alphabet.insert ( this->symbol );
+ alphabet.insert ( this->m_symbol );
}
template < class SymbolType >
const SymbolType & UnboundedRegExpSymbol < SymbolType >::getSymbol ( ) const {
- return this->symbol;
+ return this->m_symbol;
}
template < class SymbolType >
diff --git a/alib2data/src/rte/formal/FormalRTE.h b/alib2data/src/rte/formal/FormalRTE.h
index d969e03922..332e36e353 100644
--- a/alib2data/src/rte/formal/FormalRTE.h
+++ b/alib2data/src/rte/formal/FormalRTE.h
@@ -37,7 +37,7 @@ class ConstantAlphabet;
template < class SymbolType, class RankType >
class FormalRTE : public RTEBase, public std::Components < FormalRTE < SymbolType, RankType >, std::ranked_symbol < SymbolType, RankType >, std::tuple < GeneralAlphabet, ConstantAlphabet >, std::tuple < > > {
protected:
- FormalRTEStructure < SymbolType, RankType > rte;
+ FormalRTEStructure < SymbolType, RankType > m_rte;
public:
explicit FormalRTE ( );
@@ -141,8 +141,8 @@ public:
};
template < class SymbolType, class RankType >
-FormalRTE < SymbolType, RankType >::FormalRTE ( std::set < std::ranked_symbol < SymbolType, RankType > > alphabetF, std::set < std::ranked_symbol < SymbolType, RankType > > alphabetK, FormalRTEStructure < SymbolType, RankType > rte ) : std::Components < FormalRTE, std::ranked_symbol < SymbolType, RankType >, std::tuple < GeneralAlphabet, ConstantAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabetF ), std::move ( alphabetK ) ), std::tuple < > ( ) ), rte ( std::move ( rte ) ) {
- if ( !this->rte.getStructure ( ).checkAlphabet ( getAlphabet ( ), getSubstitutionAlphabet ( ) ) )
+FormalRTE < SymbolType, RankType >::FormalRTE ( std::set < std::ranked_symbol < SymbolType, RankType > > alphabetF, std::set < std::ranked_symbol < SymbolType, RankType > > alphabetK, FormalRTEStructure < SymbolType, RankType > rte ) : std::Components < FormalRTE, std::ranked_symbol < SymbolType, RankType >, std::tuple < GeneralAlphabet, ConstantAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabetF ), std::move ( alphabetK ) ), std::tuple < > ( ) ), m_rte ( std::move ( rte ) ) {
+ if ( !this->m_rte.getStructure ( ).checkAlphabet ( getAlphabet ( ), getSubstitutionAlphabet ( ) ) )
throw exception::CommonException ( "Input symbols not in the alphabet." );
}
@@ -170,12 +170,12 @@ RTEBase * FormalRTE < SymbolType, RankType >::plunder ( ) && {
template < class SymbolType, class RankType >
const FormalRTEStructure < SymbolType, RankType > & FormalRTE < SymbolType, RankType >::getRTE ( ) const {
- return rte;
+ return m_rte;
}
template < class SymbolType, class RankType >
FormalRTEStructure < SymbolType, RankType > & FormalRTE < SymbolType, RankType >::getRTE ( ) {
- return rte;
+ return m_rte;
}
template < class SymbolType, class RankType >
@@ -183,18 +183,18 @@ void FormalRTE < SymbolType, RankType >::setRTE ( FormalRTEStructure < SymbolTyp
if ( !param.getStructure ( ).checkAlphabet ( getAlphabet ( ), getSubstitutionAlphabet ( ) ) )
throw exception::CommonException ( "Symbols not matching alphabets." );
- this->rte = std::move ( param );
+ this->m_rte = std::move ( param );
}
template < class SymbolType, class RankType >
void FormalRTE < SymbolType, RankType >::operator >>( std::ostream & out ) const {
- out << "(FormalRTE " << this->rte << ")";
+ out << "(FormalRTE " << this->m_rte << ")";
}
template < class SymbolType, class RankType >
int FormalRTE < SymbolType, RankType >::compare ( const FormalRTE & other ) const {
- auto first = std::tie ( rte, getAlphabet ( ), getSubstitutionAlphabet ( ) );
- auto second = std::tie ( rte, other.getAlphabet ( ), getSubstitutionAlphabet ( ) );
+ auto first = std::tie ( m_rte, getAlphabet ( ), getSubstitutionAlphabet ( ) );
+ auto second = std::tie ( m_rte, other.getAlphabet ( ), getSubstitutionAlphabet ( ) );
std::compare < decltype ( first ) > comp;
diff --git a/alib2data/src/rte/formal/FormalRTEIteration.h b/alib2data/src/rte/formal/FormalRTEIteration.h
index ed03733fc4..50be3ec68a 100644
--- a/alib2data/src/rte/formal/FormalRTEIteration.h
+++ b/alib2data/src/rte/formal/FormalRTEIteration.h
@@ -24,7 +24,7 @@ namespace rte {
template < class SymbolType, class RankType >
class FormalRTEIteration : public FormalRTEElement < SymbolType, RankType >, public std::UnaryNode < std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, std::smart_ptr < const FormalRTEElement < SymbolType, RankType > >, FormalRTEIteration < SymbolType, RankType > > {
protected:
- std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > substitutionSymbol;
+ std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > m_substitutionSymbol;
public:
void accept ( typename FormalRTEElement < SymbolType, RankType >::Visitor & visitor ) const {
@@ -96,7 +96,7 @@ public:
};
template < class SymbolType, class RankType >
-FormalRTEIteration < SymbolType, RankType >::FormalRTEIteration ( FormalRTEElement < SymbolType, RankType > && element, FormalRTESymbolSubst < SymbolType, RankType > substitutionSymbol ) : std::UnaryNode < std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, std::smart_ptr < const FormalRTEElement < SymbolType, RankType > >, FormalRTEIteration < SymbolType, RankType > > ( std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( element ).plunder ( ) ) ), substitutionSymbol ( std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( substitutionSymbol ).plunder ( ) ) ) {
+FormalRTEIteration < SymbolType, RankType >::FormalRTEIteration ( FormalRTEElement < SymbolType, RankType > && element, FormalRTESymbolSubst < SymbolType, RankType > substitutionSymbol ) : std::UnaryNode < std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, std::smart_ptr < const FormalRTEElement < SymbolType, RankType > >, FormalRTEIteration < SymbolType, RankType > > ( std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( element ).plunder ( ) ) ), m_substitutionSymbol ( std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( substitutionSymbol ).plunder ( ) ) ) {
}
template < class SymbolType, class RankType >
@@ -115,12 +115,12 @@ FormalRTEElement < SymbolType, RankType > & FormalRTEIteration < SymbolType, Ran
template < class SymbolType, class RankType >
const FormalRTESymbolSubst < SymbolType, RankType > & FormalRTEIteration < SymbolType, RankType >::getSubstitutionSymbol ( ) const {
- return * substitutionSymbol;
+ return * m_substitutionSymbol;
}
template < class SymbolType, class RankType >
FormalRTESymbolSubst < SymbolType, RankType > & FormalRTEIteration < SymbolType, RankType >::getSubstitutionSymbol ( ) {
- return * substitutionSymbol;
+ return * m_substitutionSymbol;
}
template < class SymbolType, class RankType >
@@ -135,7 +135,7 @@ void FormalRTEIteration < SymbolType, RankType >::setElement ( FormalRTEElement
template < class SymbolType, class RankType >
void FormalRTEIteration < SymbolType, RankType >::setSubstitutionSymbol ( FormalRTESymbolSubst < SymbolType, RankType > symbol ) {
- substitutionSymbol = std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( symbol ).plunder ( ) );
+ m_substitutionSymbol = std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( symbol ).plunder ( ) );
}
template < class SymbolType, class RankType >
@@ -160,7 +160,7 @@ int FormalRTEIteration < SymbolType, RankType >::compare ( const FormalRTEIterat
template < class SymbolType, class RankType >
void FormalRTEIteration < SymbolType, RankType >::operator >>( std::ostream & out ) const {
- out << "(RTEFormalRTEIteration " << * substitutionSymbol << " " << getElement ( ) << ")";
+ out << "(RTEFormalRTEIteration " << * m_substitutionSymbol << " " << getElement ( ) << ")";
}
template < class SymbolType, class RankType >
@@ -170,7 +170,7 @@ bool FormalRTEIteration < SymbolType, RankType >::testSymbol ( const std::ranked
template < class SymbolType, class RankType >
void FormalRTEIteration < SymbolType, RankType >::computeMinimalAlphabet ( std::set < std::ranked_symbol < SymbolType, RankType > > & alphabetF, std::set < std::ranked_symbol < SymbolType, RankType > > & alphabetK ) const {
- alphabetK.insert ( substitutionSymbol->getSymbol ( ) );
+ alphabetK.insert ( m_substitutionSymbol->getSymbol ( ) );
this->getChild ( )->computeMinimalAlphabet ( alphabetF, alphabetK );
}
diff --git a/alib2data/src/rte/formal/FormalRTEStructure.h b/alib2data/src/rte/formal/FormalRTEStructure.h
index 8a4efaf2cc..170de16de6 100644
--- a/alib2data/src/rte/formal/FormalRTEStructure.h
+++ b/alib2data/src/rte/formal/FormalRTEStructure.h
@@ -26,7 +26,7 @@ namespace rte {
template < class SymbolType, class RankType >
class FormalRTEStructure {
protected:
- std::smart_ptr < FormalRTEElement < SymbolType, RankType > > structure;
+ std::smart_ptr < FormalRTEElement < SymbolType, RankType > > m_structure;
public:
explicit FormalRTEStructure ( );
@@ -93,7 +93,7 @@ struct compare < rte::FormalRTEStructure < SymbolType, RankType > > {
namespace rte {
template < class SymbolType, class RankType >
-FormalRTEStructure < SymbolType, RankType >::FormalRTEStructure ( FormalRTEElement < SymbolType, RankType > && structure ) : structure ( NULL ) {
+FormalRTEStructure < SymbolType, RankType >::FormalRTEStructure ( FormalRTEElement < SymbolType, RankType > && structure ) : m_structure ( NULL ) {
setStructure ( std::move ( structure ) );
}
@@ -107,12 +107,12 @@ FormalRTEStructure < SymbolType, RankType >::FormalRTEStructure ( ) : FormalRTES
template < class SymbolType, class RankType >
const FormalRTEElement < SymbolType, RankType > & FormalRTEStructure < SymbolType, RankType >::getStructure ( ) const {
- return * structure;
+ return * m_structure;
}
template < class SymbolType, class RankType >
FormalRTEElement < SymbolType, RankType > & FormalRTEStructure < SymbolType, RankType >::getStructure ( ) {
- return * structure;
+ return * m_structure;
}
template < class SymbolType, class RankType >
@@ -122,7 +122,7 @@ void FormalRTEStructure < SymbolType, RankType >::setStructure ( const FormalRTE
template < class SymbolType, class RankType >
void FormalRTEStructure < SymbolType, RankType >::setStructure ( FormalRTEElement < SymbolType, RankType > && param ) {
- this->structure = std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( param ).plunder ( ) );
+ this->m_structure = std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( param ).plunder ( ) );
}
} /* namespace rte */
diff --git a/alib2data/src/rte/formal/FormalRTESubstitution.h b/alib2data/src/rte/formal/FormalRTESubstitution.h
index 18cf3d0d73..ca45b93670 100644
--- a/alib2data/src/rte/formal/FormalRTESubstitution.h
+++ b/alib2data/src/rte/formal/FormalRTESubstitution.h
@@ -23,7 +23,7 @@ namespace rte {
template < class SymbolType, class RankType >
class FormalRTESubstitution : public FormalRTEElement < SymbolType, RankType >, public std::BinaryNode < std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, FormalRTESubstitution < SymbolType, RankType > > {
protected:
- std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > substitutionSymbol; // substite this in left by right
+ std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > m_substitutionSymbol; // substite this in left by right
public:
void accept ( typename FormalRTEElement < SymbolType, RankType >::Visitor & visitor ) const {
@@ -99,7 +99,7 @@ public:
};
template < class SymbolType, class RankType >
-FormalRTESubstitution < SymbolType, RankType >::FormalRTESubstitution ( FormalRTEElement < SymbolType, RankType > && left, FormalRTEElement < SymbolType, RankType > && right, FormalRTESymbolSubst < SymbolType, RankType > substitutionSymbol ) : std::BinaryNode < std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, FormalRTESubstitution < SymbolType, RankType > > ( std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( left ).plunder ( ) ), std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( right ).plunder ( ) ) ), substitutionSymbol ( std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( substitutionSymbol ).plunder ( ) ) ) {
+FormalRTESubstitution < SymbolType, RankType >::FormalRTESubstitution ( FormalRTEElement < SymbolType, RankType > && left, FormalRTEElement < SymbolType, RankType > && right, FormalRTESymbolSubst < SymbolType, RankType > substitutionSymbol ) : std::BinaryNode < std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, std::smart_ptr < FormalRTEElement < SymbolType, RankType > >, FormalRTESubstitution < SymbolType, RankType > > ( std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( left ).plunder ( ) ), std::smart_ptr < FormalRTEElement < SymbolType, RankType > > ( std::move ( right ).plunder ( ) ) ), m_substitutionSymbol ( std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( substitutionSymbol ).plunder ( ) ) ) {
}
template < class SymbolType, class RankType >
@@ -118,7 +118,7 @@ const FormalRTEElement < SymbolType, RankType > & FormalRTESubstitution < Symbol
template < class SymbolType, class RankType >
const FormalRTESymbolSubst < SymbolType, RankType > & FormalRTESubstitution < SymbolType, RankType >::getSubstitutionSymbol ( ) const {
- return * this->substitutionSymbol;
+ return * this->m_substitutionSymbol;
}
template < class SymbolType, class RankType >
@@ -133,7 +133,7 @@ FormalRTEElement < SymbolType, RankType > & FormalRTESubstitution < SymbolType,
template < class SymbolType, class RankType >
FormalRTESymbolSubst < SymbolType, RankType > & FormalRTESubstitution < SymbolType, RankType >::getSubstitutionSymbol ( ) {
- return * this->substitutionSymbol;
+ return * this->m_substitutionSymbol;
}
template < class SymbolType, class RankType >
@@ -158,7 +158,7 @@ void FormalRTESubstitution < SymbolType, RankType >::setRightElement ( FormalRTE
template < class SymbolType, class RankType >
void FormalRTESubstitution < SymbolType, RankType >::setSubstitutionSymbol ( FormalRTESymbolSubst < SymbolType, RankType > symbol ) {
- substitutionSymbol = std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( symbol ).plunder ( ) );
+ m_substitutionSymbol = std::smart_ptr < FormalRTESymbolSubst < SymbolType, RankType > > ( std::move ( symbol ).plunder ( ) );
}
template < class SymbolType, class RankType >
@@ -185,7 +185,7 @@ template < class SymbolType, class RankType >
void FormalRTESubstitution < SymbolType, RankType >::operator >>( std::ostream & out ) const {
out << "(FormalRTESubstitution";
out << " " << getLeftElement ( );
- out << " " << * substitutionSymbol;
+ out << " " << * m_substitutionSymbol;
out << " " << getRightElement ( );
out << ")";
}
@@ -196,14 +196,14 @@ bool FormalRTESubstitution < SymbolType, RankType >::testSymbol ( const std::ran
if ( getRightElement ( ).testSymbol ( symbol ) ) return true;
- if ( substitutionSymbol->getSymbol ( ) == symbol ) return true;
+ if ( m_substitutionSymbol->getSymbol ( ) == symbol ) return true;
return false;
}
template < class SymbolType, class RankType >
void FormalRTESubstitution < SymbolType, RankType >::computeMinimalAlphabet ( std::set < std::ranked_symbol < SymbolType, RankType > > & alphabetF, std::set < std::ranked_symbol < SymbolType, RankType > > & alphabetK ) const {
- alphabetK.insert ( substitutionSymbol->getSymbol ( ) );
+ alphabetK.insert ( m_substitutionSymbol->getSymbol ( ) );
getLeftElement ( ).computeMinimalAlphabet ( alphabetF, alphabetK );
getRightElement ( ).computeMinimalAlphabet ( alphabetF, alphabetK );
}
diff --git a/alib2data/src/rte/formal/FormalRTESymbol.h b/alib2data/src/rte/formal/FormalRTESymbol.h
index 27ebcbb306..b89f366eff 100644
--- a/alib2data/src/rte/formal/FormalRTESymbol.h
+++ b/alib2data/src/rte/formal/FormalRTESymbol.h
@@ -19,7 +19,7 @@ namespace rte {
template < class SymbolType, class RankType >
class FormalRTESymbol : public FormalRTEElement < SymbolType, RankType > {
protected:
- std::ranked_symbol < SymbolType, RankType > symbol;
+ std::ranked_symbol < SymbolType, RankType > m_symbol;
public:
FormalRTESymbol ( std::ranked_symbol < SymbolType, RankType > symbol );
@@ -38,12 +38,12 @@ public:
};
template < class SymbolType, class RankType >
-FormalRTESymbol < SymbolType, RankType >::FormalRTESymbol ( std::ranked_symbol < SymbolType, RankType > symbol ) : symbol ( std::move ( symbol ) ) {
+FormalRTESymbol < SymbolType, RankType >::FormalRTESymbol ( std::ranked_symbol < SymbolType, RankType > symbol ) : m_symbol ( std::move ( symbol ) ) {
}
template < class SymbolType, class RankType >
const std::ranked_symbol < SymbolType, RankType > & FormalRTESymbol < SymbolType, RankType >::getSymbol ( ) const {
- return symbol;
+ return m_symbol;
}
} /* namespace rte */
diff --git a/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h b/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h
index f303458eed..0b1c8ff8a7 100644
--- a/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h
+++ b/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h
@@ -119,7 +119,7 @@ void FormalRTESymbolAlphabet < SymbolType, RankType >::appendElement ( FormalRTE
template < class SymbolType, class RankType >
int FormalRTESymbolAlphabet < SymbolType, RankType >::compare ( const FormalRTESymbolAlphabet < SymbolType, RankType > & other ) const {
auto first = std::tie ( this->getSymbol ( ), this->getChildren ( ) );
- auto second = std::tie ( other.symbol, other.getChildren ( ) );
+ auto second = std::tie ( other.getSymbol ( ), other.getChildren ( ) );
std::compare < decltype ( first ) > comp;
diff --git a/alib2data/src/rte/formal/FormalRTESymbolSubst.h b/alib2data/src/rte/formal/FormalRTESymbolSubst.h
index 97e31dc824..b907d52860 100644
--- a/alib2data/src/rte/formal/FormalRTESymbolSubst.h
+++ b/alib2data/src/rte/formal/FormalRTESymbolSubst.h
@@ -94,7 +94,7 @@ int FormalRTESymbolSubst < SymbolType, RankType >::compare ( const FormalRTESymb
template < class SymbolType, class RankType >
void FormalRTESymbolSubst < SymbolType, RankType >::operator >>( std::ostream & out ) const {
- out << "(FormalRTESymbolSubst " << " symbol = " << this->symbol << "})";
+ out << "(FormalRTESymbolSubst " << " symbol = " << this->getSymbol ( ) << "})";
}
template < class SymbolType, class RankType >
diff --git a/alib2data/src/string/CyclicString.h b/alib2data/src/string/CyclicString.h
index 95e57b9ffa..39b067ae20 100644
--- a/alib2data/src/string/CyclicString.h
+++ b/alib2data/src/string/CyclicString.h
@@ -37,10 +37,10 @@ class CyclicString : public StringBase, public std::Components < CyclicString <
public:
explicit CyclicString ( );
- explicit CyclicString ( std::set < SymbolType > alphabet, std::vector < SymbolType > data );
- explicit CyclicString ( std::vector < SymbolType > data );
- explicit CyclicString ( const std::string & string );
- explicit CyclicString ( const char * string );
+ explicit CyclicString ( std::set < SymbolType > alphabet, std::vector < SymbolType > str );
+ explicit CyclicString ( std::vector < SymbolType > str );
+ explicit CyclicString ( const std::string & str );
+ explicit CyclicString ( const char * str );
explicit CyclicString ( const Epsilon < > & epsilon );
virtual StringBase * clone ( ) const;
@@ -59,7 +59,7 @@ public:
*/
const std::vector < SymbolType > & getContent ( ) const;
- void setContent ( std::vector < SymbolType > data );
+ void setContent ( std::vector < SymbolType > str );
/**
* @return true if string is an empty word (vector length is 0)
@@ -96,8 +96,8 @@ public:
namespace string {
template < class SymbolType >
-CyclicString < SymbolType >::CyclicString(std::set<SymbolType> alphabet, std::vector<SymbolType> data) : std::Components < CyclicString < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ) {
- setContent(std::move(data));
+CyclicString < SymbolType >::CyclicString(std::set<SymbolType> alphabet, std::vector<SymbolType> str) : std::Components < CyclicString < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ) {
+ setContent(std::move(str));
}
template < class SymbolType >
@@ -105,15 +105,15 @@ CyclicString < SymbolType >::CyclicString() : CyclicString ( std::set < SymbolTy
}
template < class SymbolType >
-CyclicString < SymbolType >::CyclicString(std::vector<SymbolType> data) : CyclicString ( std::set < SymbolType> ( data.begin(), data.end() ), data ) {
+CyclicString < SymbolType >::CyclicString(std::vector<SymbolType> str) : CyclicString ( std::set < SymbolType> ( str.begin(), str.end() ), str ) {
}
template < class SymbolType >
-CyclicString < SymbolType >::CyclicString(const std::string& string) : CyclicString ( StringAuxiliary::toInternal ( string ) ) {
+CyclicString < SymbolType >::CyclicString(const std::string& str) : CyclicString ( StringAuxiliary::toInternal ( str ) ) {
}
template < class SymbolType >
-CyclicString < SymbolType >::CyclicString(const char* string) : CyclicString((std::string) string) {
+CyclicString < SymbolType >::CyclicString(const char* str) : CyclicString((std::string) str) {
}
template < class SymbolType >
@@ -137,15 +137,15 @@ const std::vector<SymbolType>& CyclicString < SymbolType >::getContent() const {
//serves as both move and copy content setter
template < class SymbolType >
-void CyclicString < SymbolType >::setContent(std::vector<SymbolType> data) {
- std::set<SymbolType> minimalAlphabet(data.begin(), data.end());
+void CyclicString < SymbolType >::setContent(std::vector<SymbolType> str) {
+ std::set<SymbolType> minimalAlphabet(str.begin(), str.end());
std::set<SymbolType> unknownSymbols;
std::set_difference(minimalAlphabet.begin(), minimalAlphabet.end(), getAlphabet().begin(), getAlphabet().end(), std::inserter(unknownSymbols, unknownSymbols.end()));
if(unknownSymbols.size() > 0)
throw exception::CommonException("Input symbols not in the alphabet.");
- m_Data = std::move(data);
+ m_Data = std::move(str);
}
template < class SymbolType >
@@ -204,8 +204,8 @@ namespace std {
template < class SymbolType >
class ComponentConstraint< ::string::CyclicString < SymbolType >, SymbolType, ::string::GeneralAlphabet > {
public:
- static bool used ( const ::string::CyclicString < SymbolType > & string, const SymbolType & symbol ) {
- const std::vector<SymbolType>& content = string.getContent ( );
+ static bool used ( const ::string::CyclicString < SymbolType > & str, const SymbolType & symbol ) {
+ const std::vector<SymbolType>& content = str.getContent ( );
return std::find(content.begin(), content.end(), symbol) != content.end();
}
diff --git a/alib2data/src/string/LinearString.h b/alib2data/src/string/LinearString.h
index c24ec7dec1..65ef6c4459 100644
--- a/alib2data/src/string/LinearString.h
+++ b/alib2data/src/string/LinearString.h
@@ -46,10 +46,10 @@ public:
explicit LinearString ( const tree::PrefixRankedBarPattern < > & tree );
explicit LinearString ( const tree::PrefixRankedBarNonlinearPattern < > & tree );
explicit LinearString ( const tree::PrefixBarTree < SymbolType > & tree );
- explicit LinearString ( std::set < SymbolType > alphabet, std::vector < SymbolType > data );
- explicit LinearString ( std::vector < SymbolType > data );
- explicit LinearString ( const std::string & string );
- explicit LinearString ( const char * string );
+ explicit LinearString ( std::set < SymbolType > alphabet, std::vector < SymbolType > str );
+ explicit LinearString ( std::vector < SymbolType > str );
+ explicit LinearString ( const std::string & str );
+ explicit LinearString ( const char * str );
explicit LinearString ( const Epsilon < > & epsilon );
virtual StringBase * clone ( ) const;
@@ -73,7 +73,7 @@ public:
*/
const std::vector < SymbolType > & getContent ( ) const;
- void setContent ( std::vector < SymbolType > data );
+ void setContent ( std::vector < SymbolType > str );
/**
* @return true if string is an empty word (vector length is 0)
@@ -118,8 +118,8 @@ public:
namespace string {
template < class SymbolType >
-LinearString < SymbolType >::LinearString(std::set<SymbolType> alphabet, std::vector<SymbolType> data) : std::Components < LinearString < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ) {
- setContent(std::move(data));
+LinearString < SymbolType >::LinearString(std::set<SymbolType> alphabet, std::vector<SymbolType> str) : std::Components < LinearString < SymbolType >, SymbolType, std::tuple < GeneralAlphabet >, std::tuple < > > ( std::make_tuple ( std::move ( alphabet ) ), std::tuple < > ( ) ) {
+ setContent(std::move(str));
}
template < class SymbolType >
@@ -127,15 +127,15 @@ LinearString < SymbolType >::LinearString() : LinearString ( std::set < SymbolTy
}
template < class SymbolType >
-LinearString < SymbolType >::LinearString(std::vector<SymbolType> data) : LinearString ( std::set < SymbolType> ( data.begin(), data.end() ), data ) {
+LinearString < SymbolType >::LinearString(std::vector<SymbolType> str) : LinearString ( std::set < SymbolType> ( str.begin(), str.end() ), str ) {
}
template < class SymbolType >
-LinearString < SymbolType >::LinearString(const std::string& string) : LinearString ( StringAuxiliary::toInternal ( string ) ) {
+LinearString < SymbolType >::LinearString(const std::string & str) : LinearString ( StringAuxiliary::toInternal ( str ) ) {
}
template < class SymbolType >
-LinearString < SymbolType >::LinearString(const char* string) : LinearString((std::string) string) {
+LinearString < SymbolType >::LinearString(const char* str) : LinearString ( ( std::string ) str ) {
}
template < class SymbolType >
@@ -194,15 +194,15 @@ const std::vector < SymbolType > & LinearString < SymbolType >::getContent ( ) c
}
template < class SymbolType >
-void LinearString < SymbolType >::setContent ( std::vector < SymbolType > data ) {
- std::set < SymbolType > minimalAlphabet ( data.begin ( ), data.end ( ) );
+void LinearString < SymbolType >::setContent ( std::vector < SymbolType > str ) {
+ std::set < SymbolType > minimalAlphabet ( str.begin ( ), str.end ( ) );
std::set < SymbolType > unknownSymbols;
std::set_difference ( minimalAlphabet.begin ( ), minimalAlphabet.end ( ), getAlphabet().begin ( ), getAlphabet().end ( ), std::inserter ( unknownSymbols, unknownSymbols.end ( ) ) );
if ( unknownSymbols.size ( ) > 0 )
throw exception::CommonException ( "Input symbols not in the alphabet." );
- this->m_Data = std::move ( data );
+ this->m_Data = std::move ( str );
}
template < class SymbolType >
@@ -267,8 +267,8 @@ namespace std {
template < class SymbolType >
class ComponentConstraint< ::string::LinearString < SymbolType >, SymbolType, ::string::GeneralAlphabet > {
public:
- static bool used ( const ::string::LinearString < SymbolType > & string, const SymbolType & symbol ) {
- const std::vector<SymbolType>& content = string.getContent ( );
+ static bool used ( const ::string::LinearString < SymbolType > & str, const SymbolType & symbol ) {
+ const std::vector<SymbolType>& content = str.getContent ( );
return std::find(content.begin(), content.end(), symbol) != content.end();
}
--
GitLab