Skip to content

Fix NumbersToExpressions on Lua 5.4 #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prostone4 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NumbersToExpressions on Lua 5.4 #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions src/prometheus/steps/NumbersToExpressions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ local function generateModuloExpression(n)
return lhs, rhs
end

local function safe(v)
return type(v) == "number" and v == v and v > -2 ^ 53 and v < 2 ^ 53
end

local function contains(table, value)
for _, v in ipairs(table) do
if v == value then
Expand All @@ -68,7 +72,7 @@ function NumbersToExpressions:init(_)
function(val, depth) -- Addition
local val2 = math.random(-2 ^ 20, 2 ^ 20)
local diff = val - val2
if tonumber(tostring(diff)) + tonumber(tostring(val2)) ~= val then
if not safe(diff) or tonumber(tostring(diff)) + tonumber(tostring(val2)) ~= val then
return false
end
return Ast.AddExpression(
Expand All @@ -81,7 +85,7 @@ function NumbersToExpressions:init(_)
function(val, depth) -- Subtraction
local val2 = math.random(-2 ^ 20, 2 ^ 20)
local diff = val + val2
if tonumber(tostring(diff)) - tonumber(tostring(val2)) ~= val then
if not safe(diff) or tonumber(tostring(diff)) - tonumber(tostring(val2)) ~= val then
return false
end
return Ast.SubExpression(
Expand All @@ -93,7 +97,7 @@ function NumbersToExpressions:init(_)

function(val, depth) -- Modulo
local lhs, rhs = generateModuloExpression(val)
if tonumber(tostring(lhs)) % tonumber(tostring(rhs)) ~= val then
if not safe(lhs) or not safe(rhs) or rhs == 0 or tonumber(tostring(lhs)) % tonumber(tostring(rhs)) ~= val then
return false
end
return Ast.ModExpression(
Expand Down Expand Up @@ -148,7 +152,7 @@ function NumbersToExpressions:CreateNumberExpression(val, depth)
binary = "0"
else
while n > 0 do
binary = (n % 2) .. binary
binary = math.floor(n % 2) .. binary
n = math.floor(n / 2)
end
end
Expand All @@ -162,7 +166,11 @@ function NumbersToExpressions:CreateNumberExpression(val, depth)

local exp = math.floor(math.log10(math.abs(val)))
local mantissa = val / (10 ^ exp)
return Ast.NumberExpression(string.format("%.15ge%d", mantissa, exp))
local text = string.format("%.15ge%d", mantissa, exp)
if tonumber(text) ~= val then
return Ast.NumberExpression(val)
end
return Ast.NumberExpression(text)
end

if format == "normal" then
Expand Down