mirror of
https://github.com/diasurgical/DevilutionX.git
synced 2026-10-12 11:00:04 +00:00
Gleb MazovetskiyandClaude Fable 5
ac2d7fc731
- `fmt::format` with literal format strings -> `std::format`. - `fmt::format(fmt::runtime(...))` -> `FormatRuntime` in the new `utils/format.hpp`, a std::vformat wrapper that is also safe under the P2905 lvalue requirement of `std::make_format_args`. - `fmt::dynamic_format_arg_store` (Lua logging) -> a small hand-rolled per-field formatter over `std::variant`, returning `std::expected`. - `fmt::format_int` -> `std::to_chars`. - `fmt::join` -> manual joins at the two call sites. - SDL_audiolib: new patch that rewrites aulib_log.h to use std::format and drops the fmt dependency from its CMakeLists. - The `-static-libstdc++` guard now keys off `DEVILUTIONX_STATIC_SDL_AUDIOLIB` instead of `DEVILUTIONX_STATIC_LIBFMT`. - libfmt removed from CMake, vcpkg, Brewfile, CI workflows, Dockerfiles, packaging scripts, UWP project, and docs. - macOS bumped to 13.3+, iOS to 16.3+ (required for `<format>`) - Amiga m68k: provide `__cmpdf2`, which is missing from the hard-float libgcc multilib but referenced via libstdc++'s long double paths. Co-Authored-By: Claude Fable 5 <[email protected]>
38 lines
933 B
C++
38 lines
933 B
C++
#include "data/value_reader.hpp"
|
|
|
|
#include <format>
|
|
|
|
#include "appfat.h"
|
|
|
|
namespace devilution {
|
|
|
|
ValueReader::ValueReader(DataFile &dataFile, std::string_view filename)
|
|
: it_(dataFile.begin())
|
|
, end_(dataFile.end())
|
|
, filename_(filename)
|
|
{
|
|
}
|
|
|
|
DataFileField ValueReader::getValueField(std::string_view expectedKey)
|
|
{
|
|
if (it_ == end_) {
|
|
app_fatal(std::format("Missing field {} in {}", expectedKey, filename_));
|
|
}
|
|
DataFileRecord record = *it_;
|
|
FieldIterator fieldIt = record.begin();
|
|
const FieldIterator endField = record.end();
|
|
|
|
const std::string_view key = (*fieldIt).value();
|
|
if (key != expectedKey) {
|
|
app_fatal(std::format("Unexpected field in {}: got {}, expected {}", filename_, key, expectedKey));
|
|
}
|
|
|
|
++fieldIt;
|
|
if (fieldIt == endField) {
|
|
DataFile::reportFatalError(DataFile::Error::NotEnoughColumns, filename_);
|
|
}
|
|
return *fieldIt;
|
|
}
|
|
|
|
} // namespace devilution
|