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

Bug fixes in formatting of function-style macros.

Browse source
This commit is contained in:
Sergey Prigogin 2011-04-23 23:23:59 +00:00
parent 850a56e5d7
commit 21f63f9233
2 changed files with 83 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -491,12 +491,13 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
int declarationEndOffset = declarationOffset + declarationLocation.getNodeLength(); int declarationEndOffset = declarationOffset + declarationLocation.getNodeLength();
if (macroEndOffset <= declarationOffset || macroEndOffset >= declarationEndOffset || if (macroEndOffset <= declarationOffset || macroEndOffset >= declarationEndOffset ||
macroEndOffset == declarationEndOffset - 1 && scribe.scanner.source[macroEndOffset] == ';') { macroEndOffset == declarationEndOffset - 1 &&
isSemicolonAtPosition(macroEndOffset)) {
// The function-style macro expansion either doesn't overlap with // The function-style macro expansion either doesn't overlap with
// the following declaration, or completely covers, with a possible // the following declaration, or completely covers one or more
// exception for the trailing semicolon, one or more declarations. // declarations, with a possible exception for the trailing semicolon
// In both cases formatting is driven by the text of parameters of // of the last one. In both cases formatting is driven by the text of
// the macro, not by the expanded code. // parameters of the macro, not by the expanded code.
formatFunctionStyleMacroExpansion(macroExpansion); formatFunctionStyleMacroExpansion(macroExpansion);
} }
} }
@ -605,6 +606,10 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
needSpace= true; needSpace= true;
} }
break; break;
case Token.tBADCHAR:
// Avoid infinite loop if something bad happened.
scribe.exitAlignment(listAlignment, true);
return;
default: default:
scribe.printNextToken(token, hasWhitespace); scribe.printNextToken(token, hasWhitespace);
} }
@ -3028,7 +3033,8 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
private int visit(IASTNullStatement node) { private int visit(IASTNullStatement node) {
if (!fInsideFor) { if (!fInsideFor &&
node.getFileLocation().getNodeOffset() == scribe.scanner.getCurrentPosition()) {
scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon); scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon);
scribe.printTrailingComment(); scribe.printTrailingComment();
} }
@ -3392,11 +3398,13 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
expression.accept(this); expression.accept(this);
} }
// Sometimes the return expression is null, when it should not be. // Sometimes the return expression is null, when it should not be.
if (expression == null && Token.tSEMI != peekNextToken()) { if (expression == null && peekNextToken() != Token.tSEMI) {
scribe.skipToToken(Token.tSEMI); scribe.skipToToken(Token.tSEMI);
} }
if (peekNextToken() == Token.tSEMI) {
scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon); scribe.printNextToken(Token.tSEMI, preferences.insert_space_before_semicolon);
scribe.printTrailingComment(); scribe.printTrailingComment();
}
return PROCESS_SKIP; return PROCESS_SKIP;
} }
@ -3649,7 +3657,22 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
IASTNodeLocation[] locations= node.getNodeLocations(); IASTNodeLocation[] locations= node.getNodeLocations();
if (locations.length == 0) { if (locations.length == 0) {
} else if (locations[0] instanceof IASTMacroExpansionLocation) { } else if (locations[0] instanceof IASTMacroExpansionLocation) {
IASTFileLocation expansionLocation= locations[0].asFileLocation(); IASTMacroExpansionLocation location = (IASTMacroExpansionLocation) locations[0];
if (locations.length <= 2 && node instanceof IASTStatement) {
IASTPreprocessorMacroExpansion macroExpansion = location.getExpansion();
IASTFileLocation macroLocation = macroExpansion.getFileLocation();
IASTFileLocation nodeLocation = node.getFileLocation();
if (macroLocation.getNodeOffset() >= scribe.scanner.getCurrentPosition() &&
!scribe.shouldSkip(macroLocation.getNodeOffset()) &&
(nodeLocation.getNodeOffset() + nodeLocation.getNodeLength() ==
macroLocation.getNodeOffset() + macroLocation.getNodeLength() ||
locations.length == 2 && isSemicolonLocation(locations[1])) &&
isFunctionStyleMacroExpansion(macroExpansion)) {
formatFunctionStyleMacroExpansion(macroExpansion);
return false;
}
}
IASTFileLocation expansionLocation= location.asFileLocation();
int startOffset= expansionLocation.getNodeOffset(); int startOffset= expansionLocation.getNodeOffset();
int endOffset= startOffset + expansionLocation.getNodeLength(); int endOffset= startOffset + expansionLocation.getNodeLength();
scribe.skipRange(startOffset, endOffset); scribe.skipRange(startOffset, endOffset);
@ -3713,15 +3736,12 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
IASTFileLocation expansionLocation= nodeLocation.asFileLocation(); IASTFileLocation expansionLocation= nodeLocation.asFileLocation();
int startOffset= expansionLocation.getNodeOffset(); int startOffset= expansionLocation.getNodeOffset();
int endOffset= startOffset + expansionLocation.getNodeLength(); int endOffset= startOffset + expansionLocation.getNodeLength();
if (currentOffset >= startOffset) { if (currentOffset <= startOffset) {
if (currentOffset < endOffset) {
scribe.skipRange(startOffset, endOffset);
break;
} else if (currentOffset == endOffset && i == locations.length - 1) {
scribe.skipRange(startOffset, endOffset);
break; break;
} }
} else { if (currentOffset < endOffset ||
currentOffset == endOffset && i == locations.length - 1) {
scribe.skipRange(startOffset, endOffset);
break; break;
} }
} }
@ -3986,8 +4006,8 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
if (!startNode(statement)) { if (!startNode(statement)) {
continue; continue;
} }
final boolean statementIsNullStmt= statement instanceof IASTNullStatement; if (!(statement instanceof IASTNullStatement) &&
if (!statementIsNullStmt) { !doNodeLocationsOverlap(statement, statements.get(i - 1))) {
scribe.startNewLine(); scribe.startNewLine();
} }
try { try {
@ -4045,6 +4065,15 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
return 0; return 0;
} }
private int peekTokenAtPosition(int pos) {
localScanner.resetTo(pos, scribe.scannerEndPosition - 1);
int token = localScanner.getNextToken();
while (token == Token.tBLOCKCOMMENT || token == Token.tLINECOMMENT) {
token = localScanner.getNextToken();
}
return token;
}
private int peekNextToken() { private int peekNextToken() {
return peekNextToken(false); return peekNextToken(false);
} }
@ -4055,19 +4084,22 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
} }
localScanner.resetTo(scribe.scanner.getCurrentPosition(), scribe.scannerEndPosition - 1); localScanner.resetTo(scribe.scanner.getCurrentPosition(), scribe.scannerEndPosition - 1);
int token = localScanner.getNextToken(); int token = localScanner.getNextToken();
loop: while (true) { while (token == Token.tBLOCKCOMMENT || token == Token.tLINECOMMENT) {
switch (token) {
case Token.tBLOCKCOMMENT:
case Token.tLINECOMMENT:
token = localScanner.getNextToken(); token = localScanner.getNextToken();
continue loop;
default:
break loop;
}
} }
return token; return token;
} }
private boolean isSemicolonLocation(IASTNodeLocation location) {
return location instanceof IASTFileLocation && location.getNodeLength() == 1 &&
peekTokenAtPosition(location.getNodeOffset()) == Token.tSEMI &&
localScanner.getCurrentTokenEndPosition() + 1 == location.getNodeOffset() + location.getNodeLength();
}
private boolean isSemicolonAtPosition(int pos) {
return peekTokenAtPosition(pos) == Token.tSEMI && localScanner.getCurrentTokenStartPosition() == pos;
}
private boolean isGuardClause(IASTCompoundStatement block, List<IASTStatement> statements) { private boolean isGuardClause(IASTCompoundStatement block, List<IASTStatement> statements) {
IASTNodeLocation fileLocation= block.getFileLocation(); IASTNodeLocation fileLocation= block.getFileLocation();
if (fileLocation == null) { if (fileLocation == null) {

21
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
View file

@ -1360,6 +1360,27 @@ public class CodeFormatterTest extends BaseUITestCase {
assertFormatterResult(); assertFormatterResult();
} }
//#define MY_MACRO(x, b) switch (0) default: if (false)
//
//void func() {
//MY_MACRO(1000000 + 2000000 + 3000000 + 4000000 + 5000000, 6000000 + 700000);
//MY_MACRO(1000000 + 2000000 + 3000000 + 4000000 + 5000000, 6000000 + 7000000);
//}
//#define MY_MACRO(x, b) switch (0) default: if (false)
//
//void func() {
// MY_MACRO(1000000 + 2000000 + 3000000 + 4000000 + 5000000, 6000000 + 700000);
// MY_MACRO(1000000 + 2000000 + 3000000 + 4000000 + 5000000,
// 6000000 + 7000000);
//}
public void testFunctionStyleMacro_3() throws Exception {
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.SPACE);
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_METHOD_INVOCATION,
Integer.toString(Alignment.M_NEXT_PER_LINE_SPLIT | Alignment.M_INDENT_ON_COLUMN));
assertFormatterResult();
}
//void foo() { //void foo() {
//for(int i=0;i<50;++i){} //for(int i=0;i<50;++i){}
//} //}