fix lua 5.2-5.4

Author: CapsAdmin

nattlua.lua

@@ -25,7 +25,7 @@ local ARGS = _G.ARGS or {...}
 
 if ARGS[1] and ARGS[1] ~= "nattlua" and ARGS[1] ~= "temp_build_output" then
 	require("nattlua.cli")
-	_G.RUN_CLI(unpack(ARGS))
+	_G.RUN_CLI(table.unpack(ARGS))
 end
 
 return m

nattlua/cli.lua

@@ -59,5 +59,5 @@ function _G.RUN_CLI(cmd, ...)
 
 	local func = assert(default[cmd], "Unknown command " .. cmd)
 	io.write("running ", cmd, " with arguments ", table.concat(args, " "), "\n")
-	func(unpack(args))
+	func(table.unpack(args))
 end

nattlua/parser/statements.lua

@@ -530,7 +530,7 @@ function META:ParseDebugCodeStatement()
 		return node
 	elseif self:IsTokenType("parser_debug_code") then
 		local token = self:ExpectTokenType("parser_debug_code")
-		assert(loadstring("local parser = ...;" .. token.value:sub(3)))(self)
+		assert(load("local parser = ...;" .. token.value:sub(3)))(self)
 		local node = self:StartNode("statement", "parser_debug_code")
 		local code = self:StartNode("expression", "value")
 		code.value = token

nattlua/types/number.lua

@@ -28,11 +28,26 @@ end
 	GetLargestNumber = function=(self)>(TNumber | nil, nil | any),
 }]]
 
+local VERSION = jit and "LUAJIT" or _VERSION
+
+local function tostring_number(num)
+	local s = tostring(tonumber(num))
+	if VERSION == "LUAJIT" then return s end
+
+	if s == "-nan" then return "nan" end
+
+	if s:sub(-2) == ".0" then
+		s = s:sub(1, -3)
+	end
+
+	return s
+end
+
 local function compute_hash(min--[[#: any]], max--[[#: any]])
 	if max then
-		return tostring(tonumber(min)) .. ".." .. tostring(tonumber(max))
+		return tostring_number(min) .. ".." .. tostring_number(min)
 	elseif min then
-		return tostring(tonumber(min))
+		return tostring_number(min)
 	end
 
 	return "N"
@@ -97,7 +112,9 @@ end
 function META.Equal(a--[[#: TNumber]], b--[[#: TBaseType]])
 	if a.Type ~= b.Type then return false, "types differ" end
 
-	do return a.Hash == b.Hash end
+	do
+		return a.Hash == b.Hash
+	end
 
 	if a.Max and a.Max == b.Max and a.Data == b.Data then
 		return true, "max values are equal"
@@ -145,7 +162,10 @@ function META:CopyLiteralness(obj--[[#: TBaseType]])
 				if x then if x.Max then return self end end
 			end
 
-			if not obj:IsLiteral() then self.Data = false self.Hash = "N" end
+			if not obj:IsLiteral() then
+				self.Data = false
+				self.Hash = "N"
+			end
 		end
 	end
 
@@ -538,7 +558,6 @@ do
 			if l.Max then obj.Max = func(l.Max, r.Max or r.Data) end
 
 			obj.Hash = compute_hash(obj.Data, obj.Max)
-
 			return obj
 		end
 
@@ -595,12 +614,16 @@ do
 end
 
 local function string_to_integer(str--[[#: string]])
-	if not jit and (_VERSION == "Lua 5.1" or _VERSION == "Lua 5.2") then
-		str = str:lower():gsub("ull", "")
-		str = str:gsub("ll", "")
+	if not jit and (_VERSION == "Lua 5.1" or _VERSION == "Lua 5.2" or _VERSION == "Lua 5.3" or _VERSION == "Lua 5.4") then
+		str = str:lower():sub(-3)
+		if str == "ull" then
+			str = str:sub(1, -4)
+		elseif str:sub(-2) == "ll" then
+			str = str:sub(1, -3)
+		end
 	end
 
-	return assert(loadstring("return " .. str))()--[[# as number]]
+	return assert(load("return " .. str))()--[[# as number]]
 end
 
 return {

test/tests/coverage.lua

@@ -1,7 +1,7 @@
 local coverage = require("test.helpers.coverage")
 
 local function collect(code)
-	assert(loadstring(coverage.Preprocess(code, "test")))()
+	assert(load(coverage.Preprocess(code, "test")))()
 	local res = coverage.Collect("test")
 	coverage.Clear("test")
 	return res

test/tests/nattlua/analyzer/lua.lua

@@ -295,7 +295,7 @@ do --- allcases
 	analyze(table.concat(code))
 end
 
-if bit.tobit then
+if jit and bit.tobit then
 	analyze[[
             -- bit operations
             for i=1,100 do

test/tests/nattlua/analyzer/mutation_solver.lua

@@ -6,7 +6,7 @@ local function covered_mutation_solver()
 	local code = assert(f:read("*all"))
 	f:close()
 	return assert(
-		loadstring(coverage.Preprocess(code, "mutation_solver"), "@nattlua/analyzer/mutation_solver.lua")
+		load(coverage.Preprocess(code, "mutation_solver"), "@nattlua/analyzer/mutation_solver.lua")
 	)()
 end
 

test/tests/nattlua/types/number.lua

@@ -229,7 +229,7 @@ do
 		local a_res_max
 		local b_res_min
 		local b_res_max
-		local func = loadstring("local a, b = ... return a " .. operator .. " b")
+		local func = load("local a, b = ... return a " .. operator .. " b")
 
 		for x = a_min, a_max do
 			for y = b_min, b_max do