From ce1eea817d5727c0df47f80324e774a54509f47b Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 11 Feb 2024 17:28:06 -0600 Subject: [PATCH 1/2] [olympic/keel] Remove debug line --- src/olympic/keel/src/pack.cpp | 1 + src/olympic/studio/applib/src/clawviewer.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/olympic/keel/src/pack.cpp b/src/olympic/keel/src/pack.cpp index 15bd51b9..68dabdcd 100644 --- a/src/olympic/keel/src/pack.cpp +++ b/src/olympic/keel/src/pack.cpp @@ -34,6 +34,7 @@ static ox::Error pathToInode( } oxRequire(s, dest.stat(path)); oxReturnError(o["type"].set(static_cast(ox::FileAddressType::Inode))); + oxOutf("path to inode: {} => {}\n", path, s.inode); return data.set(2, s.inode); } diff --git a/src/olympic/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp index f56fe83a..58df6d6e 100644 --- a/src/olympic/studio/applib/src/clawviewer.cpp +++ b/src/olympic/studio/applib/src/clawviewer.cpp @@ -82,6 +82,7 @@ void ClawEditor::drawRow(ox::ModelValue const&value) noexcept { case ox::ModelValue::Type::Union: type = "union"; break; + case ox::ModelValue::Type::InlineArray: case ox::ModelValue::Type::Vector: type = "list"; break; From b97d7d995632f674d35fbe4d3cc3847c3a144f52 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 11 Feb 2024 17:29:54 -0600 Subject: [PATCH 2/2] [ox/preloader] Remove debug code --- deps/ox/src/ox/preloader/preloader.hpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp index be23d0d1..1f1df9fb 100644 --- a/deps/ox/src/ox/preloader/preloader.hpp +++ b/deps/ox/src/ox/preloader/preloader.hpp @@ -174,26 +174,20 @@ constexpr ox::Error Preloader::field(CRStringView name, const T *val) } oxReturnError(pad(val)); if constexpr(ox::is_integral_v) { - //oxDebug(" integral"); - //oxDebugf("Preloader::field(name, val): {}", name); return ox::serialize(&m_writer, PlatSpec::correctEndianness(*val)); } else if constexpr(ox::is_pointer_v) { - //oxDebug(" pointer"); const PtrType a = startAlloc(sizeOf(val), alignOf(*val), m_writer.tellp()) + PlatSpec::RomStart; oxReturnError(field(name, *val)); oxReturnError(endAlloc()); return ox::serialize(&m_writer, PlatSpec::correctEndianness(a)); } else if constexpr(ox::isVector_v) { - //oxDebug(" vector"); return fieldVector(name, val); } else if constexpr(ox::is_same_v) { val->types(); - //oxDebug(" vector"); return fieldVector(name, val); } else if constexpr(ox::is_same_v) { return fieldArray(name, val); } else { - //oxDebug(" object"); m_unionIdx.emplace_back(-1); const auto out = preload(this, val); m_unionIdx.pop_back();