Embrace new LosslessStringConvertible in NodePath, GString and String…

…Name, allowing Strings to be used as constructors for these types
migueldeicaza · Dec 9, 2023 · cc00834 · cc00834
1 parent ec07b5d
commit cc00834
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/Generator/Generator/BuiltinGen.swift b/Generator/Generator/BuiltinGen.swift
@@ -481,6 +481,7 @@ func generateBuiltinClasses (values: [JGodotBuiltinClass], outputDir: String?) a
         if bc.name == "String" || bc.name == "StringName" || bc.name == "NodePath" {
             conformances.append ("ExpressibleByStringLiteral")
             conformances.append ("ExpressibleByStringInterpolation")
+            conformances.append ("LosslessStringConvertible")
         }
         if bc.name.starts(with: "Packed") {
             conformances.append ("Collection")
@@ -500,7 +501,7 @@ func generateBuiltinClasses (values: [JGodotBuiltinClass], outputDir: String?) a
 
         p ("public \(kind == .isStruct ? "struct" : "class") \(typeName)\(proto)") {
             if bc.name == "String" {
-                p ("public init (_ str: String)") {
+                p ("public required init (_ str: String)") {
                     p ("gi.string_new_with_utf8_chars (&content, str)")
                 }
                 p ("// ExpressibleByStringLiteral conformace")
@@ -518,6 +519,19 @@ func generateBuiltinClasses (values: [JGodotBuiltinClass], outputDir: String?) a
                         p ("NodePath.constructor2 (&content, &args)")
                     }
                 }
+                p ("// LosslessStringConvertible conformance)")
+                p ("public required init (_ value: String)") {
+                    p ("let from = GString (value)")
+                    p ("var args: [UnsafeRawPointer?] = []")
+                    p ("withUnsafePointer (to: &from.content)", arg: " ptr in") {
+                        p ("args.append (ptr)")
+                        p ("NodePath.constructor2 (&content, &args)")
+                    }
+                }
+                p ("public var description: String") {
+                    p ("let sub = getConcatenatedSubnames ().description")
+                    p ("return getConcatenatedNames ().description + (sub == \"\" ? sub : \":\\(sub)\")")
+                }
             }
             if bc.name == "StringName" {
                 // TODO: This is a little brittle, because I am
@@ -540,6 +554,15 @@ func generateBuiltinClasses (values: [JGodotBuiltinClass], outputDir: String?) a
                         p ("StringName.constructor2 (&content, &args)")
                     }
                 }
+                p ("// LosslessStringConvertible conformance)")
+                p ("public required init (_ value: String)") {
+                    p ("let from = GString (value)")
+                    p ("var args: [UnsafeRawPointer?] = []")
+                    p ("withUnsafePointer (to: &from.content)", arg: " ptr in"){
+                        p ("args.append (ptr)")
+                        p ("StringName.constructor2 (&content, &args)")
+                    }
+                }
             }
             if bc.name == "Callable" {
                 p ("/// Creates a Callable instance from a Swift function")

diff --git a/Sources/SwiftGodot/Core/StringExtensions.swift b/Sources/SwiftGodot/Core/StringExtensions.swift
@@ -8,11 +8,6 @@
 @_implementationOnly import GDExtension
 
 extension StringName: CustomStringConvertible {
-    /// Creates a StringName from a Swift String
-    public convenience init (_ from: String) {
-        self.init (from: from)
-    }
-
     /// Creates a StringName from a Swift String.Substring
     public convenience init (_ from: String.SubSequence) {
         self.init (from: String (from))