fix bug in update manager

This revision adds a complex test to the 'TestInterpreter.cpp' file to test functionalities such as classes, variable initializations, loops, conditionals and methods in the interpreter. The token parser has also been updated with a reset method in the 'parser.cpp' file for cleaning up any previous state before parsing a new script. This ensures the parser starts fresh for each new parse request. It also improves the debugging process in 'function.cpp' by printing the description of parser errors. Few completed tasks are removed from the TODO list.

.gitmodules

@@ -22,9 +22,3 @@
 [submodule "Externals/implot"]
 	path = Externals/implot
 	url = https://github.com/epezent/implot.git
-[submodule "Externals/googletest"]
-	path = Externals/googletest
-	url = https://github.com/google/googletest.git
-[submodule "Externals/benchmark"]
-	path = Externals/benchmark
-	url = https://github.com/google/benchmark.git

Containers/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(Containers)
 
-include(GoogleTest)
-
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp")
 file(GLOB HEADERS "./public/*.hpp")
@@ -18,7 +16,6 @@ file(GLOB TEST_SOURCES
         ./tests/ListTest.cpp
         ./tests/MapTest.cpp
         ./tests/TreeTest.cpp
-        ./tests/RingBufferByte.cpp
         ./tests/Tests.cpp
 )
 
@@ -27,10 +24,5 @@ target_link_libraries(Tests${PROJECT_NAME} ${PROJECT_NAME} UnitTest++)
 add_test(NAME Tests${PROJECT_NAME} COMMAND Tests${PROJECT_NAME})
 
 
-add_executable(testLinearRingBuffer ./tests/testLinearRingBuffer.cpp)
-target_link_libraries(testLinearRingBuffer ${PROJECT_NAME} gtest)
-gtest_discover_tests(testLinearRingBuffer)
-
-
 add_executable(AVLTreeSpeedTest ./tests/AVLTreeProfiling.cpp)
 target_link_libraries(AVLTreeSpeedTest ${PROJECT_NAME})

Containers/private/linear_ring.cpp

@@ -1,65 +0,0 @@
-#include <cstdint>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdexcept>
-#include <cstring>
-
-namespace lrbm {
-	static int create_memfd(const char* name) {
-		int fd = syscall(SYS_memfd_create, name, 0);
-		if (fd == -1) throw std::runtime_error("memfd_create failed");
-		return fd;
-	}
-
-	std::pair<void*, size_t> create_linear_ring(size_t size) {
-		const size_t page = sysconf(_SC_PAGESIZE);
-
-		size_t aligned = (size + page - 1) & ~(page - 1);
-
-		// Create RAM-backed file descriptor
-		int fd = create_memfd("linear_ring");
-		if (ftruncate(fd, aligned) != 0) throw std::runtime_error("ftruncate failed");
-
-		// Reserve 2× VA space
-		uint8_t* base = (uint8_t*) mmap(nullptr, aligned * 2, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-		if (base == MAP_FAILED) throw std::runtime_error("mmap reserve failed");
-
-		// First mapping
-		void* p1 = mmap(base, aligned, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, 0);
-		if (p1 != base) throw std::runtime_error("first mmap failed");
-
-		// Mirror mapping
-		void* p2 = mmap(base + aligned, aligned, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, 0);
-		if (p2 != base + aligned) throw std::runtime_error("mirror mmap failed");
-
-		close(fd);
-		return { base, aligned }; // linear region [buf][buf]
-	}
-
-	void destroy_linear_ring(void* base, size_t size) { munmap(base, size); }
-
-	// void test() {
-	// 	const size_t RING_SIZE = 4096;
-	// 	uint8_t* ring = (uint8_t*) create_linear_ring(RING_SIZE);
-
-	// 	printf("Linear ring created at %p (size = %zu)\n", ring, RING_SIZE);
-
-	// 	const char* msg = "HELLO_LINEAR_RING";
-	// 	size_t msg_len = strlen(msg);
-
-	// 	size_t head = RING_SIZE - 4; // force boundary crossing
-	// 	std::memcpy(ring + head, msg, msg_len);
-
-	// 	char out[64];
-	// 	std::memcpy(out, ring + head, msg_len);
-	// 	out[msg_len] = 0;
-
-	// 	printf("Expected: %s\n", msg);
-	// 	printf("Readback: %s\n", out);
-
-	// 	if (std::strcmp(msg, out) == 0) printf("SUCCESS: Linear-address ring works!\n");
-	// 	else printf("FAILURE: Ring broken!\n");
-	// }
-}

Containers/public/Buffer2D.hpp

@@ -58,7 +58,6 @@ namespace tp {
 		[[nodiscard]] Index2D size() const { return { mSize.x, mSize.y }; }
 
 		tType* getBuff() const { return mBuff; }
-    void setBuff(tType* data, Index2D size) { mBuff = data; mSize = size; }
 
 		void flipY() {
 			for (Index i = 0; i < mSize.x; i++) {

Containers/public/LinearRingBuffer.hpp

@@ -1,54 +0,0 @@
-
-#include <cstddef>
-#include <cstdint>
-#include <sys/mman.h>
-
-#include "liniar_ring.hpp"
-
-class LinearRingBuffer {
-public:
-	LinearRingBuffer(size_t size, size_t history) {
-		const auto& [mem, aligned_size] = lrbm::create_linear_ring(size);
-
-		mem_ = (uint8_t*) mem;
-		memSize_ = aligned_size;
-		bufferSize_ = size;
-		historySize_ = history;
-
-		write_ptr_ = mem_;
-		read_ptr_ = mem_;
-	}
-
-	~LinearRingBuffer() { lrbm::destroy_linear_ring((void*) mem_, memSize_ * 2); }
-
-	uint8_t* write_data() { return write_ptr_; }
-	uint8_t* read_data() { return read_ptr_; }
-
-	void write_advance(size_t bytes) { write_ptr_ = advancePointer(write_ptr_, bytes); }
-	void read_advance(size_t bytes) { read_ptr_ = advancePointer(read_ptr_, bytes); }
-
-	void read_reset_with_history() {
-		const auto offset = size_t(write_ptr_ - mem_);
-
-		if (historySize_ < offset) {
-			read_ptr_ = write_ptr_ - historySize_;
-			return;
-		}
-
-		read_ptr_ = mem_ + (memSize_ + offset - historySize_);
-	}
-
-private:
-	inline uint8_t* advancePointer(const uint8_t* ptr, size_t bytes) {
-		return mem_ + (size_t(ptr - mem_) + bytes) % memSize_;
-	}
-
-	size_t bufferSize_ = 0;
-	size_t historySize_ = 0;
-	size_t memSize_ = 0;
-
-	uint8_t* mem_ = nullptr;
-
-	uint8_t* read_ptr_ = 0;
-	uint8_t* write_ptr_ = 0;
-};

Containers/public/RingBufferByte.hpp

@@ -1,127 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cassert>
-#include <cstring>
-#include <stdexcept>
-#include <vector>
-
-template <bool ALLOW_BUFFER_OVERRIDE>
-class RingBufferByte {
-public:
-	explicit RingBufferByte(size_t maxCapacity) { buffer_.resize(maxCapacity); }
-
-	~RingBufferByte() = default;
-
-	void pushBack(const uint8_t* buffer, size_t size) {
-		const auto REQUIRED_SIZE = size + sizeof(size);
-		const auto DEPOSIT = static_cast<int>(freeSpace()) - static_cast<int>(REQUIRED_SIZE);
-
-		if (DEPOSIT < 0) {
-			if (ALLOW_BUFFER_OVERRIDE) {
-				freeupSpace(static_cast<size_t>(-DEPOSIT));
-			} else {
-				throw std::runtime_error("ring buffer overflow");
-			}
-		}
-
-		push(reinterpret_cast<const uint8_t*>(&size), sizeof(size));
-		push(buffer, size);
-	}
-
-	[[nodiscard]] auto frontSize() const -> size_t {
-		size_t size = 0;
-
-		if (dataSize() < sizeof(size)) {
-			throw std::runtime_error("no data in the buffer");
-		}
-
-		peek(reinterpret_cast<uint8_t*>(&size), sizeof(size));
-
-		return size;
-	}
-
-	auto popFront(uint8_t* buffer) -> size_t {
-		size_t size = 0;
-
-		if (dataSize() < sizeof(size)) {
-			return 0;
-		}
-
-		pop(reinterpret_cast<uint8_t*>(&size), sizeof(size));
-		pop(buffer, size);
-
-		return size;
-	}
-
-	void clear() {
-		end_ = 0;
-		start_ = 0;
-	}
-
-	[[nodiscard]] bool empty() const { return start_ == end_; }
-
-private:
-	void push(const uint8_t* buffer, size_t size) {
-		for (size_t simpleIdx = 0; simpleIdx < size; simpleIdx++) {
-			buffer_[end_++] = buffer == nullptr ? 0 : buffer[simpleIdx];
-
-			if (end_ == buffer_.size()) {
-				end_ = 0;
-			}
-		}
-	}
-
-	void pop(uint8_t* buffer, size_t size) {
-		for (size_t sampleIdx = 0; sampleIdx < size; sampleIdx++) {
-			if (buffer != nullptr) {
-				buffer[sampleIdx] = buffer_[start_];
-			}
-
-			start_++;
-
-			if (start_ == buffer_.size()) {
-				start_ = 0;
-			}
-		}
-	}
-
-	void peek(uint8_t* buffer, size_t size) const {
-		auto iter = start_;
-		for (size_t sampleIdx = 0; sampleIdx < size; sampleIdx++) {
-			buffer[sampleIdx] = buffer_[iter++];
-
-			if (iter == buffer_.size()) {
-				iter = 0;
-			}
-		}
-	}
-
-	void freeupSpace(size_t additionalRequiredSpace) {
-		const auto CURRENT_DEPOSIT = freeSpace();
-
-		while (CURRENT_DEPOSIT + additionalRequiredSpace >= freeSpace()) {
-			popFront(nullptr);
-		}
-	}
-
-	[[nodiscard]] size_t freeSpace() const {
-		if (start_ > end_) {
-			return start_ - end_;
-		}
-
-		const auto OUT = buffer_.size() - (end_ - start_);
-		return OUT;
-	}
-
-	[[nodiscard]] size_t dataSize() const { return buffer_.size() - freeSpace(); }
-
-	[[nodiscard]] bool hasSpace(unsigned int length) const { return freeSpace() > length; }
-
-	std::vector<uint8_t> buffer_;
-
-	size_t end_ = 0;
-	size_t start_ = 0;
-};

Containers/public/liniar_ring.hpp

@@ -1,9 +0,0 @@
-
-#include <cstddef>
-#include <utility>
-
-namespace lrbm {
-	std::pair<void*, size_t> create_linear_ring(size_t size);
-	void destroy_linear_ring(void* base, size_t size);
-	void test();
-}

Containers/tests/RingBufferByte.cpp

@@ -1,69 +0,0 @@
-
-#include "Tests.hpp"
-#include "RingBufferByte.hpp"
-
-SUITE(RingBufferBytes) {
-	TEST(Simple) {
-
-		using Data = std::vector<uint8_t>;
-		using DataStorage = std::vector<Data>;
-
-		constexpr auto BUFFER_SIZE = 395;
-		constexpr auto MAX_MSG_SIZE = 31;
-		constexpr auto ITERATIONS = 100000;
-
-		DataStorage pushed;
-		DataStorage popped;
-
-		RingBufferByte<true> buffer(BUFFER_SIZE);
-
-		Data randomSamples(MAX_MSG_SIZE);
-
-		for (auto idx = 0; idx < MAX_MSG_SIZE; idx++) {
-			randomSamples[idx] = (idx + 5 * 31) % 13;
-		}
-
-		const auto PUSH = [&](RingBufferByte<true>& buffer, DataStorage* storage) {
-			const Data& pushedSample = randomSamples;
-
-			buffer.pushBack(pushedSample.data(), pushedSample.size());
-
-			if (storage) {
-				storage->push_back(pushedSample);
-			}
-		};
-
-		const auto POP = [](RingBufferByte<true>& buffer, DataStorage* storage) {
-			const auto poppedSampleSize = buffer.frontSize();
-
-			Data poppedSample(poppedSampleSize);
-
-			const auto SIZE = buffer.popFront(poppedSample.data());
-
-			CHECK(poppedSample.size() == SIZE);
-
-			if (storage) {
-				storage->push_back(poppedSample);
-			}
-		};
-
-		for (auto iteration = 0; iteration < ITERATIONS; iteration++) {
-			PUSH(buffer, nullptr);
-		}
-
-		while (!buffer.empty()) {
-			POP(buffer, nullptr);
-		}
-
-		for (auto iteration = 0; iteration < ITERATIONS; iteration++) {
-			PUSH(buffer, &pushed);
-			POP(buffer, &popped);
-		}
-
-		CHECK(pushed.size() == popped.size());
-
-		for (auto idx = 0; idx < popped.size(); idx++) {
-			CHECK(pushed[idx] == popped[idx]);
-		}
-	}
-}

Containers/tests/benchLinearRingBuffer.cpp

@@ -1,188 +0,0 @@
-#include "LinearRingBuffer.hpp"
-
-#include <gtest/gtest.h>
-
-#include <cstring>
-#include <cstdint>
-#include <random>
-
-static void fill(void* ptr, size_t n, uint8_t value) { std::memset(ptr, value, n); }
-
-static bool check(const void* ptr, size_t n, uint8_t value) {
-	const uint8_t* p = static_cast<const uint8_t*>(ptr);
-	for (size_t i = 0; i < n; ++i) {
-		if (p[i] != value) return false;
-	}
-	return true;
-}
-
-static bool expect_mem_eq(const void* ptr, size_t n, uint8_t value) {
-	const uint8_t* p = static_cast<const uint8_t*>(ptr);
-	for (size_t i = 0; i < n; ++i) {
-		if (p[i] != value) return false;
-	}
-	return true;
-}
-
-using Data = std::vector<uint8_t>;
-using DataStorage = std::vector<Data>;
-
-typedef ::testing::Types<
-	std::integral_constant<size_t, 64>,
-	std::integral_constant<size_t, 128>,
-	std::integral_constant<size_t, 1000>,
-	std::integral_constant<size_t, 4096>,
-	std::integral_constant<size_t, 4096 * 2>>
-	BufferSizes;
-
-template <typename TypeParam>
-class LinearRingBufferTest : public ::testing::Test {
-protected:
-	LinearRingBuffer rb;
-
-	LinearRingBufferTest() :
-		historySize_(10),
-		rb(size_t(TypeParam::value), size_t(historySize_)) {}
-
-	static constexpr auto ITERATIONS = TypeParam::value * 10;
-
-	size_t messagesPushed_ = 0;
-	size_t historySize_ = 0;
-
-	auto iterations() { return ITERATIONS; }
-
-	auto historySize() { return historySize_; }
-
-	size_t randomSize() {
-		static std::random_device rnd;
-		std::uniform_int_distribution<size_t> dist(0, 1000);
-		return dist(rnd);
-	}
-
-	auto write_and_advance(size_t messageSize, DataStorage* storage) {
-		Data pushedSample(messageSize);
-
-		for (auto idx = 0; idx < messageSize; idx++) {
-			pushedSample[idx] = (idx + messagesPushed_++ * 53) % 321;
-		}
-
-		std::memcpy(this->rb.write_data(), pushedSample.data(), pushedSample.size());
-		this->rb.write_advance(pushedSample.size());
-
-		if (storage) {
-			storage->push_back(pushedSample);
-		}
-	};
-
-	auto read_and_advance(size_t messageSize, DataStorage* storage) {
-		Data poppedSample(messageSize);
-
-		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
-
-		this->rb.read_advance(poppedSample.size());
-
-		if (storage) {
-			storage->push_back(poppedSample);
-		}
-	};
-
-	auto reset_with_history() { this->rb.read_reset_with_history(); };
-
-	auto read_with_history(size_t messageSize, DataStorage* storage) {
-		Data poppedSample(messageSize);
-
-		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
-
-		if (storage) {
-			storage->push_back(poppedSample);
-		}
-	};
-};
-
-TYPED_TEST_SUITE(LinearRingBufferTest, BufferSizes);
-
-TYPED_TEST(LinearRingBufferTest, LinearWriteAcrossBoundary) {
-	constexpr size_t N = TypeParam::value;
-
-	if (N % 4096 != 0) {
-		return;
-	}
-
-	auto* base = this->rb.write_data();
-
-	size_t half = N - 16;
-	fill(base, half, 0xAA);
-	fill(base + half, 32, 0xBB);
-
-	EXPECT_EQ(expect_mem_eq(base, 16, 0xBB), true);
-	EXPECT_EQ(expect_mem_eq(base + 16, half - 16, 0xAA), true);
-	EXPECT_EQ(expect_mem_eq(base + half, 32, 0xBB), true);
-}
-
-TYPED_TEST(LinearRingBufferTest, Chase) {
-
-	DataStorage pushed;
-	DataStorage popped;
-
-	static constexpr auto MSG_SIZE = 31;
-
-	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
-		this->write_and_advance(MSG_SIZE, &pushed);
-		this->read_and_advance(MSG_SIZE, &popped);
-	}
-
-	ASSERT_EQ(pushed.size(), popped.size());
-
-	for (auto idx = 0; idx < popped.size(); idx++) {
-		ASSERT_EQ(pushed[idx], popped[idx]);
-	}
-}
-
-Data makeMessageWithHistory(const Data& prev, const Data& current, size_t historySize) {
-	if (historySize > prev.size()) historySize = prev.size();
-
-	std::vector<uint8_t> result;
-
-	result.reserve(historySize + current.size());
-
-	result.insert(result.end(), prev.end() - historySize, prev.end());
-	result.insert(result.end(), current.begin(), current.end());
-
-	return result;
-}
-
-TYPED_TEST(LinearRingBufferTest, History) {
-
-	DataStorage pushed;
-	DataStorage popped;
-
-	pushed.push_back(Data(this->historySize()));
-
-	static constexpr auto MAX_MSG_SIZE = 111;
-
-	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
-
-		const auto MSG_SIZE = this->historySize() + this->randomSize() % MAX_MSG_SIZE;
-
-		auto prevPushed = pushed.back();
-		pushed.clear();
-
-		this->reset_with_history();
-
-		this->write_and_advance(MSG_SIZE, &pushed);
-		auto currentPushed = pushed.back();
-
-		this->read_with_history(this->historySize() + MSG_SIZE, &popped);
-		auto poppedWithHistory = popped.back();
-		popped.clear();
-
-		auto correctResult = makeMessageWithHistory(prevPushed, currentPushed, this->historySize());
-
-		ASSERT_EQ(correctResult, poppedWithHistory);
-	}
-}
-
-int main(int argc, char** argv) {
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}

Containers/tests/testLinearRingBuffer.cpp

@@ -1,188 +0,0 @@
-#include "LinearRingBuffer.hpp"
-
-#include <gtest/gtest.h>
-
-#include <cstring>
-#include <cstdint>
-#include <random>
-
-static void fill(void* ptr, size_t n, uint8_t value) { std::memset(ptr, value, n); }
-
-static bool check(const void* ptr, size_t n, uint8_t value) {
-	const uint8_t* p = static_cast<const uint8_t*>(ptr);
-	for (size_t i = 0; i < n; ++i) {
-		if (p[i] != value) return false;
-	}
-	return true;
-}
-
-static bool expect_mem_eq(const void* ptr, size_t n, uint8_t value) {
-	const uint8_t* p = static_cast<const uint8_t*>(ptr);
-	for (size_t i = 0; i < n; ++i) {
-		if (p[i] != value) return false;
-	}
-	return true;
-}
-
-using Data = std::vector<uint8_t>;
-using DataStorage = std::vector<Data>;
-
-typedef ::testing::Types<
-	std::integral_constant<size_t, 64>,
-	std::integral_constant<size_t, 128>,
-	std::integral_constant<size_t, 1000>,
-	std::integral_constant<size_t, 4096>,
-	std::integral_constant<size_t, 4096 * 2>>
-	BufferSizes;
-
-template <typename TypeParam>
-class LinearRingBufferTest : public ::testing::Test {
-protected:
-	LinearRingBuffer rb;
-
-	LinearRingBufferTest() :
-		historySize_(10),
-		rb(size_t(TypeParam::value), size_t(historySize_)) {}
-
-	static constexpr auto ITERATIONS = TypeParam::value * 10;
-
-	size_t messagesPushed_ = 0;
-	size_t historySize_ = 0;
-
-	auto iterations() { return ITERATIONS; }
-
-	auto historySize() { return historySize_; }
-
-	size_t randomSize() {
-		static std::random_device rnd;
-		std::uniform_int_distribution<size_t> dist(0, 1000);
-		return dist(rnd);
-	}
-
-	auto write_and_advance(size_t messageSize, DataStorage* storage) {
-		Data pushedSample(messageSize);
-
-		for (auto idx = 0; idx < messageSize; idx++) {
-			pushedSample[idx] = (idx + messagesPushed_++ * 53) % 321;
-		}
-
-		std::memcpy(this->rb.write_data(), pushedSample.data(), pushedSample.size());
-		this->rb.write_advance(pushedSample.size());
-
-		if (storage) {
-			storage->push_back(pushedSample);
-		}
-	};
-
-	auto read_and_advance(size_t messageSize, DataStorage* storage) {
-		Data poppedSample(messageSize);
-
-		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
-
-		this->rb.read_advance(poppedSample.size());
-
-		if (storage) {
-			storage->push_back(poppedSample);
-		}
-	};
-
-	auto reset_with_history() { this->rb.read_reset_with_history(); };
-
-	auto read_with_history(size_t messageSize, DataStorage* storage) {
-		Data poppedSample(messageSize);
-
-		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
-
-		if (storage) {
-			storage->push_back(poppedSample);
-		}
-	};
-};
-
-TYPED_TEST_SUITE(LinearRingBufferTest, BufferSizes);
-
-TYPED_TEST(LinearRingBufferTest, LinearWriteAcrossBoundary) {
-	constexpr size_t N = TypeParam::value;
-
-	if (N % 4096 != 0) {
-		return;
-	}
-
-	auto* base = this->rb.write_data();
-
-	size_t half = N - 16;
-	fill(base, half, 0xAA);
-	fill(base + half, 32, 0xBB);
-
-	EXPECT_EQ(expect_mem_eq(base, 16, 0xBB), true);
-	EXPECT_EQ(expect_mem_eq(base + 16, half - 16, 0xAA), true);
-	EXPECT_EQ(expect_mem_eq(base + half, 32, 0xBB), true);
-}
-
-TYPED_TEST(LinearRingBufferTest, Chase) {
-
-	DataStorage pushed;
-	DataStorage popped;
-
-	static constexpr auto MSG_SIZE = 31;
-
-	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
-		this->write_and_advance(MSG_SIZE, &pushed);
-		this->read_and_advance(MSG_SIZE, &popped);
-	}
-
-	ASSERT_EQ(pushed.size(), popped.size());
-
-	for (auto idx = 0; idx < popped.size(); idx++) {
-		ASSERT_EQ(pushed[idx], popped[idx]);
-	}
-}
-
-Data makeMessageWithHistory(const Data& prev, const Data& current, size_t historySize) {
-	if (historySize > prev.size()) historySize = prev.size();
-
-	std::vector<uint8_t> result;
-
-	result.reserve(historySize + current.size());
-
-	result.insert(result.end(), prev.end() - historySize, prev.end());
-	result.insert(result.end(), current.begin(), current.end());
-
-	return result;
-}
-
-TYPED_TEST(LinearRingBufferTest, History) {
-
-	DataStorage pushed;
-	DataStorage popped;
-
-	pushed.push_back(Data(this->historySize()));
-
-	static constexpr auto MAX_MSG_SIZE = 111;
-
-	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
-
-		const auto MSG_SIZE = this->historySize() + this->randomSize() % MAX_MSG_SIZE;
-
-		auto prevPushed = pushed.back();
-		pushed.clear();
-
-		this->reset_with_history();
-
-		this->write_and_advance(MSG_SIZE, &pushed);
-		auto currentPushed = pushed.back();
-
-		this->read_with_history(this->historySize() + MSG_SIZE, &popped);
-		auto poppedWithHistory = popped.back();
-		popped.clear();
-
-		auto correctResult = makeMessageWithHistory(prevPushed, currentPushed, this->historySize());
-
-		ASSERT_EQ(correctResult, poppedWithHistory);
-	}
-}
-
-int main(int argc, char** argv) {
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}

DataAnalysis/applications/NumRecApp.cpp

@@ -10,8 +10,6 @@
 
 using namespace tp;
 
-#include <filesystem>
-
 void loadImage(Buffer<halnf>& output, const char* name) {
 	int x, y, channels_in_file;
 	unsigned char* loadedImage = stbi_load(name, &x, &y, &channels_in_file, 4);
@@ -30,9 +28,7 @@ void loadImage(Buffer<halnf>& output, const char* name) {
 void loadNN(FCNN& nn) {
 	ArchiverLocalConnection<true> archiver;
 
-	if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) {
-		archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
-	}
+	archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
 
 	if (archiver.connection.getConnectionStatus().isOpened()) {
 		archiver % nn;
@@ -60,7 +56,7 @@ void executeCmd(const char* imageName) {
 }
 
 int main(int argc, char** argv) {
-	const char* imageName = "tmp2.png";
+	const char* imageName = "digit.png";
 
 	if (argc == 2) {
 		imageName = argv[1];

DataAnalysis/applications/NumRecTraining.cpp

@@ -1,4 +1,3 @@
-#include <filesystem>
 #include "FCNN.hpp"
 #include "LocalConnection.hpp"
 
@@ -72,9 +71,7 @@ struct NumberRec {
 		{
 			ArchiverLocalConnection<true> archiver;
 
-			if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) {
-				archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
-			}
+			archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
 
 			if (archiver.connection.getConnectionStatus().isOpened()) {
 				archiver % nn;
@@ -218,7 +215,7 @@ int main() {
 
 	auto batchSize = trainRange.idxDiff() / numBatches;
 
-	for (auto epoch : IterRange(10)) {
+	for (auto epoch : IterRange(1)) {
 		printf("Epoch %i\n", epoch.index());
 
 		for (auto batchIdx : IterRange(trainRange.idxDiff() / batchSize)) {
@@ -244,5 +241,5 @@ int main() {
 		// app.displayImage(i);
 	}
 
-	printf("\n\nIncorrect - %i out of %i error percentage (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff());
+	printf("\n\nIncorrect - %i out of %i (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff());
 }

Externals/CMakeLists.txt

@@ -54,5 +54,3 @@ add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)
 
 add_subdirectory(lalr)
-
-add_subdirectory(googletest)

Externals/benchmark

@@ -1 +0,0 @@
-Subproject commit c3f86578bb2081b52cee9d51615912ca4aa52fe4

Externals/googletest

@@ -1 +0,0 @@
-Subproject commit 1b96fa13f549387b7549cc89e1a785cf143a1a50

Externals/lalr

@@ -1 +1 @@
-Subproject commit 498612239713a6dbbf9f26b8e412e985538a0650
+Subproject commit 6d16a6bb60490a2ee4e86f689c86e647b300c7fb

Graphics/private/Canvas.cpp

@@ -82,19 +82,6 @@ void Canvas::frame(RectF rec, const RGBA& col, halnf round) {
 	// nvgFill(mContext->vg);
 }
 
-void Canvas::line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness) {
-	start += mOrigin;
-	end += mOrigin;
-
-	nvgBeginPath(mContext->vg);
-	nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a});
-	nvgMoveTo(mContext->vg, start.x, start.y);
-	nvgLineTo(mContext->vg, end.x, end.y);
-	nvgStrokeWidth(mContext->vg, thickness);
-	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
-	nvgStroke(mContext->vg);
-}
-
 void Canvas::circle(Vec2F pos, halnf size, const RGBA& col) {
 	pos += mOrigin;
 

Graphics/public/EventHandler.hpp

@@ -87,6 +87,7 @@ namespace tp {
 		[[nodiscard]] halnf getPointerPressure() const;
 
 		void setEnableKeyEvents(bool);
+		[[nodiscard]] bool isKeyEventsEnabled() const { return mEnableKeyEvents; }
 
 	private:
 		void processEventUnguarded();

Graphics/public/Graphics.hpp

@@ -75,7 +75,6 @@ namespace tp {
 		void circle(Vec2F pos, halnf size, const RGBA& col);
 		void text(const char*, const RectF&, halnf size, Align, halnf padding, const RGBA&);
 		void colorWheel(const RectF& rec, const ColorWheel& colorWheel);
-		void line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness);
 
 		ImageHandle createImageFromTextId(ualni id, Vec2F size);
 		void updateTextureID(ImageHandle handle, ualni id);

LICENSE

@@ -1,37 +1,339 @@
-SOFTWARE LICENSE AGREEMENT
-This Software License Agreement ("Agreement") is made and entered into as of 2024-11-24 ("Effective Date") by Ilya Shurupov.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-WHEREAS, Licensor owns certain software that it desires to license to Licensee;
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-WHEREAS, Licensee desires to use such software under the terms and conditions set forth herein.
+                            Preamble
 
-NOW, THEREFORE, in consideration of the mutual promises contained herein and for other good and valuable consideration, the receipt and sufficiency of which are hereby acknowledged, the parties agree as follows:
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
 
-1. Definition of Software:
-The term "Software" refers to the Modules, including any updates, modifications, or associated documentation provided by Licensor.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-2. Grant of License:
-Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee a no license to use the Software.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
-3. Derivative Works:
-No modifications or derivative works are allowed.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
 
-4. Commercial Use:
-Commercial use is not allowed.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-5. Attribution:
-No attribution is required.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-6. Intellectual Property Rights:
-All intellectual property rights in the Software shall remain the property of Licensor. The Licensee does not acquire any rights to the Software except for the limited use rights specified in this Agreement.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
-7. Warranty and Liability:
-The Software is provided "as is" without warranty of any kind. Licensor shall not be liable for any damages arising out of or related to the use or inability to use the Software.
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-8. Termination:
-This Agreement shall terminate automatically if Licensee breaches any of its terms and conditions. Upon termination, Licensee must cease all use of the Software and destroy all copies.
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-9. Governing Law:
-This Agreement shall be governed by and construed in accordance with the laws of .
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
 
-https://www.binpress.com/license-generator/
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

LibraryViewer/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets)
 target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS})
 
 file(COPY "library" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}")
-file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc/")
+file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
 
 ### -------------------------- Applications  --------------------------  ###
 add_executable(libView ./applications/Entry.cpp)

Math/public/Mat.hpp

@@ -465,15 +465,8 @@ namespace tp {
 		}
 
 		// Matrix Properties
-		MVec toGlobal(const MVec &in) const { return i * in.x + j * in.y; }
-
-		Mat toGlobal(const Mat &in) const { return {toGlobal(in.i), toGlobal(in.j)}; }
-
-		MVec toLocal(const MVec &in) const { return transform(in); }
-
 		MVec transform(const MVec& in) const { return MVec(i.x * in.x + i.y * in.y, j.x * in.x + j.y * in.y); }
 
-		// ???
 		Mat transform(const Mat& in) const {
 			Mat out;
 			out.i.x = i.x * in.i.x + j.x * in.i.y;

Math/public/Rect.hpp

@@ -70,29 +70,6 @@ namespace tp {
 			return *this;
 		}
 
-		Rect<Type>& adjust(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) {
-			x += left;
-			y += bottom;
-			size.x += -left + right;
-			size.y += -bottom + top;
-			return *this;
-		}
-
-		Rect<Type> adjusted(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) const {
-			return Rect<Type>(*this).adjust(left, bottom, right, top);
-		}
-
-		[[nodiscard]] halnf left() const { return x; }
-		[[nodiscard]] halnf bottom() { return y; }
-		[[nodiscard]] halnf top() { return y + size.y; }
-		[[nodiscard]] halnf right() { return x + size.x; }
-
-		static Rect fromPoints(const Vec2<Type>& p1, const Vec2<Type>& p2) {
-			tp::Vec2F min = {tp::min(p1.x, p2.x), tp::min(p1.y, p2.y)};
-			tp::Vec2F max = {tp::max(p1.x, p2.x), tp::max(p1.y, p2.y)};
-			return { min, max - min };
-		}
-
 		bool operator==(const Rect<Type>& rect) const { return (pos == rect.pos && size == rect.size); }
 
 		bool isEnclosedIn(const Rect<Type>& rect, bool aParent = false) const {
@@ -207,23 +184,13 @@ namespace tp {
 		}
 
 		void expand(const Vec2<Type>& point) {
-			if (point.x < x) {
-				size.x += x - point.x;
-				x = point.x;
-			}
+			pos.x = min(point.x, pos.x);
+			pos.y = min(point.y, pos.y);
 
-			if (point.y < y) {
-				size.y += y - point.y;
-				y = point.y;
-			}
-
-			if (point.x > x + size.x) {
-				size.x = point.x - x;
-			}
-
-			if (point.y > y + size.y) {
-				size.y = point.y - y;
-			}
+			auto p = pos + size;
+			p.x = max(point.x, p.x);
+			p.y = max(point.y, p.y);
+			size = p - pos;
 		}
 
 		void expand(const Rect<Type>& rect) {

Sketch3D/CMakeLists.txt

@@ -19,4 +19,4 @@ add_executable(Sketch3DApp ./applications/Entry.cpp)
 target_link_libraries(Sketch3DApp ${PROJECT_NAME})
 
 file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc")
+file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

Sketch3D/private/Sketch3D.cpp

@@ -280,7 +280,7 @@ void PencilBrush::draw(Renderer* render, const Camera* camera) {
 }
 
 PencilBrush::~PencilBrush() {
-	if (mStroke) delete mStroke;
+	delete mStroke;
 }
 
 void PencilBrush::finish(Project* proj) {

Widgets/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(WidgetsExample examples/Example.cpp)
 target_link_libraries(WidgetsExample ${PROJECT_NAME} ${GLEW_LIB})
 target_include_directories(WidgetsExample PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
 
-file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc")
+file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

Widgets/examples/Example.cpp

@@ -14,7 +14,7 @@ using namespace tp;
 class Example : public WidgetApplication {
 public:
 	Example() {
-		exampleColorPicker();
+		exampleNestedMenus();
 	}
 
 	void exampleAll() {
@@ -64,6 +64,7 @@ public:
 		static ButtonWidget buttons[10];
 
 		widget.setDirection(false);
+		// widget.setDirection(false);
 
 		setRoot(&widget);
 

Widgets/private/RootWidget.cpp

@@ -58,7 +58,9 @@ void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
 	updateAreaCache(&mRoot, false);
 
 	// trigger some widgets by moise pointer
-  mUpdateManager.handleFocusChanges(&mRoot, *events);
+	auto prevFocus = mUpdateManager.getFocusWidget();
+	auto newFocus = mUpdateManager.findFocusWidget(&mRoot, *events);
+  mUpdateManager.handleFocusChanges(newFocus, prevFocus);
 
 	// check triggered widgets for removal
 	mUpdateManager.clean();
@@ -148,8 +150,10 @@ void RootWidget::openPopup(Widget* widget) {
 }
 
 void RootWidget::closePopup(Widget* widget) {
-	mPopups.removeChild(widget);
-	mUpdateManager.freeFocus(widget);
+	if (mUpdateManager.canRemoveWidget(widget)) {
+		mPopups.removeChild(widget);
+		mUpdateManager.removeWidget(widget);
+	}
 }
 
 void RootWidget::lockFocus(Widget* widget) { mUpdateManager.lockFocus(widget); }

Widgets/private/managers/DebugManager.cpp

@@ -113,14 +113,17 @@ void DebugManager::recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& po
 		canvas.text((active->mDebug.id + ":" + std::to_string(depthOrder)).c_str(), area, 22, Canvas::Align::LC, 2, color);
 	}
 
+	if (mRootWidget->mUpdateManager.mFocusLockStack.find(active)) {
+		canvas.frame(area, { 0, 1, 0, 0.5f });
+	}
+
 	if (active->mFlags.get(Widget::IN_FOCUS)) {
 		if (active->isUpdate()) {
 			canvas.circle(pos + active->mDebug.pLocal, 5, active->mDebug.col);
 			canvas.circle(active->mDebug.pGlobal, 15, active->mDebug.col);
 		}
 
-		RGBA color = { 1, 0, 0, 0.3f };
-		canvas.debugCross(area, color);
+		canvas.debugCross(area, { 0, 1, 0, 1 });
 	}
 
 	int orderIdx = 0;

Widgets/private/managers/LayoutManager.cpp

@@ -36,7 +36,7 @@ void LayoutManager::findDependencies(Widget* root) {
 		if (!widget->isUpdate()) continue;
 
 		for (auto child : widget->mChildren) {
-			// if (!child->isUpdate()) continue;
+			if (!child->isUpdate()) continue;
 
 			mDepGraph.insert({ child, {} });
 

Widgets/private/managers/UpdateManager.cpp

@@ -69,35 +69,36 @@ void UpdateManager::getWidgetPath(Widget* widget, std::vector<Widget*>& out) {
 	}
 }
 
-void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
-	auto prevFocus = mInFocusWidget;
-
+Widget* UpdateManager::findFocusWidget(Widget* root, EventHandler& events) {
 	events.setCursorOrigin({ 0, 0 });
 
 	mInFocusWidget = nullptr;
+	findMouseFocusWidget(root, &mInFocusWidget, events.getPointer());
 
-	findFocusWidget(root, &mInFocusWidget, events.getPointer());
-
-	if (mFocusLockWidget) {
+	if (mFocusLockStack.size()) {
 		bool hasLockedWidget = false;
 		for (auto iter = mInFocusWidget; iter; iter = iter->mParent) {
-			if (iter == mFocusLockWidget) {
+			if (iter == mFocusLockStack.last()) {
 				hasLockedWidget = true;
 				break;
 			}
 		}
 		if (!hasLockedWidget) {
-			mInFocusWidget = mFocusLockWidget;
+			mInFocusWidget = mFocusLockStack.last();
 		}
 	}
 
-	// if (mInFocusWidget == prevFocus) return;
-	if (mInFocusWidget) scheduleUpdate(mInFocusWidget, "focus entered");
+	return mInFocusWidget;
+}
 
-	if (!mInFocusWidget && !prevFocus) return;
+void UpdateManager::handleFocusChanges(Widget* active, Widget* prevActive) {
+	// if (mInFocusWidget == prevFocus) return;
+	if (active) scheduleUpdate(active, "focus entered");
+
+	if (!active && !prevActive) return;
 
 	std::vector<Widget*> path2;
-	getWidgetPath(mInFocusWidget, path2);
+	getWidgetPath(active, path2);
 	size_t propLen2 = path2.size();
 	for (auto i = 0; i < path2.size(); i++) {
 		if (!path2[i]->propagateEventsToChildren()) {
@@ -107,7 +108,7 @@ void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
 	}
 
 	std::vector<Widget*> path1;
-	getWidgetPath(prevFocus, path1);
+	getWidgetPath(prevActive, path1);
 	size_t propLen1 = path1.size();
 	for (auto i = 0; i < path1.size(); i++) {
 		if (!path1[i]->propagateEventsToChildren()) {
@@ -135,7 +136,7 @@ void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
 	}
 }
 
-void UpdateManager::findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer) {
+void UpdateManager::findMouseFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer) {
 	if (!iter->mArea.getTargetRect().isInside(pointer) || !iter->mFlags.get(Widget::ENABLED)) return;
 
 	if (iter->processesEvents()) {
@@ -143,7 +144,7 @@ void UpdateManager::findFocusWidget(Widget* iter, Widget** focus, const Vec2F& p
 	}
 
 	for (auto child = iter->mDepthOrder.lastNode(); child; child = child->prev) {
-		findFocusWidget(child->data, focus, pointer - iter->mArea.getTargetRect().pos);
+		findMouseFocusWidget(child->data, focus, pointer - iter->mArea.getTargetRect().pos);
 	}
 }
 
@@ -159,8 +160,10 @@ void UpdateManager::processActiveTree(Widget* iter, EventHandler& events, Vec2F
 		procWidget(iter, events, false);
 	}
 
-	for (auto child : iter->mDepthOrder) {
-		processActiveTree(child.data(), events, current);
+	for (auto child = iter->mDepthOrder.firstNode(); child;) {
+		auto next = child->next; // any child may be removed at runtime
+		processActiveTree(child->data, events, current);
+		child = next;
 	}
 }
 
@@ -211,10 +214,24 @@ void UpdateManager::procWidget(Widget* widget, EventHandler& events, bool withEv
 }
 
 void UpdateManager::lockFocus(tp::Widget* widget) {
-	mFocusLockWidget = widget;
+	DEBUG_ASSERT(mFocusLockStack.find(widget) == nullptr)
+	// TODO : check that widget is a child of top of the stack
+	mFocusLockStack.pushBack(widget);
 }
 
 void UpdateManager::freeFocus(tp::Widget* widget) {
-	// DEBUG_ASSERT(mFocusLockWidget == widget)
-	mFocusLockWidget = nullptr;
+	DEBUG_ASSERT(mFocusLockStack.last() == widget)
+	mFocusLockStack.popBack();
+}
+
+bool UpdateManager::canRemoveWidget(Widget* widget) const {
+	if (auto node = mFocusLockStack.find(widget)) {
+		if (node->next) return false;
+	}
+
+	return true;
+}
+
+void UpdateManager::removeWidget(Widget* widget) {
+	freeFocus(widget);
 }

Widgets/private/widgets/DockWidget.cpp

@@ -86,7 +86,7 @@ void DockWidget::process(const EventHandler& events) {
 			}
 		} else if (events.isReleased(InputID::MOUSE1)) {
 			layout()->endResize();
-			freeFocus();
+			if (layout()->isResizing()) freeFocus();
 		}
 
 		if (layout()->isResizing()) {

Widgets/private/widgets/ScrollableWidget.cpp

@@ -7,9 +7,10 @@ using namespace tp;
 void ScrollableBarWidget::process(const EventHandler& events) {
 	// all content is visible no need to process anything
 	if (mSizeFactor >= 1) {
+		if (mScrolling) freeFocus();
+
 		mScrolling = false;
 		mPosFactor = mSizeFactor / 2.f;
-		freeFocus();
 		return;
 	}
 

Widgets/public/Widget.hpp

@@ -31,6 +31,8 @@ namespace tp {
 
 		using DFSAction = std::function<void(Widget*)>;
 
+	protected:
+
 		enum Flags : int1 {
 			ENABLED = 0,
 			NEEDS_UPDATE,

Widgets/public/WidgetApplication.hpp

@@ -10,7 +10,6 @@ namespace tp {
 		WidgetApplication() = default;
 
 		void setRoot(Widget* widget);
-		virtual void debugUI();
 
 	private:
 		void processFrame(EventHandler* eventHandler, halnf deltaTime) override;
@@ -18,6 +17,8 @@ namespace tp {
 		void drawFrame(Canvas* canvas) override;
 		bool forceNewFrame() override ;
 
+	private:
+		void debugUI();
 
 	private:
 		halnf mDebugSplitFactor = 0.7;

Widgets/public/mangers/DebugManager.hpp

@@ -87,7 +87,7 @@ namespace tp {
 		bool mDebug = false;
 		bool mDebugStopProcessing = false;
 		bool mDebugRedrawAlways = false;
-		bool mDetailed = false;
+		bool mDetailed = true;
 
 		std::set<Widget*> mProcBreakpoints;
 		std::set<Widget*> mLayBreakpoints;

Widgets/public/mangers/UpdateManager.hpp

@@ -25,20 +25,26 @@ namespace tp {
 		void clean();
 
 		void updateTreeToProcess(Widget* root);
-		void handleFocusChanges(Widget* root, EventHandler& events);
+		void handleFocusChanges(Widget* active, Widget* prevActive);
+		Widget* findFocusWidget(Widget* root, EventHandler& events);
 
-		void findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer);
+		void findMouseFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer);
 		static void getWidgetPath(Widget* widget, std::vector<Widget*>& out);
 		void processActiveTree(Widget* iter, EventHandler& events, Vec2F pos);
 		void processFocusItems(EventHandler& events);
 
+		Widget* getFocusWidget() { return mInFocusWidget; }
+
+		bool canRemoveWidget(Widget* widget) const;
+		void removeWidget(Widget* widget);
+
 	private:
 		static void procWidget(Widget* widget, EventHandler& events, bool withEvents = false);
 
 	private:
 		std::map<Widget*, bool> mTriggeredWidgets;
 		Widget* mInFocusWidget = nullptr;
-		Widget* mFocusLockWidget = nullptr;
+		List<Widget*> mFocusLockStack;
 
 	private:
 		int mDebugWidgetsToProcess = 0;