XXX

Author: ligurio

tests/lapi/lib.lua

@@ -7,14 +7,27 @@ Test helpers.
 
 -- The function determines a Lua version.
 local function lua_version()
-    local maj, min = _VERSION:match("([%d]+)%.(%d+)")
-    local maj_num, min_num = tonumber(maj), tonumber(min)
+    local major, minor = _VERSION:match("([%d]+)%.(%d+)")
+    local version = {
+        major = tonumber(major),
+        minor = tonumber(minor),
+    }
     local is_luajit, _ = pcall(require, "jit")
-    if is_luajit then
-        return "LuaJIT", maj_num, min_num
+    local lua_name = is_luajit and "LuaJIT" or "PUC Rio Lua"
+    return lua_name, version
+end
+
+local function version_ge(version1, version2)
+    if version1.major ~= version2.major then
+        return version1.major > version2.major
+    else
+        return version1.minor > version2.minor
     end
+end
 
-    return _VERSION, maj_num, min_num
+local function lua_current_version_ge_than(major, minor)
+    local _, current_version = lua_version()
+    return version_ge(current_version, { major = major, minor = minor })
 end
 
 -- By default `lua_Integer` is ptrdiff_t in Lua 5.1 and Lua 5.2
@@ -59,8 +72,7 @@ local function bitwise_op(op_name)
 end
 
 local function math_pow(x, y)
-    local chunk = ("return %f ^ %f"):format(x, y)
-    return assert(load(chunk))()
+    return x ^ y
 end
 
 local function approx_equal(a, b, epsilon)
@@ -72,6 +84,7 @@ return {
     approx_equal = approx_equal,
     bitwise_op = bitwise_op,
     lua_version = lua_version,
+    lua_current_version_ge_than = lua_current_version_ge_than,
     math_pow = math_pow,
     MAX_INT64 = MAX_INT64,
     MIN_INT64 = MIN_INT64,

tests/lapi/math_log_test.lua

@@ -17,15 +17,16 @@ Synopsis: math.log(x [, b])
 local luzer = require("luzer")
 local test_lib = require("lib")
 
--- The function `math.pow()` has been deprecated in PUC Rio Lua 5.3,
--- see Lua 5.3 Reference Manual, 8.2 – Changes in the Libraries.
+-- The function `math.pow()` has been deprecated in PUC Rio Lua
+-- 5.3, see Lua 5.3 Reference Manual, 8.2 – Changes in the
+-- Libraries.
 --
 -- 1. https://www.lua.org/manual/5.3/manual.html
 local pow
-if test_lib.lua_version() == "LuaJIT" then
-    pow = math.pow
-else
+if test_lib.lua_current_version_ge_than(5, 3) then
     pow = test_lib.math_pow
+else
+    pow = math.pow
 end
 
 local function TestOneInput(buf, _size)

tests/lapi/math_pow_test.lua

@@ -28,10 +28,10 @@ local test_lib = require("lib")
 --
 -- 1. https://www.lua.org/manual/5.3/manual.html
 local pow
-if test_lib.lua_version() == "LuaJIT" then
-    pow = math.pow
-else
+if test_lib.lua_current_version_ge_than(5, 3) then
     pow = test_lib.math_pow
+else
+    pow = math.pow
 end
 
 local function TestOneInput(buf, _size)

tests/lapi/math_randomseed_test.lua

@@ -22,8 +22,7 @@ local function TestOneInput(buf)
     -- that were effectively used, so that setting them again
     -- repeats the sequence.
     local a, b = math.randomseed(x, y)
-    local version_str, maj, min = test_lib.lua_version()
-    if version_str ~= "LuaJIT" and maj >= 5 and min >= 4 then
+    if test_lib.lua_current_version_ge_than(5, 4) then
         assert(type(a) == "number" and type(b) == "number")
     end
 end

tests/lapi/math_tointeger_test.lua

@@ -15,8 +15,7 @@ local luzer = require("luzer")
 local test_lib = require("lib")
 
 -- The function `math.tointeger()` is available since Lua 5.3.
-local _, version_major, version_minor = test_lib.lua_version()
-if version_major <= 5 and version_minor < 3 then
+if not test_lib.lua_current_version_ge_than(5, 3) then
     print("Unsupported version.")
     os.exit(0)
 end

tests/lapi/math_ult_test.lua

@@ -14,9 +14,8 @@ Synopsis: math.ult(m, n)
 local luzer = require("luzer")
 local test_lib = require("lib")
 
--- The function `math.tointeger()` is available since Lua 5.3.
-local _, version_major, version_minor = test_lib.lua_version()
-if version_major <= 5 and version_minor < 3 then
+-- The function `math.ult()` is available since Lua 5.3.
+if not test_lib.lua_current_version_ge_than(5, 3) then
     print("Unsupported version.")
     os.exit(0)
 end