code optimize

alib2data_experimental/src/indexes/stringology/SuffixTrieNodeTerminatingSymbol.cpp

@@ -95,9 +95,7 @@ const SuffixTrieNodeTerminatingSymbol & SuffixTrieNodeTerminatingSymbol::getChil
 }
 bool SuffixTrieNodeTerminatingSymbol::hasChild ( const DefaultSymbolType & symbol ) const {
-	if ( m_children.find ( symbol ) == m_children.end ( ) ) return false;
-
-	return true;
+	return m_children.find ( symbol ) != m_children.end ( );
 }
 SuffixTrieNodeTerminatingSymbol & SuffixTrieNodeTerminatingSymbol::addChild ( DefaultSymbolType symbol, SuffixTrieNodeTerminatingSymbol node ) {

alib2xml/src/core/xmlApi.cpp

@@ -89,9 +89,7 @@ bool xmlApi < object::Object >::first ( const ext::deque < sax::Token >::const_i
 	typename ext::map < std::string, std::unique_ptr < GroupParser > >::iterator callback = parseFunctions ( ).find ( tagName );
-	if ( callback == parseFunctions ( ).end ( ) ) return false;
-
-	return true;
+	return callback != parseFunctions ( ).end ( );
 }
 std::string xmlApi < object::Object >::xmlTagName ( ) {

alib2xml/src/sax/FromXMLParserHelper.cpp

@@ -50,9 +50,7 @@ void FromXMLParserHelper::popToken(ext::deque<Token>::iterator& input, Token::To
 std::string FromXMLParserHelper::popTokenData(ext::deque<Token>::iterator& input, Token::TokenType type) {
 	if(isTokenType(input, type)) {
 		skipAttributes ( input, type );
-		std::string result = std::move(*input).moveData();
-		++input;
-		return result;
+		return std::move ( * input ++ ).getData ( );
 	} else {
 		throw ParserException(Token("?", type), *input);
 	}

alib2xml/src/sax/Token.cpp

@@ -11,21 +11,14 @@
 namespace sax {
-Token::Token(const std::string& tokenData, Token::TokenType tokenType) :
-		data(tokenData), type(tokenType) {
-
-}
-
-Token::Token(std::string&& tokenData, Token::TokenType tokenType) :
-		data(std::move(tokenData)), type(tokenType) {
-
+Token::Token ( std::string tokenData, Token::TokenType tokenType ) : data ( std::move ( tokenData ) ), type ( tokenType ) {
 }
-const std::string& Token::getData() const {
+const std::string & Token::getData ( ) const & {
 	return data;
 }
-std::string&& Token::moveData() && {
+std::string && Token::getData ( ) && {
 	return std::move(data);
 }

alib2xml/src/sax/Token.h

@@ -29,18 +29,17 @@ private:
 	TokenType type;
 public:
-	Token(const std::string&, TokenType);
-	Token(std::string&&, TokenType);
+	Token ( std::string, TokenType );
 	/**
 	 * @return name of the tag or characters read
 	 */
-	const std::string& getData() const;
+	const std::string & getData ( ) const &;
 	/**
 	 * @return name of the tag or characters read
 	 */
-	std::string&& moveData() &&; //TODO should be named getData only
+	std::string && getData ( ) &&;
 	/**
 	 * @return type of the token - star of the tag, end of the tag, attribute