jkl1337/ljkiwi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert enum values to number for LuaJIT 2.0.5 compat

Browse Source
This commit is contained in:
John K. Luebs
2024-02-17 22:03:25 -06:00
parent 2ffc5a333b
commit b3cf6136a4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,6 +1,6 @@
ljkiwi - Free LuaJIT FFI kiwi (Cassowary derived) constraint solver. ljkiwi - Free LuaJIT FFI kiwi (Cassowary derived) constraint solver.
[![CI](https://github.com/jkl1337/ljkiwi/actions/workflows/ci.yml/badge.svg)](https://github.com/jkl1337/ljkiwi/actions/workflows/ci.yml) [![CI](https://github.com/jkl1337/ljkiwi/actions/workflows/busted.yml/badge.svg)](https://github.com/jkl1337/ljkiwi/actions/workflows/busted.yml)
[![Coverage Status](https://coveralls.io/repos/github/jkl1337/ljkiwi/badge.svg?branch=master)](https://coveralls.io/github/jkl1337/ljkiwi?branch=master) [![Coverage Status](https://coveralls.io/repos/github/jkl1337/ljkiwi/badge.svg?branch=master)](https://coveralls.io/github/jkl1337/ljkiwi?branch=master)
[![luarocks](https://img.shields.io/luarocks/v/jkl/ljkiwi)](https://luarocks.org/modules/jkl/ljkiwi) [![luarocks](https://img.shields.io/luarocks/v/jkl/ljkiwi)](https://luarocks.org/modules/jkl/ljkiwi)

6
kiwi.lua
View File

@@ -871,7 +871,8 @@ do
function kiwi.error_mask(kinds, invert) function kiwi.error_mask(kinds, invert)
local mask = 0 local mask = 0
for _, k in ipairs(kinds) do for _, k in ipairs(kinds) do
mask = bor(mask, lshift(1, kiwi.ErrKind(k))) -- must use tonumber only for LuaJIT 2.0 compatibility
mask = bor(mask, lshift(1, tonumber(kiwi.ErrKind(k)) --[[@as integer]]))
end end
return invert and bit.bnot(mask) or mask return invert and bit.bnot(mask) or mask
end end
@@ -940,8 +941,9 @@ do
end end
local errdata = new_error(kind, message, solver, item) local errdata = new_error(kind, message, solver, item)
local error_mask = solver and solver.error_mask_ or 0 local error_mask = solver and solver.error_mask_ or 0
-- tonumber only required for LuaJIT 2.0 compatibility
return item, return item,
band(error_mask, lshift(1, kind --[[@as integer]])) == 0 and error(errdata) band(error_mask, lshift(1, tonumber(kind) --[[@as integer]])) == 0 and error(errdata)
or errdata or errdata
end end
return item return item