From 066a527c9685274868bf98080afce514de356eb7 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 25 Apr 2008 14:51:37 +0000 Subject: [PATCH] Deprecated duplicate mechanism to configure keyword restrict, related to bug 228826. --- .../dom/parser/cpp/ICPPParserExtensionConfiguration.java | 2 ++ .../internal/core/dom/parser/cpp/GNUCPPSourceParser.java | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java index 4081d9f6d10..192ddea3268 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java @@ -81,7 +81,9 @@ public interface ICPPParserExtensionConfiguration { * * @return true if support for the extension should be * enabled + * @deprecated configure extra keywords, via {@link IScannerExtensionConfiguration#getAdditionalKeywords()} */ + @Deprecated public boolean supportRestrictKeyword(); /** 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 170da467b89..fb3c595c953 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 @@ -1833,8 +1833,6 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { private final boolean supportComplex; - private final boolean supportRestrict; - private final boolean supportLongLong; private final IIndex index; @@ -1873,7 +1871,6 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { allowCPPRestrict = config.allowRestrictPointerOperators(); supportExtendedTemplateSyntax = config.supportExtendedTemplateSyntax(); supportMinAndMaxOperators = config.supportMinAndMaxOperators(); - supportRestrict = config.supportRestrictKeyword(); supportComplex = config.supportComplexNumbers(); supportLongLong = config.supportLongLongs(); this.index= index; @@ -2968,10 +2965,6 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { last = consume(); break; case IToken.t_restrict: - if (!supportRestrict) { - IToken la = LA(1); - throwBacktrack(la.getOffset(), la.getEndOffset() - la.getOffset()); - } isRestrict = true; last = consume(); break;