drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions 1 Releases 9 Activity

[ox/std] Fix several problems that arose when trying to use strong ints

Browse Source
This commit is contained in:
Gary Talent 2019-07-27 23:56:49 -05:00
parent 6485a780a7
commit 3c86aae616
1 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
deps/ox/src/ox/std/strongint.hpp vendored
View File

@ -6,6 +6,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#pragma once
#include "types.hpp"
namespace ox {
@ -58,13 +60,13 @@ class Integer {
constexpr Integer<T> operator%=(Integer<T> i) noexcept;
constexpr Integer<T> operator>>(Integer<T> i) const noexcept;
constexpr Integer<T> operator>>(int i) const noexcept;
constexpr Integer<T> operator>>=(Integer<T> i) noexcept;
constexpr Integer<T> operator>>=(int i) noexcept;
constexpr Integer<T> operator<<(Integer<T> i) const noexcept;
constexpr Integer<T> operator<<(int i) const noexcept;
constexpr Integer<T> operator<<=(Integer<T> i) noexcept;
constexpr Integer<T> operator<<=(int i) noexcept;
constexpr Integer<T> operator|(Integer<T> i) const noexcept;
@ -90,9 +92,10 @@ class Integer {
// Postfix decrement
constexpr Integer<T> operator--(int) noexcept;
// Postfix decrement
constexpr explicit operator T() const noexcept;
constexpr operator bool() const noexcept;
};
template<typename T>
@ -102,117 +105,137 @@ constexpr Integer<T>::Integer(T i) noexcept {
template<typename T>
constexpr Integer<T> Integer<T>::operator=(Integer<T> i) noexcept {
return m_i = i.m_i;
return Integer<T>(m_i = i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator==(Integer<T> i) const noexcept {
return m_i == i.m_i;
return Integer<T>(m_i == i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator!=(Integer<T> i) const noexcept {
return m_i != i.m_i;
return Integer<T>(m_i != i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator<(Integer<T> i) const noexcept {
return m_i < i.m_i;
return Integer<T>(m_i < i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator>(Integer<T> i) const noexcept {
return m_i > i.m_i;
return Integer<T>(m_i > i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator<=(Integer<T> i) const noexcept {
return m_i <= i.m_i;
return Integer<T>(m_i <= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator>=(Integer<T> i) const noexcept {
return m_i >= i.m_i;
return Integer<T>(m_i >= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator+(Integer<T> i) const noexcept {
return m_i + i.m_i;
return Integer<T>(m_i + i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator+=(Integer<T> i) noexcept {
return m_i += i.m_i;
return Integer<T>(m_i += i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator-(Integer<T> i) const noexcept {
return m_i - i.m_i;
return Integer<T>(m_i - i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator-=(Integer<T> i) noexcept {
return m_i -= i.m_i;
return Integer<T>(m_i -= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator*(Integer<T> i) const noexcept {
return m_i * i.m_i;
return Integer<T>(m_i * i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator*=(Integer<T> i) noexcept {
return m_i *= i.m_i;
return Integer<T>(m_i *= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator/(Integer<T> i) const noexcept {
return m_i / i.m_i;
return Integer<T>(m_i / i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator/=(Integer<T> i) noexcept {
return m_i /= i.m_i;
return Integer<T>(m_i /= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator%(Integer<T> i) const noexcept {
return m_i % i.m_i;
return Integer<T>(m_i % i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator%=(Integer<T> i) noexcept {
return m_i %= i.m_i;
return Integer<T>(m_i %= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator>>(int i) const noexcept {
return Integer<T>(m_i >> i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator>>=(int i) noexcept {
return Integer<T>(m_i >>= i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator<<(int i) const noexcept {
return Integer<T>(m_i << i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator<<=(int i) noexcept {
return Integer<T>(m_i <<= i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator|(Integer<T> i) const noexcept {
return m_i | i.m_i;
return Integer<T>(m_i | i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator|=(Integer<T> i) noexcept {
return m_i |= i.m_i;
return Integer<T>(m_i |= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator&(Integer<T> i) const noexcept {
return m_i & i.m_i;
return Integer<T>(m_i & i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator&=(Integer<T> i) noexcept {
return m_i &= i.m_i;
return Integer<T>(m_i &= i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator^(Integer<T> i) const noexcept {
return m_i ^ i.m_i;
return Integer<T>(m_i ^ i.m_i);
}
template<typename T>
constexpr Integer<T> Integer<T>::operator^=(Integer<T> i) noexcept {
return m_i ^= i.m_i;
return Integer<T>(m_i ^= i.m_i);
}
// Prefix increment
@ -244,6 +267,11 @@ constexpr Integer<T>::operator T() const noexcept {
return m_i;
}
template<typename T>
constexpr Integer<T>::operator bool() const noexcept {
return m_i;
}
using Int8 = Integer<int8_t>;
using Int16 = Integer<int16_t>;
using Int32 = Integer<int32_t>;