diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-23 12:14:55 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-23 12:14:55 +0900 |
commit | a120985048e7e9e5c745b97c561c9a1ae531ec03 (patch) | |
tree | 68bfbf617d3ed4abcadf5ca0118401fbbadf49d0 /umbrello/umbrello/codeimport/kdevcppparser/parser.cpp | |
parent | b0c86264e0cd10a0d3a47de3b05be453d9417bcd (diff) | |
download | tdesdk-a120985048e7e9e5c745b97c561c9a1ae531ec03.tar.gz tdesdk-a120985048e7e9e5c745b97c561c9a1ae531ec03.zip |
Replace auto_ptr
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'umbrello/umbrello/codeimport/kdevcppparser/parser.cpp')
-rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/parser.cpp | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index adc729e9..f5748859 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -327,7 +327,7 @@ bool Parser::skipCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -379,7 +379,7 @@ bool Parser::skipExpression( AST::Node& node ) { AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } return true; @@ -430,7 +430,7 @@ bool Parser::parseName( NameAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -443,7 +443,7 @@ bool Parser::parseTranslationUnit( TranslationUnitAST::Node& node ) m_problems = 0; TranslationUnitAST::Node tun = CreateNode<TranslationUnitAST>(); - node = tun; + node = std::move(tun); while( !lex->lookAhead(0).isNull() ){ DeclarationAST::Node def; int startDecl = lex->index(); @@ -548,7 +548,7 @@ bool Parser::parseDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -602,7 +602,7 @@ bool Parser::parseLinkageSpecification( DeclarationAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -619,7 +619,7 @@ bool Parser::parseLinkageBody( LinkageBodyAST::Node& node ) lex->nextToken(); LinkageBodyAST::Node lba = CreateNode<LinkageBodyAST>(); - node = lba; + node = std::move(lba); while( !lex->lookAhead(0).isNull() ){ int tk = lex->lookAhead( 0 ); @@ -678,7 +678,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setNamespaceName( namespaceName ); ast->setAliasName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else { reportError( i18n("namespace expected") ); @@ -697,7 +697,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setLinkageBody( linkageBody ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -740,7 +740,7 @@ bool Parser::parseUsing( DeclarationAST::Node& node ) ADVANCE( ';', ";" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -767,7 +767,7 @@ bool Parser::parseUsingDirective( DeclarationAST::Node& node ) UsingDirectiveAST::Node ast = CreateNode<UsingDirectiveAST>(); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -787,7 +787,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) AST::Node op; if( parseOperator(op) ){ AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } else { @@ -811,7 +811,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) ; AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } @@ -848,7 +848,7 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -882,7 +882,7 @@ bool Parser::parseTypedef( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -916,7 +916,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) lex->nextToken(); AST::Node n = CreateNode<AST>(); UPDATE_POS( n, startExport, lex->index() ); - exp = n; + exp = std::move(n); } if( lex->lookAhead(0) != Token_template ){ @@ -943,7 +943,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) ast->setTemplateParameterList( params ); ast->setDeclaration( def ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1037,7 +1037,7 @@ bool Parser::parseCvQualify( GroupAST::Node& node ) //kdDebug(9007)<< "-----------------> token = " << lex->lookAhead(0).text() << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1094,7 +1094,7 @@ bool Parser::parseSimpleTypeSpecifier( TypeSpecifierAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1122,7 +1122,7 @@ bool Parser::parsePtrOperator( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1287,7 +1287,7 @@ bool Parser::parseDeclarator( DeclaratorAST::Node& node ) update_pos: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1384,7 +1384,7 @@ bool Parser::parseAbstractDeclarator( DeclaratorAST::Node& node ) UPDATE_POS: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1453,7 +1453,7 @@ bool Parser::parseEnumSpecifier( TypeSpecifierAST::Node& node ) lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1488,7 +1488,7 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1516,7 +1516,7 @@ bool Parser::parseTemplateParameter( TemplateParameterAST::Node& node ) ok: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1604,7 +1604,7 @@ bool Parser::parseTypeParameter( TypeParameterAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1633,7 +1633,7 @@ bool Parser::parseStorageClassSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1662,7 +1662,7 @@ bool Parser::parseFunctionSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1683,7 +1683,7 @@ bool Parser::parseTypeId( AST::Node& node ) parseAbstractDeclarator( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1718,7 +1718,7 @@ bool Parser::parseInitDeclaratorList( InitDeclaratorListAST::Node& node ) //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::parseInitDeclaratorList() -- end" << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1757,7 +1757,7 @@ good: /// @todo add ellipsis UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1795,7 +1795,7 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1838,7 +1838,7 @@ bool Parser::parseParameterDeclaration( ParameterDeclarationAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1855,7 +1855,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) int kind = lex->lookAhead( 0 ); if( kind == Token_class || kind == Token_struct || kind == Token_union ){ AST::Node asn = CreateNode<AST>(); - classKey = asn; + classKey = std::move(asn); lex->nextToken(); UPDATE_POS( classKey, classKeyStart, lex->index() ); } else { @@ -1916,7 +1916,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1932,7 +1932,7 @@ bool Parser::parseAccessSpecifier( AST::Node& node ) case Token_protected: case Token_private: { AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); lex->nextToken(); UPDATE_POS( node, start, lex->index() ); return true; @@ -1991,7 +1991,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->addAccess( n ); ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else if( parseTypedef(node) ){ return true; @@ -2012,7 +2012,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) } ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2045,7 +2045,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2101,7 +2101,7 @@ bool Parser::parseElaboratedTypeSpecifier( TypeSpecifierAST::Node& node ) ast->setKind( kind ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2135,7 +2135,7 @@ bool Parser::parseExceptionSpecification( GroupAST::Node& node ) ast->addNode( ellipsis ); lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } else { parseTypeIdList( node ); } @@ -2164,7 +2164,7 @@ bool Parser::parseEnumerator( EnumeratorAST::Node& node ) lex->nextToken(); EnumeratorAST::Node ena = CreateNode<EnumeratorAST>(); - node = ena; + node = std::move(ena); AST::Node id = CreateNode<AST>(); UPDATE_POS( id, start, lex->index() ); @@ -2203,7 +2203,7 @@ bool Parser::parseInitDeclarator( InitDeclaratorAST::Node& node ) ast->setDeclarator( decl ); ast->setInitializer( init ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2243,7 +2243,7 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node ) return false; UPDATE_POS( bca, start, lex->index() ); - node = bca; + node = std::move(bca); return true; } @@ -2340,7 +2340,7 @@ bool Parser::parseTypeIdList( GroupAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2377,7 +2377,7 @@ bool Parser::parseBaseSpecifier( BaseSpecifierAST::Node& node ) ast->setAccess( access ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2483,7 +2483,7 @@ bool Parser::parseUnqualifiedName( ClassOrNamespaceNameAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2518,7 +2518,7 @@ bool Parser::skipExpressionStatement( StatementAST::Node& node ) ExpressionStatementAST::Node ast = CreateNode<ExpressionStatementAST>(); ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2608,7 +2608,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2623,7 +2623,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2653,7 +2653,7 @@ bool Parser::parseWhileStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2687,7 +2687,7 @@ bool Parser::parseDoStatement( StatementAST::Node& node ) ast->setStatement( body ); //ast->setCondition( condition ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2724,7 +2724,7 @@ bool Parser::parseForStatement( StatementAST::Node& node ) // ast->setExpression( expression ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2773,7 +2773,7 @@ bool Parser::parseCompoundStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2817,7 +2817,7 @@ bool Parser::parseIfStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2847,7 +2847,7 @@ bool Parser::parseSwitchStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( stmt ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2864,7 +2864,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2888,7 +2888,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2945,7 +2945,7 @@ bool Parser::parseBlockDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2985,7 +2985,7 @@ bool Parser::parseDeclarationStatement( StatementAST::Node& node ) DeclarationStatementAST::Node ast = CreateNode<DeclarationStatementAST>(); ast->setDeclaration( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); //kdDebug(9007)<< "---------------------> found a block declaration" << endl; return true; @@ -3049,7 +3049,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& com SimpleDeclarationAST::Node ast = CreateNode<SimpleDeclarationAST>(); ast->setInitDeclaratorList( declarators ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; @@ -3067,7 +3067,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& com ast->setInitDeclarator( declarator ); ast->setFunctionBody( funBody ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3084,7 +3084,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& com ast->setInitDeclarator( declarator ); ast->setText( toString(start, endSignature) ); ast->setFunctionBody( funBody ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3114,7 +3114,7 @@ start_decl: if( parseInitDeclaratorList(declarators) ){ ADVANCE( ';', ";" ); DeclarationAST::Node ast = CreateNode<DeclarationAST>(); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3159,7 +3159,7 @@ start_decl: ast->setTypeSpec( spec ); ast->setWinDeclSpec( winDeclSpec ); ast->setInitDeclaratorList( declarators ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); } return true; @@ -3180,7 +3180,7 @@ start_decl: ast->setTypeSpec( spec ); ast->setFunctionBody( funBody ); ast->setInitDeclarator( decl ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3226,7 +3226,7 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node ) lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3291,7 +3291,7 @@ bool Parser::parseTryBlockStatement( StatementAST::Node& node ) } } - node = stmt; + node = std::move(stmt); return true; } @@ -3816,7 +3816,7 @@ bool Parser::parseLogicalOrExpression( AST::Node& node, bool templArgs ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3861,7 +3861,7 @@ bool Parser::parseAssignmentExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3872,7 +3872,7 @@ bool Parser::parseConstantExpression( AST::Node& node ) if( parseConditionalExpression(node) ){ AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } return false; @@ -3889,7 +3889,7 @@ bool Parser::parseExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3915,7 +3915,7 @@ bool Parser::parseCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -4120,7 +4120,7 @@ bool Parser::parseIdentifierList( GroupAST::Node & node ) ADVANCE( Token_identifier, "identifier" ); } - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } |