data: rename BlankSymbol -> Blank

alib2data/src/alphabet/BlankSymbol.cpp → alib2data/src/alphabet/Blank.cpp

-#include "BlankSymbol.h"
+#include "Blank.h"
 #include <object/Object.h>
@@ -6,9 +6,9 @@
 namespace alphabet {
-BlankSymbol::BlankSymbol() = default;
-ext::ostream & operator << ( ext::ostream & out, const BlankSymbol & ) {
+Blank::Blank() = default;
+ext::ostream & operator << ( ext::ostream & out, const Blank & ) {
 	return out << "(Blank symbol)";
 }
@@ -16,6 +16,6 @@ ext::ostream & operator << ( ext::ostream & out, const BlankSymbol & ) {
 namespace {
-auto valuePrinter = registration::ValuePrinterRegister < alphabet::BlankSymbol > ( );
+auto valuePrinter = registration::ValuePrinterRegister < alphabet::Blank > ( );
 } /* namespace */

alib2data/src/alphabet/BlankSymbol.h → alib2data/src/alphabet/Blank.h

@@ -29,13 +29,13 @@ namespace alphabet {
  * \brief
  * Represents blank symbol used in the turing machine.
  */
-class BlankSymbol {
+class Blank {
 public:
 	/**
 	 * \brief
 	 * Creates a new instance of the symbol.
 	 */
-	explicit BlankSymbol ( );
+	explicit Blank ( );
 	/**
 	 * The three way comparison implementation
@@ -44,7 +44,7 @@ public:
 	 *
 	 * \returns the ordering between this object and the @p other.
 	 */
-	std::strong_ordering operator <=> ( const BlankSymbol & ) const {
+	std::strong_ordering operator <=> ( const Blank & ) const {
 		return std::strong_ordering::equal;
 	}
@@ -55,7 +55,7 @@ public:
 	 *
 	 * \returns true if this and other objects are equal, false othervise
 	 */
-	bool operator == ( const BlankSymbol & ) const {
+	bool operator == ( const Blank & ) const {
 		return true;
 	}
@@ -67,7 +67,7 @@ public:
 	 *
 	 * \returns modified output stream
 	 */
-	friend ext::ostream & operator << ( ext::ostream & out, const BlankSymbol & instance );
+	friend ext::ostream & operator << ( ext::ostream & out, const Blank & instance );
 	/**
 	 * \brief Factory for the symbol construction of the symbol based on given type.
@@ -77,17 +77,17 @@ public:
 };
 template < typename Base >
-inline Base BlankSymbol::instance ( ) {
+inline Base Blank::instance ( ) {
 	if constexpr ( std::is_integral_v < Base > ) {
 		return ' ';
 	} else if constexpr ( std::is_same_v < Base, std::string > ) {
-		return std::string ( 1, BlankSymbol::instance < char > ( ) );
-	} else if constexpr ( std::is_same_v < Base, BlankSymbol > ) {
-		return BlankSymbol ( );
+		return std::string ( 1, Blank::instance < char > ( ) );
+	} else if constexpr ( std::is_same_v < Base, Blank > ) {
+		return Blank ( );
 	} else if constexpr ( std::is_same_v < Base, object::Object > ) {
-		return object::ObjectFactory < >::construct ( BlankSymbol ( ) );
+		return object::ObjectFactory < >::construct ( Blank ( ) );
 	} else if constexpr ( std::is_same_v < Base, common::ranked_symbol < > > ) {
-		return common::ranked_symbol < > ( BlankSymbol::instance < DefaultSymbolType > ( ), 0u );
+		return common::ranked_symbol < > ( Blank::instance < DefaultSymbolType > ( ), 0u );
 	} else {
 		static_assert ( std::is_same_v < Base, Base >, "Unsupported type of instance" );
 	}

alib2data/src/alphabet/xml/BlankSymbol.cpp → alib2data/src/alphabet/xml/Blank.cpp

-#include "BlankSymbol.h"
+#include "Blank.h"
 #include <object/Object.h>
 #include <registration/XmlRegistration.hpp>
 namespace core {
-alphabet::BlankSymbol xmlApi < alphabet::BlankSymbol >::parse ( ext::deque < sax::Token >::iterator & input ) {
+alphabet::Blank xmlApi < alphabet::Blank >::parse ( ext::deque < sax::Token >::iterator & input ) {
 	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
 	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, xmlTagName ( ) );
-	return alphabet::BlankSymbol ( );
+	return alphabet::Blank ( );
 }
-bool xmlApi < alphabet::BlankSymbol >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
+bool xmlApi < alphabet::Blank >::first ( const ext::deque < sax::Token >::const_iterator & input ) {
 	return sax::FromXMLParserHelper::isToken ( input, sax::Token::TokenType::START_ELEMENT, xmlTagName ( ) );
 }
-std::string xmlApi < alphabet::BlankSymbol >::xmlTagName ( ) {
-	return "BlankSymbol";
+std::string xmlApi < alphabet::Blank >::xmlTagName ( ) {
+	return "Blank";
 }
-void xmlApi < alphabet::BlankSymbol >::compose ( ext::deque < sax::Token > & output, const alphabet::BlankSymbol & ) {
+void xmlApi < alphabet::Blank >::compose ( ext::deque < sax::Token > & output, const alphabet::Blank & ) {
 	output.emplace_back ( xmlTagName ( ), sax::Token::TokenType::START_ELEMENT );
 	output.emplace_back ( xmlTagName ( ), sax::Token::TokenType::END_ELEMENT );
 }
@@ -28,9 +28,9 @@ void xmlApi < alphabet::BlankSymbol >::compose ( ext::deque < sax::Token > & out
 namespace {
-auto xmlWrite = registration::XmlWriterRegister < alphabet::BlankSymbol > ( );
-auto xmlRead = registration::XmlReaderRegister < alphabet::BlankSymbol > ( );
-auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::BlankSymbol > ( );
+auto xmlWrite = registration::XmlWriterRegister < alphabet::Blank > ( );
+auto xmlRead = registration::XmlReaderRegister < alphabet::Blank > ( );
+auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, alphabet::Blank > ( );
 } /* namespace */

alib2data/src/alphabet/xml/BlankSymbol.h → alib2data/src/alphabet/xml/Blank.h

 #pragma once
-#include <alphabet/BlankSymbol.h>
+#include <alphabet/Blank.h>
 #include <core/xmlApi.hpp>
 namespace core {
 template < >
-struct xmlApi < alphabet::BlankSymbol > {
-	static alphabet::BlankSymbol parse ( ext::deque < sax::Token >::iterator & input );
+struct xmlApi < alphabet::Blank > {
+	static alphabet::Blank parse ( ext::deque < sax::Token >::iterator & input );
 	static bool first ( const ext::deque < sax::Token >::const_iterator & input );
 	static std::string xmlTagName ( );
-	static void compose ( ext::deque < sax::Token > & output, const alphabet::BlankSymbol & data );
+	static void compose ( ext::deque < sax::Token > & output, const alphabet::Blank & data );
 };
 } /* namespace core */

alib2data/test-src/string/StringTest.cpp

@@ -15,8 +15,6 @@
 #include "factory/XmlDataFactory.hpp"
-#include "alphabet/BlankSymbol.h"
-
 #include <primitive/xml/Character.h>
 #include <container/xml/ObjectsSet.h>

alib2str/src/alphabet/string/BlankSymbol.cpp → alib2str/src/alphabet/string/Blank.cpp

-#include "BlankSymbol.h"
-#include <alphabet/BlankSymbol.h>
+#include "Blank.h"
+#include <alphabet/Blank.h>
 #include <object/Object.h>
 #include <registration/StringRegistration.hpp>
 namespace core {
-alphabet::BlankSymbol stringApi < alphabet::BlankSymbol >::parse ( ext::istream & ) {
-	throw exception::CommonException("parsing BlankSymbol from string not implemented");
+alphabet::Blank stringApi < alphabet::Blank >::parse ( ext::istream & ) {
+	throw exception::CommonException("parsing Blank from string not implemented");
 }
-bool stringApi < alphabet::BlankSymbol >::first ( ext::istream & ) {
+bool stringApi < alphabet::Blank >::first ( ext::istream & ) {
 	return false;
 }
-void stringApi < alphabet::BlankSymbol >::compose ( ext::ostream & output, const alphabet::BlankSymbol & ) {
+void stringApi < alphabet::Blank >::compose ( ext::ostream & output, const alphabet::Blank & ) {
 	output << "#B";
 }
@@ -22,8 +22,8 @@ void stringApi < alphabet::BlankSymbol >::compose ( ext::ostream & output, const
 namespace {
-auto stringWrite = registration::StringWriterRegister < alphabet::BlankSymbol > ( );
-auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, alphabet::BlankSymbol > ( );
+auto stringWrite = registration::StringWriterRegister < alphabet::Blank > ( );
+auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, alphabet::Blank > ( );
 } /* namespace */

alib2str/src/alphabet/string/BlankSymbol.h → alib2str/src/alphabet/string/Blank.h

 #pragma once
-#include <alphabet/BlankSymbol.h>
+#include <alphabet/Blank.h>
 #include <core/stringApi.hpp>
 namespace core {
 template < >
-struct stringApi < alphabet::BlankSymbol > {
-	static alphabet::BlankSymbol parse ( ext::istream & input );
+struct stringApi < alphabet::Blank > {
+	static alphabet::Blank parse ( ext::istream & input );
 	static bool first ( ext::istream & input );
-	static void compose ( ext::ostream & output, const alphabet::BlankSymbol & symbol );
+	static void compose ( ext::ostream & output, const alphabet::Blank & symbol );
 };
 } /* namespace core */