Skip to content
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

[Bgen] Improve the generated code for SmarEnum BindAs calls. #22323

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+127 −10
Open

[Bgen] Improve the generated code for SmarEnum BindAs calls. #22323

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17f6057
[Bgen] Improve the generated code for SmarEnum BindAs calls.
mandel-macaque Mar 6, 2025
78eefef
Auto-format source code
Mar 6, 2025
b378441
Merge branch 'main' into dev/mandel/get-value-handle-nullable
mandel-macaque Mar 9, 2025
65b637e
Fix code to take into account those methods that return a nullable enum.
mandel-macaque Mar 9, 2025
ceede5d
Auto-format source code
Mar 9, 2025
33f40a9
Update xml doc expectations.
mandel-macaque Mar 10, 2025
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
5 changes: 2 additions & 3 deletions src/bgen/Generator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2910,9 +2910,8 @@ void GetReturnsWrappers (MethodInfo mi, MemberInformation minfo, Type declaringT
var formattedReturnType = TypeManager.FormatType (minfo.type, mi.ReturnType);
if (mi.ReturnType == TypeCache.NSString) {
if (isNullable) {
print ("{0} retvaltmp;", NativeHandleType);
cast_a = "((retvaltmp = ";
cast_b = $") == IntPtr.Zero ? default ({formattedBindAsType}) : ({wrapper}Runtime.GetNSObject<{formattedReturnType}> (retvaltmp, {owns})!){suffix})";
cast_a = $"{wrapper}";
cast_b = $"{suffix}";
} else {
cast_a = $"{wrapper}Runtime.GetNSObject<{formattedReturnType}> (";
cast_b = $", {owns})!{suffix}";
Expand Down
6 changes: 3 additions & 3 deletions src/rgen/Microsoft.Macios.Generator/Emitters/BindingSyntaxFactory.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ internal static InvocationExpressionSyntax StringFromHandle (ImmutableArray<Argu
IdentifierName ("FromHandle").WithTrailingTrivia (Space)))
.WithArgumentList (argumentList);
}

/// <summary>
/// Generates a call to the NSArray.ArrayFromHandleFunc with the given arguments.
/// </summary>
Expand All @@ -189,14 +189,14 @@ internal static InvocationExpressionSyntax NSArrayFromHandleFunc (string returnT
// generate <returnType>
var genericsList = TypeArgumentList (
SingletonSeparatedList<TypeSyntax> (IdentifierName (returnType)));

// generate NSArray.ArrayFromHandleFunc<returnType> (arg1, arg2, arg3)
return InvocationExpression (
MemberAccessExpression (
SyntaxKind.SimpleMemberAccessExpression,
IdentifierName ("NSArray"),
GenericName ("ArrayFromHandleFunc")
.WithTypeArgumentList(genericsList)
.WithTypeArgumentList (genericsList)
.WithTrailingTrivia (Space)))
.WithArgumentList (argumentList);
}
Expand Down
6 changes: 3 additions & 3 deletions tests/rgen/Microsoft.Macios.Generator.Tests/Emitters/BindingSyntaxFactoryRuntimeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ void StringFromHandleTests (ImmutableArray<ArgumentSyntax> arguments, string exp
var declaration = StringFromHandle (arguments);
Assert.Equal (expectedDeclaration, declaration.ToFullString ());
}
class TestDataNSArrayFromHandleFunc: IEnumerable<object []> {

class TestDataNSArrayFromHandleFunc : IEnumerable<object []> {
public IEnumerator<object []> GetEnumerator ()
{
yield return [
Expand All @@ -168,7 +168,7 @@ public IEnumerator<object []> GetEnumerator ()

IEnumerator IEnumerable.GetEnumerator () => GetEnumerator ();
}

[Theory]
[ClassData (typeof (TestDataNSArrayFromHandleFunc))]
void NSArrayFromHandleFuncTests (string returnType, ImmutableArray<ArgumentSyntax> arguments, string expectedDeclaration)
Expand Down
Loading