Skip to content

Splice fix #140

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

Merged
lolleko merged 3 commits into from
Jul 15, 2018
Merged

Splice fix #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad00c4b
WIP update runtime lib (array.splice)
lolleko Jul 10, 2018
383170a
Changed pairs to ipairs
lolleko Jul 11, 2018
b76b87c
Added link to ECMA specs
lolleko Jul 15, 2018
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
134 changes: 109 additions & 25 deletions dist/lualib/typescript.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,123 @@ function TS_filter(list, func)
end

function TS_slice(list, startI, endI)
endI = endI or #list
if startI < 0 then startI = #list + startI end
if endI < 0 then endI = #list + endI end
if not endI or endI > #list then endI = #list end
if startI < 0 then startI = math.max(#list + startI, 1) end
if endI < 0 then endI = math.max(#list + endI, 1) end
local out = {}
for i = startI + 1, endI do
table.insert(out, list[i])
end
return out
end

function TS_splice(list, startI, deleteCount, ...)
if not deleteCount or deleteCount > #list - startI then
deleteCount = #list - startI
-- https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
function TS_splice(list, start, deleteCount, ...)
-- 1. 2.
local len = #list

local actualStart

-- 4.
if start < 0 then
actualStart = math.max(len + start, 0)
else
actualStart = math.min(start, len)
end

-- 13.
local items = {...}
-- 14.
local itemCount = #items

-- 5. - 7.
local actualDeleteCount

if not start then
actualDeleteCount = 0
elseif not deleteCount then
actualDeleteCount = len - actualStart
else
actualDeleteCount = math.min(math.max(deleteCount, 0), len - actualStart)
end
startI = startI + 1
local newElements = {...}

-- 8. ignored

-- 9.
local out = {}
local outPtr = deleteCount
local newElementsCount = #newElements
for i = startI + deleteCount - 1, startI, -1 do
out[outPtr] = list[i]
outPtr = outPtr -1
if newElements[k] then
list[i] = newElements[k]
newElementsCount = newElementsCount - 1
else
table.remove(list, i)

-- 10.
local k

k = 0

-- 11.
while k < actualDeleteCount do
local from = actualStart + k

if list[from + 1] then
out[k + 1] = list[from + 1]
end

k = k + 1
end
while newElements[newElementsCount] do
table.insert(list, startI, newElements[newElementsCount])
newElementsCount = newElementsCount - 1

-- 15.
if itemCount < actualDeleteCount then
-- a. b.
k = actualStart
while k < len - actualDeleteCount do
local from = k + actualDeleteCount
local to = k + itemCount

if list[from + 1] then
list[to + 1] = list[from + 1]
else
list[to + 1] = nil
end

k = k + 1
end
-- c. d.
k = len
while k > len - actualDeleteCount + itemCount do
list[k] = nil
k = k - 1
end
-- 16.
elseif itemCount > actualDeleteCount then
k = len - actualDeleteCount
while k > actualStart do
local from = k + actualDeleteCount
local to = k + itemCount

if list[from] then
list[to] = list[from]
else
list[to] = nil
end

k = k - 1
end
end

-- 17.
k = actualStart

-- 18.
for _, e in ipairs(items) do
list[k + 1] = e
k = k + 1
end

-- 19.
k = #list
while k > len - actualDeleteCount + itemCount do
list[k] = nil
k = k - 1
end

-- 20.
return out
end

Expand Down Expand Up @@ -154,8 +238,8 @@ function Set.constructor(self, other)
end
end
end
function Set.add(self, item)
self._items[item] = true
function Set.add(self, item)
self._items[item] = true
self.size = self.size + 1
end
function Set.clear(self)
Expand Down Expand Up @@ -210,7 +294,7 @@ function Map.constructor(self, other)
end
end
end
function Map.clear(self)
function Map.clear(self)
self._items = {}
self.size = 0
end
Expand Down Expand Up @@ -241,7 +325,7 @@ function Map.keys(self)
end
return out
end
function Map.set(self, key, value)
function Map.set(self, key, value)
self._items[key] = value
self.size = self.size + 1
return self
Expand Down
21 changes: 18 additions & 3 deletions test/unit/lualib.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,31 @@ export class LuaLibArrayTests {
@Test("array.splice[Remove]")
public spliceRemove<T>(inp: T[], start: number, deleteCount?: number, ...newElements: any[]) {
// Transpile
const lua = util.transpileString(`return JSONStringify([${inp.toString()}].splice(${start}, ${deleteCount}, ${newElements}))`);
let lua;
if (deleteCount) {
lua = util.transpileString(
`let spliceTestTable = [${inp.toString()}];
spliceTestTable.splice(${start}, ${deleteCount}, ${newElements});
return JSONStringify(spliceTestTable);`
);
} else {
lua = util.transpileString(
`let spliceTestTable = [${inp.toString()}];
spliceTestTable.splice(${start});
return JSONStringify(spliceTestTable);`
);
}

// Execute
const result = util.executeLua(lua);

// Assert
if (deleteCount) {
Expect(result).toBe(JSON.stringify(inp.splice(start, deleteCount, ...newElements)));
inp.splice(start, deleteCount, ...newElements);
Expect(result).toBe(JSON.stringify(inp));
} else {
Expect(result).toBe(JSON.stringify(inp.splice(start)));
inp.splice(start);
Expect(result).toBe(JSON.stringify(inp));
}
}

Expand Down