Fix Ref<T> and Confidence<T> formatters

CouleeApps · CouleeApps · commit 977390346733 · 2025-05-22T15:09:43.000-04:00
diff --git a/binaryninjaapi.h b/binaryninjaapi.h
@@ -20973,20 +20973,25 @@ namespace std
 
 template<typename T> struct fmt::formatter<BinaryNinja::Ref<T>>
 {
+	fmt::formatter<T> inner;
 	format_context::iterator format(const BinaryNinja::Ref<T>& obj, format_context& ctx) const
 	{
-		return fmt::formatter<T>().format(*obj.GetPtr(), ctx);
+		return inner.format(*obj.GetPtr(), ctx);
 	}
-	constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return ctx.begin(); }
+	constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return inner.parse(ctx); }
 };
 
 template<typename T> struct fmt::formatter<BinaryNinja::Confidence<T>>
 {
+	fmt::formatter<T> inner;
 	format_context::iterator format(const BinaryNinja::Confidence<T>& obj, format_context& ctx) const
 	{
-		return fmt::format_to(ctx.out(), "{} ({} confidence)", obj.GetValue(), obj.GetConfidence());
+		auto out = ctx.out();
+		out = inner.format(obj.GetValue(), ctx);
+		ctx.advance_to(out);
+		return fmt::format_to(out, " ({} confidence)", obj.GetConfidence());
 	}
-	constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return ctx.begin(); }
+	constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return inner.parse(ctx); }
 };
 
 template<> struct fmt::formatter<BinaryNinja::Metadata>

Original file line number	Diff line number	Diff line change
`@@ -20973,20 +20973,25 @@ namespace std`
`20973`	`20973`
`20974`	`20974`	`template<typename T> struct fmt::formatter<BinaryNinja::Ref<T>>`
`20975`	`20975`	`{`
	`20976`	`+ fmt::formatter<T> inner;`
`20976`	`20977`	`format_context::iterator format(const BinaryNinja::Ref<T>& obj, format_context& ctx) const`
`20977`	`20978`	`{`
`20978`		`- return fmt::formatter<T>().format(*obj.GetPtr(), ctx);`
	`20979`	`+ return inner.format(*obj.GetPtr(), ctx);`
`20979`	`20980`	`}`
`20980`		`- constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return ctx.begin(); }`
	`20981`	`+ constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return inner.parse(ctx); }`
`20981`	`20982`	`};`
`20982`	`20983`
`20983`	`20984`	`template<typename T> struct fmt::formatter<BinaryNinja::Confidence<T>>`
`20984`	`20985`	`{`
	`20986`	`+ fmt::formatter<T> inner;`
`20985`	`20987`	`format_context::iterator format(const BinaryNinja::Confidence<T>& obj, format_context& ctx) const`
`20986`	`20988`	`{`
`20987`		`- return fmt::format_to(ctx.out(), "{} ({} confidence)", obj.GetValue(), obj.GetConfidence());`
	`20989`	`+ auto out = ctx.out();`
	`20990`	`+ out = inner.format(obj.GetValue(), ctx);`
	`20991`	`+ ctx.advance_to(out);`
	`20992`	`+ return fmt::format_to(out, " ({} confidence)", obj.GetConfidence());`
`20988`	`20993`	`}`
`20989`		`- constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return ctx.begin(); }`
	`20994`	`+ constexpr auto parse(format_parse_context& ctx) -> format_parse_context::iterator { return inner.parse(ctx); }`
`20990`	`20995`	`};`
`20991`	`20996`
`20992`	`20997`	`template<> struct fmt::formatter<BinaryNinja::Metadata>`