diff --git a/aconversions2/src/ConversionHandler.cpp b/aconversions2/src/ConversionHandler.cpp index 15e4ca19f72a3349655ffe557d4d27b59873535b..151baa083df70440edda966e9ade15aee8f92697 100644 --- a/aconversions2/src/ConversionHandler.cpp +++ b/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" ) diff --git a/aconversions2/src/aconversion.cpp b/aconversions2/src/aconversion.cpp index cdbd16ccabcee30741e9036f1763028aec6c61a6..83fffdcb4a18792fcd6bb91a769987451bc5a51e 100644 --- a/aconversions2/src/aconversion.cpp +++ b/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; diff --git a/alib2data/src/regexp/RegExpFromXMLParser.cpp b/alib2data/src/regexp/RegExpFromXMLParser.cpp index f5b2072212f7cd1857a7568688178723aa92e742..7c5922632d6922ca215b62966467d6627488e859 100644 --- a/alib2data/src/regexp/RegExpFromXMLParser.cpp +++ b/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));