Skip to content

[cxx-interop] Conform std::string to ExpressibleByStringInterpolation #80090

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 19, 2025
Merged

[cxx-interop] Conform std::string to ExpressibleByStringInterpolation #80090

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
12 changes: 9 additions & 3 deletions stdlib/public/Cxx/std/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,27 @@ extension std.u32string {

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

extension std.string: ExpressibleByStringLiteral {
extension std.string: ExpressibleByStringLiteral,
ExpressibleByStringInterpolation {

@_alwaysEmitIntoClient
public init(stringLiteral value: String) {
unsafe self.init(value)
}
}

extension std.u16string: ExpressibleByStringLiteral {
extension std.u16string: ExpressibleByStringLiteral,
ExpressibleByStringInterpolation {

@_alwaysEmitIntoClient
public init(stringLiteral value: String) {
unsafe self.init(value)
}
}

extension std.u32string: ExpressibleByStringLiteral {
extension std.u32string: ExpressibleByStringLiteral,
ExpressibleByStringInterpolation {

@_alwaysEmitIntoClient
public init(stringLiteral value: String) {
unsafe self.init(value)
Expand Down
3 changes: 3 additions & 0 deletions test/Interop/Cxx/stdlib/use-std-string-typechecker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ import CxxStdlib
import StdString

let _ = HasMethodThatReturnsString().getString()

let x: std.string = "Hello"
let y: std.string = "\(x), World!"
18 changes: 18 additions & 0 deletions test/Interop/Cxx/stdlib/use-std-string.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ StdStringTestSuite.test("std::string <=> Swift.String") {
}
let swift7 = String(cxx7)
expectEqual(swift7, "���")

let cxxLiteral: std.string = "Hello"
let cxx8: std.string = "\(cxxLiteral), World!"
expectEqual(cxx8.size(), 13)
let swift8 = String(cxx8)
expectEqual(swift8, "Hello, World!")
}

StdStringTestSuite.test("std::string operators") {
Expand Down Expand Up @@ -287,6 +293,12 @@ StdStringTestSuite.test("std::u16string <=> Swift.String") {
expectEqual(cxx6.size(), 7)
let swift6 = String(cxx6)
expectEqual(swift6, "xyz\0abc")

let cxxLiteral: std.u16string = "Hello"
let cxx8: std.u16string = "\(cxxLiteral), World!"
expectEqual(cxx8.size(), 13)
let swift8 = String(cxx8)
expectEqual(swift8, "Hello, World!")
}

StdStringTestSuite.test("std::u32string <=> Swift.String") {
Expand Down Expand Up @@ -317,6 +329,12 @@ StdStringTestSuite.test("std::u32string <=> Swift.String") {
expectEqual(cxx6.size(), 7)
let swift6 = String(cxx6)
expectEqual(swift6, "xyz\0abc")

let cxxLiteral: std.u32string = "Hello"
let cxx8: std.u32string = "\(cxxLiteral), World!"
expectEqual(cxx8.size(), 13)
let swift8 = String(cxx8)
expectEqual(swift8, "Hello, World!")
}

StdStringTestSuite.test("std::string as Swift.CustomDebugStringConvertible") {
Expand Down