replace last occs of alphabet::Symbol with params

alib2data/src/alphabet/SubtreeWildcardSymbol.h

@@ -82,7 +82,7 @@ inline Symbol SubtreeWildcardSymbol::instance < Symbol > ( ) {
 // TODO make partially specialised when needed by classes or variables, functions can be partially specialsed
 template < >
 inline std::ranked_symbol < > SubtreeWildcardSymbol::instance < std::ranked_symbol < > > ( ) {
-	return std::ranked_symbol < > ( Symbol ( SubtreeWildcardSymbol ( ) ), 0);
+	return std::ranked_symbol < > ( DefaultSymbolType ( SubtreeWildcardSymbol ( ) ), 0);
 }
 template < >

alib2data/src/alphabet/VariablesBarSymbol.h

@@ -82,7 +82,7 @@ inline Symbol VariablesBarSymbol::instance < Symbol > ( ) {
 // TODO make partially specialised when needed by classes or variables, functions can be partially specialsed
 template < >
 inline std::ranked_symbol < > VariablesBarSymbol::instance < std::ranked_symbol < > > ( ) {
-	return std::ranked_symbol < > ( Symbol ( VariablesBarSymbol ( ) ), 0);
+	return std::ranked_symbol < > ( DefaultSymbolType ( VariablesBarSymbol ( ) ), 0);
 }
 template < >

alib2data/src/alphabet/ranked_symbol.hpp

@@ -76,17 +76,17 @@ public:
 };
 template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(int number, unsigned rank) : m_symbol(alphabet::Symbol(number)), m_rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(int number, unsigned rank) : m_symbol(SymbolType(number)), m_rank(RankType(rank)) {
 }
 template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(char character, unsigned rank) : m_symbol(alphabet::Symbol(character)), m_rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(char character, unsigned rank) : m_symbol(SymbolType(character)), m_rank(RankType(rank)) {
 }
 template < class SymbolType, class RankType >
-ranked_symbol < SymbolType, RankType >::ranked_symbol(std::string symbol, unsigned rank) : m_symbol(alphabet::Symbol(std::move(symbol))), m_rank(RankType(rank)) {
+ranked_symbol < SymbolType, RankType >::ranked_symbol(std::string symbol, unsigned rank) : m_symbol(SymbolType(std::move(symbol))), m_rank(RankType(rank)) {
 }

alib2data/test-src/alphabet/SymbolTest.cpp

@@ -12,6 +12,8 @@
 #include "alphabet/RankedSymbol.h"
 #include "alphabet/BarSymbol.h"
+#include <common/DefaultSymbolType.h>
+
 #include "factory/XmlDataFactory.hpp"
 #define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
@@ -67,8 +69,8 @@ void SymbolTest::testOrder ( ) {
 	alphabet::StartSymbol ss;
 	alphabet::EndSymbol es;
-	alphabet::RankedSymbol < > rs1 ( alphabet::Symbol ( alphabet::BarSymbol { } ), 0 );
-	alphabet::RankedSymbol < > rs2 ( alphabet::Symbol ( alphabet::BarSymbol { } ), 0 );
+	alphabet::RankedSymbol < > rs1 ( DefaultSymbolType ( alphabet::BarSymbol { } ), 0 );
+	alphabet::RankedSymbol < > rs2 ( DefaultSymbolType ( alphabet::BarSymbol { } ), 0 );
 	CPPUNIT_EXCLUSIVE_OR ( bs < ls, ls < bs );