diff --git a/alib2data/src/alphabet/Symbol.cpp b/alib2data/src/alphabet/Symbol.cpp
index 42eb5f2b6d9107ab7b71f60c0c73078229d225fb..31ec27637d9f977d663383e376f62de92bc57df7 100644
--- a/alib2data/src/alphabet/Symbol.cpp
+++ b/alib2data/src/alphabet/Symbol.cpp
@@ -6,6 +6,10 @@
*/
#include "Symbol.h"
+#include "../label/NextLabel.h"
+#include "LabeledSymbol.h"
+#include <climits>
+#include "../exception/AlibException.h"
namespace alphabet {
@@ -82,5 +86,23 @@ Symbol::operator std::string() const {
return (std::string) *symbol;
}
+alphabet::Symbol Symbol::createUniqueSymbol(const alphabet::Symbol& base, const std::set<alphabet::Symbol>& terminalAlphabet, const std::set<alphabet::Symbol>& nonterminalAlphabet) {
+ label::NextLabel nextLabelCreator;
+
+ const alphabet::LabeledSymbol* baseSymbol = dynamic_cast<const alphabet::LabeledSymbol*>(&(base.getSymbol()));
+ if(baseSymbol == NULL)
+ throw exception::AlibException("Could not create unique symbol with nonlabeled base symbol " + (std::string) base.getSymbol() + "." );
+
+ int i = 0;
+ do {
+ label::Label nextLabel = nextLabelCreator.nextLabel(baseSymbol->getLabel());
+ alphabet::Symbol attempt = alphabet::Symbol(alphabet::LabeledSymbol(nextLabel));
+ if(terminalAlphabet.count(attempt) == 0 && nonterminalAlphabet.count(attempt) == 0)
+ return attempt;
+ } while(++i < INT_MAX);
+
+ throw exception::AlibException("Could not create unique symbol with base symbol " + (std::string) base.getSymbol() + "." );
+}
+
} /* namespace alphabet */
diff --git a/alib2data/src/alphabet/Symbol.h b/alib2data/src/alphabet/Symbol.h
index c69839ab0ec2cf8064af6c31a8980a307e647e7f..3b9499efb535e13817b67b8364e52e8c00dcfddb 100644
--- a/alib2data/src/alphabet/Symbol.h
+++ b/alib2data/src/alphabet/Symbol.h
@@ -10,6 +10,7 @@
#include "../std/visitor.hpp"
#include "SymbolBase.h"
+#include <set>
namespace alphabet {
@@ -43,6 +44,15 @@ public:
friend std::ostream& operator<<(std::ostream& os, const Symbol& symbol);
operator std::string () const;
+
+ /**
+ * Creates and adds unique state to grammar. If given state name is
+ * already used, appends apostrophe or integer suffix
+ * @param name name of the state
+ * @throws AutomatonException if symbol could not be created
+ * @return created symbol
+ */
+ static alphabet::Symbol createUniqueSymbol(const alphabet::Symbol& base, const std::set<alphabet::Symbol>& Terminals, const std::set<alphabet::Symbol>& nonterminals);
};
} /* namespace alphabet */
diff --git a/alib2data/src/automaton/Automaton.cpp b/alib2data/src/automaton/Automaton.cpp
index 4e762c39a717ea948d515ee6f1ef8c75780bb022..6625e57fe5eec9b8fa6d0e00962b2bb15a6bd5b8 100644
--- a/alib2data/src/automaton/Automaton.cpp
+++ b/alib2data/src/automaton/Automaton.cpp
@@ -6,6 +6,9 @@
*/
#include "Automaton.h"
+#include "../label/NextLabel.h"
+#include <climits>
+#include "AutomatonException.h"
namespace automaton {
@@ -74,5 +77,18 @@ std::ostream& operator<<(std::ostream& os, const Automaton& automaton) {
return os;
}
+State Automaton::createUniqueState(const State& base, const std::set<State>& other) {
+ label::NextLabel nextLabelCreator;
+
+ int i = 0;
+ do {
+ label::Label nextLabel = nextLabelCreator.nextLabel(base.getName());
+ if(other.count(State(nextLabel)) == 0)
+ return State(nextLabel);
+ } while(++i < INT_MAX);
+
+ throw AutomatonException("Could not create unique state with base name " + (std::string) base.getName() + "." );
+}
+
} /* namespace automaton */
diff --git a/alib2data/src/automaton/Automaton.h b/alib2data/src/automaton/Automaton.h
index 4c9e0b8d0142010195c2bee4efff7cde2f8e16cc..cbd7c62f5ea4da31993d46c1625460d0f282c233 100644
--- a/alib2data/src/automaton/Automaton.h
+++ b/alib2data/src/automaton/Automaton.h
@@ -11,6 +11,9 @@
#include "../std/visitor.hpp"
#include "AutomatonBase.h"
+#include "common/State.h"
+#include <set>
+
namespace automaton {
/**
@@ -39,6 +42,15 @@ public:
bool operator==(const Automaton& other) const;
friend std::ostream& operator<<(std::ostream& os, const Automaton& automaton);
+
+ /**
+ * Creates and adds unique state to automaton. If given state name is
+ * already used, appends apostrophe or integer suffix
+ * @param name name of the state
+ * @throws AutomatonException if state could not be created
+ * @return created state
+ */
+ static State createUniqueState(const State& base, const std::set<State>& other);
};
} /* namespace automaton */
diff --git a/alib2data/src/automaton/common/States.cpp b/alib2data/src/automaton/common/States.cpp
index daa263c186b17dd9986f9601121f98c32eb71fff..7b2a25845841a19a2987907bfaa8f685430177eb 100644
--- a/alib2data/src/automaton/common/States.cpp
+++ b/alib2data/src/automaton/common/States.cpp
@@ -6,11 +6,9 @@
*/
#include "States.h"
-
#include <set>
-#include <algorithm>
#include "../AutomatonException.h"
-#include "../../label/NextLabel.h"
+#include <algorithm>
namespace automaton {
@@ -74,19 +72,6 @@ const std::set<State>& States::getFinalStates() const {
return finalStates;
}
-State States::createUniqueState(const State& base, const std::set<State>& other) {
- label::NextLabel nextLabelCreator;
-
- int i = 0;
- do {
- label::Label nextLabel = nextLabelCreator.nextLabel(base.getName());
- if(other.count(State(nextLabel)) == 0)
- return State(nextLabel);
- } while(++i < INT_MAX);
-
- throw AutomatonException("Could not create unique state with base name " + (std::string) base.getName() + "." );
-}
-
} /* namespace automaton */
diff --git a/alib2data/src/automaton/common/States.h b/alib2data/src/automaton/common/States.h
index 4279d8e80fe1ca55ea392cdb265fde7a02c7c5dd..57c1572dada2dfded94c1e615ae67c3986d19bd7 100644
--- a/alib2data/src/automaton/common/States.h
+++ b/alib2data/src/automaton/common/States.h
@@ -8,12 +8,10 @@
#ifndef STATES_H_
#define STATES_H_
-#include <climits>
#include <ostream>
#include <set>
#include <string>
#include "State.h"
-#include "../../alphabet/Symbol.h"
namespace automaton {
@@ -82,15 +80,6 @@ public:
* @return final states
*/
const std::set<State>& getFinalStates() const;
-
- /**
- * Creates and adds unique state to automaton. If given state name is
- * already used, appends apostrophe or integer suffix
- * @param name name of the state
- * @throws AutomatonException if state could not be created
- * @return created state
- */
- static State createUniqueState(const State& base, const std::set<State>& other);
};
} /* namespace automaton */
diff --git a/alib2data/src/grammar/ContextFree/CFG.h b/alib2data/src/grammar/ContextFree/CFG.h
index 0ddc621ed19e9092525f1cfa38cc1fcfd914d735..a1150d9cf4d7c835bf4bd2cc856aa59173310a4f 100644
--- a/alib2data/src/grammar/ContextFree/CFG.h
+++ b/alib2data/src/grammar/ContextFree/CFG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextFree/CNF.h b/alib2data/src/grammar/ContextFree/CNF.h
index 727d89c23b1c883cb8256a2a9a19ecd3fc6a2a44..333d9246d9ac7eb4728357ec9ab623979076375b 100644
--- a/alib2data/src/grammar/ContextFree/CNF.h
+++ b/alib2data/src/grammar/ContextFree/CNF.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
index 1af9c5446322946da1ba1d6670eb814b9568b0da..44d31bd50dd2cf20463586823d26521f2972f529 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextFree/GNF.h b/alib2data/src/grammar/ContextFree/GNF.h
index 0ee796328c38d6177b583ffd45442866d0469df2..c711939be7d1c956c754eac6822857b586379a5f 100644
--- a/alib2data/src/grammar/ContextFree/GNF.h
+++ b/alib2data/src/grammar/ContextFree/GNF.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextFree/LG.h b/alib2data/src/grammar/ContextFree/LG.h
index f957ec1a11bd4bd77b1b4f32aef584a1437de10f..6c1594f8bdce73e5bcf5e22e482016ee845199e0 100644
--- a/alib2data/src/grammar/ContextFree/LG.h
+++ b/alib2data/src/grammar/ContextFree/LG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.h b/alib2data/src/grammar/ContextSensitive/CSG.h
index 88f3f3ed98c73c77925126d31cf0a1a68d0e9519..eb7dc594437dd199805188d59e44b5d5061d3a24 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.h
+++ b/alib2data/src/grammar/ContextSensitive/CSG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
index 9ecb4ef3b751f5988d80f57771b2e918b0a3cdf7..9a6866faf919bd9f907a89c6fd568fbd5f207118 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/LeftLG.h b/alib2data/src/grammar/Regular/LeftLG.h
index 807756dd64376946fb0fe0a0513b65a8a6c01415..8127000f7fd1641472df4ece06d41fd134710178 100644
--- a/alib2data/src/grammar/Regular/LeftLG.h
+++ b/alib2data/src/grammar/Regular/LeftLG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/LeftRG.h b/alib2data/src/grammar/Regular/LeftRG.h
index b5f180483c1e8a824f5d6ee2a30861632940cee2..2160488a030e37bb9d7c9ea9048105367b23cc37 100644
--- a/alib2data/src/grammar/Regular/LeftRG.h
+++ b/alib2data/src/grammar/Regular/LeftRG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/RightLG.h b/alib2data/src/grammar/Regular/RightLG.h
index e4ed7f764ba6a4c97618e76c23aaa3dc73498049..9cba0827f4e0d648d9fc817ba7f48288ca8b3059 100644
--- a/alib2data/src/grammar/Regular/RightLG.h
+++ b/alib2data/src/grammar/Regular/RightLG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/RightRG.h b/alib2data/src/grammar/Regular/RightRG.h
index c4f6bb542266286b4e1245e37b60fdfb069d502c..3df8d61d95395893f292203d9c8117e16faab5ff 100644
--- a/alib2data/src/grammar/Regular/RightRG.h
+++ b/alib2data/src/grammar/Regular/RightRG.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
index c95593ad654a932e199e2873c81dfa5b84dd1ee8..079e023c92d73c133018cf644b328a6967f7cdb8 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
index 526f21e9c958a5171b3f13371a0a7e1fe59d7fc0..d161652a27a296e3df6fc660e82a7725b85ebe38 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h
@@ -10,6 +10,7 @@
#include "../GrammarBase.h"
#include <map>
+#include <vector>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.cpp b/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.cpp
index e538109b01770c728957facbda1ce0eb56406e56..5bb1f15fda247543b401ff816b477a42cbac4dda 100644
--- a/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.cpp
+++ b/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.cpp
@@ -9,10 +9,10 @@
#include "../GrammarException.h"
#include "../../alphabet/LabeledSymbol.h"
#include "../../label/Label.h"
-#include "../../label/NextLabel.h"
#include "../../alphabet/LabeledSymbol.h"
#include "../../alphabet/Symbol.h"
-#include <limits.h>
+#include <climits>
+#include <algorithm>
namespace grammar {
@@ -88,22 +88,4 @@ void TerminalNonterminalAlphabetInitialSymbol::setInitialSymbol(const alphabet::
initialSymbol = symbol;
}
-alphabet::Symbol TerminalNonterminalAlphabetInitialSymbol::createUniqueSymbol(const alphabet::Symbol& base, const std::set<alphabet::Symbol>& terminalAlphabet, const std::set<alphabet::Symbol>& nonterminalAlphabet) {
- label::NextLabel nextLabelCreator;
-
- const alphabet::LabeledSymbol* baseSymbol = dynamic_cast<const alphabet::LabeledSymbol*>(&(base.getSymbol()));
- if(baseSymbol == NULL)
- throw GrammarException("Could not create unique symbol with nonlabeled base symbol " + (std::string) base.getSymbol() + "." );
-
- int i = 0;
- do {
- label::Label nextLabel = nextLabelCreator.nextLabel(baseSymbol->getLabel());
- alphabet::Symbol attempt = alphabet::Symbol(alphabet::LabeledSymbol(nextLabel));
- if(terminalAlphabet.count(attempt) == 0 && nonterminalAlphabet.count(attempt) == 0)
- return attempt;
- } while(++i < INT_MAX);
-
- throw GrammarException("Could not create unique symbol with base symbol " + (std::string) base.getSymbol() + "." );
-}
-
} /* namespace grammar */
diff --git a/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.h b/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.h
index 0f2372501ea8974249e7289368708b9ca618ff40..bd40e9c782031e53c9f9b6f3e4798fcbd5b40f7e 100644
--- a/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.h
+++ b/alib2data/src/grammar/common/TerminalNonterminalAlphabetInitialSymbol.h
@@ -10,7 +10,6 @@
#include <set>
#include <list>
-#include <algorithm>
#include "../../alphabet/Symbol.h"
@@ -90,15 +89,6 @@ public:
*/
void setInitialSymbol(const alphabet::Symbol& symbol);
- /**
- * Creates and adds unique state to grammar. If given state name is
- * already used, appends apostrophe or integer suffix
- * @param name name of the state
- * @throws AutomatonException if symbol could not be created
- * @return created symbol
- */
- static alphabet::Symbol createUniqueSymbol(const alphabet::Symbol& base, const std::set<alphabet::Symbol>& Terminals, const std::set<alphabet::Symbol>& nonterminals);
-
};
} /* namespace grammar */