mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

code clean up.

Browse source
This commit is contained in:
Emanuel Graf 2009-07-07 14:18:17 +00:00
parent ff27c21286
commit 4a8cfae26e
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java
View file

@ -47,7 +47,6 @@ import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTIdExpression; import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression; import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression;
import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration; import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
@ -84,7 +83,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTFunctionCallExpression
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTFunctionDefinition; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTFunctionDefinition;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTInitializerExpression; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTInitializerExpression;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTLiteralExpression;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTQualifiedName; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTQualifiedName;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTReturnStatement; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTReturnStatement;
@ -345,14 +343,12 @@ public class ExtractFunctionRefactoring extends CRefactoring {
IASTExpression leftSubTree = parent.getOperand1(); IASTExpression leftSubTree = parent.getOperand1();
int op = parent.getOperator(); int op = parent.getOperator();
IASTBinaryExpression newParentNode = new CPPASTBinaryExpression(); IASTBinaryExpression newParentNode = new CPPASTBinaryExpression();
CPPASTLiteralExpression placeholder = new CPPASTLiteralExpression(IASTLiteralExpression.lk_integer_constant, ZERO);
IASTBinaryExpression rootBinExp = getRootBinExp(parent, list); IASTBinaryExpression rootBinExp = getRootBinExp(parent, list);
newParentNode.setParent(rootBinExp.getParent()); newParentNode.setParent(rootBinExp.getParent());
newParentNode.setOperand1(placeholder); newParentNode.setOperand1(leftSubTree.copy());
newParentNode.setOperator(op); newParentNode.setOperator(op);
newParentNode.setOperand2((IASTExpression) methodCall); // TODO check newParentNode.setOperand2((IASTExpression) methodCall);
ASTRewrite callRewrite = rewriter.replace(rootBinExp, newParentNode, editGroup); rewriter.replace(rootBinExp, newParentNode, editGroup);
callRewrite.replace(placeholder, leftSubTree, editGroup);
}else { }else {
rewriter.replace(firstNode, methodCall, editGroup); rewriter.replace(firstNode, methodCall, editGroup);
} }