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

Author: Mx-Iris

Package.resolved

@@ -116,6 +116,8 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.1"),
         .package(url: "https://github.com/onevcat/Rainbow", from: "4.0.0"),
         .package(url: "https://github.com/Mx-Iris/FrameworkToolbox", from: "0.3.0"),
+        .package(url: "https://github.com/apple/swift-collections", from: "1.2.0"),
+        .package(url: "https://github.com/MxIris-Library-Forks/swift-memberwise-init-macro", from: "0.5.3-fork"),
     ],
     targets: [
         .target(
@@ -125,11 +127,14 @@ let package = Package(
         .target(
             name: "Demangle",
             dependencies: [
-                "Semantic",
                 .product(name: "FoundationToolbox", package: "FrameworkToolbox"),
             ]
         ),
 
+        .target(
+            name: "Utilities"
+        ),
+        
         .target(
             name: "MachOExtensions",
             dependencies: [
@@ -156,6 +161,8 @@ let package = Package(
                 "MachOReading",
                 "MachOMacro",
                 "Demangle",
+                "Utilities",
+                .product(name: "OrderedCollections", package: "swift-collections"),
             ]
         ),
 
@@ -165,7 +172,6 @@ let package = Package(
                 .MachOKit,
                 "MachOReading",
                 "MachOMacro",
-                "MachOSymbols",
             ]
         ),
 
@@ -177,6 +183,7 @@ let package = Package(
                 "MachOExtensions",
                 "MachOMacro",
                 "MachOPointer",
+                "MachOSymbols",
             ]
         ),
 
@@ -187,6 +194,7 @@ let package = Package(
                 "Demangle",
                 "MachOFoundation",
                 "MachOMacro",
+                .product(name: "MemberwiseInit", package: "swift-memberwise-init-macro")
             ]
         ),
 
@@ -206,6 +214,8 @@ let package = Package(
                 .MachOKit,
                 "MachOSwiftSection",
                 "Semantic",
+                "Utilities",
+                .product(name: "OrderedCollections", package: "swift-collections"),
             ]
         ),
 

Package.swift

@@ -5,8 +5,8 @@
 ///   - isType: if true, no prefix is parsed and, on completion, the first item on the parse stack is returned.
 /// - Returns: the successfully parsed result
 /// - Throws: a SwiftSymbolParseError error that contains parse position when the error occurred.
-package func demangleAsNode(_ mangled: String, isType: Bool = false) throws -> Node {
-    return try demangleAsNode(mangled.unicodeScalars, isType: isType)
+package func demangleAsNode(_ mangled: String, isType: Bool = false, symbolicReferenceResolver: SymbolicReferenceResolver? = nil) throws -> Node {
+    return try demangleAsNode(mangled.unicodeScalars, isType: isType, symbolicReferenceResolver: symbolicReferenceResolver)
 }
 
 /// Pass a collection of `UnicodeScalars` containing a Swift mangled symbol or type, get a parsed SwiftSymbol structure which can then be directly examined or printed.
@@ -27,5 +27,3 @@ package func demangleAsNode<C: Collection>(_ mangled: C, isType: Bool = false, s
         return try demangler.demangleSwift3TopLevelSymbol()
     }
 }
-
-