gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::visit with Visitor helper instead of std::holds_alternatve

Browse Source
This commit is contained in:
Rangi42
2024-02-29 13:32:50 -05:00
committed by Sylvie
parent cf08fed067
commit 1210a7441f
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/file.hpp
View File

@@ -21,14 +21,6 @@
#include "gfx/main.hpp" #include "gfx/main.hpp"
// Convenience feature for visiting the below.
template<typename... Ts>
struct Visitor : Ts... {
using Ts::operator()...;
};
template<typename... Ts>
Visitor(Ts...) -> Visitor<Ts...>;
class File { class File {
// Construct a `std::streambuf *` by default, since it's probably lighter than a `filebuf`. // Construct a `std::streambuf *` by default, since it's probably lighter than a `filebuf`.
std::variant<std::streambuf *, std::filebuf> _file; std::variant<std::streambuf *, std::filebuf> _file;

8
include/helpers.hpp
View File

@@ -85,4 +85,12 @@
// For lack of <ranges>, this adds some more brevity // For lack of <ranges>, this adds some more brevity
#define RANGE(s) std::begin(s), std::end(s) #define RANGE(s) std::begin(s), std::end(s)
// Convenience feature for visiting variants.
template<typename... Ts>
struct Visitor : Ts... {
using Ts::operator()...;
};
template<typename... Ts>
Visitor(Ts...) -> Visitor<Ts...>;
#endif // HELPERS_H #endif // HELPERS_H

9
src/asm/parser.y
View File

@@ -27,6 +27,7 @@
#include "extern/utf8decoder.hpp" #include "extern/utf8decoder.hpp"
#include "helpers.hpp"
#include "linkdefs.hpp" #include "linkdefs.hpp"
#include "platform.hpp" // strncasecmp, strdup #include "platform.hpp" // strncasecmp, strdup
@@ -324,10 +325,10 @@ static void strfmt(char *dest, size_t destLen, char const *fmt,
std::variant<uint32_t, char *> &arg = args[a++]; std::variant<uint32_t, char *> &arg = args[a++];
static char buf[MAXSTRLEN + 1]; static char buf[MAXSTRLEN + 1];
if (std::holds_alternative<uint32_t>(arg)) std::visit(Visitor{
fmt_PrintNumber(buf, sizeof(buf), &spec, std::get<uint32_t>(arg)); [&](uint32_t num) { fmt_PrintNumber(buf, sizeof(buf), &spec, num); },
else [&](char *str) { fmt_PrintString(buf, sizeof(buf), &spec, str); },
fmt_PrintString(buf, sizeof(buf), &spec, std::get<char *>(arg)); }, arg);
i += snprintf(&dest[i], destLen - i, "%s", buf); i += snprintf(&dest[i], destLen - i, "%s", buf);
} }