From f5238bf93f48ee1993defe03c7ea15f9e63d1727 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 6 Mar 2014 15:15:19 -0800 Subject: [PATCH] Reduced use of deprecated types and methods. --- .../cdt/core/dom/ast/cpp/ICPPNodeFactory.java | 16 +++++++++--- .../core/dom/parser/cpp/CPPNodeFactory.java | 9 ++++++- .../action/gnu/GPPBuildASTParserAction.java | 26 +++++-------------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java index 769e7aad5ea..3ecbd8d9ccf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 IBM Corporation and others. + * Copyright (c) 2006, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -242,9 +242,19 @@ public interface ICPPNodeFactory extends INodeFactory { public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointerToMember newPointerToMemberGPP(IASTName name); public IASTProblemTypeId newProblemTypeId(IASTProblem problem); - + + /** + * Creates a {@link ICPPASTQualifiedName}. + * @since 5.7 + */ + public ICPPASTQualifiedName newQualifiedName(ICPPASTName name); + + /** + * @deprecated Replaced by {@link #newQualifiedName(ICPPASTName)}. + */ + @Deprecated public ICPPASTQualifiedName newQualifiedName(); - + /** * Creates a range based for statement. * @since 5.3 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java index ad83cf16922..80279c3e1bd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -84,6 +84,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTInitializerList; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLambdaExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamedTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceAlias; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; @@ -557,6 +558,12 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { } @Override + public ICPPASTQualifiedName newQualifiedName(ICPPASTName name) { + return new CPPASTQualifiedName(name); + } + + @Override + @Deprecated public ICPPASTQualifiedName newQualifiedName() { return new CPPASTQualifiedName(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java index a4d777a2912..470067d904b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/gnu/GPPBuildASTParserAction.java @@ -22,13 +22,10 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerList; import org.eclipse.cdt.core.dom.ast.IASTPointer; import org.eclipse.cdt.core.dom.ast.IASTTypeId; import org.eclipse.cdt.core.dom.ast.IASTTypeIdInitializerExpression; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExplicitTemplateInstantiation; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTPointerToMember; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPNodeFactory; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointer; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointerToMember; -import org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.lrparser.action.ITokenMap; import org.eclipse.cdt.core.dom.lrparser.action.ITokenStream; import org.eclipse.cdt.core.dom.lrparser.action.ParserUtil; @@ -39,7 +36,6 @@ import org.eclipse.cdt.core.dom.lrparser.action.cpp.ICPPSecondaryParserFactory; import org.eclipse.cdt.internal.core.dom.lrparser.gpp.GPPParsersym; public class GPPBuildASTParserAction extends CPPBuildASTParserAction { - private final ICPPNodeFactory nodeFactory; private final ITokenMap gppTokenMap; @@ -125,8 +121,6 @@ public class GPPBuildASTParserAction extends CPPBuildASTParserAction { astStack.push(declSpec); } - - private boolean hasRestrict(List tokens) { for(Object o : tokens) { IToken t = (IToken)o; @@ -137,7 +131,6 @@ public class GPPBuildASTParserAction extends CPPBuildASTParserAction { return false; } - /** * Restrict is allowed as a keyword. */ @@ -147,21 +140,18 @@ public class GPPBuildASTParserAction extends CPPBuildASTParserAction { super.consumePointer(); if(hasRestrict) { - IGPPASTPointer gppPointer = nodeFactory.newPointerGPP(); - initializeGPPPointer((IASTPointer)astStack.pop(), gppPointer); + IASTPointer gppPointer = nodeFactory.newPointer(); + initializePointer((IASTPointer) astStack.pop(), gppPointer); astStack.push(gppPointer); } } - - private static void initializeGPPPointer(IASTPointer pointer, IGPPASTPointer gppPointer) { + private static void initializePointer(IASTPointer pointer, IASTPointer gppPointer) { gppPointer.setConst(pointer.isConst()); gppPointer.setVolatile(pointer.isVolatile()); gppPointer.setRestrict(true); ParserUtil.setOffsetAndLength(gppPointer, pointer); } - - @Override public void consumePointerToMember() { @@ -170,22 +160,20 @@ public class GPPBuildASTParserAction extends CPPBuildASTParserAction { if(hasRestrict) { ICPPASTPointerToMember pointer = (ICPPASTPointerToMember) astStack.pop(); - IGPPASTPointerToMember gppPointer = nodeFactory.newPointerToMemberGPP(pointer.getName()); - initializeGPPPointer(pointer, gppPointer); + ICPPASTPointerToMember gppPointer = nodeFactory.newPointerToMember(pointer.getName()); + initializePointer(pointer, gppPointer); astStack.push(gppPointer); } } - public void consumeTemplateExplicitInstantiationGCC(int modifier) { IASTDeclaration declaration = (IASTDeclaration) astStack.pop(); - IGPPASTExplicitTemplateInstantiation instantiation = nodeFactory.newExplicitTemplateInstantiationGPP(declaration); + ICPPASTExplicitTemplateInstantiation instantiation = nodeFactory.newExplicitTemplateInstantiation(declaration); instantiation.setModifier(modifier); setOffsetAndLength(instantiation); astStack.push(instantiation); } - /** * postfix_expression ::= '(' type_id ')' initializer_list