mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-05-30 18:52:14 -07:00
parent 51e8509b3e
commit da9f840d2e
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
View file

@ -468,7 +468,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit) * @see ASTVisitor#visit(IASTTranslationUnit)
*/ */
@Override @Override
public int visit(IASTTranslationUnit tu) { public int visit(IASTTranslationUnit tu) {
@ -614,7 +614,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} else { } else {
currentArgument.endOffset = tokenEndOffset; currentArgument.endOffset = tokenEndOffset;
} }
switch (token) { switch (token) {
case Token.tLPAREN: case Token.tLPAREN:
++parenLevel; ++parenLevel;
@ -696,7 +696,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTName) * @see ASTVisitor#visit(IASTName)
*/ */
@Override @Override
public int visit(IASTName node) { public int visit(IASTName node) {
@ -713,7 +713,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTInitializer) * @see ASTVisitor#visit(IASTInitializer)
*/ */
@Override @Override
public int visit(IASTInitializer node) { public int visit(IASTInitializer node) {
@ -743,7 +743,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration) * @see ASTVisitor#visit(IASTParameterDeclaration)
*/ */
@Override @Override
public int visit(IASTParameterDeclaration node) { public int visit(IASTParameterDeclaration node) {
@ -767,7 +767,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclarator) * @see ASTVisitor#visit(IASTDeclarator)
*/ */
@Override @Override
public int visit(IASTDeclarator node) { public int visit(IASTDeclarator node) {
@ -841,7 +841,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier) * @see ASTVisitor#visit(IASTDeclSpecifier)
*/ */
@Override @Override
public int visit(IASTDeclSpecifier node) { public int visit(IASTDeclSpecifier node) {
@ -866,7 +866,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression) * @see ASTVisitor#visit(IASTExpression)
*/ */
@Override @Override
public int visit(IASTExpression node) { public int visit(IASTExpression node) {
@ -911,7 +911,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTStatement) * @see ASTVisitor#visit(IASTStatement)
*/ */
@Override @Override
public int visit(IASTStatement node) { public int visit(IASTStatement node) {
@ -978,7 +978,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTTypeId) * @see ASTVisitor#visit(IASTTypeId)
*/ */
@Override @Override
public int visit(IASTTypeId node) { public int visit(IASTTypeId node) {
@ -1005,7 +1005,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator) * @see ASTVisitor#visit(IASTEnumerator)
*/ */
@Override @Override
public int visit(IASTEnumerator enumerator) { public int visit(IASTEnumerator enumerator) {
@ -1027,7 +1027,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#visit(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier) * @see ASTVisitor#visit(ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier)
*/ */
@Override @Override
public int visit(ICPPASTBaseSpecifier specifier) { public int visit(ICPPASTBaseSpecifier specifier) {
@ -1056,7 +1056,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#visit(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition) * @see ASTVisitor#visit(ICPPASTNamespaceDefinition)
*/ */
@Override @Override
public int visit(ICPPASTNamespaceDefinition node) { public int visit(ICPPASTNamespaceDefinition node) {
@ -1084,7 +1084,6 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
return PROCESS_SKIP; return PROCESS_SKIP;
} }
private int visit(ICPPASTLinkageSpecification node) { private int visit(ICPPASTLinkageSpecification node) {
scribe.printComment(); scribe.printComment();
final int line= scribe.line; final int line= scribe.line;
@ -1177,7 +1176,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
/* /*
* @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#visit(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter) * @see ASTVisitor#visit(ICPPASTTemplateParameter)
*/ */
@Override @Override
public int visit(ICPPASTTemplateParameter node) { public int visit(ICPPASTTemplateParameter node) {
@ -2651,7 +2650,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
// To improve speed of the algorithm we flatten homogeneous nested binary expressions // To improve speed of the algorithm we flatten homogeneous nested binary expressions
// to reduce overall depth of the expression tree. // to reduce overall depth of the expression tree.
IASTExpression[] operands = CPPVisitor.getOperandsOfMultiExpression(node); IASTExpression[] operands = CPPVisitor.getOperandsOfMultiExpression(node);
Runnable tailFormatter = endsWithMacroExpansion(node) ? null : scribe.takeTailFormatter(); Runnable tailFormatter = endsWithMacroExpansion(node) ? null : scribe.takeTailFormatter();
Alignment alignment= scribe.createAlignment( Alignment alignment= scribe.createAlignment(
@ -3085,13 +3084,13 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
scribe.printNextToken(Token.t_while, preferences.insert_space_after_closing_brace_in_block); scribe.printNextToken(Token.t_while, preferences.insert_space_after_closing_brace_in_block);
scribe.printNextToken(Token.tLPAREN, preferences.insert_space_before_opening_paren_in_while); scribe.printNextToken(Token.tLPAREN, preferences.insert_space_before_opening_paren_in_while);
if (preferences.insert_space_after_opening_paren_in_while) { if (preferences.insert_space_after_opening_paren_in_while) {
scribe.space(); scribe.space();
} }
node.getCondition().accept(this); node.getCondition().accept(this);
scribe.printNextToken(Token.tRPAREN, preferences.insert_space_before_closing_paren_in_while); scribe.printNextToken(Token.tRPAREN, preferences.insert_space_before_closing_paren_in_while);
} }
scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon); scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon);