From a3951e89ae505cf527e61cd5004b14b8f2690fe3 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Mon, 24 Feb 2014 19:43:00 +0100
Subject: [PATCH] fix for build error
Conflicts:
aconversions/src/re2fa/Brzozowski.cpp
libaderivation/src/RegExpDerivation.cpp
libaregexptree/src/RegExpAlphabet.cpp
---
alib/src/regexp/RegExpPrinter.cpp | 2 +-
alib/src/regexp/RegExpSymbol.cpp | 10 +++++++---
alib/src/regexp/RegExpSymbol.h | 5 ++++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/alib/src/regexp/RegExpPrinter.cpp b/alib/src/regexp/RegExpPrinter.cpp
index 223ab54691..bd8371e3c7 100644
--- a/alib/src/regexp/RegExpPrinter.cpp
+++ b/alib/src/regexp/RegExpPrinter.cpp
@@ -83,7 +83,7 @@ void RegExpPrinter::printIteration(Iteration* iteration, ostream& out, string pr
void RegExpPrinter::printSymbol(RegExpSymbol* symbol, ostream& out, string prefix) {
out << prefix << "<symbol>";
- out << symbol->getSymbol();
+ out << symbol->getSymbol().getSymbol();
out << "</symbol>\n";
}
diff --git a/alib/src/regexp/RegExpSymbol.cpp b/alib/src/regexp/RegExpSymbol.cpp
index 1ecb2bcf90..6c017bba1b 100644
--- a/alib/src/regexp/RegExpSymbol.cpp
+++ b/alib/src/regexp/RegExpSymbol.cpp
@@ -10,15 +10,15 @@
namespace regexp {
RegExpSymbol::RegExpSymbol() :
- Symbol("") {
+ symbol("") {
}
RegExpSymbol::RegExpSymbol(const string& symbol) :
- Symbol(symbol) {
+ symbol(symbol) {
}
RegExpElement* RegExpSymbol::clone() const {
- return new RegExpSymbol(this->symbol);
+ return new RegExpSymbol(this->symbol.getSymbol());
}
bool RegExpSymbol::operator<(const RegExpElement& other) const {
@@ -70,5 +70,9 @@ bool RegExpSymbol::containsEmptyString() const {
return false;
}
+const Symbol& RegExpSymbol::getSymbol() const {
+ return this->symbol;
+}
+
} /* namespace regexp */
diff --git a/alib/src/regexp/RegExpSymbol.h b/alib/src/regexp/RegExpSymbol.h
index 1b7b4982b1..6ea3028565 100644
--- a/alib/src/regexp/RegExpSymbol.h
+++ b/alib/src/regexp/RegExpSymbol.h
@@ -20,7 +20,8 @@ using namespace alphabet;
/**
* Represents symbol in the regular expression. Contains name of the symbol.
*/
-class RegExpSymbol: public RegExpElement, public Symbol {
+class RegExpSymbol: public RegExpElement {
+ Symbol symbol;
public:
RegExpSymbol();
RegExpSymbol(const string& symbol);
@@ -48,6 +49,8 @@ public:
* @copydoc RegExpElement::containsEmptyString() const
*/
bool containsEmptyString() const;
+
+ const Symbol& getSymbol() const;
};
} /* namespace regexp */
--
GitLab