fix name of variables bar symbol

alib2data/src/alphabet/VariablesBarSymbol.cpp

@@ -14,58 +14,58 @@
 namespace alphabet {
-VariablesBarSymbol::VariablesBarSymbol() {
-
+VariablesBarSymbol::VariablesBarSymbol ( ) {
 }
-SymbolBase* VariablesBarSymbol::clone() const {
-	return new VariablesBarSymbol(*this);
+SymbolBase * VariablesBarSymbol::clone ( ) const {
+	return new VariablesBarSymbol ( * this );
 }
-SymbolBase* VariablesBarSymbol::plunder() && {
-	return new VariablesBarSymbol(std::move(*this));
+SymbolBase * VariablesBarSymbol::plunder ( ) && {
+	return new VariablesBarSymbol ( std::move ( * this ) );
 }
-int VariablesBarSymbol::compare(const VariablesBarSymbol&) const {
+int VariablesBarSymbol::compare ( const VariablesBarSymbol & ) const {
 	return 0;
 }
-void VariablesBarSymbol::operator>>(std::ostream& out) const {
-	out << "(Bar symbol)";
+void VariablesBarSymbol::operator >>( std::ostream & out ) const {
+	out << "(Variables bar symbol)";
 }
-VariablesBarSymbol::operator std::string () const {
+VariablesBarSymbol::operator std::string ( ) const {
 	return "|";
 }
-VariablesBarSymbol VariablesBarSymbol::BAR = VariablesBarSymbol();
+VariablesBarSymbol VariablesBarSymbol::BAR = VariablesBarSymbol ( );
 const std::string VariablesBarSymbol::XML_TAG_NAME = "VariablesBarSymbol";
-VariablesBarSymbol VariablesBarSymbol::parse(std::deque<sax::Token>::iterator& input) {
-	sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::START_ELEMENT, VariablesBarSymbol::XML_TAG_NAME);
-	sax::FromXMLParserHelper::popToken(input, sax::Token::TokenType::END_ELEMENT, VariablesBarSymbol::XML_TAG_NAME);
-	return VariablesBarSymbol();
+VariablesBarSymbol VariablesBarSymbol::parse ( std::deque < sax::Token >::iterator & input ) {
+	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::START_ELEMENT, VariablesBarSymbol::XML_TAG_NAME );
+	sax::FromXMLParserHelper::popToken ( input, sax::Token::TokenType::END_ELEMENT, VariablesBarSymbol::XML_TAG_NAME );
+
+	return VariablesBarSymbol ( );
 }
-void VariablesBarSymbol::compose(std::deque<sax::Token>& out) const {
-	out.emplace_back(VariablesBarSymbol::XML_TAG_NAME, sax::Token::TokenType::START_ELEMENT);
-	out.emplace_back(VariablesBarSymbol::XML_TAG_NAME, sax::Token::TokenType::END_ELEMENT);
+void VariablesBarSymbol::compose ( std::deque < sax::Token > & out ) const {
+	out.emplace_back ( VariablesBarSymbol::XML_TAG_NAME, sax::Token::TokenType::START_ELEMENT );
+	out.emplace_back ( VariablesBarSymbol::XML_TAG_NAME, sax::Token::TokenType::END_ELEMENT );
 }
-SymbolBase* VariablesBarSymbol::next() const {
-	return new UniqueSymbol(Symbol(*this), primitive::Integer(0));
+SymbolBase * VariablesBarSymbol::next ( ) const {
+	return new UniqueSymbol ( Symbol ( * this ), primitive::Integer ( 0 ) );
 }
-SymbolBase* VariablesBarSymbol::inc() && {
-	return new UniqueSymbol(Symbol(std::move(*this)), primitive::Integer(0));
+SymbolBase * VariablesBarSymbol::inc ( ) && {
+	return new UniqueSymbol ( Symbol ( std::move ( * this ) ), primitive::Integer ( 0 ) );
 }
 } /* namespace alphabet */
 namespace alib {
-xmlApi<alphabet::Symbol>::ParserRegister<alphabet::VariablesBarSymbol> variablesBarSymbolParserRegister = xmlApi<alphabet::Symbol>::ParserRegister<alphabet::VariablesBarSymbol>(alphabet::VariablesBarSymbol::XML_TAG_NAME, alphabet::VariablesBarSymbol::parse);
-xmlApi<alib::Object>::ParserRegister<alphabet::VariablesBarSymbol> variablesBarSymbolParserRegister2 = xmlApi<alib::Object>::ParserRegister<alphabet::VariablesBarSymbol>(alphabet::VariablesBarSymbol::XML_TAG_NAME, alphabet::VariablesBarSymbol::parse);
+xmlApi < alphabet::Symbol >::ParserRegister < alphabet::VariablesBarSymbol > variablesBarSymbolParserRegister = xmlApi < alphabet::Symbol >::ParserRegister < alphabet::VariablesBarSymbol > ( alphabet::VariablesBarSymbol::XML_TAG_NAME, alphabet::VariablesBarSymbol::parse );
+xmlApi < alib::Object >::ParserRegister < alphabet::VariablesBarSymbol > variablesBarSymbolParserRegister2 = xmlApi < alib::Object >::ParserRegister < alphabet::VariablesBarSymbol > ( alphabet::VariablesBarSymbol::XML_TAG_NAME, alphabet::VariablesBarSymbol::parse );
 } /* namespace alib */

alib2data/test-src/alphabet/SymbolTest.cpp

@@ -9,66 +9,71 @@
 #include "alphabet/BlankSymbol.h"
 #include "alphabet/StartSymbol.h"
 #include "alphabet/EndSymbol.h"
+#include "alphabet/RankedSymbol.h"
+#include "alphabet/BarSymbol.h"
 #include "factory/XmlDataFactory.hpp"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SymbolTest, "alphabet" );
-CPPUNIT_TEST_SUITE_REGISTRATION( SymbolTest );
-void SymbolTest::setUp() {
+#define CPPUNIT_IMPLY( x, y )			CPPUNIT_ASSERT ( !( x ) || ( y ) )
+#define CPPUNIT_EXCLUSIVE_OR( x, y )	CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SymbolTest, "alphabet" );
+CPPUNIT_TEST_SUITE_REGISTRATION ( SymbolTest );
+void SymbolTest::setUp ( ) {
 }
-void SymbolTest::tearDown() {
+void SymbolTest::tearDown ( ) {
 }
-void SymbolTest::testCopyConstruct() {
-	alphabet::Symbol symbol = alphabet::symbolFrom("1");
-	alphabet::Symbol symbol2(symbol);
-	CPPUNIT_ASSERT( symbol == symbol2 );
-	alphabet::Symbol symbol3(std::move(symbol));
-	CPPUNIT_ASSERT( symbol2 == symbol3 );
+void SymbolTest::testCopyConstruct ( ) {
+	alphabet::Symbol symbol = alphabet::symbolFrom ( "1" );
+	alphabet::Symbol symbol2 ( symbol );
+	CPPUNIT_ASSERT ( symbol == symbol2 );
+	alphabet::Symbol symbol3 ( std::move ( symbol ) );
+	CPPUNIT_ASSERT ( symbol2 == symbol3 );
 }
-void SymbolTest::testXMLParser() {
-	alphabet::Symbol symbol = alphabet::symbolFrom("1");
+void SymbolTest::testXMLParser ( ) {
+	alphabet::Symbol symbol = alphabet::symbolFrom ( "1" );
 	{
-		std::deque<sax::Token> tokens = alib::XmlDataFactory::toTokens(symbol);
+		std::deque < sax::Token > tokens = alib::XmlDataFactory::toTokens ( symbol );
 		std::string tmp;
-		sax::SaxComposeInterface::printMemory(tmp, tokens);
-		std::deque<sax::Token> tokens2;
-		sax::SaxParseInterface::parseMemory(tmp, tokens2);
-		alphabet::Symbol symbol2 = alib::XmlDataFactory::fromTokens<alphabet::Symbol>(tokens2);
-		CPPUNIT_ASSERT( symbol == symbol2 );
+		sax::SaxComposeInterface::printMemory ( tmp, tokens );
+		std::deque < sax::Token > tokens2;
+		sax::SaxParseInterface::parseMemory ( tmp, tokens2 );
+		alphabet::Symbol symbol2 = alib::XmlDataFactory::fromTokens < alphabet::Symbol > ( tokens2 );
+		CPPUNIT_ASSERT ( symbol == symbol2 );
 	}
 	{
-		std::string tmp = alib::XmlDataFactory::toString(symbol);
-		alphabet::Symbol symbol2 = alib::XmlDataFactory::fromString<alphabet::Symbol>(tmp);
-		CPPUNIT_ASSERT( symbol == symbol2 );
+		std::string tmp = alib::XmlDataFactory::toString ( symbol );
+		alphabet::Symbol symbol2 = alib::XmlDataFactory::fromString < alphabet::Symbol > ( tmp );
+		CPPUNIT_ASSERT ( symbol == symbol2 );
 	}
 }
-void SymbolTest::testOrder() {
-	alphabet::LabeledSymbol ls("a");
+void SymbolTest::testOrder ( ) {
+	alphabet::LabeledSymbol ls ( "a" );
 	alphabet::BlankSymbol bs;
 	alphabet::StartSymbol ss;
 	alphabet::EndSymbol es;
-	CPPUNIT_EXCLUSIVE_OR( bs < ls, ls < bs);
-//	CPPUNIT_ASSERT(es < ls); //End symbol typically denoted by '$' is lexicographically smaller than any other symbol
-//	CPPUNIT_ASSERT(ls < ss); //Start symbol typically denoted by '^' is lexicographically bigger than any other symbol
-;
-}
+	alphabet::RankedSymbol rs1 ( alphabet::Symbol ( alphabet::BarSymbol { } ), 0 );
+	alphabet::RankedSymbol rs2 ( alphabet::Symbol ( alphabet::BarSymbol { } ), 0 );
+	CPPUNIT_EXCLUSIVE_OR ( bs < ls, ls < bs );
+
+	CPPUNIT_ASSERT ( rs1 == rs2 );
+	// CPPUNIT_ASSERT(es < ls); //End symbol typically denoted by '$' is lexicographically smaller than any other symbol
+	// CPPUNIT_ASSERT(ls < ss); //Start symbol typically denoted by '^' is lexicographically bigger than any other symbol
+}