diff --git a/src/main/java/lol/fairplay/ghidraapple/core/objc/modelling/Models.kt b/src/main/java/lol/fairplay/ghidraapple/core/objc/modelling/Models.kt index 3a526139..e55673be 100644 --- a/src/main/java/lol/fairplay/ghidraapple/core/objc/modelling/Models.kt +++ b/src/main/java/lol/fairplay/ghidraapple/core/objc/modelling/Models.kt @@ -195,8 +195,6 @@ data class OCProtocol( } fun baseMethods(): List { -// // fixme: I believe this function was devised in a misconception that only one of these -// // fields could be non-null per instance. return (instanceMethods ?: listOf()) + (classMethods ?: listOf()) + (optionalInstanceMethods ?: listOf()) + @@ -204,6 +202,19 @@ data class OCProtocol( } } +data class OCCategory( + override val name: String, + var contents: List, +) : OCFieldContainer(name) + +data class OCCategoryClassEntry( + val category: OCCategory, + val klass: OCClass, + val instanceMethods: List?, + val classMethods: List?, + val protocols: List?, +) : OCFieldContainer("${klass.name} (${category.name})") + data class OCMethod( var parent: OCFieldContainer, override val name: String,