BAN: Cleanup includes
This commit is contained in:
Bananymous
parent
a7a55cd0fb
commit
cf63552b2a
|
|
@ -0,0 +1,13 @@
|
|||
#include <BAN/Memory.h>
|
||||
|
||||
namespace std { enum class align_val_t : size_t {}; }
|
||||
|
||||
void* operator new(size_t size) { return BAN::allocator(size); }
|
||||
void* operator new[](size_t size) { return BAN::allocator(size); }
|
||||
void* operator new(size_t size, std::align_val_t align) { return BAN::allocator_align(size, (size_t)align); }
|
||||
void* operator new[](size_t size, std::align_val_t align) { return BAN::allocator_align(size, (size_t)align); }
|
||||
|
||||
void operator delete(void* addr) { BAN::deallocator(addr); }
|
||||
void operator delete[](void* addr) { BAN::deallocator(addr); }
|
||||
void operator delete(void* addr, size_t) { BAN::deallocator(addr); }
|
||||
void operator delete[](void* addr, size_t) { BAN::deallocator(addr); }
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
#include <BAN/Errors.h>
|
||||
#include <BAN/Math.h>
|
||||
#include <BAN/Memory.h>
|
||||
#include <BAN/Move.h>
|
||||
#include <BAN/String.h>
|
||||
#include <BAN/StringView.h>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ BUILDDIR=$(abspath build)
|
|||
|
||||
FREEOBJS= \
|
||||
$(ARCH_FREEOBJS) \
|
||||
BAN/Memory.o \
|
||||
BAN/String.o \
|
||||
BAN/StringView.o \
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <BAN/Formatter.h>
|
||||
#include <BAN/Memory.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
|
@ -15,10 +14,12 @@
|
|||
|
||||
#define TRY(error) ({ auto e = error; if (e.IsError()) return e; e.Value(); })
|
||||
|
||||
|
||||
class Error
|
||||
namespace BAN
|
||||
{
|
||||
public:
|
||||
|
||||
class Error
|
||||
{
|
||||
public:
|
||||
static Error FromString(const char* message)
|
||||
{
|
||||
Error result;
|
||||
|
|
@ -31,15 +32,15 @@ public:
|
|||
uint8_t GetErrorCode() const { return m_error_code; }
|
||||
const char* GetMessage() const { return m_message; }
|
||||
|
||||
private:
|
||||
private:
|
||||
char m_message[128];
|
||||
uint8_t m_error_code;
|
||||
};
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
class ErrorOr
|
||||
{
|
||||
public:
|
||||
template<typename T>
|
||||
class ErrorOr
|
||||
{
|
||||
public:
|
||||
ErrorOr(const T& value) : m_has_error(false) { m_data = (void*)new T(value); }
|
||||
ErrorOr(const Error& error) : m_has_error(true) { m_data = (void*)new Error(error); }
|
||||
template<typename S> ErrorOr(const ErrorOr<S>& other) : ErrorOr(other.GetError()) {}
|
||||
|
|
@ -49,15 +50,15 @@ public:
|
|||
const Error& GetError() const { return *reinterpret_cast<Error*>(m_data); }
|
||||
T& Value() { return *reinterpret_cast<T*>(m_data); }
|
||||
|
||||
private:
|
||||
private:
|
||||
bool m_has_error = false;
|
||||
void* m_data = nullptr;
|
||||
};
|
||||
};
|
||||
|
||||
template<>
|
||||
class ErrorOr<void>
|
||||
{
|
||||
public:
|
||||
template<>
|
||||
class ErrorOr<void>
|
||||
{
|
||||
public:
|
||||
ErrorOr() { }
|
||||
ErrorOr(const Error& error) : m_error(error) { }
|
||||
~ErrorOr() { }
|
||||
|
|
@ -66,11 +67,12 @@ public:
|
|||
const Error& GetError() const { return m_error; }
|
||||
void Value() { }
|
||||
|
||||
private:
|
||||
private:
|
||||
Error m_error;
|
||||
bool m_has_error = false;
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
namespace BAN::Formatter
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
#pragma once
|
||||
|
||||
template<typename T> class ErrorOr;
|
||||
#include <stddef.h>
|
||||
|
||||
namespace BAN
|
||||
{
|
||||
|
||||
|
||||
template<typename, size_t> class Array;
|
||||
template<typename> class ErrorOr;
|
||||
template<typename> class Function;
|
||||
template<typename> class Queue;
|
||||
class String;
|
||||
class StringView;
|
||||
|
||||
template<typename T> class Vector;
|
||||
template<typename T> class Queue;
|
||||
template<typename> class Vector;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,16 +38,5 @@ namespace BAN
|
|||
|
||||
}
|
||||
|
||||
namespace std { enum class align_val_t : size_t {}; }
|
||||
|
||||
inline void* operator new(size_t size) { return BAN::allocator(size); }
|
||||
inline void* operator new[](size_t size) { return BAN::allocator(size); }
|
||||
inline void* operator new(size_t size, std::align_val_t align) { return BAN::allocator_align(size, (size_t)align); }
|
||||
inline void* operator new[](size_t size, std::align_val_t align) { return BAN::allocator_align(size, (size_t)align); }
|
||||
inline void* operator new(size_t, void* addr) { return addr; }
|
||||
inline void* operator new[](size_t, void* addr) { return addr; }
|
||||
|
||||
inline void operator delete(void* addr) { BAN::deallocator(addr); }
|
||||
inline void operator delete[](void* addr) { BAN::deallocator(addr); }
|
||||
inline void operator delete(void* addr, size_t) { BAN::deallocator(addr); }
|
||||
inline void operator delete[](void* addr, size_t) { BAN::deallocator(addr); }
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include <BAN/Errors.h>
|
||||
#include <BAN/Math.h>
|
||||
#include <BAN/Memory.h>
|
||||
#include <BAN/Move.h>
|
||||
|
||||
namespace BAN
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
#include <BAN/Errors.h>
|
||||
#include <BAN/ForwardList.h>
|
||||
#include <BAN/Formatter.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include <BAN/Errors.h>
|
||||
#include <BAN/Math.h>
|
||||
#include <BAN/Memory.h>
|
||||
#include <BAN/Move.h>
|
||||
|
||||
namespace BAN
|
||||
|
|
|
|||
Loading…
Reference in New Issue