fix unbounded regexp parser

aconversions2/src/ConversionHandler.cpp

@@ -363,7 +363,7 @@ ConversionHandler::TFormalism ConversionHandler::parseFormalismFromTokens( void
 {
 	std::string xmlMark = m_tokens.front( ).getData( );
-	if( xmlMark == "automaton" || xmlMark == "nfa" )
+	if( xmlMark == "automaton" || xmlMark == "NFA" )
 		return FINITE_AUTOMATON;
 	if( xmlMark == "regexp" || xmlMark == "unboundedRegexp" )

aconversions2/src/aconversion.cpp

@@ -131,6 +131,7 @@ int main(int argc, char* argv[])
 	}
 	catch( const exception::AlibException & exception ) {
 		alib::DataFactory::toStdout(exception);
+		std::cout << exception << std::endl;
 		return 1;
 	} catch (...) {
 		return 127;

alib2data/src/regexp/RegExpFromXMLParser.cpp

@@ -99,17 +99,8 @@ UnboundedRegExpElement* RegExpFromXMLParser::parseUnboundedRegExpElement(std::li
 UnboundedRegExpAlternation* RegExpFromXMLParser::parseUnboundedRegExpAlternation(std::list<sax::Token>& input) const {
 	popToken(input, sax::Token::TokenType::START_ELEMENT, "alternation");
-	UnboundedRegExpElement* element1 = parseUnboundedRegExpElement(input);
-	UnboundedRegExpElement* element2 = parseUnboundedRegExpElement(input);
-	
 	UnboundedRegExpAlternation* alternation = new UnboundedRegExpAlternation();
-	alternation->appendElement(std::move(*element1));
-	alternation->appendElement(std::move(*element2));
-
-	delete element1;
-	delete element2;
-	
 	while (isTokenType(input, sax::Token::TokenType::START_ELEMENT)) {
 		UnboundedRegExpElement* element = parseUnboundedRegExpElement(input);
 		alternation->appendElement(std::move(*element));
@@ -123,17 +114,8 @@ UnboundedRegExpAlternation* RegExpFromXMLParser::parseUnboundedRegExpAlternation
 UnboundedRegExpConcatenation* RegExpFromXMLParser::parseUnboundedRegExpConcatenation(std::list<sax::Token>& input) const {
 	popToken(input, sax::Token::TokenType::START_ELEMENT, "concatenation");
-	UnboundedRegExpElement* element1 = parseUnboundedRegExpElement(input);
-	UnboundedRegExpElement* element2 = parseUnboundedRegExpElement(input);
-	
 	UnboundedRegExpConcatenation* concatenation = new UnboundedRegExpConcatenation();
-	concatenation->appendElement(std::move(*element1));
-	concatenation->appendElement(std::move(*element2));
-
-	delete element1;
-	delete element2;
-	
 	while (isTokenType(input, sax::Token::TokenType::START_ELEMENT)) {
 		UnboundedRegExpElement* element = parseUnboundedRegExpElement(input);
 		concatenation->appendElement(std::move(*element));