Merge getAlphabet from master

alib2/src/regexp/Alternation.cpp

@@ -87,6 +87,11 @@ bool Alternation::operator<(const Alternation& other) const {
 	return **thisIter < **otherIter;
 }
+void Alternation::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+	for(const auto& child : this->elements)
+		child->getAlphabet(alphabet);
+}
+
 bool Alternation::operator==(const Alternation& other) const {
 	if(this->elements.size() != other.elements.size()) return false;

alib2/src/regexp/Alternation.h

@@ -50,7 +50,12 @@ public:
 	virtual bool operator<(const Concatenation&) const;
 	virtual bool operator<(const Alternation&) const;
 	virtual bool operator==(const Alternation&) const;
-
+	
+	/**
+	 * @copydoc RegExpElement::getAlphabet() const
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const;
+	
 	/**
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */

alib2/src/regexp/Concatenation.cpp

@@ -95,6 +95,11 @@ bool Concatenation::operator==(const Concatenation& other) const {
 	return true;
 }
+void Concatenation::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+	for(const auto& child : this->elements)
+		child->getAlphabet(alphabet);
+}
+
 bool Concatenation::containsEmptyString() const {
 	for(const auto& e : getElements())
 		if( ! e->containsEmptyString())

alib2/src/regexp/Concatenation.h

@@ -50,6 +50,11 @@ public:
 	virtual bool operator<(const Concatenation&) const;
 	virtual bool operator==(const Concatenation&) const;
+	/**
+	 * @copydoc RegExpElement::getAlphabet() const
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const;
+	
 	/**
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */

alib2/src/regexp/Iteration.cpp

@@ -93,6 +93,10 @@ bool Iteration::operator==(const Iteration& other) const {
 	return *(this->element) == *(other.element);
 }
+void Iteration::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+	element->getAlphabet( alphabet );
+}
+
 bool Iteration::containsEmptyString() const {
 	return true;
 }

alib2/src/regexp/Iteration.h

@@ -58,6 +58,11 @@ public:
 	virtual bool operator<(const Iteration&) const;
 	virtual bool operator==(const Iteration&) const;
+	/**
+	 * @copydoc RegExpElement::getAlphabet() const
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const;
+	
 	/**
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */

alib2/src/regexp/RegExp.cpp

@@ -69,6 +69,15 @@ void RegExp::setRegExp(RegExpElement* regExp) {
 	this->regExp = regExp;
 }
+set<alphabet::Symbol> RegExp::getAlphabet() const {
+	set<alphabet::Symbol> alphabet;
+
+	if(regExp)
+		regExp->getAlphabet( alphabet );
+
+	return alphabet;
+}
+
 bool RegExp::isEmpty() const {
 	return regExp == NULL || regExp->isEmpty();
 }

alib2/src/regexp/RegExp.h

@@ -55,7 +55,13 @@ public:
 	 * @param regExp root node to set
 	 */
 	void setRegExp(RegExpElement* regExp);
-
+	
+	/**
+	 * Gets alphabet symbols used in RegExp.
+	 * @return set of alphabet symbols used in regexp.
+	 */
+	std::set<alphabet::Symbol> getAlphabet() const;
+	
 	/**
 	 * @return true if regexp represents empty language
 	 */

alib2/src/regexp/RegExpElement.h

@@ -9,6 +9,8 @@
 #define REGEXPELEMENT_H_
 #include "../std/visitor.hpp"
+#include "../alphabet/Symbol.h"
+#include <set>
 namespace regexp {
@@ -67,6 +69,13 @@ public:
 	 * @return true if this subtree describes empty language
 	 */
 	virtual bool isEmpty() const = 0;
+	
+	/**
+	 * Traverses the regexp tree to get alphabet symbols used.
+	 *
+	 * @param alphabet All alphabet symbols encountered are added into this set
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const = 0;
 };
 } /* namespace regexp */

alib2/src/regexp/RegExpEmpty.cpp

@@ -53,6 +53,10 @@ bool RegExpEmpty::operator==(const RegExpEmpty&) const {
 	return true;
 }
+void RegExpEmpty::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+
+}
+
 bool RegExpEmpty::containsEmptyString() const {
 	return false;
 }

alib2/src/regexp/RegExpEmpty.h

@@ -36,7 +36,12 @@ public:
 	virtual bool operator<(const RegExpSymbol&) const;
 	virtual bool operator<(const RegExpEpsilon&) const;
 	virtual bool operator==(const RegExpEmpty&) const;
-
+	
+	/**
+	 * @copydoc RegExpElement::getAlphabet() const
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const;
+	
 	/**
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */

alib2/src/regexp/RegExpEpsilon.cpp

@@ -49,6 +49,10 @@ bool RegExpEpsilon::operator==(const RegExpEpsilon&) const {
 	  return true;
 }
+void RegExpElement::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+
+}
+
 bool RegExpEpsilon::containsEmptyString() const {
 	return true;
 }

alib2/src/regexp/RegExpEpsilon.h

@@ -37,7 +37,12 @@ public:
 	virtual bool operator<(const Iteration&) const;
 	virtual bool operator<(const RegExpSymbol&) const;
 	virtual bool operator==(const RegExpEpsilon&) const;
-
+	
+	/**
+	 * @copydoc RegExpElement::getAlphabet() const
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const;
+	
 	/**
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */

alib2/src/regexp/RegExpSymbol.cpp

@@ -62,6 +62,10 @@ bool RegExpSymbol::isEmpty() const {
 	return false;
 }
+void RegExpSymbol::getAlphabet( std::set<alphabet::Symbol> & alphabet ) const {
+	alphabet.insert( Symbol( this->getSymbol( ) ) );
+}
+
 const string& RegExpSymbol::getSymbol() const {
 	return this->symbol;
 }

alib2/src/regexp/RegExpSymbol.h

@@ -41,7 +41,11 @@ public:
 	virtual bool operator<(const RegExpSymbol&) const;
 	virtual bool operator==(const RegExpSymbol&) const;
-
+	/**
+	 * @copydoc RegExpElement::getAlphabet() const
+	 */
+	virtual void getAlphabet( std::set<alphabet::Symbol> & alphabet ) const;
+	
 	/**
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */