AAAAAAAA METAINFO DONEgit status! AAAAAAAAAA

.clangd

@@ -0,0 +1,3 @@
+---
+CompileFlags: 
+  Add: [-I. -fanalyze]

base/base.hpp

@@ -22,8 +22,6 @@
  * Please use compiler with C++20 concepts and general C++20 support to compile pixelbox! 
  */
 
-#include <iterator>
-#include <stdexcept>
 #if !((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L || PB_NO_STDVER_CHECK)
 #error C++17 support is required!
 #endif
@@ -37,7 +35,6 @@
 
 #include <stdint.h>
 #include <limits.h>
-#include <string>
 
 namespace pb {
 
@@ -76,7 +73,6 @@ namespace pb {
 	};
 
 	/** @deprecated */
-	class Default : public Static {};
 
 	/** Abstract base class */
 	class Abstract {
@@ -97,4 +93,4 @@ namespace pb {
 #define ANONYMOUS(x) CONCAT(x, __COUNTER__)
 #else // __COUNTER__
 #define ANONYMOUS(x) CONCAT(x, __LINE__)
-#endif // __COUNTER__
+#endif // __COUNTER__

base/event.hpp → base/defer.hpp

@@ -1,6 +1,6 @@
 /*
  * This file is a part of Pixelbox - Infinite 2D sandbox game
- * Evenst for objservers/subscribers patterns
+ * Guaranteed execution of destructor, for RAII
  * Copyright (C) 2023-2024 UtoECat
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,33 +18,35 @@
  */
 
 #pragma once
-#include <functional>
+#include <type_traits>
 #include <utility>
+#include "base/base.hpp"
 
 namespace pb {
 
-	// subject for "Observers"
-	// TODO : This thing is horrible...
-	template <typename F, typename... Args>
-	class Subject {
-		protected:
-		using function_type = std::function<F(Args...)>;
-		std::vector<function_type> handlers;
-		public:
-		Subject() {};
-		Subject(const Subject&) = default;
-		Subject(Subject&&) = default;
-		Subject& operator=(const Subject&) = default;
-		Subject& operator=(Subject&&) = default;
-		void subscribe(const function_type& f) { handlers.emplace_back(f); }
-		void subscribe(function_type&& f) { handlers.emplace_back(std::move(f)); }
-		void notify_all(Args&&... args) {
-			for (auto& f : handlers) {
-				f(std::forward<Args>(args)...);
-			}
-		}
-	};
+namespace impl {
 
+template <class F>
+class ScopeGuard : Moveable {
+  private:
+  F f;
+  bool invoke = true;
+  public:
+  explicit ScopeGuard(const F& ff) : f(ff) { }
+  explicit ScopeGuard(F&& ff) : f(std::move(ff)) { }
+  ~ScopeGuard() { if (invoke) f(); }
+  ScopeGuard(ScopeGuard&& other) noexcept : f(std::move(other.f)) {
+    other.invoke = false;
+  }
+  ScopeGuard(const ScopeGuard&&) = delete;
 };
 
+};
+
+// defer operator :D yay
+template <class F>
+[[nodiscard]] auto defer(F&& f) noexcept {
+    return impl::ScopeGuard<std::decay_t<F>>{std::forward<F>(f)};
+}
 
+};

base/profiler.cpp

@@ -18,18 +18,14 @@
  */
 
 #include "profiler.hpp"
-#include "base/base.hpp"
 #include "clock.hpp"
 
 #include "spinlock.hpp"
 #include "base/resource.hpp"
 
-#include <memory>
 #include <stdexcept>
 #include <thread>
-#include <mutex>
 
-#include <array>
 #include <stack>
 #include <utility>
 #include <stdexcept>
@@ -338,15 +334,6 @@ void ThreadData::begin(const HString& name) {
 void ThreadData::end() {return data.end();}
 void ThreadData::step() {return data.step();}
 
-/** syntax sugar and safer wrapper of begin()/end() functions above
- * Calls begin() immediatly, and calls end when returned object is destructed
- */
-ScopeGuard<void()> ThreadData::make_zone(const HString& name) {
-	begin(name);
-	auto &master = *this;
-	return ScopeGuard<void()>([&master]{master.end();});
-}
-
 /**
  * API for retrieving profiling results
  */
@@ -414,4 +401,4 @@ size_t get_current_position(ThreadID id) {
 
 };
 
-};
+};

base/profiler.hpp

@@ -20,7 +20,7 @@
 #pragma once
 #include "base/base.hpp"
 #include "base/string.hpp"
-#include "base/scopeguard.hpp"
+#include "base/defer.hpp"
 
 #include <map> // insertion speed and reference stablility matters here
 #include <thread> // for ThreadID
@@ -86,12 +86,16 @@ class ThreadData {
 	 * done.~~ This requirement is removed in current version : you can safely
 	 * tick in the middle of deep zone stack :)
 	 */
-	 void step();
+	void step();
 
-	 /** syntax sugar and safer wrapper of begin()/end() functions above
+	/** syntax sugar and safer wrapper of begin()/end() functions above
 	   * Calls begin() immediatly, and calls end when returned object is destructed
 		 */
-	 pb::ScopeGuard<void()> make_zone(const HString& name);
+  auto make_zone(const HString& name) {
+    begin(name);
+	  auto &master = *this;
+	  return pb::defer([&master]{master.end();});
+  }
 };
 
 /**
@@ -108,9 +112,9 @@ void       free_thread_data(ThreadData);
 ThreadData get_thread_data();
 
 /** convinient wrapper around initialization things above */
-inline pb::ScopeGuard<void()> make_thread_data() {
+inline auto make_thread_data() {
 	ThreadData data = init_thread_data();
-	return pb::ScopeGuard<void()> ([data]() {
+	return pb::defer([data]() {
 		free_thread_data(data);
 	});
 }

base/readme.md

@@ -22,4 +22,4 @@ functions/libraries/systems all over the place :
 - locale-independent strtod()
 
 # todo
-- ~~Locale and implementation-independent vsnprintf() :p~~(done)
+- ~~Locale and implementation-independent vsnprintf() :p~~(done)

base/resource.hpp

@@ -61,4 +61,4 @@ class Resource<T, void> : public T{
 	ResUsage<T, void> use() {
 		return {static_cast<T&>(*this)};
 	}
-};
+};

base/sharedobj.hpp

@@ -18,8 +18,6 @@
  */
 
 #pragma once
-#include "base.hpp"
-#include "spinlock.hpp"
 #include <memory>
 
 namespace pb {

base/spinlock.hpp

@@ -20,7 +20,6 @@
 #pragma once
 #include <atomic>
 #include <mutex>
-#include <thread>
 
 namespace pb {
 

base/string.hpp

@@ -20,6 +20,7 @@
 #pragma once
 #include <string>
 #include <stdexcept>
+#include <string_view>
 #include "external/printf.h"
 
 namespace pb {
@@ -108,6 +109,7 @@ namespace pb {
 		auto size = static_cast<size_t>(size_s + 1); // Extra space for '\0'
 		result.resize(size);
 		auto vv = snprintf_( &result[0], size, format.c_str(), args... );
+		result.pop_back(); // remove '\0!'
 		return (vv > 0);
 	}
 
@@ -131,6 +133,10 @@ namespace pb {
 	 */
 	double strtod(const char *str, char **end);
 
+
+	using String = std::string;
+	using StringView = std::string_view;
+
 };
 
 // here is the hash function 
@@ -142,4 +148,4 @@ struct std::hash<pb::HString> {
 	std::size_t operator()(const pb::HString& s) const noexcept {
 		return s.get_hash();
 	}
-};
+};

base/strtod.cpp

@@ -6,8 +6,6 @@
  * modified a bit by utoecat. still public domain.
  */
 
-#include "base/base.hpp"
-#include <string.h>
 #include <math.h>
 #include <ctype.h>