Skip to content

[cxx-interop] Conform std::u16string to CustomStringConvertible and CustomDebugStringConvertible #63973

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 1 commit into from
Mar 1, 2023
Merged

[cxx-interop] Conform std::u16string to CustomStringConvertible and CustomDebugStringConvertible #63973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions stdlib/public/Cxx/std/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,32 @@ extension std.u16string: ExpressibleByStringLiteral {
}
}

// MARK: Getting a Swift description of a C++ string

extension std.string: CustomDebugStringConvertible {
public var debugDescription: String {
return "std.string(\(String(self)))"
}
}

extension std.u16string: CustomDebugStringConvertible {
public var debugDescription: String {
return "std.u16string(\(String(self)))"
}
}

extension std.string: CustomStringConvertible {
public var description: String {
return String(self)
}
}

extension std.u16string: CustomStringConvertible {
public var description: String {
return String(self)
}
}

// MARK: Initializing Swift String from a C++ string

extension String {
Expand Down
30 changes: 30 additions & 0 deletions test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,21 @@ StdStringOverlayTestSuite.test("std::string as Swift.CustomDebugStringConvertibl
expectEqual(cxx3.debugDescription, "std.string(���)")
}

StdStringOverlayTestSuite.test("std::u16string as Swift.CustomDebugStringConvertible") {
let cxx1 = std.u16string()
expectEqual(cxx1.debugDescription, "std.u16string()")

let cxx2 = std.u16string("something123")
expectEqual(cxx2.debugDescription, "std.u16string(something123)")

let scalars: [UInt16] = [97, 55296, 99]
var cxx3 = std.u16string()
for scalar in scalars {
cxx3.push_back(scalar)
}
expectEqual(cxx3.debugDescription, "std.u16string(a�c)")
}

StdStringOverlayTestSuite.test("std::string as Swift.Sequence") {
let cxx1 = std.string()
var iterated = false
Expand Down Expand Up @@ -124,4 +139,19 @@ StdStringOverlayTestSuite.test("std::string as CustomStringConvertible") {
expectEqual(cxx3.description, "���")
}

StdStringOverlayTestSuite.test("std::u16string as Swift.CustomStringConvertible") {
let cxx1 = std.u16string()
expectEqual(cxx1.description, "")

let cxx2 = std.u16string("something123")
expectEqual(cxx2.description, "something123")

let scalars: [UInt16] = [97, 55296, 99]
var cxx3 = std.u16string()
for scalar in scalars {
cxx3.push_back(scalar)
}
expectEqual(cxx3.description, "a�c")
}

runAllTests()