diff --git a/alib2/src/regexp/Alternation.cpp b/alib2/src/regexp/Alternation.cpp
index 24377bd12e240191935b055a39ed018a7e80a656..e3fd7b15088d0944555cba27474135b42da89455 100644
--- a/alib2/src/regexp/Alternation.cpp
+++ b/alib2/src/regexp/Alternation.cpp
@@ -104,6 +104,14 @@ bool Alternation::operator==(const Alternation& other) const {
return true;
}
+void Alternation::operator>>(ostream& out) const {
+ out << "(Alternation";
+ for(const auto& e : getElements())
+ out << " " << *e;
+
+ out << ")";
+}
+
bool Alternation::containsEmptyString() const {
for(const auto& e : getElements())
if(e->containsEmptyString())
diff --git a/alib2/src/regexp/Alternation.h b/alib2/src/regexp/Alternation.h
index 930dce0e97c083a5dc4a59a5ebc4e8ac5f1aa2a1..a5e7b56b6716dbef32db9ac2c02839e265672b40 100644
--- a/alib2/src/regexp/Alternation.h
+++ b/alib2/src/regexp/Alternation.h
@@ -51,6 +51,11 @@ public:
virtual bool operator<(const Alternation&) const;
virtual bool operator==(const Alternation&) const;
+ /**
+ * @copydoc RegExpElement::operator>>() const
+ */
+ virtual void operator>>(ostream& out) const;
+
/**
* @copydoc RegExpElement::getAlphabet() const
*/
diff --git a/alib2/src/regexp/Concatenation.cpp b/alib2/src/regexp/Concatenation.cpp
index b678958ac903898e5d8e5dabdab98066f8ed7cb5..e2553fc7567bf9e4d85750e202b915e6ef854d97 100644
--- a/alib2/src/regexp/Concatenation.cpp
+++ b/alib2/src/regexp/Concatenation.cpp
@@ -76,7 +76,7 @@ bool Concatenation::operator<(const Concatenation& other) const {
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
- if(**thisIter != **otherIter) break;
+ if(**thisIter != **otherIter) break;
}
if(thisIter == this->elements.end()) return false;
@@ -89,12 +89,20 @@ bool Concatenation::operator==(const Concatenation& other) const {
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
- if(**thisIter != **otherIter) return false;
+ if(**thisIter != **otherIter) return false;
}
return true;
}
+void Concatenation::operator>>(ostream& out) const {
+ out << "(Concatenation";
+ for(const auto& e : getElements())
+ out << " " << *e;
+
+ out << ")";
+}
+
void Concatenation::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
for(const auto& child : this->elements)
child->getAlphabet(alphabet);
diff --git a/alib2/src/regexp/Concatenation.h b/alib2/src/regexp/Concatenation.h
index 6b8b10a04ab74ba30e8423f3bbac50a7d5a58f38..03a3115fc5bc5d231d0bacd1ba3ae593064b59a9 100644
--- a/alib2/src/regexp/Concatenation.h
+++ b/alib2/src/regexp/Concatenation.h
@@ -50,6 +50,11 @@ public:
virtual bool operator<(const Concatenation&) const;
virtual bool operator==(const Concatenation&) const;
+ /**
+ * @copydoc RegExpElement::operator>>() const
+ */
+ virtual void operator>>(ostream& out) const;
+
/**
* @copydoc RegExpElement::getAlphabet() const
*/
diff --git a/alib2/src/regexp/Iteration.cpp b/alib2/src/regexp/Iteration.cpp
index 888985fa098e84a3fd3232911854a5a01d26f23b..6bd9f316252b1beee19f2965ea10833ffb46536c 100644
--- a/alib2/src/regexp/Iteration.cpp
+++ b/alib2/src/regexp/Iteration.cpp
@@ -93,6 +93,10 @@ bool Iteration::operator==(const Iteration& other) const {
return *(this->element) == *(other.element);
}
+void Iteration::operator>>(ostream& out) const {
+ out << "(RegExpIteration " << *element << ")";
+}
+
void Iteration::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
element->getAlphabet( alphabet );
}
diff --git a/alib2/src/regexp/Iteration.h b/alib2/src/regexp/Iteration.h
index 168158461eb1f2ea93a45ea97b3cbd40b0f1d204..097e249b17dd511bc82036930b8106b6da2dda51 100644
--- a/alib2/src/regexp/Iteration.h
+++ b/alib2/src/regexp/Iteration.h
@@ -58,6 +58,11 @@ public:
virtual bool operator<(const Iteration&) const;
virtual bool operator==(const Iteration&) const;
+ /**
+ * @copydoc RegExpElement::operator>>() const
+ */
+ virtual void operator>>(ostream& out) const;
+
/**
* @copydoc RegExpElement::getAlphabet() const
*/
diff --git a/alib2/src/regexp/RegExp.cpp b/alib2/src/regexp/RegExp.cpp
index cc899dc63b12821caff94910cc46f8d391b01e5d..6d0ea276b729fe99dfd8ec4f00e5b1ec1e998120 100644
--- a/alib2/src/regexp/RegExp.cpp
+++ b/alib2/src/regexp/RegExp.cpp
@@ -90,7 +90,7 @@ bool RegExp::containsEmptyString() const {
}
ostream& operator <<(ostream& out, const RegExp& regexp) {
- out << "(" << "RegExp" << " " << "Element:" << regexp.regExp << ")";
+ out << "(RegExp " << *(regexp.regExp) << ")";
return out;
}
diff --git a/alib2/src/regexp/RegExpElement.cpp b/alib2/src/regexp/RegExpElement.cpp
index fc07c4c1f017c38e277ec1b9717f54ba53d569a3..1f4bee974028994d7855c4a7ecfc8cfc6668646f 100644
--- a/alib2/src/regexp/RegExpElement.cpp
+++ b/alib2/src/regexp/RegExpElement.cpp
@@ -75,4 +75,9 @@ bool RegExpElement::operator==(const RegExpEmpty& other) const {
return false;
}
+ostream& operator<<(ostream& out, const RegExpElement& regexp) {
+ regexp >> out;
+ return out;
+}
+
} /* namespace regexp */
diff --git a/alib2/src/regexp/RegExpElement.h b/alib2/src/regexp/RegExpElement.h
index 4809f67cf145ff30bcfbeaff018ce2c479ea8bf6..ed283d91254fb4385d17a4167597a395e9c3803d 100644
--- a/alib2/src/regexp/RegExpElement.h
+++ b/alib2/src/regexp/RegExpElement.h
@@ -59,6 +59,19 @@ public:
virtual bool operator==(const RegExpSymbol&) const;
virtual bool operator==(const RegExpEpsilon&) const;
virtual bool operator==(const RegExpEmpty&) const;
+
+ /**
+ * Prints XML representation of the RegExp to the output stream.
+ * @param out output stream to which print the RegExp
+ */
+ virtual void operator>>(ostream& out) const = 0;
+
+ /**
+ * Prints XML representation of the RegExp to the output stream.
+ * @param out output stream to which print the RegExp
+ * @param regexp RegExp to print
+ */
+ friend ostream& operator<<(ostream& out, const RegExpElement& regexp);
/**
* @return true if this subtree of regexp matches empty string (epsilon)
diff --git a/alib2/src/regexp/RegExpEmpty.cpp b/alib2/src/regexp/RegExpEmpty.cpp
index ed76ea14b1af985e17b36fba4d006d39998e3bf0..83d0c1f2480f407f4a426adba8f68a08e5ffe1c3 100644
--- a/alib2/src/regexp/RegExpEmpty.cpp
+++ b/alib2/src/regexp/RegExpEmpty.cpp
@@ -53,6 +53,10 @@ bool RegExpEmpty::operator==(const RegExpEmpty&) const {
return true;
}
+void RegExpEmpty::operator>>(ostream& out) const {
+ out << "(RegExpEmpty)";
+}
+
void RegExpEmpty::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
}
diff --git a/alib2/src/regexp/RegExpEmpty.h b/alib2/src/regexp/RegExpEmpty.h
index 927842634fcee2fcac8b5b24d283c4a3a3e50c65..150ebda6afa88ec1d03bd1a7f1979e52c00783c6 100644
--- a/alib2/src/regexp/RegExpEmpty.h
+++ b/alib2/src/regexp/RegExpEmpty.h
@@ -37,6 +37,11 @@ public:
virtual bool operator<(const RegExpEpsilon&) const;
virtual bool operator==(const RegExpEmpty&) const;
+ /**
+ * @copydoc RegExpElement::operator>>() const
+ */
+ virtual void operator>>(ostream& out) const;
+
/**
* @copydoc RegExpElement::getAlphabet() const
*/
diff --git a/alib2/src/regexp/RegExpEpsilon.cpp b/alib2/src/regexp/RegExpEpsilon.cpp
index f82c17a4c5835daa594b91752ac58deabbe8b600..18940c9d3dab4f9c49bd07093372a1b016d7f8f6 100644
--- a/alib2/src/regexp/RegExpEpsilon.cpp
+++ b/alib2/src/regexp/RegExpEpsilon.cpp
@@ -49,7 +49,11 @@ bool RegExpEpsilon::operator==(const RegExpEpsilon&) const {
return true;
}
-void RegExpElement::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+void RegExpEpsilon::operator>>(ostream& out) const {
+ out << "(RegExpEpsilon)";
+}
+
+void RegExpEpsilon::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
}
diff --git a/alib2/src/regexp/RegExpEpsilon.h b/alib2/src/regexp/RegExpEpsilon.h
index d51af0821a3a48905676f156693646ebd5172d3d..57c64dccdbc8e8698427fdac40d756d91a9ae437 100644
--- a/alib2/src/regexp/RegExpEpsilon.h
+++ b/alib2/src/regexp/RegExpEpsilon.h
@@ -38,6 +38,11 @@ public:
virtual bool operator<(const RegExpSymbol&) const;
virtual bool operator==(const RegExpEpsilon&) const;
+ /**
+ * @copydoc RegExpElement::operator>>() const
+ */
+ virtual void operator>>(ostream& out) const;
+
/**
* @copydoc RegExpElement::getAlphabet() const
*/
diff --git a/alib2/src/regexp/RegExpSymbol.cpp b/alib2/src/regexp/RegExpSymbol.cpp
index 140eee9f5210f0e097601e6a24c1fae478a85ff6..9f091a5b705b4c1ff275d2bebdefa1040f4f29df 100644
--- a/alib2/src/regexp/RegExpSymbol.cpp
+++ b/alib2/src/regexp/RegExpSymbol.cpp
@@ -54,6 +54,10 @@ bool RegExpSymbol::operator==(const RegExpSymbol& other) const {
return this->symbol == other.symbol;
}
+void RegExpSymbol::operator>>(ostream& out) const {
+ out << "(RegExpSymbol " << symbol << ")";
+}
+
bool RegExpSymbol::containsEmptyString() const {
return false;
}
diff --git a/alib2/src/regexp/RegExpSymbol.h b/alib2/src/regexp/RegExpSymbol.h
index 83d79f6bae278708f25f4898f88a8bac129f91a3..5325b49a1367a54e5e9f20047b6a8acbfb20838e 100644
--- a/alib2/src/regexp/RegExpSymbol.h
+++ b/alib2/src/regexp/RegExpSymbol.h
@@ -40,6 +40,11 @@ public:
virtual bool operator<(const Iteration&) const;
virtual bool operator<(const RegExpSymbol&) const;
virtual bool operator==(const RegExpSymbol&) const;
+
+ /**
+ * @copydoc RegExpElement::operator>>() const
+ */
+ virtual void operator>>(ostream& out) const;
/**
* @copydoc RegExpElement::getAlphabet() const