Skip to content

Complete support for [BindAs] #2220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dalexsoto merged 5 commits into from
Jun 26, 2017
Merged

Complete support for [BindAs] #2220

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
911eab9
[registrar] BindAs uses Nullable types so allow them to be registered…
dalexsoto Jun 14, 2017
d256179
[tests][introspection] Teach intro about BindAs and Nullable types
dalexsoto Jun 14, 2017
9310bc4
[introspection] Add better type checking instead of totally skipping …
dalexsoto Jun 15, 2017
8a9c588
Revert "[registrar] BindAs uses Nullable types so allow them to be re…
dalexsoto Jun 23, 2017
3a19a0f
[tests] Add comment about where to find BindAs types
dalexsoto Jun 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions tests/introspection/ApiSignatureTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,12 @@ protected virtual bool Check (char encodedType, Type type)
{
switch (encodedType) {
case '@':
// We use BindAsAttribute to wrap NSNumber/NSValue into more accurate Nullable<T> types
// So we check if T of nullable is supported by bindAs
var nullableType = Nullable.GetUnderlyingType (type);
if (nullableType != null)
return BindAsSupportedTypes.Contains (nullableType.Name);

return (type.IsInterface || // protocol
type.IsArray || // NSArray
(type.Name == "NSArray") || // NSArray
Expand Down Expand Up @@ -978,5 +984,14 @@ protected virtual bool IgnoreAsync (MethodInfo m)
}
return false;
}

// This must be kept in sync with generator.cs NSValueCreateMap and NSValueReturnMap
protected HashSet<string> BindAsSupportedTypes = new HashSet<string> {
"CGAffineTransform", "Range", "CGVector", "SCNMatrix4", "CLLocationCoordinate2D",
"SCNVector3", "Vector", "CGPoint", "CGRect", "CGSize", "UIEdgeInsets",
"UIOffset", "MKCoordinateSpan", "CMTimeRange", "CMTime", "CMTimeMapping",
"CATransform3D", "Boolean", "Byte", "Double", "Float", "Int16", "Int32",
"Int64", "SByte", "UInt16", "UInt32", "UInt64", "nfloat", "nint", "nuint",
};
}
}