From bff4a3bf6c06b13033974c94ff31c78b7689657d Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 18 Dec 2013 12:27:03 -0800 Subject: [PATCH] Cosmetics. --- .../cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java | 8 +++----- .../internal/core/dom/parser/cpp/GNUCPPSourceParser.java | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java index d4363854bd8..6da206dd43e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * John Camelon (IBM) - Initial API and implementation - * Markus Schorn (Wind River Systems) + * John Camelon (IBM) - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.core.dom.ast.cpp; @@ -18,7 +18,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; * @noimplement This interface is not intended to be implemented by clients. */ public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression, ICPPASTExpression { - public static final int op_typeid = IASTTypeIdExpression.op_typeid; /** @@ -26,8 +25,7 @@ public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression, ICPPASTEx */ @Deprecated public static final int op_last = IASTTypeIdExpression.op_last; - - + /** * @since 5.1 */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index 3968b84c1fb..9944a6011c8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -1942,7 +1942,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { return astUD; } - if(LT(1) == IToken.tIDENTIFIER && LT(2) == IToken.tASSIGN){ + if (LT(1) == IToken.tIDENTIFIER && LT(2) == IToken.tASSIGN){ return aliasDeclaration(offset); } @@ -1959,7 +1959,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { ICPPASTTypeId aliasedType = typeId(DeclarationOptions.TYPEID); - if(LT(1) != IToken.tSEMI){ + if (LT(1) != IToken.tSEMI){ throw backtrack; } int endOffset = consume().getEndOffset(); @@ -4223,7 +4223,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { ICPPASTCompositeTypeSpecifier astClassSpecifier = nodeFactory.newCompositeTypeSpecifier(classKind, name); // class virt specifier - if(LT(1) == IToken.tIDENTIFIER) { + if (LT(1) == IToken.tIDENTIFIER) { classVirtSpecifier(astClassSpecifier); } @@ -4301,7 +4301,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { private void classVirtSpecifier(ICPPASTCompositeTypeSpecifier astClassSpecifier) throws EndOfFileException, BacktrackException { IToken token = LA(); char[] tokenImage = token.getCharImage(); - if(token.getType() == IToken.tIDENTIFIER && Arrays.equals(Keywords.cFINAL, tokenImage)){ + if (token.getType() == IToken.tIDENTIFIER && Arrays.equals(Keywords.cFINAL, tokenImage)){ consume(); astClassSpecifier.setFinal(true); }