Merge pull request #17 from MxIris-Reverse-Engineering/optimize/generic-refactor

Bug fixes and some optimizations

Author: Mx-Iris

Package.swift

@@ -134,12 +134,24 @@ let package = Package(
         .target(
             name: "Utilities"
         ),
-        
+
         .target(
             name: "MachOExtensions",
             dependencies: [
                 .MachOKit,
                 "MachOMacro",
+                .product(name: "AssociatedObject", package: "AssociatedObject"),
+            ]
+        ),
+
+        .target(
+            name: "MachOCaches",
+            dependencies: [
+                .MachOKit,
+                "MachOExtensions",
+                "MachOMacro",
+                "Utilities",
+                .product(name: "AssociatedObject", package: "AssociatedObject"),
             ]
         ),
 
@@ -153,59 +165,75 @@ let package = Package(
                 .product(name: "AssociatedObject", package: "AssociatedObject"),
             ]
         ),
-        
+
+        .target(
+            name: "MachOResolving",
+            dependencies: [
+                .MachOKit,
+                "MachOExtensions",
+                "MachOReading",
+            ]
+        ),
+
         .target(
             name: "MachOSymbols",
             dependencies: [
                 .MachOKit,
                 "MachOReading",
+                "MachOResolving",
                 "MachOMacro",
                 "Demangle",
                 "Utilities",
+                "MachOCaches",
                 .product(name: "OrderedCollections", package: "swift-collections"),
             ]
         ),
-        
+
         .target(
             name: "MachOPointer",
             dependencies: [
                 .MachOKit,
                 "MachOReading",
+                "MachOResolving",
                 "MachOMacro",
             ]
         ),
 
         .target(
-            name: "MachOFoundation",
+            name: "MachOSymbolPointer",
             dependencies: [
                 .MachOKit,
                 "MachOReading",
-                "MachOExtensions",
+                "MachOResolving",
                 "MachOMacro",
                 "MachOPointer",
                 "MachOSymbols",
             ]
         ),
 
         .target(
-            name: "MachOSwiftSection",
+            name: "MachOFoundation",
             dependencies: [
                 .MachOKit,
-                "Demangle",
-                "MachOFoundation",
+                "MachOReading",
+                "MachOExtensions",
                 "MachOMacro",
-                .product(name: "MemberwiseInit", package: "swift-memberwise-init-macro")
+                "MachOPointer",
+                "MachOSymbols",
+                "MachOResolving",
+                "MachOSymbolPointer",
             ]
         ),
 
         .target(
-            name: "MachOTestingSupport",
+            name: "MachOSwiftSection",
             dependencies: [
                 .MachOKit,
-                "MachOExtensions",
-                "SwiftDump",
-            ],
-            swiftSettings: testSettings
+                "Demangle",
+                "MachOFoundation",
+                "MachOMacro",
+                .product(name: "MemberwiseInit", package: "swift-memberwise-init-macro"),
+            ]
         ),
 
         .target(
@@ -228,6 +256,8 @@ let package = Package(
             ]
         ),
 
+        // MARK: - Macros
+
         .target(
             name: "MachOMacro",
             dependencies: [
@@ -245,6 +275,18 @@ let package = Package(
             ]
         ),
 
+        // MARK: - Testing
+
+        .target(
+            name: "MachOTestingSupport",
+            dependencies: [
+                .MachOKit,
+                "MachOExtensions",
+                "SwiftDump",
+            ],
+            swiftSettings: testSettings
+        ),
+
         .testTarget(
             name: "DemangleTests",
             dependencies: [

Sources/Demangle/Enums/SwiftSymbolParseError.swift

@@ -25,4 +25,6 @@ public enum SwiftSymbolParseError: Error, Sendable {
     case unimplementedFeature
 
     case requiredNonOptional
+    
+    case invalidSwiftMangledName
 }

Sources/Demangle/Interface.swift

@@ -21,9 +21,9 @@ package func demangleAsNode<C: Collection>(_ mangled: C, isType: Bool = false, s
     demangler.symbolicReferenceResolver = symbolicReferenceResolver
     if isType {
         return try demangler.demangleType()
-    } else if getManglingPrefixLength(mangled) != 0 {
+    } else if Demangler.getManglingPrefixLength(mangled) != 0 {
         return try demangler.demangleSymbol()
     } else {
-        return try demangler.demangleSwift3TopLevelSymbol()
+        throw SwiftSymbolParseError.invalidSwiftMangledName
     }
 }

Sources/Demangle/Main/DemangleOptions.swift

@@ -26,6 +26,8 @@ public struct DemangleOptions: OptionSet, Codable, Sendable {
     public static let showModuleInDependentMemberType = DemangleOptions(rawValue: 1 << 21)
 
     package static let removeWeakPrefix = DemangleOptions(rawValue: 1 << 22)
+    package static let removeBoundGeneric = DemangleOptions(rawValue: 1 << 23)
+    
 
     public init(rawValue: Int) {
         self.rawValue = rawValue
@@ -67,6 +69,13 @@ public struct DemangleOptions: OptionSet, Codable, Sendable {
         options.remove(.displayExtensionContexts)
         options.remove(.showPrivateDiscriminators)
         options.remove(.showModuleInDependentMemberType)
+        options.remove(.displayUnmangledSuffix)
+        return options
+    }()
+    
+    public static let interfaceType: DemangleOptions = {
+        var options = DemangleOptions.interface
+        options.insert(.removeBoundGeneric)
         return options
     }()