remove Grammar wrapper

alib2data/src/grammar/Grammar.h

@@ -8,9 +8,6 @@
 #ifndef GRAMMAR_H_
 #define GRAMMAR_H_
-#include <base/WrapperBase.hpp>
-#include "GrammarBase.h"
-
 #include <alib/type_traits>
 namespace grammar {
@@ -18,10 +15,7 @@ namespace grammar {
 /**
  * Wrapper around grammars.
  */
-class Grammar : public base::WrapperBase < GrammarBase > {
-	using base::WrapperBase < GrammarBase >::WrapperBase;
-
-};
+class Grammar;
 template < class T >
 using TerminalSymbolTypeOfGrammar = typename std::decay < decltype (std::declval<T>().getTerminalAlphabet()) >::type::value_type;

alib2data/src/grammar/xml/ContextFree/CFG.cpp

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

alib2data/src/grammar/xml/ContextFree/CNF.cpp

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

alib2data/src/grammar/xml/ContextFree/EpsilonFreeCFG.cpp

@@ -14,9 +14,8 @@
 namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::EpsilonFreeCFG < > > ( );
-static auto xmlGroup = registration::XmlReaderRegister < grammar::EpsilonFreeCFG < > > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::EpsilonFreeCFG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::EpsilonFreeCFG < > > ( );
+static auto xmlRead = registration::XmlReaderRegister < grammar::EpsilonFreeCFG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::EpsilonFreeCFG < > > ( );
 } /* namespace */

alib2data/src/grammar/xml/ContextFree/GNF.cpp

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

alib2data/src/grammar/xml/ContextFree/LG.cpp

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

alib2data/src/grammar/xml/ContextSensitive/CSG.cpp

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

alib2data/src/grammar/xml/ContextSensitive/NonContractingGrammar.cpp

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

alib2data/src/grammar/xml/Regular/LeftLG.cpp

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

alib2data/src/grammar/xml/Regular/LeftRG.cpp

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

alib2data/src/grammar/xml/Regular/RightLG.cpp

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

alib2data/src/grammar/xml/Regular/RightRG.cpp

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

alib2data/src/grammar/xml/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp

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

alib2data/src/grammar/xml/Unrestricted/UnrestrictedGrammar.cpp

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