diff --git a/alib2/src/alphabet/Symbol.cpp b/alib2/src/alphabet/Symbol.cpp
index 29215ae225cefb926fa4fc7612e099da8cc1a328..3dcf5beb38454c12e36a0bddc32c499c79ea3c11 100644
--- a/alib2/src/alphabet/Symbol.cpp
+++ b/alib2/src/alphabet/Symbol.cpp
@@ -9,8 +9,12 @@
namespace alphabet {
-Symbol::Symbol(const std::string& symbol) {
- this->symbol = symbol;
+Symbol::Symbol(const std::string& symbol) : symbol(symbol) {
+
+}
+
+Symbol::Symbol(std::string&& symbol) : symbol(std::move(symbol)) {
+
}
const std::string& Symbol::getSymbol() const {
diff --git a/alib2/src/alphabet/Symbol.h b/alib2/src/alphabet/Symbol.h
index 7bbe40df56a8fb91151a1cd61ff2e12e6cb55c6b..57da01c69efc994d1e210c7c0d42cf7d4762a64d 100644
--- a/alib2/src/alphabet/Symbol.h
+++ b/alib2/src/alphabet/Symbol.h
@@ -24,6 +24,7 @@ public:
* @param symbol name of the symbol
*/
Symbol(const std::string& symbol);
+ Symbol(std::string&& symbol);
/**
* @return name of the symbol
diff --git a/alib2/src/regexp/Alternation.cpp b/alib2/src/regexp/Alternation.cpp
index 8745b14392a5194ddb65bcb8efa0695c3843044e..4c9fa359f101299e963c28123714bce1e9353726 100644
--- a/alib2/src/regexp/Alternation.cpp
+++ b/alib2/src/regexp/Alternation.cpp
@@ -46,11 +46,11 @@ Alternation::~Alternation() noexcept {
elements.clear();
}
-std::list<RegExpElement*>& Alternation::getElements() {
+std::vector<RegExpElement*>& Alternation::getElements() {
return elements;
}
-const std::list<RegExpElement*>& Alternation::getElements() const {
+const std::vector<RegExpElement*>& Alternation::getElements() const {
return elements;
}
diff --git a/alib2/src/regexp/Alternation.h b/alib2/src/regexp/Alternation.h
index fbddb2b93c24d72511c3fa014d62276a9a70a814..f26963cab25f4e08853f87253f16d6f2894f0817 100644
--- a/alib2/src/regexp/Alternation.h
+++ b/alib2/src/regexp/Alternation.h
@@ -8,7 +8,7 @@
#ifndef ALTERNATION_H_
#define ALTERNATION_H_
-#include <list>
+#include <vector>
#include "RegExpElement.h"
namespace regexp {
@@ -18,30 +18,30 @@ namespace regexp {
* as operands of the operator.
*/
class Alternation: public RegExpElement, public std::element<Alternation, RegExpElement::visitor_type> {
-private:
- std::list<RegExpElement*> elements;
+protected:
+ /**
+ * @copydoc RegExpElement::clone() const
+ */
+ virtual RegExpElement* clone() const;
+
+ std::vector<RegExpElement*> elements;
public:
Alternation();
Alternation(const Alternation& other);
Alternation(Alternation&& other) noexcept;
Alternation& operator =(const Alternation& other);
Alternation& operator =(Alternation&& other) noexcept;
- ~Alternation() noexcept;
+ virtual ~Alternation() noexcept;
/**
* @return list of operands
*/
- std::list<RegExpElement*>& getElements();
+ std::vector<RegExpElement*>& getElements();
/**
* @return list of operands
*/
- const std::list<RegExpElement*>& getElements() const;
-
- /**
- * @copydoc RegExpElement::clone() const
- */
- RegExpElement* clone() const;
+ const std::vector<RegExpElement*>& getElements() const;
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
diff --git a/alib2/src/regexp/Concatenation.cpp b/alib2/src/regexp/Concatenation.cpp
index dcc3aa767e8566cd3fe9dd899f404a586ba25b73..bc0db201f3db261677fbb4b801380c50bd73b159 100644
--- a/alib2/src/regexp/Concatenation.cpp
+++ b/alib2/src/regexp/Concatenation.cpp
@@ -45,11 +45,11 @@ Concatenation::~Concatenation() noexcept {
elements.clear();
}
-std::list<RegExpElement*>& Concatenation::getElements() {
+std::vector<RegExpElement*>& Concatenation::getElements() {
return elements;
}
-const std::list<RegExpElement*>& Concatenation::getElements() const {
+const std::vector<const RegExpElement*>& Concatenation::getElements() const {
return elements;
}
diff --git a/alib2/src/regexp/Concatenation.h b/alib2/src/regexp/Concatenation.h
index be52c02b352b0d8df0b7b636bc2b05d89899d784..de3b3c086bbbfba725f75993f2cce608d6f17493 100644
--- a/alib2/src/regexp/Concatenation.h
+++ b/alib2/src/regexp/Concatenation.h
@@ -8,7 +8,7 @@
#ifndef CONCATENATION_H_
#define CONCATENATION_H_
-#include <list>
+#include <vector>
#include "RegExpElement.h"
namespace regexp {
@@ -18,30 +18,30 @@ namespace regexp {
* as operands of the operator.
*/
class Concatenation: public RegExpElement, public std::element<Concatenation, RegExpElement::visitor_type> {
-private:
- std::list<RegExpElement*> elements;
+protected:
+ /**
+ * @copydoc RegExpElement::clone() const
+ */
+ virtual RegExpElement* clone() const;
+
+ std::vector<RegExpElement*> elements;
public:
Concatenation();
Concatenation(const Concatenation& other);
Concatenation(Concatenation&& other) noexcept;
Concatenation& operator =(const Concatenation& other);
Concatenation& operator =(Concatenation&& other) noexcept;
- ~Concatenation() noexcept;
+ virtual ~Concatenation() noexcept;
/**
* @return list of operands
*/
- std::list<RegExpElement*>& getElements();
+ std::vector<RegExpElement*>& getElements();
/**
* @return list of operands
*/
- const std::list<RegExpElement*>& getElements() const;
-
- /**
- * @copydoc RegExpElement::clone() const
- */
- RegExpElement* clone() const;
+ const std::vector<const RegExpElement*>& getElements() const;
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
diff --git a/alib2/src/regexp/Iteration.cpp b/alib2/src/regexp/Iteration.cpp
index 12bfdeea90844b8f707cbd520bb76ea5752d80ee..dfceeddb839086f66251268b87d118966132ee7e 100644
--- a/alib2/src/regexp/Iteration.cpp
+++ b/alib2/src/regexp/Iteration.cpp
@@ -7,19 +7,15 @@
#include "Iteration.h"
#include <cstdio>
+#include "../AlibException.h"
namespace regexp {
Iteration::Iteration() {
- element = NULL;
+ element = new RegExpEmpty();
}
-Iteration::Iteration(const Iteration& other) {
- if (other.element != NULL) {
- element = other.element->clone();
- } else {
- element = NULL;
- }
+Iteration::Iteration(const Iteration& other) : element(other.element->clone()) {
}
@@ -44,11 +40,7 @@ Iteration& Iteration::operator=(Iteration&& other) noexcept {
}
regexp::Iteration::~Iteration() noexcept {
- if (element != NULL) {
- delete element;
- }
-
- element = NULL;
+ delete element;
}
RegExpElement* Iteration::getElement() {
@@ -60,6 +52,7 @@ const RegExpElement* Iteration::getElement() const {
}
void Iteration::setElement(RegExpElement* element) {
+ delete this->element;
this->element = element;
}
diff --git a/alib2/src/regexp/Iteration.h b/alib2/src/regexp/Iteration.h
index 90d270a3a934d3db0d665e1978b0132a26c484f0..9ee699c011141d444969a975916321824ff3f2e7 100644
--- a/alib2/src/regexp/Iteration.h
+++ b/alib2/src/regexp/Iteration.h
@@ -10,6 +10,7 @@
#include <list>
#include "RegExpElement.h"
+#include "RegExpEmpty.h"
namespace regexp {
@@ -18,15 +19,20 @@ namespace regexp {
* as operand.
*/
class Iteration: public RegExpElement, public std::element<Iteration, RegExpElement::visitor_type> {
-private:
+protected:
RegExpElement* element;
+
+ /**
+ * @copydoc RegExpElement::clone() const
+ */
+ virtual RegExpElement* clone() const;
public:
Iteration();
Iteration(const Iteration& other);
Iteration(Iteration&& other) noexcept;
Iteration& operator =(const Iteration& other);
Iteration& operator =(Iteration&& other) noexcept;
- ~Iteration() noexcept;
+ virtual ~Iteration() noexcept;
/**
* @return element to iterate
@@ -37,18 +43,12 @@ public:
* @return element to iterate
*/
const RegExpElement* getElement() const;
-
+
/**
- * Sets the element to iterate. Doesn't perform the copy, just stores the pointer!
- * @param element RegExpElement to set
+ * @param element to iterate
*/
void setElement(RegExpElement* element);
- /**
- * @copydoc RegExpElement::clone() const
- */
- RegExpElement* clone() const;
-
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
virtual bool operator>(const RegExpElement&) const;
diff --git a/alib2/src/regexp/RegExp.cpp b/alib2/src/regexp/RegExp.cpp
index 6c190100db4bdfd98d866c6d7c0db038cc1b0b4e..2168387220df96f0cb9009c4776c57064eb8c976 100644
--- a/alib2/src/regexp/RegExp.cpp
+++ b/alib2/src/regexp/RegExp.cpp
@@ -61,6 +61,8 @@ const RegExpElement* RegExp::getRegExp() const {
}
void RegExp::setRegExp(RegExpElement* regExp) {
+ delete this->regExp;
+ if(regExp == NULL) throw alib::AlibException();
this->regExp = regExp;
}
diff --git a/alib2/src/regexp/RegExp.h b/alib2/src/regexp/RegExp.h
index 7bb157b3f48372799c10879743b403b16a0feb90..430bcd15f89e9cd6d21be417db9750145a4bad46 100644
--- a/alib2/src/regexp/RegExp.h
+++ b/alib2/src/regexp/RegExp.h
@@ -22,7 +22,7 @@ namespace regexp {
* as a tree of RegExpElement.
*/
class RegExp : public std::element<RegExp, std::visitor<RegExp> > {
-private:
+protected:
RegExpElement* regExp;
public:
diff --git a/alib2/src/regexp/RegExpElement.h b/alib2/src/regexp/RegExpElement.h
index 046a0294c1bd2f981074861b111dd6b116eb37cd..57207bf229c808e5e443a1be9ae4d58c6a26defe 100644
--- a/alib2/src/regexp/RegExpElement.h
+++ b/alib2/src/regexp/RegExpElement.h
@@ -26,14 +26,14 @@ class RegExpEpsilon;
*/
class RegExpElement : virtual public std::elementBase<std::visitor<Alternation, Concatenation, Iteration, RegExpSymbol, RegExpEmpty, RegExpEpsilon> > {
public:
- virtual ~RegExpElement() noexcept;
-
/**
* Creates copy of the element.
* @return copy of the element
*/
virtual RegExpElement* clone() const = 0;
+ virtual ~RegExpElement() noexcept;
+
// RegExpEmpty < RegExpEpsilon < RegExpSymbol < RegExpIteration < RegExpAlternation < RegExpConcatenation
virtual bool operator<(const RegExpElement&) const = 0;
virtual bool operator==(const RegExpElement&) const = 0;
diff --git a/alib2/src/regexp/RegExpEmpty.h b/alib2/src/regexp/RegExpEmpty.h
index 4b4198c1887f6ef3f2c1f88d8ff22cd5b1573078..535344074f57ab1b4dd4f4768e34e0bf7feeb167 100644
--- a/alib2/src/regexp/RegExpEmpty.h
+++ b/alib2/src/regexp/RegExpEmpty.h
@@ -16,13 +16,14 @@ namespace regexp {
* Represents empty regular expression in the regular expression.
*/
class RegExpEmpty: public RegExpElement, public std::element<RegExpEmpty, RegExpElement::visitor_type> {
-public:
- RegExpEmpty();
-
+protected:
/**
* @copydoc RegExpElement::clone() const
*/
- RegExpElement* clone() const;
+ virtual RegExpElement* clone() const;
+
+public:
+ RegExpEmpty();
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
diff --git a/alib2/src/regexp/RegExpEpsilon.h b/alib2/src/regexp/RegExpEpsilon.h
index 24f82b22b157c8cae9c56eadb846cb9d25fdfb64..b570974b0390c4e6a0cc3faaecaa2741d6661eca 100644
--- a/alib2/src/regexp/RegExpEpsilon.h
+++ b/alib2/src/regexp/RegExpEpsilon.h
@@ -17,13 +17,14 @@ namespace regexp {
* Represents epsilon in the regular expression.
*/
class RegExpEpsilon: public RegExpElement, public std::element<RegExpEpsilon, RegExpElement::visitor_type> {
-public:
- RegExpEpsilon();
-
+protected:
/**
* @copydoc RegExpElement::clone() const
*/
- RegExpElement* clone() const;
+ virtual RegExpElement* clone() const;
+
+public:
+ RegExpEpsilon();
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
diff --git a/alib2/src/regexp/RegExpFromXMLParser.cpp b/alib2/src/regexp/RegExpFromXMLParser.cpp
index b9f8af8e7c91093140cba2464b77106c15741aec..a7a55400b7a21cb80830278ca8854ffea3686bff 100644
--- a/alib2/src/regexp/RegExpFromXMLParser.cpp
+++ b/alib2/src/regexp/RegExpFromXMLParser.cpp
@@ -62,7 +62,9 @@ Iteration* RegExpFromXMLParser::parseIteration(std::list<sax::Token>& input) {
popToken(input, sax::Token::START_ELEMENT, "iteration");
Iteration* iteration = new Iteration();
- iteration->setElement(parseElement(input));
+ RegExpElement* element = parseElement(input);
+ if(element == NULL) throw sax::ParserException(sax::Token("", sax::Token::CHARACTER), input.front());
+ iteration->setElement(element);
popToken(input, sax::Token::END_ELEMENT, "iteration");
return iteration;
diff --git a/alib2/src/regexp/RegExpSymbol.h b/alib2/src/regexp/RegExpSymbol.h
index 11faa21d97bfdf48194f6ee8cc5b31ccf639ce64..c0af90f1ba3b98cdffd04afa21ddd103d6465c79 100644
--- a/alib2/src/regexp/RegExpSymbol.h
+++ b/alib2/src/regexp/RegExpSymbol.h
@@ -18,16 +18,17 @@ namespace regexp {
* Represents symbol in the regular expression. Contains name of the symbol.
*/
class RegExpSymbol : public RegExpElement, public std::element<RegExpSymbol, RegExpElement::visitor_type> {
+protected:
+ /**
+ * @copydoc RegExpElement::clone() const
+ */
+ virtual RegExpElement* clone() const;
+
std::string symbol;
public:
RegExpSymbol(const std::string& symbol);
RegExpSymbol(std::string&& symbol);
- /**
- * @copydoc RegExpElement::clone() const
- */
- RegExpElement* clone() const;
-
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
virtual bool operator>(const RegExpElement&) const;