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

Jump to bottom

Generate external categories #574

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Generate external categories #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a5df5a
Generate external categories
madsmtm Feb 4, 2024
40dac6d
Add CIImage and CIColor categories
madsmtm Feb 4, 2024
42808b7
Emit NSObject categories
madsmtm Feb 4, 2024
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
17 changes: 12 additions & 5 deletions crates/header-translator/src/availability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,10 @@ impl Availability {
_swift,
}
}
}

impl fmt::Display for Availability {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match &self.deprecated {
pub fn is_deprecated(&self) -> bool {
!matches!(
self.deprecated,
Versions {
ios: None,
ios_app_extension: None,
Expand All @@ -153,7 +152,15 @@ impl fmt::Display for Availability {
watchos: None,
tvos: None,
visionos: None,
} => {
}
)
}
}

impl fmt::Display for Availability {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match &self.deprecated {
_ if !self.is_deprecated() => {
// Not deprecated
}
Versions { .. } => {
Expand Down
10 changes: 8 additions & 2 deletions crates/header-translator/src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ impl<'a> Cache<'a> {
let mut names = BTreeMap::<(ItemIdentifier, String), &mut Method>::new();
for stmt in file.stmts.iter_mut() {
match stmt {
Stmt::ClassMethods {
Stmt::ExternMethods {
cls: id, methods, ..
}
| Stmt::ExternCategory {
cls: id, methods, ..
}
| Stmt::ProtocolDecl { id, methods, .. } => {
Expand Down Expand Up @@ -114,7 +117,10 @@ impl<'a> Cache<'a> {
// Add `mainthreadonly` to relevant methods
for stmt in file.stmts.iter_mut() {
match stmt {
Stmt::ClassMethods {
Stmt::ExternMethods {
cls: id, methods, ..
}
| Stmt::ExternCategory {
cls: id, methods, ..
}
| Stmt::ProtocolDecl { id, methods, .. } => {
Expand Down
26 changes: 13 additions & 13 deletions crates/header-translator/src/method.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,16 +245,16 @@ impl MemoryManagement {
pub struct Method {
pub selector: String,
pub fn_name: String,
availability: Availability,
pub availability: Availability,
features: Features,
pub is_class: bool,
is_optional_protocol: bool,
is_optional: bool,
memory_management: MemoryManagement,
pub(crate) arguments: Vec<(String, Ty)>,
pub result_type: Ty,
safe: bool,
mutating: bool,
is_protocol: bool,
is_pub: bool,
// Thread-safe, even on main-thread only (@MainActor/@UIActor) classes
non_isolated: bool,
pub(crate) mainthreadonly: bool,
Expand Down Expand Up @@ -333,7 +333,7 @@ impl<'tu> PartialMethod<'tu> {
self,
data: MethodData,
parent_is_mutable: bool,
parent_is_protocol: bool,
is_pub: bool,
implied_features: impl IntoIterator<Item = &'a ItemIdentifier>,
context: &Context<'_>,
) -> Option<(bool, Method)> {
Expand Down Expand Up @@ -479,7 +479,7 @@ impl<'tu> PartialMethod<'tu> {
availability,
features,
is_class,
is_optional_protocol: entity.is_objc_optional(),
is_optional: entity.is_objc_optional(),
memory_management,
arguments,
result_type,
Expand All @@ -488,7 +488,7 @@ impl<'tu> PartialMethod<'tu> {
// since immutable methods are usually either declared on an
// immutable subclass, or as a property.
mutating: data.mutating.unwrap_or(parent_is_mutable),
is_protocol: parent_is_protocol,
is_pub,
non_isolated: modifiers.non_isolated,
mainthreadonly: modifiers.mainthreadonly,
},
Expand All @@ -513,7 +513,7 @@ impl PartialProperty<'_> {
getter_data: MethodData,
setter_data: Option<MethodData>,
parent_is_mutable: bool,
parent_is_protocol: bool,
is_pub: bool,
implied_features: impl IntoIterator<Item = &'a ItemIdentifier> + Clone,
context: &Context<'_>,
) -> (Option<Method>, Option<Method>) {
Expand Down Expand Up @@ -566,15 +566,15 @@ impl PartialProperty<'_> {
availability: availability.clone(),
features: features.clone(),
is_class,
is_optional_protocol: entity.is_objc_optional(),
is_optional: entity.is_objc_optional(),
memory_management,
arguments: Vec::new(),
result_type: ty,
safe: !getter_data.unsafe_,
// Getters are usually not mutable, even if the class itself
// is, so let's default to immutable.
mutating: getter_data.mutating.unwrap_or(false),
is_protocol: parent_is_protocol,
is_pub,
non_isolated: modifiers.non_isolated,
mainthreadonly: modifiers.mainthreadonly,
})
Expand Down Expand Up @@ -608,14 +608,14 @@ impl PartialProperty<'_> {
availability,
features,
is_class,
is_optional_protocol: entity.is_objc_optional(),
is_optional: entity.is_objc_optional(),
memory_management,
arguments: vec![(name, ty)],
result_type: Ty::VOID_RESULT,
safe: !setter_data.unsafe_,
// Setters are usually mutable if the class itself is.
mutating: setter_data.mutating.unwrap_or(parent_is_mutable),
is_protocol: parent_is_protocol,
is_pub,
non_isolated: modifiers.non_isolated,
mainthreadonly: modifiers.mainthreadonly,
})
Expand Down Expand Up @@ -659,7 +659,7 @@ impl fmt::Display for Method {
write!(f, "{}", self.features.cfg_gate_ln())?;
write!(f, "{}", self.availability)?;

if self.is_optional_protocol {
if self.is_optional {
writeln!(f, " #[optional]")?;
}

Expand All @@ -683,7 +683,7 @@ impl fmt::Display for Method {
//

write!(f, " ")?;
if !self.is_protocol {
if self.is_pub {
write!(f, "pub ")?;
}

Expand Down
Loading
Loading