diff --git a/alib2data/src/rte/RTE.cpp b/alib2data/src/rte/RTE.cpp
index 3da4d4b48754f73f38ffdc221154767d7f99bf43..e57226fc5801065e2665f5f97c0fa85bd83c725e 100644
--- a/alib2data/src/rte/RTE.cpp
+++ b/alib2data/src/rte/RTE.cpp
@@ -14,45 +14,6 @@ const std::set < alphabet::RankedSymbol > & RTE::getConstantAlphabet ( ) const {
return this->getData ( ).getConstantAlphabet ( );
}
-/*
- * rte::RTE regexpFrom ( const std::string & string ) {
- * rte::UnboundedRTEConcatenation con;
- *
- * for ( const char & symbol : string )
- * con.appendElement ( rte::UnboundedRTESymbol ( alphabet::symbolFrom ( symbol ) ) );
- *
- * return rte::RTE {
- * rte::UnboundedRTE ( std::move ( con ) )
- * };
- * }
- *
- * rte::RTE regexpFrom ( const char * string ) {
- * return regexpFrom ( ( std::string ) string );
- * }
- *
- * rte::RTE regexpFrom ( string::LinearString string ) {
- * rte::UnboundedRTEConcatenation con;
- *
- * for ( auto & symbol : string.getContent ( ) )
- * con.appendElement ( rte::UnboundedRTESymbol ( std::move ( symbol ) ) );
- *
- * return rte::RTE {
- * rte::UnboundedRTE ( std::move ( con ) )
- * };
- * }
- *
- * rte::RTE regexpFrom ( alphabet::Symbol symbol ) {
- * return rte::RTE {
- * rte::UnboundedRTE ( rte::UnboundedRTESymbol ( std::move ( symbol ) ) )
- * };
- * }
- *
- * rte::RTE regexpFrom ( ) {
- * return rte::RTE {
- * rte::UnboundedRTE ( rte::UnboundedRTEEmpty { } )
- * };
- * }
- */
} /* namespace rte */
namespace alib {
diff --git a/alib2data/src/rte/RTE.h b/alib2data/src/rte/RTE.h
index 10bdf579e3c429061e475f79ac23e1a5ed632337..173cf311e4e478e3dff4dedfb280121f9ed736ec 100644
--- a/alib2data/src/rte/RTE.h
+++ b/alib2data/src/rte/RTE.h
@@ -1,13 +1,13 @@
#ifndef RTE_H_
#define RTE_H_
-#include <base/WrapperBase.hpp>
#include "RTEBase.h"
+#include <base/WrapperBase.hpp>
#include "../alphabet/SymbolFeatures.h"
#include "../string/StringFeatures.h"
-#include <string>
#include <set>
+#include <string>
namespace rte {
@@ -21,20 +21,13 @@ public:
const std::set < alphabet::RankedSymbol > & getAlphabet ( ) const;
const std::set < alphabet::RankedSymbol > & getConstantAlphabet ( ) const;
- static const std::string & getXmlTagRefName() {
+ static const std::string & getXmlTagRefName ( ) {
static std::string xmlTagName = "RTERef";
return xmlTagName;
}
-};
-/*
- * rte::RTE rteFrom ( const std::string & string );
- * rte::RTE rteFrom ( const char * string );
- * rte::RTE rteFrom ( string::LinearString string );
- * rte::RTE rteFrom ( alphabet::Symbol symbol );
- * rte::RTE rteFrom ( );
- */
+};
} /* namespace rte */
diff --git a/alib2data/src/rte/RTEClasses.h b/alib2data/src/rte/RTEClasses.h
index 9cfc0f78a434514248f4dea5f7e9aa765be78afd..d4f8591187e7d89431f1abe185d6037bba9e2dcd 100644
--- a/alib2data/src/rte/RTEClasses.h
+++ b/alib2data/src/rte/RTEClasses.h
@@ -1,7 +1,6 @@
#ifndef RTE_CLASSES_H_
#define RTE_CLASSES_H_
-// #include "unbounded/UnboundedRegExp.h"
#include "formal/FormalRTE.h"
#endif /* RTE_CLASSES_H_ */
diff --git a/alib2data/src/rte/RTEFeatures.h b/alib2data/src/rte/RTEFeatures.h
index 55e31aff0aeb917b56f19d6d4b3cd3d2dbbab7f8..7deb651c80cf721ff9123d4ba16a6c9e61f91171 100644
--- a/alib2data/src/rte/RTEFeatures.h
+++ b/alib2data/src/rte/RTEFeatures.h
@@ -11,23 +11,12 @@
namespace rte {
enum class FEATURES {
- FORMAL, UNBOUNDED
+ FORMAL
};
class RTE;
class RTEBase;
-/*
- * class UnboundedRTE;
- *
- * class UnboundedRTEElement;
- * class UnboundedRTEAlternation;
- * class UnboundedRTEConcatenation;
- * class UnboundedRTEIteration;
- * class UnboundedRTESymbol;
- * class UnboundedRTEEmpty;
- */
-
class FormalRTE;
class FormalRTEElement;
diff --git a/alib2data/src/rte/common/RTEFromXMLParser.cpp b/alib2data/src/rte/common/RTEFromXMLParser.cpp
index bf29d7e17704bf9e511f07f5e6202ffd11a971b9..9254a8615f04f11291b3ad37699d8cdb20d75eda 100644
--- a/alib2data/src/rte/common/RTEFromXMLParser.cpp
+++ b/alib2data/src/rte/common/RTEFromXMLParser.cpp
@@ -10,7 +10,6 @@
#include "../RTE.h"
#include "../RTEClasses.h"
-// #include "../unbounded/UnboundedRTEElements.h"
#include "../formal/FormalRTEElements.h"
#include <XmlApi.hpp>
@@ -36,83 +35,6 @@ std::pair < std::set < alphabet::RankedSymbol >, std::set < alphabet::RankedSymb
return std::make_pair ( alphabetF, alphabetK );
}
-/*
- * UnboundedRTEElement* RTEFromXMLParser::parseUnboundedRTEElement(std::deque<sax::Token>::iterator& input) {
- * if (sax::FromXMLParserHelper::isToken(input, sax::Token::TokenType::START_ELEMENT, "empty")) {
- * return parseUnboundedRTEEmpty(input);
- * } else if (sax::FromXMLParserHelper::isToken(input, sax::Token::TokenType::START_ELEMENT, "epsilon")) {
- * return parseUnboundedRTEEpsilon(input);
- * } else if (sax::FromXMLParserHelper::isToken(input, sax::Token::TokenType::START_ELEMENT, "iteration")) {
- * return parseUnboundedRTEIteration(input);
- * } else if (sax::FromXMLParserHelper::isToken(input, sax::Token::TokenType::START_ELEMENT, "alternation")) {
- * return parseUnboundedRTEAlternation(input);
- * } else if (sax::FromXMLParserHelper::isToken(input, sax::Token::TokenType::START_ELEMENT, "substitution")) {
- * return parseUnboundedRTESubstitution(input);
- * } else {
- * return new UnboundedRTESymbol(alib::xmlApi<alphabet::Symbol>::parse(input));
- * }
- * }
- *
- * UnboundedRTEAlternation* RTEFromXMLParser::parseUnboundedRTEAlternation(std::deque<sax::Token>::iterator& input) {
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, "alternation");
- *
- * UnboundedRTEAlternation* alternation = new UnboundedRTEAlternation();
- *
- * while (sax::FromXMLParserHelper::isTokenType(input, sax::Token::TokenType::START_ELEMENT)) {
- * UnboundedRTEElement* element = parseUnboundedRTEElement(input);
- * alternation->appendElement(std::move(*element));
- * delete element;
- * }
- *
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, "alternation");
- * return alternation;
- * }
- *
- * UnboundedRTESubstitution* RTEFromXMLParser::parseUnboundedRTESubstitution(std::deque<sax::Token>::iterator& input) {
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, "substitution");
- *
- * UnboundedRTESubstitution* substitution = new UnboundedRTESubstitution();
- *
- * while (sax::FromXMLParserHelper::isTokenType(input, sax::Token::TokenType::START_ELEMENT)) {
- * UnboundedRTEElement* element = parseUnboundedRTEElement(input);
- * substitution->appendElement(std::move(*element));
- * delete element;
- * }
- *
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, "substitution");
- * return substitution;
- *
- * }
- *
- * UnboundedRTEIteration* RTEFromXMLParser::parseUnboundedRTEIteration(std::deque<sax::Token>::iterator& input) {
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, "iteration");
- *
- * UnboundedRTEElement* element = parseUnboundedRTEElement(input);
- * UnboundedRTEIteration* iteration = new UnboundedRTEIteration(std::move(*element));
- * delete element;
- *
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, "iteration");
- * return iteration;
- * }
- *
- * UnboundedRTEEpsilon* RTEFromXMLParser::parseUnboundedRTEEpsilon(std::deque<sax::Token>::iterator& input) {
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, "epsilon");
- *
- * UnboundedRTEEpsilon* epsilon = new UnboundedRTEEpsilon();
- *
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, "epsilon");
- * return epsilon;
- * }
- *
- * UnboundedRTEEmpty* RTEFromXMLParser::parseUnboundedRTEEmpty(std::deque<sax::Token>::iterator& input) {
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, "empty");
- *
- * UnboundedRTEEmpty* empty = new UnboundedRTEEmpty();
- *
- * sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, "empty");
- * return empty;
- * }
- */
std::rvalue_ref < FormalRTEElement > RTEFromXMLParser::parseFormalRTEElement ( std::deque < sax::Token >::iterator & input ) {
if ( sax::FromXMLParserHelper::isToken ( input, sax::Token::TokenType::START_ELEMENT, "empty" ) )
return parseFormalRTEEmpty ( input );
diff --git a/alib2data/src/rte/common/RTEFromXMLParser.h b/alib2data/src/rte/common/RTEFromXMLParser.h
index 1deff579ed20b43e2ea2b2d53b601fe9b32c6335..3bb1726a0e5405b0ff4490c91a816164d1ae5a09 100644
--- a/alib2data/src/rte/common/RTEFromXMLParser.h
+++ b/alib2data/src/rte/common/RTEFromXMLParser.h
@@ -23,16 +23,6 @@ class RTEFromXMLParser {
public:
static std::pair < std::set < alphabet::RankedSymbol >, std::set < alphabet::RankedSymbol > > parseAlphabet ( std::deque < sax::Token >::iterator & input );
- /*
- * static UnboundedRTEElement* parseUnboundedRTEElement(std::deque<sax::Token>::iterator& input);
- *
- * static UnboundedRTEEpsilon* parseUnboundedRTEEpsilon(std::deque<sax::Token>::iterator& input);
- * static UnboundedRTEEmpty* parseUnboundedRTEEmpty(std::deque<sax::Token>::iterator& input);
- * static UnboundedRTEIteration* parseUnboundedRTEIteration(std::deque<sax::Token>::iterator& input);
- * static UnboundedRTEAlternation* parseUnboundedRTEAlternation(std::deque<sax::Token>::iterator& input);
- * static UnboundedRTESubstitution* parseUnboundedRTESubstitution(std::deque<sax::Token>::iterator& input);
- */
-
static std::rvalue_ref < FormalRTEElement > parseFormalRTEElement ( std::deque < sax::Token >::iterator & input );
static std::rvalue_ref < FormalRTEEmpty > parseFormalRTEEmpty ( std::deque < sax::Token >::iterator & input );
diff --git a/alib2data/src/rte/common/RTEToXMLComposer.cpp b/alib2data/src/rte/common/RTEToXMLComposer.cpp
index d5621b8889fc9721e9332da0b9265f9a207beff0..4ae25b7670b0aaff8d8a527da3f34114a0131789 100644
--- a/alib2data/src/rte/common/RTEToXMLComposer.cpp
+++ b/alib2data/src/rte/common/RTEToXMLComposer.cpp
@@ -3,62 +3,11 @@
#include "../RTE.h"
#include "../RTEClasses.h"
-// #include "../unbounded/UnboundedRTEElements.h"
#include "../formal/FormalRTEElements.h"
#include <XmlApi.hpp>
namespace rte {
-/*
- * void RTEToXMLComposer::Visit(void* userData, const UnboundedRTEAlternation& alternation) const {
- * std::deque<sax::Token> &out = *((std::deque<sax::Token>*) userData);
- *
- * out.emplace_back("alternation", sax::Token::TokenType::START_ELEMENT);
- * for (const auto& element : alternation.getElements()) {
- * element->Accept(userData, *this);
- * }
- * out.emplace_back("alternation", sax::Token::TokenType::END_ELEMENT);
- * }
- *
- * void RTEToXMLComposer::Visit(void* userData, const UnboundedRTEConcatenation& concatenation) const {
- * std::deque<sax::Token> &out = *((std::deque<sax::Token>*) userData);
- *
- * out.emplace_back("concatenation", sax::Token::TokenType::START_ELEMENT);
- * for (auto element : concatenation.getElements()) {
- * element->Accept(userData, *this);
- * }
- * out.emplace_back("concatenation", sax::Token::TokenType::END_ELEMENT);
- *
- * }
- *
- * void RTEToXMLComposer::Visit(void* userData, const UnboundedRTEIteration& iteration) const {
- * std::deque<sax::Token> &out = *((std::deque<sax::Token>*) userData);
- *
- * out.emplace_back("iteration", sax::Token::TokenType::START_ELEMENT);
- * iteration.getElement().Accept(userData, *this);
- * out.emplace_back("iteration", sax::Token::TokenType::END_ELEMENT);
- * }
- *
- * void RTEToXMLComposer::Visit(void* userData, const UnboundedRTESymbol& symbol) const {
- * std::deque<sax::Token> &out = *((std::deque<sax::Token>*) userData);
- *
- * alib::xmlApi<alphabet::Symbol>::compose(out, symbol.getSymbol());
- * }
- *
- * void RTEToXMLComposer::Visit(void* userData, const UnboundedRTEEpsilon&) const {
- * std::deque<sax::Token> &out = *((std::deque<sax::Token>*) userData);
- *
- * out.emplace_back("epsilon", sax::Token::TokenType::START_ELEMENT);
- * out.emplace_back("epsilon", sax::Token::TokenType::END_ELEMENT);
- * }
- *
- * void RTEToXMLComposer::Visit(void* userData, const UnboundedRTEEmpty&) const {
- * std::deque<sax::Token> &out = *((std::deque<sax::Token>*) userData);
- *
- * out.emplace_back("empty", sax::Token::TokenType::START_ELEMENT);
- * out.emplace_back("empty", sax::Token::TokenType::END_ELEMENT);
- * }
- */
void RTEToXMLComposer::Visit ( void * userData, const FormalRTEAlternation & alternation ) const {
std::deque < sax::Token > & out = * ( ( std::deque < sax::Token > * )userData );
diff --git a/alib2data/src/rte/common/RTEToXMLComposer.h b/alib2data/src/rte/common/RTEToXMLComposer.h
index d55e8e445de73e879f052890db3fc15cb649dabd..45ce57ba0bde3a1e0bc682186c01ab85eab2cc2c 100644
--- a/alib2data/src/rte/common/RTEToXMLComposer.h
+++ b/alib2data/src/rte/common/RTEToXMLComposer.h
@@ -4,7 +4,6 @@
#include "../RTEFeatures.h"
#include <deque>
-// #include "../unbounded/UnboundedRTEElement.h"
#include "../formal/FormalRTEElement.h"
#include <sax/Token.h>
@@ -13,7 +12,7 @@ namespace rte {
/**
* This class contains methods to print XML representation of regular tree expression to the output stream.
*/
-class RTEToXMLComposer : /*public UnboundedRTEElement::const_visitor_type,*/ public FormalRTEElementVisitor {
+class RTEToXMLComposer : public FormalRTEElementVisitor {
public:
RTEToXMLComposer ( ) { }
@@ -22,15 +21,6 @@ public:
static void composeAlphabet ( std::deque < sax::Token > & out, const std::set < alphabet::RankedSymbol > & alphabetF, const std::set < alphabet::RankedSymbol > & alphabetK );
private:
- /*
- * void Visit(void*, const UnboundedRTEAlternation& alternation) const;
- * void Visit(void*, const UnboundedRTEConcatenation& concatenation) const;
- * void Visit(void*, const UnboundedRTEIteration& iteration) const;
- * void Visit(void*, const UnboundedRTESymbol& symbol) const;
- * void Visit(void*, const UnboundedRTEEpsilon& epsilon) const;
- * void Visit(void*, const UnboundedRTEEmpty& empty) const;
- */
-
void Visit ( void *, const FormalRTEAlternation & alternation ) const;
void Visit ( void *, const FormalRTEIteration & iteration ) const;
void Visit ( void *, const FormalRTESubstitution & concatenation ) const;
diff --git a/alib2data/src/rte/formal/FormalRTE.cpp b/alib2data/src/rte/formal/FormalRTE.cpp
index 75e8fd7b58a6202840d081ec3cf34ef2d895da04..9191a9d81bd0de9badb2c026c841d091f931de49 100644
--- a/alib2data/src/rte/formal/FormalRTE.cpp
+++ b/alib2data/src/rte/formal/FormalRTE.cpp
@@ -1,20 +1,19 @@
#include "FormalRTE.h"
#include "FormalRTEEmpty.h"
#include "FormalRTESymbol.h"
+#include <exception/CommonException.h>
-#include <iostream>
#include <algorithm>
+#include <iostream>
#include <sstream>
-// #include "../unbounded/UnboundedRTE.h"
-
-#include <sax/FromXMLParserHelper.h>
+#include "../RTE.h"
#include "../common/RTEFromXMLParser.h"
#include "../common/RTEToXMLComposer.h"
-#include "../RTE.h"
-#include <object/Object.h>
#include <XmlApi.hpp>
#include <cast/CastApi.hpp>
+#include <object/Object.h>
+#include <sax/FromXMLParserHelper.h>
namespace rte {
@@ -31,16 +30,6 @@ FormalRTE::FormalRTE ( std::pair < std::set < alphabet::RankedSymbol >, std::set
FormalRTE::FormalRTE ( ) : FormalRTE ( std::set < alphabet::RankedSymbol > ( ), std::set < alphabet::RankedSymbol > ( ), FormalRTEEmpty ( ) ) {
}
-/*
- * FormalRTE::FormalRTE ( const UnboundedRTE & other ) {
- * alphabet = other.getAlphabet ( );
- * this->rte = NULL;
- * FormalRTEElement * element = other.getRTE ( ).cloneAsFormal ( );
- * setRTE ( std::move ( * element ) );
- * delete element;
- * }
- */
-
FormalRTE::FormalRTE ( std::set < alphabet::RankedSymbol > alphabetF, std::set < alphabet::RankedSymbol > alphabetK, const FormalRTEElement & rte ) : FormalRTE ( std::move ( alphabetF ), std::move ( alphabetK ), std::move_copy ( rte ) ) {
}
@@ -125,31 +114,30 @@ FormalRTE::operator std::string ( ) const {
}
FormalRTE FormalRTE::parse ( std::deque < sax::Token >::iterator & input ) {
- sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, FormalRTE::getXmlTagName() );
+ sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, FormalRTE::getXmlTagName ( ) );
std::pair < std::set < alphabet::RankedSymbol >, std::set < alphabet::RankedSymbol > > alphabets = RTEFromXMLParser::parseAlphabet ( input );
std::rvalue_ref < FormalRTEElement > element = alib::xmlApi < rte::FormalRTEElement >::parse ( input );
FormalRTE rte ( std::move ( alphabets.first ), std::move ( alphabets.second ), std::move ( element ) );
- sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, FormalRTE::getXmlTagName() );
+ sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, FormalRTE::getXmlTagName ( ) );
return rte;
}
void FormalRTE::compose ( std::deque < sax::Token > & out ) const {
- out.emplace_back ( FormalRTE::getXmlTagName(), sax::Token::TokenType::START_ELEMENT );
+ out.emplace_back ( FormalRTE::getXmlTagName ( ), sax::Token::TokenType::START_ELEMENT );
RTEToXMLComposer::composeAlphabet ( out, this->getAlphabet ( ), this->getConstantAlphabet ( ) );
alib::xmlApi < FormalRTEElement >::compose ( out, this->getRTE ( ) );
- out.emplace_back ( FormalRTE::getXmlTagName(), sax::Token::TokenType::END_ELEMENT );
+ out.emplace_back ( FormalRTE::getXmlTagName ( ), sax::Token::TokenType::END_ELEMENT );
}
} /* namespace rte */
namespace alib {
-auto formalRTEParserRegister = xmlApi < rte::RTE >::ParserRegister < rte::FormalRTE > ( );
+auto formalRTEParserRegister = xmlApi < rte::RTE >::ParserRegister < rte::FormalRTE > ( );
auto formalRTEParserRegister2 = xmlApi < alib::Object >::ParserRegister < rte::FormalRTE > ( );
- // auto FormalRTEFromUnboundedRTE = castApi::CastRegister < rte::FormalRTE, rte::UnboundedRTE > ( );
-auto FormalRTECastBinder = castApi::CastPoolStringBinder < rte::FormalRTE > ( rte::FormalRTE::getXmlTagName() );
+auto FormalRTECastBinder = castApi::CastPoolStringBinder < rte::FormalRTE > ( rte::FormalRTE::getXmlTagName ( ) );
} /* namespace alib */
diff --git a/alib2data/src/rte/formal/FormalRTE.h b/alib2data/src/rte/formal/FormalRTE.h
index a66482ef98fd243618514311787c3f842b8002b6..527c870812473f97d14ef25e4bb9b18fb05226d8 100644
--- a/alib2data/src/rte/formal/FormalRTE.h
+++ b/alib2data/src/rte/formal/FormalRTE.h
@@ -1,12 +1,12 @@
#ifndef FORMAL_RTE_H_
#define FORMAL_RTE_H_
-#include <string>
-#include <set>
+#include "../RTEBase.h"
#include <exception/CommonException.h>
#include "FormalRTEElement.h"
-#include "../RTEBase.h"
#include <core/components.hpp>
+#include <set>
+#include <string>
namespace rte {
@@ -14,8 +14,6 @@ class FormalRTEElement;
class GeneralAlphabet;
class ConstantAlphabet;
-// class UnboundedRTE;
-
/**
* Represents regular tree expression parsed from the XML. Regular tree expression is stored
* as a tree of RTEElement elements.
@@ -27,7 +25,6 @@ protected:
public:
explicit FormalRTE ( );
- // explicit FormalRTE ( const UnboundedRTE & other );
explicit FormalRTE ( std::set < alphabet::RankedSymbol > alphabetF, std::set < alphabet::RankedSymbol > alphabetK, const FormalRTEElement & rte );
explicit FormalRTE ( std::set < alphabet::RankedSymbol > alphabetF, std::set < alphabet::RankedSymbol > alphabetK, FormalRTEElement && rte );
explicit FormalRTE ( std::pair < std::set < alphabet::RankedSymbol >, std::set < alphabet::RankedSymbol > > alphabets, const FormalRTEElement & rte );
@@ -134,7 +131,7 @@ public:
virtual explicit operator std::string ( ) const;
- static const std::string & getXmlTagName() {
+ static const std::string & getXmlTagName ( ) {
static std::string xmlTagName = "FormalRTE";
return xmlTagName;
diff --git a/alib2data/src/rte/formal/FormalRTEAlternation.cpp b/alib2data/src/rte/formal/FormalRTEAlternation.cpp
index f7ccb0adb23f3138dde4177c8516cb4a9070833a..fb76f66909713fc4b8801a2b307a30cb1703ac29 100644
--- a/alib2data/src/rte/formal/FormalRTEAlternation.cpp
+++ b/alib2data/src/rte/formal/FormalRTEAlternation.cpp
@@ -1,7 +1,6 @@
#include "FormalRTEAlternation.h"
#include <exception/CommonException.h>
-// #include "../unbounded/UnboundedRTEAlternation.h"
#include <sstream>
namespace rte {
@@ -90,21 +89,6 @@ FormalRTEAlternation * FormalRTEAlternation::plunder ( ) && {
return new FormalRTEAlternation ( std::move ( * this ) );
}
-/*
- * UnboundedRTEElement* FormalRTEAlternation::cloneAsUnbounded() const {
- * UnboundedRTEAlternation* res = new UnboundedRTEAlternation();
- *
- * UnboundedRTEElement* leftTmp = left->cloneAsUnbounded();
- * res->appendElement(std::move(*leftTmp));
- * delete leftTmp;
- *
- * UnboundedRTEElement* rightTmp = right->cloneAsUnbounded();
- * res->appendElement(std::move(*rightTmp));
- * delete rightTmp;
- *
- * return res;
- * }
- */
int FormalRTEAlternation::compare ( const FormalRTEAlternation & other ) const {
int res = left->compare ( * other.left );
diff --git a/alib2data/src/rte/formal/FormalRTEAlternation.h b/alib2data/src/rte/formal/FormalRTEAlternation.h
index b7d2801143dbe5eeab6a4369e5776e47a0e3b26a..3211d5a2bc31ddd3fa487b887a4547ce12ad9533 100644
--- a/alib2data/src/rte/formal/FormalRTEAlternation.h
+++ b/alib2data/src/rte/formal/FormalRTEAlternation.h
@@ -15,8 +15,6 @@ protected:
* @copydoc FormalRTEElement::clone() const
*/
- // virtual UnboundedRTEElement * cloneAsUnbounded ( ) const;
-
std::smart_ptr < FormalRTEElement > left;
std::smart_ptr < FormalRTEElement > right;
diff --git a/alib2data/src/rte/formal/FormalRTEElement.h b/alib2data/src/rte/formal/FormalRTEElement.h
index 4d90960df506e63ce510461f2cb7892772afe899..d18298e78d955f4cfcda019bc51f187e4fed3fac 100644
--- a/alib2data/src/rte/formal/FormalRTEElement.h
+++ b/alib2data/src/rte/formal/FormalRTEElement.h
@@ -18,7 +18,6 @@ class FormalRTESymbolAlphabet;
class FormalRTESymbolSubst;
class FormalRTEEmpty;
- // class UnboundedRTEElement;
class FormalRTEElement;
class FormalRTEElementVisitor {
@@ -76,8 +75,6 @@ public:
* @return copy of the element
*/
- // virtual UnboundedRTEElement * cloneAsUnbounded ( ) const = 0;
-
friend class FormalRTE;
friend class FormalRTEAlternation;
diff --git a/alib2data/src/rte/formal/FormalRTEEmpty.cpp b/alib2data/src/rte/formal/FormalRTEEmpty.cpp
index 8438131d8cbcb9a82c351a72fc41bbba955b7f9a..a25f3a7eae61382838f8defa805774abf8506934 100644
--- a/alib2data/src/rte/formal/FormalRTEEmpty.cpp
+++ b/alib2data/src/rte/formal/FormalRTEEmpty.cpp
@@ -1,7 +1,5 @@
#include "FormalRTEEmpty.h"
-// #include "../unbounded/UnboundedRTEEmpty.h"
-
namespace rte {
FormalRTEEmpty::FormalRTEEmpty ( ) {
@@ -34,11 +32,6 @@ FormalRTEEmpty * FormalRTEEmpty::plunder ( ) && {
return new FormalRTEEmpty ( std::move ( * this ) );
}
-/*
- * UnboundedRTEElement* FormalRTEEmpty::cloneAsUnbounded() const {
- * return new UnboundedRTEEmpty();
- * }
- */
int FormalRTEEmpty::compare ( const FormalRTEEmpty & ) const {
return 0;
}
diff --git a/alib2data/src/rte/formal/FormalRTEEmpty.h b/alib2data/src/rte/formal/FormalRTEEmpty.h
index c8b05c2d536029082cda87023182713ebc96ef06..b2e0ca04e61c36929b49cca04dc77e096db464be 100644
--- a/alib2data/src/rte/formal/FormalRTEEmpty.h
+++ b/alib2data/src/rte/formal/FormalRTEEmpty.h
@@ -15,8 +15,6 @@ protected:
* @copydoc FormalRTEElement::clone() const
*/
- // virtual UnboundedRTEElement * cloneAsUnbounded ( ) const;
-
/**
* @copydoc FormalRTEElement::attachRTE()
*/
diff --git a/alib2data/src/rte/formal/FormalRTEIteration.cpp b/alib2data/src/rte/formal/FormalRTEIteration.cpp
index 8db7d0232363ec728c33e71cbfdfac46a24e1094..ce93805b9868e5407b45605ae735180b8b6eb9a7 100644
--- a/alib2data/src/rte/formal/FormalRTEIteration.cpp
+++ b/alib2data/src/rte/formal/FormalRTEIteration.cpp
@@ -1,7 +1,6 @@
#include "FormalRTEIteration.h"
#include <exception/CommonException.h>
-// #include "../unbounded/UnboundedRTEIteration.h"
#include <sstream>
namespace rte {
@@ -86,14 +85,6 @@ FormalRTEIteration * FormalRTEIteration::plunder ( ) && {
return new FormalRTEIteration ( std::move ( * this ) );
}
-/*
- * UnboundedRTEElement* FormalRTEIteration::cloneAsUnbounded() const {
- * UnboundedRTEElement* tmp = this->element->cloneAsUnbounded();
- * UnboundedRTEElement* res = new UnboundedRTEIteration(std::move(*tmp));
- * delete tmp;
- * return res;
- * }
- */
int FormalRTEIteration::compare ( const FormalRTEIteration & other ) const {
auto first = std::tie ( getElement ( ), getSubstitutionSymbol ( ) );
auto second = std::tie ( other.getElement ( ), other.getSubstitutionSymbol ( ) );
diff --git a/alib2data/src/rte/formal/FormalRTEIteration.h b/alib2data/src/rte/formal/FormalRTEIteration.h
index 82f141c1d81de6a0ef578956655098c48526eea0..e68dde5af35c35d6e39b839294f489aea20dbfae 100644
--- a/alib2data/src/rte/formal/FormalRTEIteration.h
+++ b/alib2data/src/rte/formal/FormalRTEIteration.h
@@ -26,8 +26,6 @@ protected:
* @copydoc FormalRTEElement::clone() const
*/
- // virtual UnboundedRTEElement * cloneAsUnbounded ( ) const;
-
/**
* @copydoc FormalRTEElement::attachRTE()
*/
diff --git a/alib2data/src/rte/formal/FormalRTESubstitution.cpp b/alib2data/src/rte/formal/FormalRTESubstitution.cpp
index c3e74bd2bedca848ccf7581cc1203fb2dbac31be..59aa739cbe09011b7f29adbdf72c7429959b0643 100644
--- a/alib2data/src/rte/formal/FormalRTESubstitution.cpp
+++ b/alib2data/src/rte/formal/FormalRTESubstitution.cpp
@@ -2,8 +2,6 @@
#include <exception/CommonException.h>
#include <sstream>
-// #include "../unbounded/UnboundedRTESubstitution.h"
-
namespace rte {
FormalRTESubstitution::FormalRTESubstitution ( FormalRTEElement && left, FormalRTEElement && right, FormalRTESymbolSubst substitutionSymbol ) : left ( nullptr ), right ( nullptr ), substitutionSymbol ( nullptr ) {
@@ -104,21 +102,6 @@ FormalRTESubstitution * FormalRTESubstitution::clone ( ) const {
return new FormalRTESubstitution ( * this );
}
-/*
- * UnboundedRTEElement* FormalRTESubstitution::cloneAsUnbounded() const {
- * UnboundedRTESubstitution* res = new UnboundedRTESubstitution();
- *
- * UnboundedRTEElement* leftTmp = left->cloneAsUnbounded();
- * res->appendElement(std::move(*leftTmp));
- * delete leftTmp;
- *
- * UnboundedRTEElement* rightTmp = right->cloneAsUnbounded();
- * res->appendElement(std::move(*rightTmp));
- * delete rightTmp;
- *
- * return res;
- * }
- */
FormalRTESubstitution * FormalRTESubstitution::plunder ( ) && {
return new FormalRTESubstitution ( std::move ( * this ) );
}
diff --git a/alib2data/src/rte/formal/FormalRTESubstitution.h b/alib2data/src/rte/formal/FormalRTESubstitution.h
index a2fbba360b180aef2104035555084c58b4b2e671..936df0837322a4d12e7a2627d575bf7a92cbd8fe 100644
--- a/alib2data/src/rte/formal/FormalRTESubstitution.h
+++ b/alib2data/src/rte/formal/FormalRTESubstitution.h
@@ -17,8 +17,6 @@ protected:
* @copydoc FormalRTEElement::clone() const
*/
- // virtual UnboundedRTEElement * cloneAsUnbounded ( ) const;
-
std::smart_ptr < FormalRTEElement > left;
std::smart_ptr < FormalRTEElement > right;
std::smart_ptr < FormalRTESymbolSubst > substitutionSymbol; // substite this in left by right
diff --git a/alib2data/src/rte/formal/FormalRTESymbol.cpp b/alib2data/src/rte/formal/FormalRTESymbol.cpp
index b71b94e24a4be1f5c4a4fd0c893b9be57fd2b600..51f6630a627ace9ae5308de06ae690987e87adba 100644
--- a/alib2data/src/rte/formal/FormalRTESymbol.cpp
+++ b/alib2data/src/rte/formal/FormalRTESymbol.cpp
@@ -1,8 +1,8 @@
#include "FormalRTESymbol.h"
-// #include "../unbounded/UnboundedRTESymbol.h"
#include "../../primitive/Unsigned.h"
#include <exception/CommonException.h>
+#include <exception/CommonException.h>
#include <sstream>
namespace rte {
diff --git a/alib2data/src/rte/formal/FormalRTESymbolAlphabet.cpp b/alib2data/src/rte/formal/FormalRTESymbolAlphabet.cpp
index 9dd620252a54f5a7d152bb0ec95e208ceb9cda53..1c0ac404a80e3c1ed609bfcda0a726507323fe2f 100644
--- a/alib2data/src/rte/formal/FormalRTESymbolAlphabet.cpp
+++ b/alib2data/src/rte/formal/FormalRTESymbolAlphabet.cpp
@@ -1,6 +1,5 @@
#include "FormalRTESymbolAlphabet.h"
-// #include "../unbounded/UnboundedRTESymbol.h"
#include "../../primitive/Unsigned.h"
#include <exception/CommonException.h>
#include <sstream>
@@ -64,11 +63,6 @@ void FormalRTESymbolAlphabet::appendElement ( const FormalRTESymbol & element )
this->elements.push_back ( std::move ( elem ) );
}
-/*
- * UnboundedRTEElement* FormalRTESymbolAlphabet::cloneAsUnbounded() const {
- * return new UnboundedRTESymbol(this->symbol);
- * }
- */
int FormalRTESymbolAlphabet::compare ( const FormalRTESymbolAlphabet & other ) const {
auto first = std::tie ( symbol, getElements ( ) );
auto second = std::tie ( other.symbol, other.getElements ( ) );
diff --git a/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h b/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h
index 23cb0f3b1c0a90642f3bfe4d793a4247546453ee..2ce66dca55d0b1947a5ad363f871e066c778fd29 100644
--- a/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h
+++ b/alib2data/src/rte/formal/FormalRTESymbolAlphabet.h
@@ -17,8 +17,6 @@ protected:
* @copydoc FormalRTEElement::clone() const
*/
- // virtual UnboundedRTEElement * cloneAsUnbounded ( ) const;
-
/**
* @copydoc FormalRTESymbol::attachRTE()
*/
diff --git a/alib2data/src/rte/formal/FormalRTESymbolSubst.cpp b/alib2data/src/rte/formal/FormalRTESymbolSubst.cpp
index b6a69796780214cf2966c3854b78da454cc59a7d..44ee762ce3d237faf41170d9bd658e5b169512f0 100644
--- a/alib2data/src/rte/formal/FormalRTESymbolSubst.cpp
+++ b/alib2data/src/rte/formal/FormalRTESymbolSubst.cpp
@@ -1,8 +1,8 @@
#include "FormalRTESymbolSubst.h"
-// #include "../unbounded/UnboundedRTESymbolSubst.h"
#include "../../primitive/Unsigned.h"
#include <exception/CommonException.h>
+#include <exception/CommonException.h>
#include <sstream>
namespace rte {