Skip to content

Commit

Permalink
Expand numerical class templates (#80)
Browse files Browse the repository at this point in the history 
* Expand numerical class templates

This will make it easier to understand the pybind error messages

* Fix base class
  • Loading branch information
@gentlegiantJGC
gentlegiantJGC authored Jul 30, 2024
1 parent f546f6f commit 1d57227
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 50 deletions.
52 changes: 29 additions & 23 deletions src/amulet_nbt/include/amulet_nbt/tag/float.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,38 @@
#include <amulet_nbt/tag/abc.hpp>

namespace AmuletNBT {
template <typename T>
class FloatTagTemplate: public AbstractBaseFloatTag {
static_assert(
std::is_same_v<T, float> ||
std::is_same_v<T, double>,
"T must be float or double"
);
public:
T value;
typedef T native_type;
FloatTagTemplate() : value() {};
FloatTagTemplate(const T& value) : value(value) {};
FloatTagTemplate(const FloatTagTemplate<T>& other) : value(other.value) {};
FloatTagTemplate<T>& operator=(const FloatTagTemplate<T>& rhs) { value = rhs.value; return *this; };
FloatTagTemplate<T>& operator=(const T& rhs) { value = rhs; return *this; };
operator const T&() const { return value; };
operator T& () { return value; };
bool operator==(const FloatTagTemplate<T>& rhs) { return value == rhs.value; }
bool operator<(const FloatTagTemplate<T>& rhs) { return value < rhs.value; }
};

typedef float FloatTagNative;
typedef double DoubleTagNative;

typedef FloatTagTemplate<FloatTagNative> FloatTag;
typedef FloatTagTemplate<DoubleTagNative> DoubleTag;
class FloatTag: public AbstractBaseFloatTag {
public:
FloatTagNative value;
typedef FloatTagNative native_type;
FloatTag() : value() {};
FloatTag(const FloatTagNative& value) : value(value) {};
FloatTag(const FloatTag& other) : value(other.value) {};
FloatTag& operator=(const FloatTag& rhs) { value = rhs.value; return *this; };
FloatTag& operator=(const FloatTagNative& rhs) { value = rhs; return *this; };
operator const FloatTagNative&() const { return value; };
operator FloatTagNative& () { return value; };
bool operator==(const FloatTag& rhs) { return value == rhs.value; }
bool operator<(const FloatTag& rhs) { return value < rhs.value; }
};

class DoubleTag: public AbstractBaseFloatTag {
public:
DoubleTagNative value;
typedef DoubleTagNative native_type;
DoubleTag() : value() {};
DoubleTag(const DoubleTagNative& value) : value(value) {};
DoubleTag(const DoubleTag& other) : value(other.value) {};
DoubleTag& operator=(const DoubleTag& rhs) { value = rhs.value; return *this; };
DoubleTag& operator=(const DoubleTagNative& rhs) { value = rhs; return *this; };
operator const DoubleTagNative&() const { return value; };
operator DoubleTagNative& () { return value; };
bool operator==(const DoubleTag& rhs) { return value == rhs.value; }
bool operator<(const DoubleTag& rhs) { return value < rhs.value; }
};

static_assert(std::is_copy_constructible_v<FloatTag>, "FloatTag is not copy constructible");
static_assert(std::is_copy_assignable_v<FloatTag>, "FloatTag is not copy assignable");
Expand Down
86 changes: 59 additions & 27 deletions src/amulet_nbt/include/amulet_nbt/tag/int.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,70 @@
#include <amulet_nbt/tag/abc.hpp>

namespace AmuletNBT {
template <typename T>
class IntTagTemplate: public AbstractBaseIntTag {
static_assert(
std::is_same_v<T, std::int8_t> ||
std::is_same_v<T, std::int16_t> ||
std::is_same_v<T, std::int32_t> ||
std::is_same_v<T, std::int64_t>,
"T must be int 8, 16, 32 or 64"
);
public:
T value;
typedef T native_type;
IntTagTemplate() : value() {};
IntTagTemplate(const T& value) : value(value) {};
IntTagTemplate(const IntTagTemplate<T>& other) : value(other.value) {};
IntTagTemplate<T>& operator=(const IntTagTemplate<T>& rhs) { value = rhs.value; return *this; };
IntTagTemplate<T>& operator=(const T& rhs) { value = rhs; return *this; };
operator const T&() const { return value; };
operator T& () { return value; };
bool operator==(const IntTagTemplate<T>& rhs) { return value == rhs.value; }
bool operator<(const IntTagTemplate<T>& rhs) { return value < rhs.value; }
};

typedef std::int8_t ByteTagNative;
typedef std::int16_t ShortTagNative;
typedef std::int32_t IntTagNative;
typedef std::int64_t LongTagNative;

typedef IntTagTemplate<ByteTagNative> ByteTag;
typedef IntTagTemplate<ShortTagNative> ShortTag;
typedef IntTagTemplate<IntTagNative> IntTag;
typedef IntTagTemplate<LongTagNative> LongTag;
class ByteTag: public AbstractBaseIntTag {
public:
ByteTagNative value;
typedef ByteTagNative native_type;
ByteTag() : value() {};
ByteTag(const ByteTagNative& value) : value(value) {};
ByteTag(const ByteTag& other) : value(other.value) {};
ByteTag& operator=(const ByteTag& rhs) { value = rhs.value; return *this; };
ByteTag& operator=(const ByteTagNative& rhs) { value = rhs; return *this; };
operator const ByteTagNative&() const { return value; };
operator ByteTagNative& () { return value; };
bool operator==(const ByteTag& rhs) { return value == rhs.value; }
bool operator<(const ByteTag& rhs) { return value < rhs.value; }
};

class ShortTag: public AbstractBaseIntTag {
public:
ShortTagNative value;
typedef ShortTagNative native_type;
ShortTag() : value() {};
ShortTag(const ShortTagNative& value) : value(value) {};
ShortTag(const ShortTag& other) : value(other.value) {};
ShortTag& operator=(const ShortTag& rhs) { value = rhs.value; return *this; };
ShortTag& operator=(const ShortTagNative& rhs) { value = rhs; return *this; };
operator const ShortTagNative&() const { return value; };
operator ShortTagNative& () { return value; };
bool operator==(const ShortTag& rhs) { return value == rhs.value; }
bool operator<(const ShortTag& rhs) { return value < rhs.value; }
};

class IntTag: public AbstractBaseIntTag {
public:
IntTagNative value;
typedef IntTagNative native_type;
IntTag() : value() {};
IntTag(const IntTagNative& value) : value(value) {};
IntTag(const IntTag& other) : value(other.value) {};
IntTag& operator=(const IntTag& rhs) { value = rhs.value; return *this; };
IntTag& operator=(const IntTagNative& rhs) { value = rhs; return *this; };
operator const IntTagNative&() const { return value; };
operator IntTagNative& () { return value; };
bool operator==(const IntTag& rhs) { return value == rhs.value; }
bool operator<(const IntTag& rhs) { return value < rhs.value; }
};

class LongTag: public AbstractBaseIntTag {
public:
LongTagNative value;
typedef LongTagNative native_type;
LongTag() : value() {};
LongTag(const LongTagNative& value) : value(value) {};
LongTag(const LongTag& other) : value(other.value) {};
LongTag& operator=(const LongTag& rhs) { value = rhs.value; return *this; };
LongTag& operator=(const LongTagNative& rhs) { value = rhs; return *this; };
operator const LongTagNative&() const { return value; };
operator LongTagNative& () { return value; };
bool operator==(const LongTag& rhs) { return value == rhs.value; }
bool operator<(const LongTag& rhs) { return value < rhs.value; }
};

static_assert(std::is_copy_constructible_v<ByteTag>, "ByteTag is not copy constructible");
static_assert(std::is_copy_assignable_v<ByteTag>, "ByteTag is not copy assignable");
Expand Down

0 comments on commit 1d57227

Please sign in to comment.