wip remove Symbol wrapper

alib2data/src/alphabet/BarSymbol.h

@@ -114,11 +114,6 @@ inline BarSymbol BarSymbol::instance < BarSymbol > ( ) {
 	return BarSymbol ( );
 }
-template < >
-inline Symbol BarSymbol::instance < Symbol > ( ) {
-	return Symbol ( BarSymbol ( ) );
-}
-
 template < >
 inline object::Object BarSymbol::instance < object::Object > ( ) {
 	return object::Object ( BarSymbol ( ) );

alib2data/src/alphabet/BlankSymbol.h

@@ -119,11 +119,6 @@ inline BlankSymbol BlankSymbol::instance < BlankSymbol > ( ) {
 	return BlankSymbol ( );
 }
-template < >
-inline Symbol BlankSymbol::instance < Symbol > ( ) {
-	return Symbol ( BlankSymbol ( ) );
-}
-
 template < >
 inline common::ranked_symbol < > BlankSymbol::instance < common::ranked_symbol < > > ( ) {
 	return common::ranked_symbol < > ( BlankSymbol::instance < DefaultSymbolType > ( ), DefaultRankType ( 0 ) );

alib2data/src/alphabet/BottomOfTheStackSymbol.h

@@ -119,11 +119,6 @@ inline BottomOfTheStackSymbol BottomOfTheStackSymbol::instance < BottomOfTheStac
 	return BottomOfTheStackSymbol ( );
 }
-template < >
-inline Symbol BottomOfTheStackSymbol::instance < Symbol > ( ) {
-	return Symbol ( BottomOfTheStackSymbol ( ) );
-}
-
 template < >
 inline common::ranked_symbol < > BottomOfTheStackSymbol::instance < common::ranked_symbol < > > ( ) {
 	return common::ranked_symbol < > ( BottomOfTheStackSymbol::instance < DefaultSymbolType > ( ), DefaultRankType ( 0 ) );

alib2data/src/alphabet/EndSymbol.h

@@ -119,11 +119,6 @@ inline EndSymbol EndSymbol::instance < EndSymbol > ( ) {
 	return EndSymbol ( );
 }
-template < >
-inline Symbol EndSymbol::instance < Symbol > ( ) {
-	return Symbol ( EndSymbol ( ) );
-}
-
 template < >
 inline common::ranked_symbol < > EndSymbol::instance < common::ranked_symbol < > > ( ) {
 	return common::ranked_symbol < > ( EndSymbol::instance < DefaultSymbolType > ( ), DefaultRankType ( 0 ) );

alib2data/src/alphabet/InitialSymbol.h

@@ -119,11 +119,6 @@ inline InitialSymbol InitialSymbol::instance < InitialSymbol > ( ) {
 	return InitialSymbol ( );
 }
-template < >
-inline Symbol InitialSymbol::instance < Symbol > ( ) {
-	return Symbol ( InitialSymbol ( ) );
-}
-
 template < >
 inline common::ranked_symbol < > InitialSymbol::instance < common::ranked_symbol < > > ( ) {
 	return common::ranked_symbol < > ( InitialSymbol::instance < DefaultSymbolType > ( ), DefaultRankType ( 0 ) );

alib2data/src/alphabet/NonlinearVariableSymbol.h

@@ -24,7 +24,7 @@
 #ifndef NONLINEAR_VARIABLE_SYMBOL_H_
 #define NONLINEAR_VARIABLE_SYMBOL_H_
-#include "Symbol.h"
+#include "SymbolBase.h"
 #include <core/normalize.hpp>
 #include <alphabet/common/SymbolNormalize.h>

alib2data/src/alphabet/StartSymbol.h

@@ -119,11 +119,6 @@ inline StartSymbol StartSymbol::instance < StartSymbol > ( ) {
 	return StartSymbol ( );
 }
-template < >
-inline Symbol StartSymbol::instance < Symbol > ( ) {
-	return Symbol ( StartSymbol ( ) );
-}
-
 template < >
 inline common::ranked_symbol < > StartSymbol::instance < common::ranked_symbol < > > ( ) {
 	return common::ranked_symbol < > ( StartSymbol::instance < DefaultSymbolType > ( ), DefaultRankType ( 0 ) );

alib2data/src/alphabet/Symbol.h

@@ -8,21 +8,9 @@
 #ifndef SYMBOL_H_
 #define SYMBOL_H_
-#include <base/WrapperBase.hpp>
-#include "SymbolBase.h"
-
 namespace alphabet {
-/**
- * \brief Wrapper around any symbol type.
- */
-class Symbol : public base::WrapperBase < SymbolBase > {
-	/**
-	 * Inherite constructors of base::WrapperBase < SymbolBase >
-	 */
-	using base::WrapperBase < SymbolBase >::WrapperBase;
-
-};
+class Symbol;
 } /* namespace alphabet */

alib2data/src/alphabet/VariablesBarSymbol.h

@@ -119,11 +119,6 @@ inline VariablesBarSymbol VariablesBarSymbol::instance < VariablesBarSymbol > (
 	return VariablesBarSymbol ( );
 }
-template < >
-inline Symbol VariablesBarSymbol::instance < Symbol > ( ) {
-	return Symbol ( VariablesBarSymbol ( ) );
-}
-
 // TODO make partially specialised when needed by classes or variables, functions can be partially specialsed
 template < >
 inline common::ranked_symbol < > VariablesBarSymbol::instance < common::ranked_symbol < > > ( ) {

alib2data/src/alphabet/WildcardSymbol.h

@@ -119,11 +119,6 @@ inline WildcardSymbol WildcardSymbol::instance < WildcardSymbol > ( ) {
 	return WildcardSymbol ( );
 }
-template < >
-inline Symbol WildcardSymbol::instance < Symbol > ( ) {
-	return Symbol ( WildcardSymbol ( ) );
-}
-
 // TODO make partially specialised when needed by classes or variables, functions can't be partially specialsed
 template < >
 inline common::ranked_symbol < > WildcardSymbol::instance < common::ranked_symbol < > > ( ) {

alib2data/src/alphabet/xml/BarSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::BarSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::BarSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::BarSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BarSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BarSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/BlankSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::BlankSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::BlankSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::BlankSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BlankSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BlankSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/BottomOfTheStackSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::BottomOfTheStackSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::BottomOfTheStackSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::BottomOfTheStackSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BottomOfTheStackSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BottomOfTheStackSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/EndSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::EndSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::EndSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::EndSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::EndSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::EndSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/InitialSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::InitialSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::InitialSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::InitialSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::InitialSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::InitialSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/NonlinearVariableSymbol.cpp

@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::NonlinearVariableSymbol < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::NonlinearVariableSymbol < > > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::NonlinearVariableSymbol < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::NonlinearVariableSymbol < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::NonlinearVariableSymbol < > > ( );
 } /* namespace */

alib2data/src/alphabet/xml/RankedSymbol.cpp

@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::RankedSymbol < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::RankedSymbol < > > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::RankedSymbol < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::RankedSymbol < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::RankedSymbol < > > ( );
 } /* namespace */

alib2data/src/alphabet/xml/StartSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::StartSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::StartSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::StartSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::StartSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::StartSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/VariablesBarSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::VariablesBarSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::VariablesBarSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::VariablesBarSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::VariablesBarSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::VariablesBarSymbol > ( );
 } /* namespace */

alib2data/src/alphabet/xml/WildcardSymbol.cpp

@@ -41,7 +41,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < alphabet::WildcardSymbol > ( );
 static auto xmlRead = registration::XmlReaderRegister < alphabet::WildcardSymbol > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < alphabet::Symbol, alphabet::WildcardSymbol > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, alphabet::WildcardSymbol > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::WildcardSymbol > ( );
 } /* namespace */