Skip to content

Bug fixes and some optimizations #17

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

Merged
merged 8 commits into from
Jul 5, 2025
Merged

Bug fixes and some optimizations #17

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfe88fa
Fixes
Mx-Iris Jul 2, 2025
bda9d9e
Add MachCaches target, optimize the effect of dump protocolConformance
Mx-Iris Jul 2, 2025
55f2593
Generic refactoring
Mx-Iris Jul 3, 2025
0cf6370
Renaming
Mx-Iris Jul 3, 2025
b1bf486
Refactor SwiftDump target
Mx-Iris Jul 3, 2025
8abcf3f
Format
Mx-Iris Jul 3, 2025
008f92b
Add MachOResolving, MachOSymbolPointer targets
Mx-Iris Jul 4, 2025
7e3d4ab
Update Testing
Mx-Iris Jul 4, 2025
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
70 changes: 56 additions & 14 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]
),

Expand All @@ -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(
Expand All @@ -228,6 +256,8 @@ let package = Package(
]
),

// MARK: - Macros

.target(
name: "MachOMacro",
dependencies: [
Expand All @@ -245,6 +275,18 @@ let package = Package(
]
),

// MARK: - Testing

.target(
name: "MachOTestingSupport",
dependencies: [
.MachOKit,
"MachOExtensions",
"SwiftDump",
],
swiftSettings: testSettings
),

.testTarget(
name: "DemangleTests",
dependencies: [
Expand Down
2 changes: 2 additions & 0 deletions Sources/Demangle/Enums/SwiftSymbolParseError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public enum SwiftSymbolParseError: Error, Sendable {
case unimplementedFeature

case requiredNonOptional

case invalidSwiftMangledName
}
4 changes: 2 additions & 2 deletions Sources/Demangle/Interface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
9 changes: 9 additions & 0 deletions Sources/Demangle/Main/DemangleOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}()

Expand Down
Loading
Loading