From 5ed8e7ed554f665136db3c2abd6164cf889d7873 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 11 Jun 2014 21:55:32 +0200
Subject: [PATCH] remove virtual inheritance

---
 alib2/src/alphabet/BlankSymbol.cpp     | 2 +-
 alib2/src/alphabet/BlankSymbol.h       | 2 +-
 alib2/src/alphabet/LabeledSymbol.h     | 2 +-
 alib2/src/alphabet/SymbolBase.h        | 2 +-
 alib2/src/automaton/AutomatonBase.h    | 2 +-
 alib2/src/automaton/FSM/CompactNFA.h   | 2 +-
 alib2/src/automaton/FSM/DFA.h          | 2 +-
 alib2/src/automaton/FSM/EpsilonNFA.h   | 2 +-
 alib2/src/automaton/FSM/ExtendedNFA.h  | 2 +-
 alib2/src/automaton/FSM/NFA.h          | 2 +-
 alib2/src/automaton/PDA/PDA.h          | 2 +-
 alib2/src/automaton/TM/OneTapeDTM.h    | 2 +-
 alib2/src/automaton/UnknownAutomaton.h | 2 +-
 alib2/src/label/IntegerLabel.h         | 2 +-
 alib2/src/label/StringLabel.h          | 2 +-
 alib2/src/regexp/Alternation.h         | 2 +-
 alib2/src/regexp/Concatenation.h       | 2 +-
 alib2/src/regexp/Iteration.h           | 2 +-
 alib2/src/regexp/RegExpElement.h       | 2 +-
 alib2/src/regexp/RegExpEmpty.h         | 2 +-
 alib2/src/regexp/RegExpEpsilon.h       | 2 +-
 alib2/src/regexp/RegExpSymbol.h        | 2 +-
 alib2/src/std/visitor.hpp              | 2 +-
 alib2/src/string/CyclicString.h        | 2 +-
 alib2/src/string/Epsilon.h             | 2 +-
 alib2/src/string/LinearString.h        | 2 +-
 alib2/src/string/StringBase.h          | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/alib2/src/alphabet/BlankSymbol.cpp b/alib2/src/alphabet/BlankSymbol.cpp
index c669f71ca9..2f4f17821e 100644
--- a/alib2/src/alphabet/BlankSymbol.cpp
+++ b/alib2/src/alphabet/BlankSymbol.cpp
@@ -9,7 +9,7 @@
 
 namespace alphabet {
 
-BlankSymbol::BlankSymbol() : SymbolBase() {
+BlankSymbol::BlankSymbol() {
 
 }
 
diff --git a/alib2/src/alphabet/BlankSymbol.h b/alib2/src/alphabet/BlankSymbol.h
index 671e7a887d..25bfcb4a34 100644
--- a/alib2/src/alphabet/BlankSymbol.h
+++ b/alib2/src/alphabet/BlankSymbol.h
@@ -15,7 +15,7 @@ namespace alphabet {
 /**
  * Represents blank symbol in an alphabet.
  */
-class BlankSymbol : virtual public SymbolBase, public std::element<BlankSymbol, SymbolBase> {
+class BlankSymbol : public std::element<BlankSymbol, SymbolBase> {
 public:
 	/**
 	 * Creates a blank symbol.
diff --git a/alib2/src/alphabet/LabeledSymbol.h b/alib2/src/alphabet/LabeledSymbol.h
index 4e8b236ccb..2bc0ffc661 100644
--- a/alib2/src/alphabet/LabeledSymbol.h
+++ b/alib2/src/alphabet/LabeledSymbol.h
@@ -17,7 +17,7 @@ namespace alphabet {
 /**
  * Represents symbol in an alphabet.
  */
-class LabeledSymbol : virtual public SymbolBase, public std::element<LabeledSymbol, SymbolBase> {
+class LabeledSymbol : public std::element<LabeledSymbol, SymbolBase> {
 protected:
 	label::Label label;
 	
diff --git a/alib2/src/alphabet/SymbolBase.h b/alib2/src/alphabet/SymbolBase.h
index 717d2e80f6..8b61aa1e2a 100644
--- a/alib2/src/alphabet/SymbolBase.h
+++ b/alib2/src/alphabet/SymbolBase.h
@@ -19,7 +19,7 @@ class BlankSymbol;
 /**
  * Represents symbol in an alphabet.
  */
-class SymbolBase : virtual public std::elementBase<LabeledSymbol, BlankSymbol> {
+class SymbolBase : public std::elementBase<LabeledSymbol, BlankSymbol> {
 public:
 	virtual ~SymbolBase() noexcept;
 
diff --git a/alib2/src/automaton/AutomatonBase.h b/alib2/src/automaton/AutomatonBase.h
index bc669805ea..cc2b51e4b7 100644
--- a/alib2/src/automaton/AutomatonBase.h
+++ b/alib2/src/automaton/AutomatonBase.h
@@ -25,7 +25,7 @@ class OneTapeDTM;
 /**
  * Abstract base class for all automata.
  */
-class AutomatonBase : virtual public std::elementBase<UnknownAutomaton, DFA, NFA, EpsilonNFA, CompactNFA, ExtendedNFA, PDA, OneTapeDTM> {
+class AutomatonBase : public std::elementBase<UnknownAutomaton, DFA, NFA, EpsilonNFA, CompactNFA, ExtendedNFA, PDA, OneTapeDTM> {
 public:
 	virtual AutomatonBase* clone() const = 0;
 
diff --git a/alib2/src/automaton/FSM/CompactNFA.h b/alib2/src/automaton/FSM/CompactNFA.h
index 9c25705881..3ec1959049 100644
--- a/alib2/src/automaton/FSM/CompactNFA.h
+++ b/alib2/src/automaton/FSM/CompactNFA.h
@@ -20,7 +20,7 @@ namespace automaton {
  * Represents Finite Automaton.
  * Can store nondeterministic finite automaton without epsilon transitions.
  */
-class CompactNFA : virtual public AutomatonBase, public std::element<CompactNFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
+class CompactNFA : public std::element<CompactNFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
 protected:
 	std::map<std::pair<State, string::String>, std::set<State> > transitions;
 public:
diff --git a/alib2/src/automaton/FSM/DFA.h b/alib2/src/automaton/FSM/DFA.h
index 03a2a203da..ec5a979539 100644
--- a/alib2/src/automaton/FSM/DFA.h
+++ b/alib2/src/automaton/FSM/DFA.h
@@ -20,7 +20,7 @@ namespace automaton {
  * Represents Finite Automaton.
  * Can store nondeterministic finite automaton without epsilon transitions.
  */
-class DFA : virtual public AutomatonBase, public std::element<DFA, AutomatonBase>, public SingleInitialState, public InputAlphabet {
+class DFA : public std::element<DFA, AutomatonBase>, public SingleInitialState, public InputAlphabet {
 protected:
 	std::map<std::pair<State, alphabet::Symbol>, State> transitions;
 public:
diff --git a/alib2/src/automaton/FSM/EpsilonNFA.h b/alib2/src/automaton/FSM/EpsilonNFA.h
index 61fa4c44fc..f21d59a52c 100644
--- a/alib2/src/automaton/FSM/EpsilonNFA.h
+++ b/alib2/src/automaton/FSM/EpsilonNFA.h
@@ -22,7 +22,7 @@ namespace automaton {
  * Represents Finite Automaton.
  * Can store nondeterministic finite automaton with epsilon transitions.
  */
-class EpsilonNFA : virtual public AutomatonBase, public std::element<EpsilonNFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
+class EpsilonNFA : public std::element<EpsilonNFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
 protected:
 	std::map<std::pair<State, std::variant<string::Epsilon, alphabet::Symbol> >, std::set<State> > transitions;
 public:
diff --git a/alib2/src/automaton/FSM/ExtendedNFA.h b/alib2/src/automaton/FSM/ExtendedNFA.h
index b3715bd4f8..d0847d82e2 100644
--- a/alib2/src/automaton/FSM/ExtendedNFA.h
+++ b/alib2/src/automaton/FSM/ExtendedNFA.h
@@ -20,7 +20,7 @@ namespace automaton {
  * Represents Finite Automaton.
  * Can store nondeterministic finite automaton without epsilon transitions.
  */
-class ExtendedNFA : virtual public AutomatonBase, public std::element<ExtendedNFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
+class ExtendedNFA : public std::element<ExtendedNFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
 protected:
 	std::map<std::pair<State, regexp::RegExp>, std::set<State> > transitions;
 public:
diff --git a/alib2/src/automaton/FSM/NFA.h b/alib2/src/automaton/FSM/NFA.h
index 6ac9bca3af..e3efb77104 100644
--- a/alib2/src/automaton/FSM/NFA.h
+++ b/alib2/src/automaton/FSM/NFA.h
@@ -21,7 +21,7 @@ namespace automaton {
  * Represents Finite Automaton.
  * Can store nondeterministic finite automaton without epsilon transitions.
  */
-class NFA : virtual public AutomatonBase, public std::element<NFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
+class NFA : public std::element<NFA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
 protected:
 	std::map<std::pair<State, alphabet::Symbol>, std::set<State> > transitions;
 public:
diff --git a/alib2/src/automaton/PDA/PDA.h b/alib2/src/automaton/PDA/PDA.h
index 125097599d..ca03be482d 100644
--- a/alib2/src/automaton/PDA/PDA.h
+++ b/alib2/src/automaton/PDA/PDA.h
@@ -23,7 +23,7 @@ namespace automaton {
 /**
  * Push Down Automaton
  */
-class PDA: virtual public AutomatonBase, public std::element<PDA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
+class PDA: public std::element<PDA, AutomatonBase>, public MultiInitialStates, public InputAlphabet {
 protected:
 	std::set<alphabet::Symbol> stackAlphabet;
 	std::map<std::tuple<State, std::variant<string::Epsilon, alphabet::Symbol>, std::vector<alphabet::Symbol> >, std::set<std::pair<State, std::vector<alphabet::Symbol> > > > transitions;
diff --git a/alib2/src/automaton/TM/OneTapeDTM.h b/alib2/src/automaton/TM/OneTapeDTM.h
index ae9b995a0a..805ad65488 100644
--- a/alib2/src/automaton/TM/OneTapeDTM.h
+++ b/alib2/src/automaton/TM/OneTapeDTM.h
@@ -22,7 +22,7 @@ namespace automaton {
 /**
  * One tape turing machine
  */
-class OneTapeDTM : virtual public AutomatonBase, public std::element<OneTapeDTM, AutomatonBase>, public SingleInitialState, public BlankSymbolInputTapeAlphabet {
+class OneTapeDTM : public std::element<OneTapeDTM, AutomatonBase>, public SingleInitialState, public BlankSymbolInputTapeAlphabet {
 protected:
 	std::map<std::pair<State, alphabet::Symbol>, std::tuple<State, alphabet::Symbol, Shift> > transitions;
 
diff --git a/alib2/src/automaton/UnknownAutomaton.h b/alib2/src/automaton/UnknownAutomaton.h
index 63ddcc95bc..6b7f65fa31 100644
--- a/alib2/src/automaton/UnknownAutomaton.h
+++ b/alib2/src/automaton/UnknownAutomaton.h
@@ -21,7 +21,7 @@ namespace automaton {
 /**
  * Class representing unknown automaton parsed from XML.
  */
-class UnknownAutomaton : virtual public AutomatonBase, public std::element<UnknownAutomaton, AutomatonBase> {
+class UnknownAutomaton : public std::element<UnknownAutomaton, AutomatonBase> {
 protected:
 	std::set<State> states;
 	std::set<State> initialStates;
diff --git a/alib2/src/label/IntegerLabel.h b/alib2/src/label/IntegerLabel.h
index e18da16d5c..59794b6b38 100644
--- a/alib2/src/label/IntegerLabel.h
+++ b/alib2/src/label/IntegerLabel.h
@@ -17,7 +17,7 @@ namespace label {
 /**
  * Represents symbol in an alphabet.
  */
-class IntegerLabel : virtual public LabelBase, public std::element<IntegerLabel, LabelBase>{
+class IntegerLabel : public std::element<IntegerLabel, LabelBase> {
 protected:
 	int label;
 public:
diff --git a/alib2/src/label/StringLabel.h b/alib2/src/label/StringLabel.h
index 925a79781f..e4824063f3 100644
--- a/alib2/src/label/StringLabel.h
+++ b/alib2/src/label/StringLabel.h
@@ -18,7 +18,7 @@ namespace label {
 /**
  * Represents symbol in an alphabet.
  */
-class StringLabel : virtual public LabelBase, public std::element<StringLabel, LabelBase>{
+class StringLabel : public std::element<StringLabel, LabelBase> {
 protected:
 	std::string label;
 public:
diff --git a/alib2/src/regexp/Alternation.h b/alib2/src/regexp/Alternation.h
index 26fb5df538..7a8dfcea7b 100644
--- a/alib2/src/regexp/Alternation.h
+++ b/alib2/src/regexp/Alternation.h
@@ -17,7 +17,7 @@ namespace regexp {
  * Represents alternation operator in the regular expression. Contains list of RegExpElement
  * as operands of the operator.
  */
-class Alternation: virtual public RegExpElement, public std::element<Alternation, RegExpElement> {
+class Alternation: public std::element<Alternation, RegExpElement> {
 protected:
 	/**
 	 * @copydoc RegExpElement::clone() const
diff --git a/alib2/src/regexp/Concatenation.h b/alib2/src/regexp/Concatenation.h
index 7aad061167..fd78e94269 100644
--- a/alib2/src/regexp/Concatenation.h
+++ b/alib2/src/regexp/Concatenation.h
@@ -17,7 +17,7 @@ namespace regexp {
  * Represents concatenation operator in the regular expression. Contains list of RegExpElement
  * as operands of the operator.
  */
-class Concatenation: virtual public RegExpElement, public std::element<Concatenation, RegExpElement> {
+class Concatenation: public std::element<Concatenation, RegExpElement> {
 protected:
 	/**
 	 * @copydoc RegExpElement::clone() const
diff --git a/alib2/src/regexp/Iteration.h b/alib2/src/regexp/Iteration.h
index fb3ef21d3f..68f59a740b 100644
--- a/alib2/src/regexp/Iteration.h
+++ b/alib2/src/regexp/Iteration.h
@@ -17,7 +17,7 @@ namespace regexp {
  * Represents iteration operator in the regular expression. Contains one RegExpElement
  * as operand.
  */
-class Iteration: virtual public RegExpElement, public std::element<Iteration, RegExpElement> {
+class Iteration: public std::element<Iteration, RegExpElement> {
 protected:
 	RegExpElement* element;
 
diff --git a/alib2/src/regexp/RegExpElement.h b/alib2/src/regexp/RegExpElement.h
index 7aca59838f..12981564a4 100644
--- a/alib2/src/regexp/RegExpElement.h
+++ b/alib2/src/regexp/RegExpElement.h
@@ -27,7 +27,7 @@ class RegExpEpsilon;
 /**
  * Abstract class representing element in the regular expression. Can be operator or symbol.
  */
-class RegExpElement : virtual public std::elementBase<Alternation, Concatenation, Iteration, RegExpSymbol, RegExpEmpty, RegExpEpsilon> {
+class RegExpElement : public std::elementBase<Alternation, Concatenation, Iteration, RegExpSymbol, RegExpEmpty, RegExpEpsilon> {
 protected:
 	/* 
 	 * Parent regexp contanining this instance of RegExpElement
diff --git a/alib2/src/regexp/RegExpEmpty.h b/alib2/src/regexp/RegExpEmpty.h
index bd5466f445..c87739ecc1 100644
--- a/alib2/src/regexp/RegExpEmpty.h
+++ b/alib2/src/regexp/RegExpEmpty.h
@@ -15,7 +15,7 @@ namespace regexp {
 /**
  * Represents empty regular expression in the regular expression.
  */
-class RegExpEmpty: virtual public RegExpElement, public std::element<RegExpEmpty, RegExpElement> {
+class RegExpEmpty: public std::element<RegExpEmpty, RegExpElement> {
 protected:
 	/**
 	 * @copydoc RegExpElement::clone() const
diff --git a/alib2/src/regexp/RegExpEpsilon.h b/alib2/src/regexp/RegExpEpsilon.h
index bb4b7406a3..96ed05db09 100644
--- a/alib2/src/regexp/RegExpEpsilon.h
+++ b/alib2/src/regexp/RegExpEpsilon.h
@@ -15,7 +15,7 @@ namespace regexp {
 /**
  * Represents epsilon in the regular expression.
  */
-class RegExpEpsilon: virtual public RegExpElement, public std::element<RegExpEpsilon, RegExpElement> {
+class RegExpEpsilon: public std::element<RegExpEpsilon, RegExpElement> {
 protected:
 	/**
 	 * @copydoc RegExpElement::clone() const
diff --git a/alib2/src/regexp/RegExpSymbol.h b/alib2/src/regexp/RegExpSymbol.h
index b4c9e00d1f..2939172ee5 100644
--- a/alib2/src/regexp/RegExpSymbol.h
+++ b/alib2/src/regexp/RegExpSymbol.h
@@ -17,7 +17,7 @@ namespace regexp {
 /**
  * Represents symbol in the regular expression. Contains name of the symbol.
  */
-class RegExpSymbol : virtual public RegExpElement, public std::element<RegExpSymbol, RegExpElement> {
+class RegExpSymbol : public std::element<RegExpSymbol, RegExpElement> {
 protected:
 	alphabet::Symbol symbol;
 
diff --git a/alib2/src/std/visitor.hpp b/alib2/src/std/visitor.hpp
index ded39b2bdc..9130533337 100644
--- a/alib2/src/std/visitor.hpp
+++ b/alib2/src/std/visitor.hpp
@@ -65,7 +65,7 @@ public:
 };
 
 template<typename Derived, typename Base>
-class element : virtual public Base {
+class element : public Base {
 public:
     virtual void Accept(void* userData, typename Base::visitor_type& visitor) const {
         visitor.Visit(userData, static_cast<const Derived&>(*this));
diff --git a/alib2/src/string/CyclicString.h b/alib2/src/string/CyclicString.h
index 2444eaa70e..048efd95b1 100644
--- a/alib2/src/string/CyclicString.h
+++ b/alib2/src/string/CyclicString.h
@@ -22,7 +22,7 @@ namespace string {
  * Represents regular expression parsed from the XML. Regular expression is stored
  * as a tree of CyclicStringElement.
  */
-class CyclicString : virtual public StringBase, public std::element<CyclicString, StringBase> {
+class CyclicString : public std::element<CyclicString, StringBase> {
 protected:
 	std::vector<alphabet::Symbol> m_Data;
 
diff --git a/alib2/src/string/Epsilon.h b/alib2/src/string/Epsilon.h
index 2d42d13dbb..ed0f5bde12 100644
--- a/alib2/src/string/Epsilon.h
+++ b/alib2/src/string/Epsilon.h
@@ -22,7 +22,7 @@ namespace string {
  * Represents epsilon. Regular expression is stored
  * as a tree of EpsilonElement.
  */
-class Epsilon : virtual public StringBase, public std::element<Epsilon, StringBase> {
+class Epsilon : public std::element<Epsilon, StringBase> {
 protected:
 
 	virtual bool testSymbol( const alphabet::Symbol & symbol ) const;
diff --git a/alib2/src/string/LinearString.h b/alib2/src/string/LinearString.h
index 4fb4b0ffdc..9af1abe971 100644
--- a/alib2/src/string/LinearString.h
+++ b/alib2/src/string/LinearString.h
@@ -22,7 +22,7 @@ namespace string {
  * Represents regular expression parsed from the XML. Regular expression is stored
  * as a tree of LinearStringElement.
  */
-class LinearString : virtual public StringBase, public std::element<LinearString, StringBase> {
+class LinearString : public std::element<LinearString, StringBase> {
 protected:
 	std::vector<alphabet::Symbol> m_Data;
 
diff --git a/alib2/src/string/StringBase.h b/alib2/src/string/StringBase.h
index 45885a3891..46850570c2 100644
--- a/alib2/src/string/StringBase.h
+++ b/alib2/src/string/StringBase.h
@@ -25,7 +25,7 @@ class Epsilon;
 /**
  * Represents string in an alphabet.
  */
-class StringBase : virtual public std::elementBase<Epsilon, LinearString, CyclicString> {
+class StringBase : public std::elementBase<Epsilon, LinearString, CyclicString> {
 protected:
 	const String* parentString;
 
-- 
GitLab