mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-01-02 22:48:59 +00:00
parent a84636dec5
commit c1bea60652
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDefinition.java
View file

@ -30,8 +30,8 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent;
* Models a function definition without a try-block. If used for a constructor definition it may contain * Models a function definition without a try-block. If used for a constructor definition it may contain
* member initializers. * member initializers.
*/ */
public class CPPASTFunctionDefinition extends ASTNode implements public class CPPASTFunctionDefinition extends ASTNode
ICPPASTFunctionDefinition, IASTAmbiguityParent { implements ICPPASTFunctionDefinition, IASTAmbiguityParent {
private IASTDeclSpecifier declSpecifier; private IASTDeclSpecifier declSpecifier;
private IASTFunctionDeclarator declarator; private IASTFunctionDeclarator declarator;
@ -41,7 +41,6 @@ public class CPPASTFunctionDefinition extends ASTNode implements
private boolean fDeleted= false; private boolean fDeleted= false;
private boolean fDefaulted= false; private boolean fDefaulted= false;
public CPPASTFunctionDefinition() { public CPPASTFunctionDefinition() {
} }
@ -56,7 +55,7 @@ public class CPPASTFunctionDefinition extends ASTNode implements
CPPASTFunctionDefinition copy = new CPPASTFunctionDefinition(); CPPASTFunctionDefinition copy = new CPPASTFunctionDefinition();
copy.setDeclSpecifier(declSpecifier == null ? null : declSpecifier.copy()); copy.setDeclSpecifier(declSpecifier == null ? null : declSpecifier.copy());
if(declarator != null) { if (declarator != null) {
IASTDeclarator outer = ASTQueries.findOutermostDeclarator(declarator); IASTDeclarator outer = ASTQueries.findOutermostDeclarator(declarator);
outer = outer.copy(); outer = outer.copy();
copy.setDeclarator((IASTFunctionDeclarator)ASTQueries.findTypeRelevantDeclarator(outer)); copy.setDeclarator((IASTFunctionDeclarator)ASTQueries.findTypeRelevantDeclarator(outer));
@ -64,7 +63,7 @@ public class CPPASTFunctionDefinition extends ASTNode implements
copy.setBody(bodyStatement == null ? null : bodyStatement.copy()); copy.setBody(bodyStatement == null ? null : bodyStatement.copy());
for(ICPPASTConstructorChainInitializer initializer : getMemberInitializers()) for (ICPPASTConstructorChainInitializer initializer : getMemberInitializers())
copy.addMemberInitializer(initializer == null ? null : initializer.copy()); copy.addMemberInitializer(initializer == null ? null : initializer.copy());
copy.fDefaulted= fDefaulted; copy.fDefaulted= fDefaulted;
@ -199,10 +198,9 @@ public class CPPASTFunctionDefinition extends ASTNode implements
} }
public void replace(IASTNode child, IASTNode other) { public void replace(IASTNode child, IASTNode other) {
if( bodyStatement == child ) if (bodyStatement == child) {
{ other.setPropertyInParent(bodyStatement.getPropertyInParent());
other.setPropertyInParent( bodyStatement.getPropertyInParent() ); other.setParent(bodyStatement.getParent());
other.setParent( bodyStatement.getParent() );
bodyStatement = (IASTStatement) other; bodyStatement = (IASTStatement) other;
} }
} }

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
View file

@ -55,7 +55,8 @@ public class SelectionHelper {
} }
@Override @Override
public int visit(IASTDeclaration declaration) { public int visit(IASTDeclaration declaration) {
if (declaration instanceof IASTSimpleDeclaration && isSelectionOnExpression(textSelection, declaration)) { if (declaration instanceof IASTSimpleDeclaration &&
isSelectionOnExpression(textSelection, declaration)) {
container.setObject((IASTSimpleDeclaration) declaration); container.setObject((IASTSimpleDeclaration) declaration);
} }
return super.visit(declaration); return super.visit(declaration);
@ -78,7 +79,7 @@ public class SelectionHelper {
int selStart = textSelection.getOffset(); int selStart = textSelection.getOffset();
int selEnd = textSelection.getLength() + selStart; int selEnd = textSelection.getLength() + selStart;
return exprPos.getOffset() >= selStart && exprPos.getOffset()+exprPos.getLength() <= selEnd; return exprPos.getOffset() >= selStart && exprPos.getOffset() + exprPos.getLength() <= selEnd;
} }
public static boolean isInSameFile(IASTNode node, IFile file) { public static boolean isInSameFile(IASTNode node, IFile file) {