drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox/std] Make use ##__VA_ARGS__ only non OX_USE_STDLIB builds, which are GCC builds

Browse Source
This commit is contained in:
Gary Talent 2021-03-11 20:04:34 -06:00
parent 84a9a9d2fd
commit 07c5ed07ef
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/ox/src/ox/std/fmt.hpp vendored
View File

@ -60,6 +60,7 @@ constexpr uint64_t argCount(const char *str) noexcept {
return cnt; return cnt;
} }
static_assert(argCount("sadf asdf") == 0);
static_assert(argCount("{}") == 1); static_assert(argCount("{}") == 1);
static_assert(argCount("{}{}") == 2); static_assert(argCount("{}{}") == 2);
static_assert(argCount("thing1: {}, thing2: {}") == 2); static_assert(argCount("thing1: {}, thing2: {}") == 2);

39
deps/ox/src/ox/std/trace.hpp vendored
View File

@ -8,6 +8,10 @@
#pragma once #pragma once
#ifdef OX_USE_STDLIB
#include <array>
#endif
#include "bstring.hpp" #include "bstring.hpp"
#include "fmt.hpp" #include "fmt.hpp"
#include "hashmap.hpp" #include "hashmap.hpp"
@ -55,9 +59,26 @@ class OutStream {
m_msg.msg = msg; m_msg.msg = msg;
} }
#ifdef OX_USE_STDLIB
template<std::size_t fmtSegmentCnt, typename ...Args>
constexpr OutStream(const char *file, int line, const char *ch, detail::Fmt<fmtSegmentCnt> fmtSegments, std::array<detail::FmtArg, fmtSegmentCnt - 1> elements) {
//static_assert(sizeof...(args) == fmtSegmentCnt - 1, "Wrong number of trace arguments for format.");
m_msg.file = file;
m_msg.line = line;
m_msg.ch = ch;
const auto &firstSegment = fmtSegments.segments[0];
m_msg.msg.append(firstSegment.str, firstSegment.length);
//const detail::FmtArg elements[sizeof...(args)] = {args...};
for (auto i = 0u; i < fmtSegments.size - 1; ++i) {
m_msg.msg += elements[i].out;
const auto &s = fmtSegments.segments[i + 1];
m_msg.msg.append(s.str, s.length);
}
}
#else
template<std::size_t fmtSegmentCnt, typename ...Args> template<std::size_t fmtSegmentCnt, typename ...Args>
constexpr OutStream(const char *file, int line, const char *ch, detail::Fmt<fmtSegmentCnt> fmtSegments, Args... args) { constexpr OutStream(const char *file, int line, const char *ch, detail::Fmt<fmtSegmentCnt> fmtSegments, Args... args) {
static_assert(sizeof...(args) == fmtSegmentCnt - 1, "Wrong number of trace arguments for format."); //static_assert(sizeof...(args) == fmtSegmentCnt - 1, "Wrong number of trace arguments for format.");
m_msg.file = file; m_msg.file = file;
m_msg.line = line; m_msg.line = line;
m_msg.ch = ch; m_msg.ch = ch;
@ -70,6 +91,7 @@ class OutStream {
m_msg.msg.append(s.str, s.length); m_msg.msg.append(s.str, s.length);
} }
} }
#endif
inline ~OutStream() { inline ~OutStream() {
oxTraceHook(m_msg.file, m_msg.line, m_msg.ch, m_msg.msg.c_str()); oxTraceHook(m_msg.file, m_msg.line, m_msg.ch, m_msg.msg.c_str());
@ -109,9 +131,15 @@ class NullStream {
constexpr NullStream(const char*, int, const char*, const char* = "") { constexpr NullStream(const char*, int, const char*, const char* = "") {
} }
#ifdef OX_USE_STDLIB
template<std::size_t fmtSegmentCnt, typename ...Args>
constexpr NullStream(const char*, int, const char*, detail::Fmt<fmtSegmentCnt>, std::array<detail::FmtArg, fmtSegmentCnt - 1>) {
}
#else
template<std::size_t fmtSegmentCnt, typename ...Args> template<std::size_t fmtSegmentCnt, typename ...Args>
constexpr NullStream(const char*, int, const char*, detail::Fmt<fmtSegmentCnt>, Args...) { constexpr NullStream(const char*, int, const char*, detail::Fmt<fmtSegmentCnt>, Args...) {
} }
#endif
template<typename T> template<typename T>
constexpr NullStream &operator<<(const T&) { constexpr NullStream &operator<<(const T&) {
@ -140,7 +168,12 @@ void init();
#define oxTrace(ch) ox::trace::TraceStream(__FILE__, __LINE__, ch) #define oxTrace(ch) ox::trace::TraceStream(__FILE__, __LINE__, ch)
#ifdef OX_USE_STDLIB
// Non-GCC compilers don't like ##__VA_ARGS__, so use initializer list, which relies on std lib
#define oxTracef(ch, fmt, ...) ox::trace::TraceStream(__FILE__, __LINE__, ch, ox::detail::fmtSegments<ox::detail::argCount(fmt)+1>(fmt), {__VA_ARGS__})
#else
#define oxTracef(ch, fmt, ...) ox::trace::TraceStream(__FILE__, __LINE__, ch, ox::detail::fmtSegments<ox::detail::argCount(fmt)+1>(fmt), ##__VA_ARGS__) #define oxTracef(ch, fmt, ...) ox::trace::TraceStream(__FILE__, __LINE__, ch, ox::detail::fmtSegments<ox::detail::argCount(fmt)+1>(fmt), ##__VA_ARGS__)
#endif
#define oxDebug() ox::trace::TraceStream(__FILE__, __LINE__, "debug") #define oxDebug() oxTrace("debug")
#define oxDebugf(fmt, ...) ox::trace::TraceStream(__FILE__, __LINE__, "debug", ox::detail::fmtSegments<ox::detail::argCount(fmt)+1>(fmt), ##__VA_ARGS__) #define oxDebugf(...) oxTracef("debug", __VA_ARGS__)