Skip to content

Commit 16b887a

Browse files
committed
Align with the original Demangler & NodePrinter
1 parent 4ee550c commit 16b887a

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Sources/Demangle/Main/Demangler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ extension Demangler {
934934
case "p": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.RawPointer")
935935
case "t": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.SILToken")
936936
case "w": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.Word")
937-
case "c": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.DefaultActorStorage")
937+
case "c": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.RawUnsafeContinuation")
938938
case "D": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.DefaultActorStorage")
939939
case "d": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.NonDefaultDistributedActorStorage")
940940
case "j": return Node(swiftBuiltinType: .builtinTypeName, name: "Builtin.Job")

Sources/Demangle/Main/Node/Node.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ extension Node {
193193
case .tupleElementName: fallthrough
194194
case .typeAlias: fallthrough
195195
case .typeList: fallthrough
196-
case .typeSymbolicReference: fallthrough
196+
case .typeSymbolicReference: return true
197197
case .type:
198198
return children.first.map { $0.isSimpleType } ?? false
199199
case .protocolList:

Sources/Demangle/Main/NodePrinter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ struct NodePrinter: Sendable {
902902

903903
mutating func printReabstracctionThunkHelperWithGlobalActor(_ name: Node) {
904904
printFirstChild(name)
905-
_ = printOptional(name.children.at(1), prefix: " with global actor constraint")
905+
_ = printOptional(name.children.at(1), prefix: " with global actor constraint ")
906906
}
907907

908908
mutating func printBuildInFixedArray(_ name: Node) {

Sources/Demangle/Utils/Common.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ func decodeSwiftPunycode(_ value: String) throws -> String {
7979
bias = k
8080
n = n + i / (output.count + 1)
8181
i = i % (output.count + 1)
82-
let validScalar = UnicodeScalar(n) ?? UnicodeScalar(".")
82+
var scalarValue = n
83+
if scalarValue >= 0xD800, scalarValue < 0xD880 {
84+
scalarValue -= 0xD800
85+
}
86+
let validScalar = UnicodeScalar(scalarValue) ?? UnicodeScalar(".")
8387
output.insert(validScalar, at: i)
8488
i += 1
8589
}

0 commit comments

Comments
 (0)