Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ build/
.DS_store
.idea/
cmake-build-*/
tmpunwind.o
6 changes: 5 additions & 1 deletion Distribution/LuaBridge/LuaBridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <algorithm>
#include <array>
#include <cassert>
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <cstdio>
Expand Down Expand Up @@ -689,8 +690,11 @@ bool is_integral_representable_by(lua_State* L, int index)
}

template <class U = lua_Number, class T>
constexpr bool is_floating_point_representable_by(T value)
bool is_floating_point_representable_by(T value)
{
if (std::isnan(value) || std::isinf(value))
return true;

if constexpr (sizeof(T) == sizeof(U))
return true;

Expand Down
51 changes: 35 additions & 16 deletions Source/LuaBridge/detail/LuaHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "Config.h"

#include <cmath>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
Expand Down Expand Up @@ -626,26 +627,33 @@ constexpr bool is_integral_representable_by(T value)
if constexpr (sizeof(T) == sizeof(U))
{
if constexpr (same_signedness)
{
return true;

if constexpr (std::is_unsigned_v<T>)
}
else if constexpr (std::is_unsigned_v<T>)
{
return value <= static_cast<T>((std::numeric_limits<U>::max)());

return value >= static_cast<T>((std::numeric_limits<U>::min)())
&& static_cast<U>(value) <= (std::numeric_limits<U>::max)();
}
else
{
return value >= static_cast<T>((std::numeric_limits<U>::min)())
&& static_cast<U>(value) <= (std::numeric_limits<U>::max)();
}
}

if constexpr (sizeof(T) < sizeof(U))
else if constexpr (sizeof(T) < sizeof(U))
{
return static_cast<U>(value) >= (std::numeric_limits<U>::min)()
&& static_cast<U>(value) <= (std::numeric_limits<U>::max)();
}

if constexpr (std::is_unsigned_v<T>)
else if constexpr (std::is_unsigned_v<T>)
{
return value <= static_cast<T>((std::numeric_limits<U>::max)());

return value >= static_cast<T>((std::numeric_limits<U>::min)())
&& value <= static_cast<T>((std::numeric_limits<U>::max)());
}
else
{
return value >= static_cast<T>((std::numeric_limits<U>::min)())
&& value <= static_cast<T>((std::numeric_limits<U>::max)());
}
}

template <class U = lua_Integer>
Expand All @@ -662,17 +670,28 @@ bool is_integral_representable_by(lua_State* L, int index)
* @brief Checks if the value on the stack is a number type and can fit into the corresponding c++ numerical type..
*/
template <class U = lua_Number, class T>
constexpr bool is_floating_point_representable_by(T value)
bool is_floating_point_representable_by(T value)
{
if constexpr (sizeof(T) == sizeof(U))
{
return true;
}
else if constexpr (sizeof(T) < sizeof(U))
{
if (std::isnan(value) || std::isinf(value))
return true;

if constexpr (sizeof(T) < sizeof(U))
return static_cast<U>(value) >= -(std::numeric_limits<U>::max)()
&& static_cast<U>(value) <= (std::numeric_limits<U>::max)();
}
else
{
if (std::isnan(value) || std::isinf(value))
return true;

return value >= static_cast<T>(-(std::numeric_limits<U>::max)())
&& value <= static_cast<T>((std::numeric_limits<U>::max)());
return value >= static_cast<T>(-(std::numeric_limits<U>::max)())
&& value <= static_cast<T>((std::numeric_limits<U>::max)());
}
}

template <class U = lua_Number>
Expand Down
102 changes: 102 additions & 0 deletions Tests/Source/StackTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1404,6 +1404,108 @@ TEST_F(StackTests, FloatTypeNotFittingIsInstance)
EXPECT_TRUE(luabridge::isInstance<long double>(L, 1));
}

TEST_F(StackTests, FloatNaNAndInfPush)
{
{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, std::numeric_limits<float>::quiet_NaN()));
EXPECT_TRUE(luabridge::isInstance<float>(L, -1));
EXPECT_TRUE(luabridge::isInstance<double>(L, -1));
EXPECT_TRUE(luabridge::isInstance<long double>(L, -1));
auto result = luabridge::get<float>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isnan(*result));
}

{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, std::numeric_limits<float>::infinity()));
EXPECT_TRUE(luabridge::isInstance<float>(L, -1));
EXPECT_TRUE(luabridge::isInstance<double>(L, -1));
EXPECT_TRUE(luabridge::isInstance<long double>(L, -1));
auto result = luabridge::get<float>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isinf(*result));
}

{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, -std::numeric_limits<float>::infinity()));
auto result = luabridge::get<float>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isinf(*result));
EXPECT_LT(*result, 0.0f);
}
}

TEST_F(StackTests, DoubleNaNAndInfPush)
{
{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, std::numeric_limits<double>::quiet_NaN()));
EXPECT_TRUE(luabridge::isInstance<float>(L, -1));
EXPECT_TRUE(luabridge::isInstance<double>(L, -1));
EXPECT_TRUE(luabridge::isInstance<long double>(L, -1));
auto result = luabridge::get<double>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isnan(*result));
}

{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, std::numeric_limits<double>::infinity()));
EXPECT_TRUE(luabridge::isInstance<float>(L, -1));
EXPECT_TRUE(luabridge::isInstance<double>(L, -1));
EXPECT_TRUE(luabridge::isInstance<long double>(L, -1));
auto result = luabridge::get<double>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isinf(*result));
}

{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, -std::numeric_limits<double>::infinity()));
auto result = luabridge::get<double>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isinf(*result));
EXPECT_LT(*result, 0.0);
}
}

TEST_F(StackTests, LongDoubleNaNAndInfPush)
{
{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, std::numeric_limits<long double>::quiet_NaN()));
EXPECT_TRUE(luabridge::isInstance<float>(L, -1));
EXPECT_TRUE(luabridge::isInstance<double>(L, -1));
EXPECT_TRUE(luabridge::isInstance<long double>(L, -1));
auto result = luabridge::get<long double>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isnan(*result));
}

{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, std::numeric_limits<long double>::infinity()));
EXPECT_TRUE(luabridge::isInstance<float>(L, -1));
EXPECT_TRUE(luabridge::isInstance<double>(L, -1));
EXPECT_TRUE(luabridge::isInstance<long double>(L, -1));
auto result = luabridge::get<long double>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isinf(*result));
}

{
const luabridge::StackRestore sr(L);
EXPECT_TRUE(luabridge::push(L, -std::numeric_limits<long double>::infinity()));
auto result = luabridge::get<long double>(L, -1);
ASSERT_TRUE(result);
EXPECT_TRUE(std::isinf(*result));
EXPECT_LT(*result, 0.0l);
}
}

TEST_F(StackTests, CharArrayType)
{
char value[] = "xyz";
Expand Down
Loading