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

Squashed 'deps/nostalgia/' changes from 89ae226b..9676ea59

Browse Source 
9676ea59 [turbine/glfw] Fix programmatic shutdown to invoke shutdownHandler
de8ac106 [turbine/glfw] Fix closing when no shutdown handler is set
88a6cd59 [turbine/glfw] Treat close window event like other events with regard to a mandatory refresh period
cd43fb7f [turbine,studio] Fix confirm app close pop up to work with Ctrl-Q
136f4224 [nostalgia] Update release notes
e773d6f0 [studio] Rename StudioContext to Context
7da2f68d [nostalgia/sample_project] Add assets
d20889ae [nostalgia/gfx/studio] Update for Ox changes
50c8302f [ox] Rename itoa to intToStr
d8195d30 [olympic,nostalgia] Address unsafe buffer warnings
a8c1387d [ox] Address unsafe buffer warnings
ff1e8f26 [studio] Add popup to warn about UUID duplication
d4329981 [studio,nostalgia] Cleanup
00034543 [studio,nostalgia/gfx/studio] Cleanup
8c6b2234 [olympic/util] Make pkg-gba script check return code of subprocesses
aad4b8a4 [studio] Cleanup
7cab1331 [keel] Add ability to log UUID duplication
640ac85d [nostalgia/gfx/studio/palette] Make page rename dialog accept on enter if input focused
b8d76586 [nostalgia/studio] Update generated icondata.cpp with Clang fix
2503bb3b [nostalgia/sample_project] Update type descriptors
e5dd448f [turbine,studio] Make Studio confirm with user before closing app if any unsaved changes
4770bb6a [olympic/util] Cleanup
c0bac696 [nostalgia/gfx/studio/paletteeditor] Fix color number key range
95f7c334 [studio] Change Studio font
535d8876 [keel] Cleanup
845e4332 [turbine] Fix Mac build
5169a607 [turbine] Disable useless window icon on Mac, it causes GLFW warning
8f03af99 [keel] Style updates
ee63a4a1 [keel] Cleanup

git-subtree-dir: deps/nostalgia
git-subtree-split: 9676ea59787215b01498dfa82f88d426363b3cfd
This commit is contained in:
Gary Talent
2025-05-07 00:11:20 -05:00
parent ec6cf92c47
commit ce53be9271
140 changed files with 22045 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deps/ox/src/ox/std/cstrops.hpp vendored
View File

@@ -30,9 +30,12 @@ constexpr T1 strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept {
}
[[nodiscard]]
constexpr auto strnlen(const char *str1, std::size_t maxLen) noexcept {
std::size_t len = 0;
for (; len < maxLen && str1[len]; len++);
constexpr size_t strnlen_s(const char *str, size_t const maxLen) noexcept {
if (!str) [[unlikely]] {
return 0;
}
size_t len = 0;
for (; len < maxLen && str[len]; len++);
return len;
}

2
deps/ox/src/ox/std/istring.hpp vendored
View File

@@ -245,7 +245,7 @@ struct MaybeView<ox::IString<sz>> {
template<Integer_c Integer>
[[nodiscard]]
constexpr auto itoa(Integer v) noexcept {
constexpr auto intToStr(Integer v) noexcept {
constexpr auto Cap = [] {
auto out = 0;
switch (sizeof(Integer)) {

18
deps/ox/src/ox/std/span.hpp vendored
View File

@@ -8,6 +8,10 @@
#pragma once
#if __has_include(<array>)
#include <array>
#endif
#include "array.hpp"
#include "bit.hpp"
#include "def.hpp"
@@ -35,6 +39,20 @@ class Span {
constexpr Span() noexcept = default;
#if __has_include(<array>)
template<std::size_t sz>
constexpr Span(std::array<T, sz> &a) noexcept:
m_items(a.data()),
m_size(a.size()) {
}
template<std::size_t sz>
constexpr Span(std::array<ox::remove_const_t<T>, sz> const&a) noexcept:
m_items(a.data()),
m_size(a.size()) {
}
#endif
template<std::size_t sz>
constexpr Span(ox::Array<T, sz> &a) noexcept:
m_items(a.data()),

10
deps/ox/src/ox/std/string.hpp vendored
View File

@@ -28,7 +28,7 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
namespace ox {
template<typename Integer>
constexpr ox::IString<21> itoa(Integer v) noexcept;
constexpr ox::IString<21> intToStr(Integer v) noexcept;
template<std::size_t SmallStringSize_v>
class BasicString {
@@ -317,13 +317,13 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(int64_t i) noexcept {
set(ox::itoa(i));
set(ox::intToStr(i));
return *this;
}
template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(uint64_t i) noexcept {
set(ox::itoa(i));
set(ox::intToStr(i));
return *this;
}
@@ -371,7 +371,7 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(Integer_c auto i) noexcept {
auto const str = ox::itoa(i);
auto const str = ox::intToStr(i);
return this->operator+=(str.c_str());
}
@@ -414,7 +414,7 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
template<std::size_t SmallStringSize_v>
constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(Integer_c auto i) const noexcept {
auto const str = ox::itoa(i);
auto const str = ox::intToStr(i);
return *this + str;
}

2
deps/ox/src/ox/std/stringliteral.hpp vendored
View File

@@ -32,7 +32,9 @@ class StringLiteral: public detail::BaseStringView {
constexpr explicit StringLiteral(const char *str, std::size_t len) noexcept: BaseStringView(str, len) {}
OX_ALLOW_UNSAFE_BUFFERS_BEGIN
constexpr explicit StringLiteral(char const *str) noexcept: StringLiteral(str, ox::strlen(str)) {}
OX_ALLOW_UNSAFE_BUFFERS_END
constexpr StringLiteral &operator=(StringLiteral const&other) noexcept {
if (&other != this) {

4
deps/ox/src/ox/std/stringview.hpp vendored
View File

@@ -100,7 +100,8 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
#endif
constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
constexpr ox::Result<int> strToInt(ox::StringViewCR str) noexcept {
OX_ALLOW_UNSAFE_BUFFERS_BEGIN
int total = 0;
int multiplier = 1;
for (auto i = static_cast<int64_t>(str.len()) - 1; i != -1; --i) {
@@ -113,6 +114,7 @@ constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
}
}
return total;
OX_ALLOW_UNSAFE_BUFFERS_END
}

4
deps/ox/src/ox/std/strops.cpp vendored
View File

@@ -9,6 +9,8 @@
#include "def.hpp"
#include "strops.hpp"
OX_ALLOW_UNSAFE_BUFFERS_BEGIN
static_assert(ox::strcmp("asdf", "hijk") < 0, "asdf < hijk");
static_assert(ox::strcmp("hijk", "asdf") > 0, "hijk > asdf");
static_assert(ox::strcmp("resize", "read") > 0, "resize > read");
@@ -42,3 +44,5 @@ std::size_t strlen(const char *str) {
}
#endif
OX_ALLOW_UNSAFE_BUFFERS_END

2
deps/ox/src/ox/std/test/tests.cpp vendored
View File

@@ -145,6 +145,7 @@ OX_CLANG_NOWARN_END
return ox::Error{};
}
},
OX_ALLOW_UNSAFE_BUFFERS_BEGIN
{
"ABCDEFG != HIJKLMN",
[]() {
@@ -169,6 +170,7 @@ OX_CLANG_NOWARN_END
return ox::Error(ox::memcmp("ABCDEFGHI", "ABCDEFG", 7) != 0);
}
},
OX_ALLOW_UNSAFE_BUFFERS_END
{
"IString",
[]() {

4
deps/ox/src/ox/std/tracehook.cpp vendored
View File

@@ -39,6 +39,8 @@ enum LogChan {
Debug = 4,
};
OX_ALLOW_UNSAFE_BUFFERS_BEGIN
template<LogChan chan>
static void log(ox::StringViewCR str) {
const auto sz = ox::min<std::size_t>(0x100, str.bytes());
@@ -103,5 +105,7 @@ void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line,
#endif
}
OX_ALLOW_UNSAFE_BUFFERS_END
}

4
deps/ox/src/ox/std/uuid.hpp vendored
View File

@@ -105,6 +105,10 @@ class UUID {
ox::Array<uint8_t, 16> m_value{};
public:
static constexpr auto TypeName = "net.drinkingtea.ox.UUID";
static constexpr auto TypeVersion = 1;
static void seedGenerator(const RandomSeed &seed) noexcept;
static ox::Result<UUID> generate() noexcept;