mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

Bug 511108 - Only report support for type trait primitives in __has_feature if such support is actually enabled by the active scanner extension configuration

Browse source 
Change-Id: I0631f555935fdbdd1f2a98fe737a129ef5b90eda
This commit is contained in:
Nathan Ridge 2017-01-28 00:11:37 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent dd92d1c9d5
commit 8b64d79199
2 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/CPreprocessor.java
View file

@ -37,6 +37,7 @@ import org.eclipse.cdt.core.parser.AbstractParserLogService;
import org.eclipse.cdt.core.parser.EndOfFileException; import org.eclipse.cdt.core.parser.EndOfFileException;
import org.eclipse.cdt.core.parser.ExtendedScannerInfo; import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
import org.eclipse.cdt.core.parser.FileContent; import org.eclipse.cdt.core.parser.FileContent;
import org.eclipse.cdt.core.parser.GCCKeywords;
import org.eclipse.cdt.core.parser.IExtendedScannerInfo; import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IMacro; import org.eclipse.cdt.core.parser.IMacro;
import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IParserLogService;
@ -228,7 +229,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
} }
} }
private static Set<String> sSupportedFeatures; private Set<String> sSupportedFeatures;
TokenSequence fInputToMacroExpansion= new TokenSequence(false); TokenSequence fInputToMacroExpansion= new TokenSequence(false);
TokenSequence fLineInputToMacroExpansion= new TokenSequence(true); TokenSequence fLineInputToMacroExpansion= new TokenSequence(true);
@ -309,7 +310,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
fPPKeywords= new CharArrayIntMap(40, -1); fPPKeywords= new CharArrayIntMap(40, -1);
configureKeywords(language, configuration); configureKeywords(language, configuration);
fExpressionEvaluator= new ExpressionEvaluator(); fExpressionEvaluator= new ExpressionEvaluator(this);
fMacroDefinitionParser= new MacroDefinitionParser(); fMacroDefinitionParser= new MacroDefinitionParser();
fMacroExpander= new MacroExpander(this, fMacroDictionary, fLocationMap, fLexOptions); fMacroExpander= new MacroExpander(this, fMacroDictionary, fLocationMap, fLexOptions);
fIncludeFileResolutionHeuristics= fFileContentProvider.getIncludeHeuristics(); fIncludeFileResolutionHeuristics= fFileContentProvider.getIncludeHeuristics();
@ -2086,7 +2087,7 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
} }
@SuppressWarnings("nls") @SuppressWarnings("nls")
public static Set<String> getSupportedFeatures() { public Set<String> getSupportedFeatures() {
if (sSupportedFeatures == null) { if (sSupportedFeatures == null) {
sSupportedFeatures = new HashSet<>(); sSupportedFeatures = new HashSet<>();
@ -2153,38 +2154,50 @@ public class CPreprocessor implements ILexerLog, IScanner, IAdaptable {
// missing: c_thread_local (bug 445297) // missing: c_thread_local (bug 445297)
// Type trait primitives // Type trait primitives
// Whether support for these is activated depends on the scanner extension
// configuration, so check it and report support accordingly.
// Note also that having a keyword for it doesn't necessarily mean we fully
// support it. For example, currently we have a keyword
// GCCKeywords.cp__has_nothrown_assign, but we don't support evaluation of
// this trait at the semantics level, so we don't report support for it.
// missing: has_nothrow_assign // missing: has_nothrow_assign
// missing: has_nothrow_copy // missing: has_nothrow_copy
// missing: has_nothrow_constructor // missing: has_nothrow_constructor
// missing: has_trivial_assign // missing: has_trivial_assign
sSupportedFeatures.add("has_trivial_copy"); addTypeTraitPrimitive("has_trivial_copy", GCCKeywords.cp__has_trivial_copy);
// missing: has_trivial_constructor // missing: has_trivial_constructor
// missing: has_trivial_destructor // missing: has_trivial_destructor
// missing: has_virtual_destructor // missing: has_virtual_destructor
sSupportedFeatures.add("is_abstract"); addTypeTraitPrimitive("is_abstract", GCCKeywords.cp__is_abstract);
sSupportedFeatures.add("is_base_of"); addTypeTraitPrimitive("is_base_of", GCCKeywords.cp__is_base_of);
sSupportedFeatures.add("is_class"); addTypeTraitPrimitive("is_class", GCCKeywords.cp__is_class);
// missing: is_constructible // missing: is_constructible
// missing: is_convertible_to // missing: is_convertible_to
// missing: is_destructible // missing: is_destructible
// missing: is_empty // missing: is_empty
sSupportedFeatures.add("is_enum"); addTypeTraitPrimitive("is_enum", GCCKeywords.cp__is_enum);
sSupportedFeatures.add("is_final"); addTypeTraitPrimitive("is_final", GCCKeywords.cp__is_final);
// missing: is_interface_class // missing: is_interface_class
// missing: is_literal // missing: is_literal
// missing: is_nothrow_assignable // missing: is_nothrow_assignable
// missing: is_nothrow_constructible // missing: is_nothrow_constructible
// missing: is_nothrow_destructible // missing: is_nothrow_destructible
sSupportedFeatures.add("is_pod"); addTypeTraitPrimitive("is_pod", GCCKeywords.cp__is_pod);
sSupportedFeatures.add("is_polymorphic"); addTypeTraitPrimitive("is_polymorphic", GCCKeywords.cp__is_polymorphic);
// missing: is_standard_layout // missing: is_standard_layout
// missing: is_trivial // missing: is_trivial
// missing: is_trivially_assignable // missing: is_trivially_assignable
// missing: is_trivially_constructible // missing: is_trivially_constructible
// missing: is_trivially_copyable // missing: is_trivially_copyable
sSupportedFeatures.add("is_union"); addTypeTraitPrimitive("is_union", GCCKeywords.cp__is_union);
sSupportedFeatures.add("underlying_type"); addTypeTraitPrimitive("underlying_type", GCCKeywords.cp__underlying_type);
} }
return sSupportedFeatures; return sSupportedFeatures;
} }
private void addTypeTraitPrimitive(String featureName, char[] keyword) {
if (fKeywords.containsKey(keyword)) {
sSupportedFeatures.add(featureName);
}
}
} }

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ExpressionEvaluator.java
View file

@ -48,8 +48,10 @@ public class ExpressionEvaluator {
private CharArrayMap<PreprocessorMacro> fDictionary; private CharArrayMap<PreprocessorMacro> fDictionary;
private ArrayList<IASTName> fMacrosInDefinedExpressions= new ArrayList<>(); private ArrayList<IASTName> fMacrosInDefinedExpressions= new ArrayList<>();
private LocationMap fLocationMap; private LocationMap fLocationMap;
private CPreprocessor fPreprocessor;
ExpressionEvaluator() { ExpressionEvaluator(CPreprocessor preprocessor) {
fPreprocessor = preprocessor;
} }
public boolean evaluate(TokenList condition, CharArrayMap<PreprocessorMacro> macroDictionary, public boolean evaluate(TokenList condition, CharArrayMap<PreprocessorMacro> macroDictionary,
@ -335,7 +337,7 @@ public class ExpressionEvaluator {
throw new EvalException(IProblem.SCANNER_EXPRESSION_SYNTAX_ERROR, null); throw new EvalException(IProblem.SCANNER_EXPRESSION_SYNTAX_ERROR, null);
} }
final char[] featureName = fTokens.getCharImage(); final char[] featureName = fTokens.getCharImage();
boolean supported = CPreprocessor.getSupportedFeatures().contains(new String(featureName)); boolean supported = fPreprocessor.getSupportedFeatures().contains(new String(featureName));
consume(); // feature name token consume(); // feature name token
if (LA() != IToken.tRPAREN) { if (LA() != IToken.tRPAREN) {
throw new EvalException(IProblem.SCANNER_MISSING_R_PAREN, null); throw new EvalException(IProblem.SCANNER_MISSING_R_PAREN, null);