diff options
author | Sergey Prigogin | 2013-02-28 19:44:23 +0000 |
---|---|---|
committer | Sergey Prigogin | 2013-02-28 19:44:23 +0000 |
commit | 5cad4cd8beda87c04cdbd3619813d0afe453f65c (patch) | |
tree | dcdd0e121413e2014af26063403def6e083595cf /core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter | |
parent | 91de3531687c4da12b74c7a8c83cb422c4f061df (diff) | |
download | org.eclipse.cdt-5cad4cd8beda87c04cdbd3619813d0afe453f65c.tar.gz org.eclipse.cdt-5cad4cd8beda87c04cdbd3619813d0afe453f65c.tar.xz org.eclipse.cdt-5cad4cd8beda87c04cdbd3619813d0afe453f65c.zip |
Bug 402006 - [formatter] Crashes on sizeof() macro
Diffstat (limited to 'core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter')
-rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java index c4da1712865..be1b39a2939 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java @@ -2467,6 +2467,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, } private int visit(IASTTypeIdExpression node) { + if (enclosedInMacroExpansion(node)) { + return PROCESS_SKIP; + } scribe.printNextToken(peekNextToken()); scribe.printNextToken(Token.tLPAREN); node.getTypeId().accept(this); @@ -2598,6 +2601,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, } private int visit(IASTUnaryExpression node) { + if (enclosedInMacroExpansion(node)) { + return PROCESS_SKIP; + } final IASTExpression operand= node.getOperand(); final int operator= node.getOperator(); switch (operator) { |