Fix a bunch of CFArray/CFDictionary generics

Generics in things such as blocks are currently still wrong.

Author: madsmtm

crates/header-translator/src/config.rs

@@ -964,7 +964,27 @@ pub struct ItemGeneric {
 impl FromStr for ItemGeneric {
     type Err = Box<dyn Error>;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if let Some((id, generics)) = s.rsplit_once('<') {
+        fn split_top_level_commas(s: &str) -> Vec<&str> {
+            let mut parts = Vec::new();
+            let mut depth = 0usize;
+            let mut start = 0;
+
+            for (i, c) in s.char_indices() {
+                match c {
+                    '<' => depth += 1,
+                    '>' => depth = depth.saturating_sub(1),
+                    ',' if depth == 0 => {
+                        parts.push(s[start..i].trim());
+                        start = i + 1;
+                    }
+                    _ => {}
+                }
+            }
+            parts.push(s[start..].trim());
+            parts
+        }
+
+        if let Some((id, generics)) = s.split_once('<') {
             let (generics, rest) = generics
                 .rsplit_once('>')
                 .ok_or_else(|| std::io::Error::other("missing closing >"))?;
@@ -973,10 +993,9 @@ impl FromStr for ItemGeneric {
             }
             Ok(Self {
                 id: ItemIdentifier::from_str(id)?,
-                // Simplistic, only handles one level
-                generics: generics
-                    .split(",")
-                    .map(|generic| generic.trim().parse::<ItemGeneric>())
+                generics: split_top_level_commas(generics)
+                    .into_iter()
+                    .map(|g| g.parse::<ItemGeneric>())
                     .collect::<Result<Vec<_>, _>>()?,
             })
         } else {
@@ -1013,3 +1032,69 @@ impl<'de> de::Deserialize<'de> for ItemGeneric {
         deserializer.deserialize_str(ItemGenericVisitor)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn item_generic_parse() {
+        assert_eq!(
+            ItemGeneric::from_str("Foo.Bar").unwrap(),
+            ItemGeneric {
+                id: ItemIdentifier::from_str("Foo.Bar").unwrap(),
+                generics: vec![],
+            }
+        );
+
+        assert_eq!(
+            ItemGeneric::from_str("Foo.Bar<X.Y.Z, A.B.C>").unwrap(),
+            ItemGeneric {
+                id: ItemIdentifier::from_str("Foo.Bar").unwrap(),
+                generics: vec![
+                    ItemGeneric {
+                        id: ItemIdentifier::from_str("X.Y.Z").unwrap(),
+                        generics: vec![],
+                    },
+                    ItemGeneric {
+                        id: ItemIdentifier::from_str("A.B.C").unwrap(),
+                        generics: vec![],
+                    },
+                ],
+            }
+        );
+
+        assert_eq!(
+            ItemGeneric::from_str(
+                "Foo.Bar<X.Y.Z, Inner.Item<With.Generic, Second.Generic>, A.B.C>"
+            )
+            .unwrap(),
+            ItemGeneric {
+                id: ItemIdentifier::from_str("Foo.Bar").unwrap(),
+                generics: vec![
+                    ItemGeneric {
+                        id: ItemIdentifier::from_str("X.Y.Z").unwrap(),
+                        generics: vec![],
+                    },
+                    ItemGeneric {
+                        id: ItemIdentifier::from_str("Inner.Item").unwrap(),
+                        generics: vec![
+                            ItemGeneric {
+                                id: ItemIdentifier::from_str("With.Generic").unwrap(),
+                                generics: vec![],
+                            },
+                            ItemGeneric {
+                                id: ItemIdentifier::from_str("Second.Generic").unwrap(),
+                                generics: vec![],
+                            }
+                        ],
+                    },
+                    ItemGeneric {
+                        id: ItemIdentifier::from_str("A.B.C").unwrap(),
+                        generics: vec![],
+                    },
+                ],
+            }
+        );
+    }
+}

framework-crates/objc2-application-services/Cargo.toml

@@ -166,6 +166,38 @@ fn.ATSFontFamilyGetName.arguments.2.lifetime = "out-pointer-not-retained"
 fn.ATSFontGetName.arguments.2.lifetime = "out-pointer-not-retained"
 fn.ATSFontGetPostScriptName.arguments.2.lifetime = "out-pointer-not-retained"
 
+##
+## Generics
+##
+
+fn.ProcessInformationCopyDictionary.return.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.PasteboardCopyItemFlavors.arguments.2.generics = ["CoreFoundation.CFString.CFString"]
+fn.TranslationCreateWithSourceArray.arguments.0.generics = ["CoreFoundation.CFString.CFString"]
+fn.TranslationCreateWithSourceArray.arguments.2.generics = ["CoreFoundation.CFString.CFString"]
+fn.TranslationCreateWithSourceArray.arguments.3.generics = ["CoreFoundation.CFString.CFString", "ApplicationServices.HIServices.TranslationServices.Translation"]
+fn.AXIsProcessTrustedWithOptions.arguments.0.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.AXUIElementCopyAttributeNames.arguments.1.generics = ["CoreFoundation.CFString.CFString"]
+fn.AXUIElementCopyAttributeValues.arguments.4.generics = ["CoreFoundation.CFType"]
+fn.AXUIElementCopyMultipleAttributeValues.arguments.1.generics = ["CoreFoundation.CFString.CFString"]
+fn.AXUIElementCopyMultipleAttributeValues.arguments.3.generics = ["CoreFoundation.CFType"]
+fn.AXUIElementCopyParameterizedAttributeNames.arguments.1.generics = ["CoreFoundation.CFString.CFString"]
+fn.AXUIElementCopyActionNames.arguments.1.generics = ["CoreFoundation.CFString.CFString"]
+fn.PMSessionCopyOutputFormatList.arguments.2.generics = ["CoreFoundation.CFString.CFString"]
+fn.PMSessionCreatePageFormatList.arguments.2.generics = ["ApplicationServices.PMDefinitions.OpaquePMPageFormat"] # CFArrayRef of PMPageFormat
+fn.PMSessionCreatePrinterList.arguments.1.generics = ["ApplicationServices.PMDefinitions.OpaquePMPrinter"] # CFArrayRef of PMPrinter
+fn.PMPrintSettingsCopyAsDictionary.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.PMPrintSettingsCopyKeys.arguments.1.generics = ["CoreFoundation.CFString.CFString"]
+fn.PMServerCreatePrinterList.arguments.1.generics = ["ApplicationServices.PMDefinitions.OpaquePMPrinter"] # CFArrayRef of PMPrinter
+fn.PMServerLaunchPrinterBrowser.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Probably?
+fn.PMPrinterCopyPresets.arguments.1.generics = ["ApplicationServices.PMDefinitions.OpaquePMPreset"] # CFArrayRef of PMPreset
+fn.PMPrinterGetMimeTypes.arguments.2.generics = ["CoreFoundation.CFString.CFString"]
+fn.PMPrinterGetPaperList.arguments.1.generics = ["ApplicationServices.PMDefinitions.OpaquePMPaper"] # CFArrayRef of PMPaper
+fn.PMPresetGetAttributes.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Probably?
+fn.PMWorkflowCopyItems.arguments.0.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.PMPrinterSendCommand.arguments.3.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Reserved, though probably this.
+fn.PMPrinterCopyState.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.PMCopyAvailablePPDs.arguments.1.generics = ["CoreFoundation.CFURL.CFURL"]
+
 ##
 ## Safety
 ##

framework-crates/objc2-application-services/translation-config.toml

@@ -69,6 +69,16 @@ const.kTXNQDFontColorAttributeSize.skipped = true
 # Private.
 const._KeyboardDispatch.skipped = true
 
+##
+## Generics
+##
+
+fn.HIObjectCopyDelegates.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFArray.CFArray<Carbon.HIToolbox.HIObject.HIObject>"]
+fn.CopySymbolicHotKeys.arguments.0.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.TISCreateInputSourceList.arguments.0.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.TISCreateInputSourceList.return.generics = ["Carbon.HIToolbox.TextInputSources.TISInputSource"]
+fn.TISCreateASCIICapableInputSourceList.return.generics = ["Carbon.HIToolbox.TextInputSources.TISInputSource"]
+
 ##
 ## Nullability, lifetime and pointer bounds.
 ##

framework-crates/objc2-carbon/Cargo.toml

@@ -7,3 +7,27 @@ maccatalyst = "13.0"
 ios = "2.0"
 tvos = "9.0"
 visionos = "1.0"
+
+##
+## Generics
+##
+
+fn.CFFTPCreateParsedResourceListing.arguments.3.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+
+fn.CFHostGetAddressing.return.generics = ["CoreFoundation.CFData.CFData"]
+fn.CFHostGetNames.return.generics = ["CoreFoundation.CFString.CFString"]
+
+fn.CFHTTPMessageApplyCredentialDictionary.arguments.2.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.CFHTTPAuthenticationCopyDomains.return.generics = ["CoreFoundation.CFURL.CFURL"] # Probably
+
+fn.CFHTTPMessageCopyAllHeaderFields.return.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Maybe CFString value?
+
+fn.CFNetServiceGetAddressing.return.generics = ["CoreFoundation.CFData.CFData"]
+fn.CFNetServiceCreateDictionaryWithTXTData.return.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFData.CFData"]
+# Dict values can also be CFString for convenience, but let's not support that to allow passing ^ directly to this.
+fn.CFNetServiceCreateTXTDataWithDictionary.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFData.CFData"]
+
+fn.CFNetworkCopySystemProxySettings.return.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.CFNetworkCopyProxiesForURL.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.CFNetworkCopyProxiesForURL.return.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.CFNetworkCopyProxiesForAutoConfigurationScript.return.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]

framework-crates/objc2-carbon/translation-config.toml

@@ -12,3 +12,28 @@ visionos = "1.0"
 const.icVersion4Number.skipped = false
 const.COLORSYNC_PROFILE_INSTALL_ENTITLEMENT.skipped = false
 const.COLORSYNC_MD5_LENGTH.skipped = false
+
+##
+## Generics
+##
+
+# ColorSyncProfile
+fn.ColorSyncProfileCreateWithURLAndOptions.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.ColorSyncProfileCreateLink.arguments.0.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.ColorSyncProfileCreateLink.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.ColorSyncProfileCopyTagSignatures.return.generics = ["CoreFoundation.CFString.CFString"]
+fn.ColorSyncIterateInstalledProfilesWithOptions.arguments.3.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+
+# ColorSyncTransform
+fn.ColorSyncTransformCreate.arguments.0.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.ColorSyncTransformCreate.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.ColorSyncTransformCopyProperty.arguments.2.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Probably
+fn.ColorSyncTransformGetProfileSequence.return.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.ColorSyncTransformConvert.arguments.11.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Probably
+fn.ColorSyncCreateCodeFragment.arguments.0.generics = ["CoreFoundation.CFDictionary.CFDictionary<CoreFoundation.CFString.CFString, CoreFoundation.CFType>"]
+fn.ColorSyncCreateCodeFragment.arguments.1.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"] # Same as ColorSyncTransformCreate
+
+# ColorSyncDevice
+fn.ColorSyncRegisterDevice.arguments.2.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.ColorSyncDeviceSetCustomProfiles.arguments.2.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]
+fn.ColorSyncDeviceCopyDeviceInfo.return.generics = ["CoreFoundation.CFString.CFString", "CoreFoundation.CFType"]

framework-crates/objc2-cf-network/Cargo.toml

@@ -18,3 +18,6 @@ protocol.CIFilter.renamed = "CIFilterProtocol"
 class.CIImage.categories.AVDepthData.skipped = true
 class.CIImage.categories.AVPortraitEffectsMatte.skipped = true
 class.CIImage.categories.AVSemanticSegmentationMatte.skipped = true
+
+# Reserved for future use, pass NULL.
+class.CIContext.methods."createCGLayerWithSize:info:".arguments.1.generics = []