mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Code streamlining.

Browse source
This commit is contained in:
Sergey Prigogin 2011-01-31 18:51:49 +00:00
parent 253c5f1f03
commit bc8b98729f
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3441,7 +3441,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
try { try {
statement.accept(this); statement.accept(this);
} catch (RuntimeException e) { } catch (RuntimeException e) {
if (i < statementsLength - 1) { if (i >= statementsLength - 1) {
throw e;
}
reportFormattingProblem(e); reportFormattingProblem(e);
exitAlignments(); exitAlignments();
skipToNode(statements.get(i + 1)); skipToNode(statements.get(i + 1));
@ -3451,7 +3453,6 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
while (scribe.indentationLevel > indentLevel) { while (scribe.indentationLevel > indentLevel) {
scribe.unIndent(); scribe.unIndent();
} }
} else throw e;
} }
previousStatement= statement; previousStatement= statement;
} }
@ -3474,8 +3475,8 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
localScanner.resetTo(start, end); localScanner.resetTo(start, end);
if (localScanner.getNextToken() == Token.tLBRACE) { if (localScanner.getNextToken() == Token.tLBRACE) {
switch (localScanner.getNextToken()) { switch (localScanner.getNextToken()) {
case Token.tBLOCKCOMMENT : case Token.tBLOCKCOMMENT:
case Token.tLINECOMMENT : case Token.tLINECOMMENT:
return true; return true;
} }
} }
@ -3504,8 +3505,8 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
int token = localScanner.getNextToken(); int token = localScanner.getNextToken();
loop: while (true) { loop: while (true) {
switch (token) { switch (token) {
case Token.tBLOCKCOMMENT : case Token.tBLOCKCOMMENT:
case Token.tLINECOMMENT : case Token.tLINECOMMENT:
token = localScanner.getNextToken(); token = localScanner.getNextToken();
continue loop; continue loop;
default: default: