From 95d9d67f5ca107fc3731bb011bae14529406bff0 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Fri, 26 Apr 2019 10:00:10 +0200 Subject: [PATCH] remove not needed code --- alib2xml/src/sax/FromXMLParserHelper.cpp | 30 ------------------------ alib2xml/src/sax/FromXMLParserHelper.h | 7 ------ 2 files changed, 37 deletions(-) diff --git a/alib2xml/src/sax/FromXMLParserHelper.cpp b/alib2xml/src/sax/FromXMLParserHelper.cpp index 01626f3f1b..26c32cc14b 100644 --- a/alib2xml/src/sax/FromXMLParserHelper.cpp +++ b/alib2xml/src/sax/FromXMLParserHelper.cpp @@ -67,34 +67,4 @@ std::string FromXMLParserHelper::getTokenData(ext::deque<Token>::const_iterator } } -ext::deque< sax::Token > FromXMLParserHelper::parseInput(const std::string& input) { - ext::deque < sax::Token > res; - sax::SaxParseInterface::parseFile ( input, res ); - return res; -} - -ext::deque < ext::deque < sax::Token > > FromXMLParserHelper::parseInput(bool needSingle, /*const*/ TCLAP::MultiArg < std::string >& input) { - ext::deque < ext::deque < sax::Token > > inputTokens; - - if ( input.isSet ( ) ) { - if(needSingle && input.getValue().size() > 1) - throw exception::CommonException("Multiple parameters when single required."); - - for ( const std::string & fileName : input.getValue() ) { - inputTokens.emplace_back ( parseInput ( fileName ) ); - } - } else { - inputTokens.emplace_back ( parseInput ( "-" ) ); - } - - return inputTokens; -} - -ext::deque < sax::Token > FromXMLParserHelper::parseInput(/*const*/ TCLAP::ValueArg < std::string >& input) { - if ( input.isSet ( ) ) { - return parseInput ( input.getValue() ); - } else { - return parseInput ( "-" ); - } -} } /* namespace sax */ diff --git a/alib2xml/src/sax/FromXMLParserHelper.h b/alib2xml/src/sax/FromXMLParserHelper.h index eafe664ce0..0071a8d08e 100644 --- a/alib2xml/src/sax/FromXMLParserHelper.h +++ b/alib2xml/src/sax/FromXMLParserHelper.h @@ -8,8 +8,6 @@ #ifndef FROM_XML_PARSER_HELPER_H_ #define FROM_XML_PARSER_HELPER_H_ -#include <tclap/MultiArg.h> -#include <tclap/ValueArg.h> #include <alib/string> #include <alib/deque> #include "Token.h" @@ -27,13 +25,8 @@ public: static std::string popTokenData(ext::deque<Token>::iterator& input, Token::TokenType type); static std::string getTokenData(ext::deque<Token>::const_iterator input, Token::TokenType type); - static ext::deque < ext::deque < sax::Token > > parseInput(bool needSingle, /*const*/ TCLAP::MultiArg < std::string >& input); - static ext::deque < sax::Token > parseInput(/*const*/ TCLAP::ValueArg < std::string >& input); - static void skipAttributes ( ext::deque < Token >::const_iterator & input, Token::TokenType type ); static void skipAttributes ( ext::deque < Token >::iterator & input, Token::TokenType type ); - - static ext::deque< sax::Token > parseInput(const std::string& input); }; } /* namespace sax */ -- GitLab