make identifiers include digits

alib2str/src/primitive/PrimitiveFromStringLexer.cpp

@@ -45,7 +45,7 @@ L1:
 	character = in.get();
 	if(in.eof()) {
 		return token;
-	} else if((character >= 'a' && character <= 'z') || (character >= 'A' && character <= 'Z') ) {
+	} else if ( ( character >= 'a' && character <= 'z' ) || ( character >= 'A' && character <= 'Z' ) || ( character >= '0' && character <= '9' ) ) {
 		token.value += character;
 		token.raw += character;
 		goto L1;

alib2str/src/tree/string/common/TreeToStringComposerCommon.h

@@ -31,7 +31,7 @@ template < class SymbolType, class RankType >
 void TreeToStringComposerCommon::compose ( std::ostream & out, const ext::tree < common::ranked_symbol < SymbolType, RankType> > & node ) {
 	alib::stringApi < SymbolType >::compose ( out, node.getData ( ).getSymbol ( ) );
-	out << ext::to_string ( node.getData ( ).getRank ( ) );
+	out << " " << ext::to_string ( node.getData ( ).getRank ( ) );
 	for ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & child : node ) {
 		out << " ";
@@ -46,7 +46,7 @@ void TreeToStringComposerCommon::compose ( std::ostream & out, const common::ran
 	} else {
 		alib::stringApi < SymbolType >::compose ( out, node.getData ( ).getSymbol ( ) );
-		out << ext::to_string ( node.getData ( ).getRank ( ) );
+		out << " " << ext::to_string ( node.getData ( ).getRank ( ) );
 		for ( const ext::tree < common::ranked_symbol < SymbolType, RankType > > & child : node ) {
 			out << " ";

alib2str/test-src/tree/TreeTest.cpp

@@ -23,7 +23,7 @@ void TreeTest::tearDown ( ) {
 void TreeTest::testEqual ( ) {
 	{
-		std::string input = "RANKED_TREE a0";
+		std::string input = "RANKED_TREE a 0";
 		tree::Tree tree = alib::StringDataFactory::fromString ( input );
 		std::string output = alib::StringDataFactory::toString ( tree );
@@ -49,7 +49,7 @@ void TreeTest::testEqual ( ) {
 		CPPUNIT_ASSERT ( tree == tree2 );
 	}
 	{
-		std::string input = "RANKED_TREE a2 a0 a1 a0";
+		std::string input = "RANKED_TREE a 2 a 0 a 1 a 0";
 		tree::Tree tree = alib::StringDataFactory::fromString ( input );
 		std::string output = alib::StringDataFactory::toString ( tree );
@@ -73,7 +73,7 @@ void TreeTest::testEqual ( ) {
 		CPPUNIT_ASSERT ( tree == tree2 );
 	}
 	{
-		std::string input = "RANKED_PATTERN a2 #S a1 a0";
+		std::string input = "RANKED_PATTERN a 2 #S a 1 a 0";
 		tree::Tree tree = alib::StringDataFactory::fromString ( input );
 		std::string output = alib::StringDataFactory::toString ( tree );