diff --git a/alib/src/regexp/Alternation.cpp b/alib/src/regexp/Alternation.cpp
index 23e5ed740974e0a0c95eab28eee04d5f30e5fe3d..2284faced6c636d5feb64dafb417ad1bf8a6b4fc 100644
--- a/alib/src/regexp/Alternation.cpp
+++ b/alib/src/regexp/Alternation.cpp
@@ -76,25 +76,25 @@ bool Alternation::operator<(const Alternation& other) const {
int otherSize = other.elements.size();
if(thisSize < otherSize) return true;
if(thisSize > otherSize) return false;
-
+
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
if(**thisIter < **otherIter) return true;
}
-
+
return false;
}
bool Alternation::operator==(const Alternation& other) const {
if(this->elements.size() != other.elements.size()) return false;
-
+
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
if(**thisIter != **otherIter) return false;
}
-
+
return true;
}
@@ -103,13 +103,13 @@ bool Alternation::operator>(const Alternation& other) const {
int otherSize = other.elements.size();
if(thisSize < otherSize) return false;
if(thisSize > otherSize) return true;
-
+
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
if(**thisIter > **otherIter) return true;
}
-
+
return false;
}
@@ -129,5 +129,13 @@ bool Alternation::operator>(const RegExpEmpty&) const {
return true;
}
+bool Alternation::containsEmptyString() const {
+ for(const auto& e : getElements())
+ if(e->containsEmptyString())
+ return true;
+
+ return false;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/Alternation.h b/alib/src/regexp/Alternation.h
index 20c154d7661e1d589068ec7c7f60dc9ab434e83f..cfeb34d6395ec965324fc80ab12a9f8abd3521b2 100644
--- a/alib/src/regexp/Alternation.h
+++ b/alib/src/regexp/Alternation.h
@@ -42,11 +42,11 @@ public:
* @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;
-
+
virtual bool operator<(const Concatenation&) const;
virtual bool operator<(const Alternation&) const;
virtual bool operator==(const Alternation&) const;
@@ -55,6 +55,11 @@ public:
virtual bool operator>(const RegExpSymbol&) const;
virtual bool operator>(const RegExpEpsilon&) const;
virtual bool operator>(const RegExpEmpty&) const;
+
+ /**
+ * @copydoc RegExpElement::containsEmptyString() const
+ */
+ bool containsEmptyString() const;
};
} /* namespace regexp */
diff --git a/alib/src/regexp/Concatenation.cpp b/alib/src/regexp/Concatenation.cpp
index 983e1e2e6b41801b6ab6efe77acf54172f74c7a9..395f02a4d65fad82f6d3b708c7a747fdb43aee7b 100644
--- a/alib/src/regexp/Concatenation.cpp
+++ b/alib/src/regexp/Concatenation.cpp
@@ -72,25 +72,25 @@ bool Concatenation::operator<(const Concatenation& other) const {
int otherSize = other.elements.size();
if(thisSize < otherSize) return true;
if(thisSize > otherSize) return false;
-
+
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
if(**thisIter < **otherIter) return true;
}
-
+
return false;
}
bool Concatenation::operator==(const Concatenation& other) const {
if(this->elements.size() != other.elements.size()) return false;
-
+
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
if(**thisIter != **otherIter) return false;
}
-
+
return true;
}
@@ -99,13 +99,13 @@ bool Concatenation::operator>(const Concatenation& other) const {
int otherSize = other.elements.size();
if(thisSize < otherSize) return false;
if(thisSize > otherSize) return true;
-
+
auto thisIter = this->elements.begin();
auto otherIter = other.elements.begin();
for(; thisIter != this->elements.end(); thisIter++, otherIter++) {
if(**thisIter > **otherIter) return true;
}
-
+
return false;
}
@@ -129,4 +129,12 @@ bool Concatenation::operator>(const RegExpEmpty&) const {
return true;
}
+bool Concatenation::containsEmptyString() const {
+ for( const auto& e : getElements())
+ if( ! e->containsEmptyString())
+ return false;
+
+ return true;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/Concatenation.h b/alib/src/regexp/Concatenation.h
index 4df551234296328edd40b2e6a1c0e5b26fffc049..e35d05eac2b966fb4c2a98ededd1c31f99c1c35f 100644
--- a/alib/src/regexp/Concatenation.h
+++ b/alib/src/regexp/Concatenation.h
@@ -46,7 +46,7 @@ public:
virtual bool operator<(const RegExpElement&) const;
virtual bool operator==(const RegExpElement&) const;
virtual bool operator>(const RegExpElement&) const;
-
+
virtual bool operator<(const Concatenation&) const;
virtual bool operator==(const Concatenation&) const;
virtual bool operator>(const Concatenation&) const;
@@ -56,6 +56,10 @@ public:
virtual bool operator>(const RegExpEpsilon&) const;
virtual bool operator>(const RegExpEmpty&) const;
+ /**
+ * @copydoc RegExpElement::containsEmptyString() const
+ */
+ bool containsEmptyString() const;
};
} /* namespace regexp */
diff --git a/alib/src/regexp/Iteration.cpp b/alib/src/regexp/Iteration.cpp
index 8126596a4cad43b8955e650764a19621687c3323..399a3ee371d46cd1596199f751d3c2799def4a46 100644
--- a/alib/src/regexp/Iteration.cpp
+++ b/alib/src/regexp/Iteration.cpp
@@ -65,7 +65,6 @@ RegExpElement* Iteration::clone() const {
return new Iteration(*this);
}
-
bool Iteration::operator<(const RegExpElement& other) const {
return !(other > *this || other == *this);
}
@@ -77,7 +76,7 @@ bool Iteration::operator==(const RegExpElement& other) const {
bool Iteration::operator>(const RegExpElement& other) const {
return !(other < *this || other == *this);
}
-
+
bool Iteration::operator<(const Concatenation&) const {
return true;
}
@@ -110,5 +109,9 @@ bool Iteration::operator>(const RegExpEmpty&) const {
return true;
}
+bool Iteration::containsEmptyString() const {
+ return true;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/Iteration.h b/alib/src/regexp/Iteration.h
index 7f5c23cbb0f5d5af9247d7665554ad31572e970a..ab34a89deb1ef144f4661fd286404212121dd3cc 100644
--- a/alib/src/regexp/Iteration.h
+++ b/alib/src/regexp/Iteration.h
@@ -48,11 +48,11 @@ public:
* @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;
-
+
virtual bool operator<(const Concatenation&) const;
virtual bool operator<(const Alternation&) const;
virtual bool operator<(const Iteration&) const;
@@ -62,6 +62,10 @@ public:
virtual bool operator>(const RegExpEpsilon&) const;
virtual bool operator>(const RegExpEmpty&) const;
+ /**
+ * @copydoc RegExpElement::containsEmptyString() const
+ */
+ bool containsEmptyString() const;
};
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExp.cpp b/alib/src/regexp/RegExp.cpp
index b35657c0d97d7376f54e012d56f8539ff997d08a..65b63e54a07c81bd448925f5dc9490030aed1712 100644
--- a/alib/src/regexp/RegExp.cpp
+++ b/alib/src/regexp/RegExp.cpp
@@ -74,6 +74,13 @@ bool RegExp::isEmpty() const {
return regExp == NULL || dynamic_cast<const RegExpEmpty*>(regExp);
}
+bool RegExp::containsEmptyString() const {
+ if(regExp)
+ return regExp->containsEmptyString();
+
+ return false;
+}
+
void RegExp::toXML(ostream& out) {
RegExpPrinter::toXML(*this, out);
}
diff --git a/alib/src/regexp/RegExp.h b/alib/src/regexp/RegExp.h
index e31198ae94f0ae3d3c6bbcdce2adbf58867b3645..def92709e7c4c2a71a2cf05931f046405ba064b8 100644
--- a/alib/src/regexp/RegExp.h
+++ b/alib/src/regexp/RegExp.h
@@ -60,6 +60,11 @@ public:
*/
bool isEmpty() const;
+ /**
+ * @return true if regexp matches empty string (epsilon)
+ */
+ bool containsEmptyString() const;
+
/**
* Prints XML representation of the RegExp to the output stream.
* @param out output stream to which print the RegExp
diff --git a/alib/src/regexp/RegExpElement.cpp b/alib/src/regexp/RegExpElement.cpp
index f6198be509c822d99b80ace5b3958f2faf4aa98c..4b1cfb88348cd72b4e19cf86437a2806eb2f259f 100644
--- a/alib/src/regexp/RegExpElement.cpp
+++ b/alib/src/regexp/RegExpElement.cpp
@@ -10,6 +10,7 @@
namespace regexp {
RegExpElement::~RegExpElement() {
+
}
bool RegExpElement::operator!=(const RegExpElement& other) const {
diff --git a/alib/src/regexp/RegExpElement.h b/alib/src/regexp/RegExpElement.h
index 6365c1da0a686ae19662afc3c2fb5fc96dce2e61..206c80759d6a31e8765f0d459935fe47f94fa31f 100644
--- a/alib/src/regexp/RegExpElement.h
+++ b/alib/src/regexp/RegExpElement.h
@@ -32,34 +32,38 @@ public:
* @return copy of the element
*/
virtual RegExpElement* clone() const = 0;
-
+
virtual bool operator<(const RegExpElement&) const = 0;
virtual bool operator==(const RegExpElement&) const = 0;
virtual bool operator>(const RegExpElement&) const = 0;
-
+
virtual bool operator!=(const RegExpElement&) const;
-
+
virtual bool operator<(const Concatenation&) const;
virtual bool operator<(const Alternation&) const;
virtual bool operator<(const Iteration&) const;
virtual bool operator<(const RegExpSymbol&) const;
virtual bool operator<(const RegExpEpsilon&) const;
virtual bool operator<(const RegExpEmpty&) const;
-
+
virtual bool operator==(const Concatenation&) const;
virtual bool operator==(const Alternation&) const;
virtual bool operator==(const Iteration&) const;
virtual bool operator==(const RegExpSymbol&) const;
virtual bool operator==(const RegExpEpsilon&) const;
virtual bool operator==(const RegExpEmpty&) const;
-
+
virtual bool operator>(const Concatenation&) const;
virtual bool operator>(const Alternation&) const;
virtual bool operator>(const Iteration&) const;
virtual bool operator>(const RegExpSymbol&) const;
virtual bool operator>(const RegExpEpsilon&) const;
virtual bool operator>(const RegExpEmpty&) const;
-
+
+ /**
+ * @return true if this subtree of regexp matches empty string (epsilon)
+ */
+ virtual bool containsEmptyString() const = 0;
};
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpEmpty.cpp b/alib/src/regexp/RegExpEmpty.cpp
index 16c579eaefbac129e5c09f631f50d3524e8740b3..28683e657fe871d8038d2d4857e0aa06f6976c47 100644
--- a/alib/src/regexp/RegExpEmpty.cpp
+++ b/alib/src/regexp/RegExpEmpty.cpp
@@ -53,5 +53,9 @@ bool RegExpEmpty::operator==(const RegExpEmpty&) const {
return true;
}
+bool RegExpEmpty::containsEmptyString() const {
+ return false;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpEmpty.h b/alib/src/regexp/RegExpEmpty.h
index 2c5ffb08271bf4f92fc6d6239d9154c3895baead..7fb80a8935aa801a0fc928214b2b62b2e33d2fec 100644
--- a/alib/src/regexp/RegExpEmpty.h
+++ b/alib/src/regexp/RegExpEmpty.h
@@ -25,7 +25,7 @@ public:
* @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;
@@ -36,6 +36,11 @@ public:
virtual bool operator<(const RegExpSymbol&) const;
virtual bool operator<(const RegExpEpsilon&) const;
virtual bool operator==(const RegExpEmpty&) const;
+
+ /**
+ * @copydoc RegExpElement::containsEmptyString() const
+ */
+ bool containsEmptyString() const;
};
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpEpsilon.cpp b/alib/src/regexp/RegExpEpsilon.cpp
index 11645bb8bd8c18bf22af5983e778269fb1481398..0d7c64f1591e4bb5d412d4724bc3d2c5b4e6a6ce 100644
--- a/alib/src/regexp/RegExpEpsilon.cpp
+++ b/alib/src/regexp/RegExpEpsilon.cpp
@@ -52,6 +52,10 @@ bool RegExpEpsilon::operator==(const RegExpEpsilon&) const {
bool RegExpEpsilon::operator>(const RegExpEmpty&) const {
return true;
}
-
+
+bool RegExpEpsilon::containsEmptyString() const {
+ return true;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpEpsilon.h b/alib/src/regexp/RegExpEpsilon.h
index 4c0f028251873d41c16df8cbc919debdde3f7419..351df1bde6edecfe2a062e7022d6c45fd1d81f6c 100644
--- a/alib/src/regexp/RegExpEpsilon.h
+++ b/alib/src/regexp/RegExpEpsilon.h
@@ -27,7 +27,7 @@ public:
* @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;
@@ -38,6 +38,11 @@ public:
virtual bool operator<(const RegExpSymbol&) const;
virtual bool operator==(const RegExpEpsilon&) const;
virtual bool operator>(const RegExpEmpty&) const;
+
+ /**
+ * @copydoc RegExpElement::containsEmptyString() const
+ */
+ bool containsEmptyString() const;
};
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpSymbol.cpp b/alib/src/regexp/RegExpSymbol.cpp
index 1e524be73fc7f9cd942666f2da0d81bd88522fe2..1ecb2bcf901c5a45582414d6af11b56003c92833 100644
--- a/alib/src/regexp/RegExpSymbol.cpp
+++ b/alib/src/regexp/RegExpSymbol.cpp
@@ -66,5 +66,9 @@ bool RegExpSymbol::operator>(const RegExpEmpty&) const {
return true;
}
+bool RegExpSymbol::containsEmptyString() const {
+ return false;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpSymbol.h b/alib/src/regexp/RegExpSymbol.h
index ddd17e9d29d52f7a3635193628076a773590c5ac..1b7b4982b145d8c4ee89870ee2f0210e91074157 100644
--- a/alib/src/regexp/RegExpSymbol.h
+++ b/alib/src/regexp/RegExpSymbol.h
@@ -29,11 +29,11 @@ public:
* @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;
-
+
virtual bool operator<(const Concatenation&) const;
virtual bool operator<(const Alternation&) const;
virtual bool operator<(const Iteration&) const;
@@ -43,6 +43,11 @@ public:
virtual bool operator>(const RegExpEpsilon&) const;
virtual bool operator>(const RegExpEmpty&) const;
+
+ /**
+ * @copydoc RegExpElement::containsEmptyString() const
+ */
+ bool containsEmptyString() const;
};
} /* namespace regexp */