aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2022-07-03 16:25:52 +0200
committersfan5 <sfan5@live.de>2022-07-14 20:55:45 +0200
commit8ff3fadba033dbc686c4f834811f0744099fedfb (patch)
treeee1c2c3c9aa40f386ec7cf76348eb29a681d0021 /src
parent137eef6590205b7bcdf5273221bc22c17b218f6e (diff)
downloadminetest-8ff3fadba033dbc686c4f834811f0744099fedfb.tar.gz
minetest-8ff3fadba033dbc686c4f834811f0744099fedfb.tar.bz2
minetest-8ff3fadba033dbc686c4f834811f0744099fedfb.zip
Remove unnecessary float limits from script API
Leaves a check for NaN and inf.
Diffstat (limited to 'src')
-rw-r--r--src/script/common/c_converter.cpp43
1 files changed, 23 insertions, 20 deletions
diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index b5ff52f73..109fa1a14 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -18,8 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
}
#include "util/numeric.h"
@@ -29,26 +29,27 @@ extern "C" {
#include "common/c_internal.h"
#include "constants.h"
#include <set>
+#include <cmath>
-#define CHECK_TYPE(index, name, type) { \
+#define CHECK_TYPE(index, name, type) do { \
int t = lua_type(L, (index)); \
if (t != (type)) { \
throw LuaError(std::string("Invalid ") + (name) + \
" (expected " + lua_typename(L, (type)) + \
" got " + lua_typename(L, t) + ")."); \
} \
- }
-#define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
-#define CHECK_FLOAT_RANGE(value, name) \
-if (value < F1000_MIN || value > F1000_MAX) { \
- std::ostringstream error_text; \
- error_text << "Invalid float vector dimension range '" name "' " << \
- "(expected " << F1000_MIN << " < " name " < " << F1000_MAX << \
- " got " << value << ")." << std::endl; \
- throw LuaError(error_text.str()); \
-}
-#define CHECK_POS_TAB(index) CHECK_TYPE(index, "position", LUA_TTABLE)
+ } while(0)
+
+#define CHECK_FLOAT(value, name) do {\
+ if (std::isnan(value) || std::isinf(value)) { \
+ throw LuaError("Invalid float value for '" name \
+ "' (NaN or infinity)"); \
+ } \
+ } while (0)
+
+#define CHECK_POS_COORD(name) CHECK_TYPE(-1, "vector coordinate " name, LUA_TNUMBER)
+#define CHECK_POS_TAB(index) CHECK_TYPE(index, "vector", LUA_TTABLE)
/**
@@ -145,10 +146,12 @@ v2f check_v2f(lua_State *L, int index)
lua_getfield(L, index, "x");
CHECK_POS_COORD("x");
p.X = lua_tonumber(L, -1);
+ CHECK_FLOAT(p.X, "x");
lua_pop(L, 1);
lua_getfield(L, index, "y");
CHECK_POS_COORD("y");
p.Y = lua_tonumber(L, -1);
+ CHECK_FLOAT(p.Y, "y");
lua_pop(L, 1);
return p;
}
@@ -176,17 +179,17 @@ v3f check_v3f(lua_State *L, int index)
lua_getfield(L, index, "x");
CHECK_POS_COORD("x");
pos.X = lua_tonumber(L, -1);
- CHECK_FLOAT_RANGE(pos.X, "x")
+ CHECK_FLOAT(pos.X, "x");
lua_pop(L, 1);
lua_getfield(L, index, "y");
CHECK_POS_COORD("y");
pos.Y = lua_tonumber(L, -1);
- CHECK_FLOAT_RANGE(pos.Y, "y")
+ CHECK_FLOAT(pos.Y, "y");
lua_pop(L, 1);
lua_getfield(L, index, "z");
CHECK_POS_COORD("z");
pos.Z = lua_tonumber(L, -1);
- CHECK_FLOAT_RANGE(pos.Z, "z")
+ CHECK_FLOAT(pos.Z, "z");
lua_pop(L, 1);
return pos;
}
@@ -214,17 +217,17 @@ v3d check_v3d(lua_State *L, int index)
lua_getfield(L, index, "x");
CHECK_POS_COORD("x");
pos.X = lua_tonumber(L, -1);
- CHECK_FLOAT_RANGE(pos.X, "x")
+ CHECK_FLOAT(pos.X, "x");
lua_pop(L, 1);
lua_getfield(L, index, "y");
CHECK_POS_COORD("y");
pos.Y = lua_tonumber(L, -1);
- CHECK_FLOAT_RANGE(pos.Y, "y")
+ CHECK_FLOAT(pos.Y, "y");
lua_pop(L, 1);
lua_getfield(L, index, "z");
CHECK_POS_COORD("z");
pos.Z = lua_tonumber(L, -1);
- CHECK_FLOAT_RANGE(pos.Z, "z")
+ CHECK_FLOAT(pos.Z, "z");
lua_pop(L, 1);
return pos;
}