fix segfaults in composers

alib2/src/ExceptionToXMLComposer.cpp

@@ -9,7 +9,9 @@
 namespace alib {
-void ExceptionToXMLComposer::Visit(std::list<sax::Token>& out, const AlibException& exception) {
+void ExceptionToXMLComposer::Visit(void* userData, const AlibException& exception) {
+	std::list<sax::Token> &out = *((std::list<sax::Token>*) userData);
+	
 	out.push_back(sax::Token("exception", sax::Token::START_ELEMENT));
 	out.push_back(sax::Token(exception.getCause(), sax::Token::CHARACTER));
 	out.push_back(sax::Token("exception", sax::Token::END_ELEMENT));
@@ -17,7 +19,7 @@ void ExceptionToXMLComposer::Visit(std::list<sax::Token>& out, const AlibExcepti
 std::list<sax::Token> ExceptionToXMLComposer::compose(const AlibException& exception) {
 	std::list<sax::Token> out;
-	Visit(out, exception);
+	Visit((void*) &out, exception);
 	return out;
 }

alib2/src/ExceptionToXMLComposer.h

@@ -18,7 +18,7 @@ namespace alib {
  * This class contains methods to print XML representation of string to the output stream.
  */
 class ExceptionToXMLComposer {
-	static void Visit(std::list<sax::Token>&, const AlibException& exception);
+	static void Visit(void* userData, const AlibException& exception);
 public:
 	/**
 	 * Prints XML representation of AlibException to the output stream.

alib2/src/alphabet/SymbolToStringComposer.cpp

@@ -32,7 +32,7 @@ void SymbolToStringComposer::Visit(void* userData, const LabeledSymbol& symbol)
 	std::stringstream &out = *((std::stringstream*) userData);
 	out << '\'';
-	Visit(out, symbol.getLabel());
+	Visit(userData, symbol.getLabel());
 	out << '\'';
 }
@@ -49,7 +49,7 @@ void SymbolToStringComposer::Visit(void* userData, const Symbol& symbol) {
 std::string SymbolToStringComposer::compose(const Symbol& symbol) {
 	std::stringstream out;
-	Visit(out, symbol);
+	Visit((void*) &out, symbol);
 	return std::move(out).str();
 }

alib2/src/alphabet/SymbolToXMLComposer.cpp

@@ -8,13 +8,9 @@
 #include "SymbolToXMLComposer.h"
 #include "LabeledSymbol.h"
-namespace alphabet {
-
-void SymbolToXMLComposer::Visit(void* userData, const label::Label& label) const {
-	std::list<sax::Token> &out = *((std::list<sax::Token>*) userData);
-	out.push_back(sax::Token((std::string) label, sax::Token::CHARACTER));
-}
+#include "../ToXMLComposers.h"
+namespace alphabet {
 void SymbolToXMLComposer::Visit(void* userData, const BlankSymbol&) const {
 	std::list<sax::Token> &out = *((std::list<sax::Token>*) userData);
@@ -27,7 +23,7 @@ void SymbolToXMLComposer::Visit(void* userData, const LabeledSymbol& symbol) con
 	std::list<sax::Token> &out = *((std::list<sax::Token>*) userData);
 	out.push_back(sax::Token("LabeledSymbol", sax::Token::START_ELEMENT));
-	Visit(userData, symbol.getLabel());
+	out.splice(out.end(), alib::ToXMLComposers::labelComposer.compose(symbol.getLabel()));
 	out.push_back(sax::Token("LabeledSymbol", sax::Token::END_ELEMENT));
 }

alib2/src/alphabet/SymbolToXMLComposer.h

@@ -19,7 +19,6 @@ namespace alphabet {
  * This class contains methods to print XML representation of string to the output stream.
  */
 class SymbolToXMLComposer : public SymbolBase::const_visitor_type {
-	void Visit(void*, const label::Label& slabel) const;
 	void Visit(void*, const Symbol& symbol) const;
 	void Visit(void*, const LabeledSymbol& symbol) const;
 	void Visit(void*, const BlankSymbol& symbol) const;

alib2/src/string/StringToStringComposer.cpp

@@ -46,7 +46,7 @@ void StringToStringComposer::Visit(void* userData, const CyclicString& string) {
 			else
 				out << ' ';
-			Visit(out, symbol);
+			Visit(userData, symbol);
 		}
 		out << ">";
@@ -69,7 +69,7 @@ void StringToStringComposer::Visit(void* userData, const LinearString& string) {
 			else
 				out << ' ';
 	
-			Visit(out, symbol);
+			Visit(userData, symbol);
 		}
 	}
@@ -88,7 +88,7 @@ void StringToStringComposer::Visit(void* userData, const String& string) {
 std::string StringToStringComposer::compose(const String& string) {
 	std::stringstream out;
-	Visit(out, string);
+	Visit((void*) &out, string);
 	return std::move(out).str();
 }