Skip to content

[RGen] Use the global alias with the Libraries class. #22623

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
mandel-macaque merged 10 commits into from
May 2, 2025
Merged

[RGen] Use the global alias with the Libraries class. #22623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ede32a0
[RGen] Uset the global alias for NSValue and NSNumber.
mandel-macaque Apr 14, 2025
ea7c1c9
Auto-format source code
Apr 14, 2025
f969ae2
Merge branch 'main' into dev/mandel/global-nsvalue-nsnumber
mandel-macaque Apr 15, 2025
d3f770b
[RGen] Use the global alias with the Libraries class.
mandel-macaque Apr 15, 2025
c5dbe1d
Merge branch 'main' into dev/mandel/global-nsvalue-nsnumber
mandel-macaque Apr 16, 2025
68c3f10
Merge branch 'dev/mandel/global-nsvalue-nsnumber' into dev/mandel/glo…
mandel-macaque Apr 16, 2025
00d36f7
Merge branch 'main' into dev/mandel/global-nsvalue-nsnumber
mandel-macaque Apr 16, 2025
7d9a824
Merge branch 'dev/mandel/global-nsvalue-nsnumber' into dev/mandel/glo…
mandel-macaque Apr 16, 2025
1146da0
Merge branch 'main' into dev/mandel/global-libraries
mandel-macaque Apr 17, 2025
401ec77
Merge branch 'main' into dev/mandel/global-libraries
mandel-macaque May 1, 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
6 changes: 5 additions & 1 deletion src/rgen/Microsoft.Macios.Generator/Emitters/BindingSyntaxFactory.Dlfcn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ static partial class BindingSyntaxFactory {
@namespace: ["ObjCRuntime"],
@class: "Dlfcn",
isGlobal: true);
public readonly static TypeSyntax Libraries = GetIdentifierName (
@namespace: ["ObjCRuntime"],
@class: "Libraries",
isGlobal: true);

/// <summary>
/// Get the syntax needed to access a library handle.
Expand All @@ -34,7 +38,7 @@ static ArgumentSyntax GetLibraryArgument (string libraryName)
SyntaxKind.SimpleMemberAccessExpression,
MemberAccessExpression (
SyntaxKind.SimpleMemberAccessExpression,
IdentifierName ("Libraries"),
Libraries,
IdentifierName (libraryName)),
IdentifierName ("Handle")));
}
Expand Down
4 changes: 2 additions & 2 deletions src/rgen/Microsoft.Macios.Generator/Emitters/EnumEmitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void EmitEnumFieldAtIndex (TabbedWriter<StringWriter> classBlock, in Binding bin
using (var getterBlock = propertyBlock.CreateBlock ("get", true)) {
getterBlock.WriteLine ($"fixed (IntPtr *storage = &values [{index}])");
getterBlock.WriteLine (
$"\treturn Dlfcn.CachePointer (Libraries.{libraryName}.Handle, \"{fieldData.SymbolName}\", storage);");
$"\treturn Dlfcn.CachePointer ({Libraries}.{libraryName}.Handle, \"{fieldData.SymbolName}\", storage);");
}
}
}
Expand Down Expand Up @@ -272,7 +272,7 @@ bool TryEmitErrorCode (in BindingTypeData<SmartEnum> bindingTypeData, in Binding
$@"public static NSString? GetDomain (this {bindingContext.Changes.Name} self)
{{
if ({backingFieldName} is null)
{backingFieldName} = Dlfcn.GetStringConstant (Libraries.{libraryName}.Handle, ""{bindingTypeData.ErrorDomain}"");
{backingFieldName} = Dlfcn.GetStringConstant ({Libraries}.{libraryName}.Handle, ""{bindingTypeData.ErrorDomain}"");
return {backingFieldName};
}}
");
Expand Down
10 changes: 5 additions & 5 deletions tests/rgen/Microsoft.Macios.Generator.Tests/Classes/Data/ExpectedCIImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static partial Foundation.NSString DidProcessEditingNotification
get
{
if (_DidProcessEditingNotification is null)
_DidProcessEditingNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (Libraries.TestNamespace.Handle, "kCIFormatLA8")!;
_DidProcessEditingNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (global::ObjCRuntime.Libraries.TestNamespace.Handle, "kCIFormatLA8")!;
Copy link
Contributor

@StephaneDelcroix StephaneDelcroix Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

love that

return _DidProcessEditingNotification;
}
}
Expand All @@ -140,7 +140,7 @@ public static partial int FormatABGR8
[SupportedOSPlatform ("maccatalyst13.1")]
get
{
return global::ObjCRuntime.Dlfcn.GetInt32 (Libraries.TestNamespace.Handle, "kCIFormatABGR8");
return global::ObjCRuntime.Dlfcn.GetInt32 (global::ObjCRuntime.Libraries.TestNamespace.Handle, "kCIFormatABGR8");
}
}

Expand All @@ -158,7 +158,7 @@ public static partial int FormatLA8
[SupportedOSPlatform ("maccatalyst13.1")]
get
{
return global::ObjCRuntime.Dlfcn.GetInt32 (Libraries.TestNamespace.Handle, "kCIFormatLA8");
return global::ObjCRuntime.Dlfcn.GetInt32 (global::ObjCRuntime.Libraries.TestNamespace.Handle, "kCIFormatLA8");
}

[SupportedOSPlatform ("macos14.0")]
Expand All @@ -167,7 +167,7 @@ public static partial int FormatLA8
[SupportedOSPlatform ("maccatalyst17.0")]
set
{
global::ObjCRuntime.Dlfcn.SetInt32 (Libraries.TestNamespace.Handle, "kCIFormatLA8", value);
global::ObjCRuntime.Dlfcn.SetInt32 (global::ObjCRuntime.Libraries.TestNamespace.Handle, "kCIFormatLA8", value);
}
}

Expand All @@ -185,7 +185,7 @@ public static partial int FormatRGBA16Int
[SupportedOSPlatform ("maccatalyst13.1")]
get
{
return global::ObjCRuntime.Dlfcn.GetInt32 (Libraries.TestNamespace.Handle, "FormatRGBA16Int");
return global::ObjCRuntime.Dlfcn.GetInt32 (global::ObjCRuntime.Libraries.TestNamespace.Handle, "FormatRGBA16Int");
}
}

Expand Down
8 changes: 4 additions & 4 deletions tests/rgen/Microsoft.Macios.Generator.Tests/Classes/Data/ExpectedNSUserDefaults.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static partial Foundation.NSString CompletedInitialSyncNotification
get
{
if (_CompletedInitialSyncNotification is null)
_CompletedInitialSyncNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (Libraries.Foundation.Handle, "NSUbiquitousUserDefaultsCompletedInitialSyncNotification")!;
_CompletedInitialSyncNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (global::ObjCRuntime.Libraries.Foundation.Handle, "NSUbiquitousUserDefaultsCompletedInitialSyncNotification")!;
return _CompletedInitialSyncNotification;
}
}
Expand All @@ -127,7 +127,7 @@ public static partial Foundation.NSString DidChangeAccountsNotification
get
{
if (_DidChangeAccountsNotification is null)
_DidChangeAccountsNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (Libraries.Foundation.Handle, "NSUbiquitousUserDefaultsDidChangeAccountsNotification")!;
_DidChangeAccountsNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (global::ObjCRuntime.Libraries.Foundation.Handle, "NSUbiquitousUserDefaultsDidChangeAccountsNotification")!;
return _DidChangeAccountsNotification;
}
}
Expand All @@ -141,7 +141,7 @@ public static partial Foundation.NSString NoCloudAccountNotification
get
{
if (_NoCloudAccountNotification is null)
_NoCloudAccountNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (Libraries.Foundation.Handle, "NSUbiquitousUserDefaultsNoCloudAccountNotification")!;
_NoCloudAccountNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (global::ObjCRuntime.Libraries.Foundation.Handle, "NSUbiquitousUserDefaultsNoCloudAccountNotification")!;
return _NoCloudAccountNotification;
}
}
Expand All @@ -155,7 +155,7 @@ public static partial Foundation.NSString SizeLimitExceededNotification
get
{
if (_SizeLimitExceededNotification is null)
_SizeLimitExceededNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (Libraries.Foundation.Handle, "NSUserDefaultsSizeLimitExceededNotification")!;
_SizeLimitExceededNotification = global::ObjCRuntime.Dlfcn.GetStringConstant (global::ObjCRuntime.Libraries.Foundation.Handle, "NSUserDefaultsSizeLimitExceededNotification")!;
return _SizeLimitExceededNotification;
}
}
Expand Down
Loading