From e984df3ba0bf15fad2a44bb939fa8a5d28f90038 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 17 Feb 2016 16:31:18 -0800 Subject: [PATCH] Removed INodeFactory.newTranslationUnit() method. Change-Id: Iaff5e56a18f1a1c53dfc1c31d7bdc6bbfc6c0ae3 --- .../parser/org/eclipse/cdt/core/dom/ast/INodeFactory.java | 6 ------ .../org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java | 7 ------- .../cdt/internal/core/dom/parser/c/CNodeFactory.java | 5 ----- .../cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java | 5 ----- .../cdt/core/dom/lrparser/action/BuildASTParserAction.java | 6 +++--- 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/INodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/INodeFactory.java index ef119255459..e2a9ec33204 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/INodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/INodeFactory.java @@ -197,12 +197,6 @@ public interface INodeFactory { /** @since 5.4 */ public IASTTokenList newTokenList(); - /** - * @deprecated Replaced by {@link #newTranslationUnit(IScanner)}. - */ - @Deprecated - public IASTTranslationUnit newTranslationUnit(); - /** * Creates a new translation unit that cooperates with the given scanner in order * to track macro-expansions and location information. 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 446978f8de8..6256f66aefd 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 @@ -408,13 +408,6 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTTemplateSpecialization newTemplateSpecialization(IASTDeclaration declaration); - /** - * @deprecated Replaced by {@link #newTranslationUnit(IScanner)}. - */ - @Override - @Deprecated - public ICPPASTTranslationUnit newTranslationUnit(); - /** * Creates a new translation unit that cooperates with the given scanner in order * to track macro-expansions and location information. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java index b425b3f1714..d82e74dafd8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java @@ -434,11 +434,6 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory { return new ASTTokenList(); } - @Override - public IASTTranslationUnit newTranslationUnit() { - return newTranslationUnit(null); - } - @Override public IASTTranslationUnit newTranslationUnit(IScanner scanner) { CASTTranslationUnit tu = new CASTTranslationUnit(); 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 ac97b68524f..ca304376544 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 @@ -790,11 +790,6 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return new ASTTokenList(); } - @Override - public ICPPASTTranslationUnit newTranslationUnit() { - return newTranslationUnit(null); - } - @Override public ICPPASTTranslationUnit newTranslationUnit(IScanner scanner) { CPPASTTranslationUnit tu = new CPPASTTranslationUnit(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java index 3dae5e1e47b..dd028e5e9ce 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java @@ -16,8 +16,6 @@ import static org.eclipse.cdt.core.dom.lrparser.action.ParserUtil.offset; import java.util.List; -import lpg.lpgjavaruntime.IToken; - import org.eclipse.cdt.core.dom.ast.IASTASMDeclaration; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; @@ -85,6 +83,8 @@ import org.eclipse.cdt.internal.core.dom.parser.AbstractGNUSourceCodeParser; import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousExpression; import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousStatement; +import lpg.lpgjavaruntime.IToken; + /** * Parser semantic actions that are common to both C and C++. * @@ -149,7 +149,7 @@ public abstract class BuildASTParserAction extends AbstractParserAction { public void consumeTranslationUnit() { if(tu == null) - tu = nodeFactory.newTranslationUnit(); + tu = nodeFactory.newTranslationUnit(null); // can't close the outermost scope for(Object o : astStack.topScope()) {