+explicit to all constructors; parse/compose State

alib2data/src/label/ObjectLabel.h

@@ -21,11 +21,8 @@ namespace label {
 class ObjectLabel : public std::acceptor<ObjectLabel, VisitableLabelBase, std::acceptor<ObjectLabel, alib::VisitableObjectBase, LabelBase> > {
 protected:
 	alib::Object label;
-public:
-	virtual LabelBase* clone() const;
-
-	virtual LabelBase* plunder() &&;
+public:
 	/**
 	 * Creates new symbol with given name.
 	 * @param symbol name of the symbol
@@ -34,6 +31,10 @@ public:
 	explicit ObjectLabel(alib::Object&& label);
+	virtual LabelBase* clone() const;
+
+	virtual LabelBase* plunder() &&;
+
 	virtual bool operator<(const alib::ObjectBase& other) const;
 	
 	virtual bool operator>(const alib::ObjectBase& other) const;

alib2data/src/label/PrimitiveLabel.h

@@ -21,18 +21,20 @@ namespace label {
 class PrimitiveLabel : public std::acceptor<PrimitiveLabel, VisitableLabelBase, std::acceptor<PrimitiveLabel, alib::VisitableObjectBase, LabelBase> > {
 protected:
 	primitive::Primitive primitive;
-public:
-	virtual LabelBase* clone() const;
-
-	virtual LabelBase* plunder() &&;
+public:
 	/**
 	 * Creates new symbol with given name.
 	 * @param symbol name of the symbol
 	 */
 	explicit PrimitiveLabel(const primitive::Primitive& primitive);
+
 	explicit PrimitiveLabel(primitive::Primitive&& primitive);
+	virtual LabelBase* clone() const;
+
+	virtual LabelBase* plunder() &&;
+
 	virtual bool operator<(const alib::ObjectBase& other) const;
 	
 	virtual bool operator>(const alib::ObjectBase& other) const;

alib2data/src/primitive/Character.h

@@ -21,17 +21,18 @@ namespace primitive {
 class Character : public std::acceptor<Character, VisitablePrimitiveBase, std::acceptor<Character, alib::VisitableObjectBase, PrimitiveBase> > {
 protected:
 	char data;
-public:
-	virtual PrimitiveBase* clone() const;
-
-	virtual PrimitiveBase* plunder() &&;
+public:
 	/**
 	 * Creates new symbol with given name.
 	 * @param symbol name of the symbol
 	 */
 	explicit Character(char data);
+	virtual PrimitiveBase* clone() const;
+
+	virtual PrimitiveBase* plunder() &&;
+
 	virtual bool operator<(const alib::ObjectBase& other) const;
 	virtual bool operator>(const alib::ObjectBase& other) const;

alib2data/src/primitive/Integer.h

@@ -20,17 +20,18 @@ namespace primitive {
 class Integer : public std::acceptor<Integer, VisitablePrimitiveBase, std::acceptor<Integer, alib::VisitableObjectBase, PrimitiveBase> > {
 protected:
 	int data;
-public:
-	virtual PrimitiveBase* clone() const;
-
-	virtual PrimitiveBase* plunder() &&;
+public:
 	/**
 	 * Creates new symbol with given name.
 	 * @param symbol name of the symbol
 	 */
 	explicit Integer(int data);
+	virtual PrimitiveBase* clone() const;
+
+	virtual PrimitiveBase* plunder() &&;
+
 	virtual bool operator<(const alib::ObjectBase& other) const;
 	
 	virtual bool operator>(const alib::ObjectBase& other) const;

alib2data/src/primitive/String.h

@@ -21,11 +21,8 @@ namespace primitive {
 class String : public std::acceptor<String, VisitablePrimitiveBase, std::acceptor<String, alib::VisitableObjectBase, PrimitiveBase> > {
 protected:
 	std::string data;
-public:
-	virtual PrimitiveBase* clone() const;
-
-	virtual PrimitiveBase* plunder() &&;
+public:
 	/**
 	 * Creates new symbol with given name.
 	 * @param symbol name of the symbol
@@ -34,6 +31,10 @@ public:
 	explicit String(std::string&& data);
+	virtual PrimitiveBase* clone() const;
+
+	virtual PrimitiveBase* plunder() &&;
+
 	virtual bool operator<(const alib::ObjectBase& other) const;
 	virtual bool operator>(const alib::ObjectBase& other) const;

alib2data/src/regexp/formal/FormalRegExp.h

@@ -41,10 +41,10 @@ public:
 	 */
 	virtual RegExpBase* plunder() &&;
-	FormalRegExp();
+	explicit FormalRegExp();
 	explicit FormalRegExp(const UnboundedRegExp& other);
-	FormalRegExp(const std::set<alphabet::Symbol>& alphabet, const FormalRegExpElement& regExp);
-	FormalRegExp(std::set<alphabet::Symbol>&& alphabet, FormalRegExpElement&& regExp);
+	explicit FormalRegExp(const std::set<alphabet::Symbol>& alphabet, const FormalRegExpElement& regExp);
+	explicit FormalRegExp(std::set<alphabet::Symbol>&& alphabet, FormalRegExpElement&& regExp);
 	explicit FormalRegExp(const FormalRegExpElement& regExp);
 	explicit FormalRegExp(FormalRegExpElement&& regExp);

alib2data/src/regexp/formal/FormalRegExpElement.h

@@ -60,7 +60,7 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const = 0;
 	
 public:
-	FormalRegExpElement();
+	explicit FormalRegExpElement();
 	
 	/**
 	 * Creates copy of the element.

alib2data/src/regexp/formal/FormalRegExpEmpty.h

@@ -38,7 +38,7 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const;
 public:
-	FormalRegExpEmpty();
+	explicit FormalRegExpEmpty();
 	FormalRegExpEmpty(const FormalRegExpEmpty& other);
 	FormalRegExpEmpty(FormalRegExpEmpty&& other) noexcept;
 	FormalRegExpEmpty& operator =(const FormalRegExpEmpty& other);

alib2data/src/regexp/formal/FormalRegExpEpsilon.h

@@ -39,7 +39,7 @@ protected:
 public:
-	FormalRegExpEpsilon();
+	explicit FormalRegExpEpsilon();
 	FormalRegExpEpsilon(const FormalRegExpEpsilon& other);
 	FormalRegExpEpsilon(FormalRegExpEpsilon&& other) noexcept;
 	FormalRegExpEpsilon& operator=(const FormalRegExpEpsilon& other);

alib2data/src/regexp/unbounded/UnboundedRegExp.h

@@ -41,10 +41,10 @@ public:
 	 */
 	virtual RegExpBase* plunder() &&;
-	UnboundedRegExp();
+	explicit UnboundedRegExp();
 	explicit UnboundedRegExp(const FormalRegExp& other);
-	UnboundedRegExp(const std::set<alphabet::Symbol>& alphabet, const UnboundedRegExpElement& regExp);
-	UnboundedRegExp(std::set<alphabet::Symbol>&& alphabet, UnboundedRegExpElement&& regExp);
+	explicit UnboundedRegExp(const std::set<alphabet::Symbol>& alphabet, const UnboundedRegExpElement& regExp);
+	explicit UnboundedRegExp(std::set<alphabet::Symbol>&& alphabet, UnboundedRegExpElement&& regExp);
 	explicit UnboundedRegExp(const UnboundedRegExpElement& regExp);
 	explicit UnboundedRegExp(UnboundedRegExpElement&& regExp);

alib2data/src/regexp/unbounded/UnboundedRegExpAlternation.h

@@ -44,7 +44,7 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const;
 public:
-	UnboundedRegExpAlternation();
+	explicit UnboundedRegExpAlternation();
 	UnboundedRegExpAlternation(const UnboundedRegExpAlternation& other);
 	UnboundedRegExpAlternation(UnboundedRegExpAlternation&& other) noexcept;

alib2data/src/regexp/unbounded/UnboundedRegExpConcatenation.h

@@ -45,7 +45,7 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const;
 public:
-	UnboundedRegExpConcatenation();
+	explicit UnboundedRegExpConcatenation();
 	
 	UnboundedRegExpConcatenation(const UnboundedRegExpConcatenation& other);
 	UnboundedRegExpConcatenation(UnboundedRegExpConcatenation&& other) noexcept;

alib2data/src/regexp/unbounded/UnboundedRegExpElement.h

@@ -60,7 +60,7 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const = 0;
 	
 public:
-	UnboundedRegExpElement();
+	explicit UnboundedRegExpElement();
 	
 	/**
 	 * Creates copy of the element.

alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h

@@ -38,7 +38,7 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const;
 public:
-	UnboundedRegExpEmpty();
+	explicit UnboundedRegExpEmpty();
 	UnboundedRegExpEmpty(const UnboundedRegExpEmpty& other);
 	UnboundedRegExpEmpty(UnboundedRegExpEmpty&& other) noexcept;
 	UnboundedRegExpEmpty& operator =(const UnboundedRegExpEmpty& other);

alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h

@@ -39,7 +39,7 @@ protected:
 public:
-	UnboundedRegExpEpsilon();
+	explicit UnboundedRegExpEpsilon();
 	UnboundedRegExpEpsilon(const UnboundedRegExpEpsilon& other);
 	UnboundedRegExpEpsilon(UnboundedRegExpEpsilon&& other) noexcept;
 	UnboundedRegExpEpsilon& operator=(const UnboundedRegExpEpsilon& other);

alib2data/src/string/CyclicString.h

@@ -26,7 +26,7 @@ namespace string {
 class CyclicString : public std::acceptor<CyclicString, VisitableStringBase, std::acceptor<CyclicString, alib::VisitableObjectBase, StringBase> >, public StringAlphabet {
 	std::vector<alphabet::Symbol> m_Data;
 public:
-	CyclicString();
+	explicit CyclicString();
 	explicit CyclicString(const std::set<alphabet::Symbol>& alphabet, const std::vector<alphabet::Symbol>& data);
 	explicit CyclicString(std::set<alphabet::Symbol>&& alphabet, std::vector<alphabet::Symbol>&& data);
 	explicit CyclicString(const std::vector<alphabet::Symbol>& data);

alib2data/src/string/LinearString.h

@@ -27,7 +27,7 @@ class LinearString : public std::acceptor<LinearString, VisitableStringBase, std
 	std::vector<alphabet::Symbol> m_Data;
 public:
-	LinearString();
+	explicit LinearString();
 	explicit LinearString(const std::set<alphabet::Symbol>& alphabet, const std::vector<alphabet::Symbol>& data);
 	explicit LinearString(std::set<alphabet::Symbol>&& alphabet, std::vector<alphabet::Symbol>&& data);
 	explicit LinearString(const std::vector<alphabet::Symbol>& data);