averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Clang importer] Infer get-only properties and static properties.

Browse Source 
Expands support for inference of computed properties, whether instance
or static, to include get-only. Adds test cases for both inference and
manual annotation for static computed properties.
This commit is contained in:
Michael Ilseman
2016-03-07 16:51:34 -08:00
parent c39aebce24
commit 73f7fd2eb6
6 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ClangImporter/IAMInference.cpp
View File

@@ -407,10 +407,16 @@ IAMResult IAMInference::infer(const clang::NamedDecl *clangDecl) {
// See if it's a property
for (auto propSpec : PropertySpecifiers) {
NameBuffer propName;
if (match(remainingName, propSpec, propName))
if (auto pair = findPairedAccessor(workingName, propSpec))
if (match(remainingName, propSpec, propName)) {
if (auto pair = findPairedAccessor(workingName, propSpec)) {
return importAsInstanceProperty(propName, propSpec, selfIdx,
nonSelfParams, pair, effectiveDC);
} else if (propSpec == "Get") {
return importAsInstanceProperty(propName, propSpec, selfIdx,
nonSelfParams, nullptr,
effectiveDC);
}
}
}
return importAsInstanceMethod(remainingName, selfIdx, nonSelfParams,
@@ -433,10 +439,16 @@ IAMResult IAMInference::infer(const clang::NamedDecl *clangDecl) {
// See if it's a property
for (auto propSpec : PropertySpecifiers) {
NameBuffer propName;
if (match(remainingName, propSpec, propName))
if (auto pair = findPairedAccessor(workingName, propSpec))
if (match(remainingName, propSpec, propName)) {
if (auto pair = findPairedAccessor(workingName, propSpec)) {
return importAsStaticProperty(propName, propSpec, nonSelfParams, pair,
effectiveDC);
} else if (propSpec == "Get") {
return importAsStaticProperty(propName, propSpec, nonSelfParams,
nullptr, effectiveDC);
}
}
}
return importAsStaticMethod(remainingName, nonSelfParams, effectiveDC);