move createUnique* to better places

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 */

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 */

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 */

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 */

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 */

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 */

alib2data/src/grammar/ContextFree/CFG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/ContextFree/CNF.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/ContextFree/EpsilonFreeCFG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/ContextFree/GNF.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/ContextFree/LG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/ContextSensitive/CSG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/ContextSensitive/NonContractingGrammar.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/Regular/LeftLG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/Regular/LeftRG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/Regular/RightLG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/Regular/RightRG.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.h

@@ -10,6 +10,7 @@
 #include "../GrammarBase.h"
 #include <map>
+#include <vector>
 #include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
 namespace grammar {

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 */