Skip to content

Commit 5dffb6b

Browse files
PerryvwPerryvw
committed
Official support for Lua 5.4
1 parent f6a92c0 commit 5dffb6b

File tree

9 files changed

+125
-5
lines changed

9 files changed

+125
-5
lines changed

‎src/CompilerOptions.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export enum LuaTarget {
4949
Lua51 = "5.1",
5050
Lua52 = "5.2",
5151
Lua53 = "5.3",
52+
Lua54 = "5.4",
5253
LuaJIT = "JIT",
5354
}
5455

‎test/cli/parse.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ describe("tsconfig", () => {
221221
["luaTarget", "5.1", { luaTarget: tstl.LuaTarget.Lua51 }],
222222
["luaTarget", "5.2", { luaTarget: tstl.LuaTarget.Lua52 }],
223223
["luaTarget", "5.3", { luaTarget: tstl.LuaTarget.Lua53 }],
224+
["luaTarget", "5.4", { luaTarget: tstl.LuaTarget.Lua54 }],
224225
["luaTarget", "jit", { luaTarget: tstl.LuaTarget.LuaJIT }],
225226

226227
["luaBundle", "foo", { luaBundle: "foo" }],

‎test/unit/__snapshots__/expressions.spec.ts.snap‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,87 @@ ____exports.__result = a | b
335335
return ____exports"
336336
`;
337337
338+
exports[`Bitop [5.4] ("~a") 1`] = `
339+
"local ____exports = {}
340+
____exports.__result = ~a
341+
return ____exports"
342+
`;
343+
344+
exports[`Bitop [5.4] ("a&=b") 1`] = `
345+
"local ____exports = {}
346+
____exports.__result = (function()
347+
a = a & b
348+
return a
349+
end)()
350+
return ____exports"
351+
`;
352+
353+
exports[`Bitop [5.4] ("a&b") 1`] = `
354+
"local ____exports = {}
355+
____exports.__result = a & b
356+
return ____exports"
357+
`;
358+
359+
exports[`Bitop [5.4] ("a<<=b") 1`] = `
360+
"local ____exports = {}
361+
____exports.__result = (function()
362+
a = a << b
363+
return a
364+
end)()
365+
return ____exports"
366+
`;
367+
368+
exports[`Bitop [5.4] ("a<<b") 1`] = `
369+
"local ____exports = {}
370+
____exports.__result = a << b
371+
return ____exports"
372+
`;
373+
374+
exports[`Bitop [5.4] ("a>>>=b") 1`] = `
375+
"local ____exports = {}
376+
____exports.__result = (function()
377+
a = a >> b
378+
return a
379+
end)()
380+
return ____exports"
381+
`;
382+
383+
exports[`Bitop [5.4] ("a>>>b") 1`] = `
384+
"local ____exports = {}
385+
____exports.__result = a >> b
386+
return ____exports"
387+
`;
388+
389+
exports[`Bitop [5.4] ("a^=b") 1`] = `
390+
"local ____exports = {}
391+
____exports.__result = (function()
392+
a = a ~ b
393+
return a
394+
end)()
395+
return ____exports"
396+
`;
397+
398+
exports[`Bitop [5.4] ("a^b") 1`] = `
399+
"local ____exports = {}
400+
____exports.__result = a ~ b
401+
return ____exports"
402+
`;
403+
404+
exports[`Bitop [5.4] ("a|=b") 1`] = `
405+
"local ____exports = {}
406+
____exports.__result = (function()
407+
a = a | b
408+
return a
409+
end)()
410+
return ____exports"
411+
`;
412+
413+
exports[`Bitop [5.4] ("a|b") 1`] = `
414+
"local ____exports = {}
415+
____exports.__result = a | b
416+
return ____exports"
417+
`;
418+
338419
exports[`Bitop [JIT] ("~a") 1`] = `
339420
"local ____exports = {}
340421
____exports.__result = bit.bnot(a)
@@ -553,3 +634,22 @@ return ____exports"
553634
`;
554635
555636
exports[`Unsupported bitop 5.3 ("a>>b"): diagnostics 1`] = `"main.ts(1,25): error TSTL: Right shift operator is not supported for target Lua 5.3. Use \`>>>\` instead."`;
637+
638+
exports[`Unsupported bitop 5.4 ("a>>=b"): code 1`] = `
639+
"local ____exports = {}
640+
____exports.__result = (function()
641+
a = a >> b
642+
return a
643+
end)()
644+
return ____exports"
645+
`;
646+
647+
exports[`Unsupported bitop 5.4 ("a>>=b"): diagnostics 1`] = `"main.ts(1,25): error TSTL: Right shift operator is not supported for target Lua 5.3. Use \`>>>\` instead."`;
648+
649+
exports[`Unsupported bitop 5.4 ("a>>b"): code 1`] = `
650+
"local ____exports = {}
651+
____exports.__result = a >> b
652+
return ____exports"
653+
`;
654+
655+
exports[`Unsupported bitop 5.4 ("a>>b"): diagnostics 1`] = `"main.ts(1,25): error TSTL: Right shift operator is not supported for target Lua 5.3. Use \`>>>\` instead."`;

‎test/unit/builtins/math.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ util.testEachVersion("Math.atan2", () => util.testExpression`Math.atan2(4, 5)`,
3434
[tstl.LuaTarget.Lua51]: builder => builder.tap(expectMathAtan2),
3535
[tstl.LuaTarget.Lua52]: builder => builder.tap(expectMathAtan2),
3636
[tstl.LuaTarget.Lua53]: builder => builder.tap(expectMathAtan),
37+
[tstl.LuaTarget.Lua54]: builder => builder.tap(expectMathAtan2),
3738
});
3839

3940
test("Math.atan2(4, 5)", () => {

‎test/unit/expressions.spec.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,27 @@ test.each(supportedInAll)("Bitop [5.3] (%p)", input => {
7777
.expectLuaToMatchSnapshot();
7878
});
7979

80+
test.each(supportedInAll)("Bitop [5.4] (%p)", input => {
81+
util.testExpression(input)
82+
.setOptions({ luaTarget: tstl.LuaTarget.Lua54, luaLibImport: tstl.LuaLibImportKind.None })
83+
.disableSemanticCheck()
84+
.expectLuaToMatchSnapshot();
85+
});
86+
8087
test.each(unsupportedIn53)("Unsupported bitop 5.3 (%p)", input => {
8188
util.testExpression(input)
8289
.setOptions({ luaTarget: tstl.LuaTarget.Lua53, luaLibImport: tstl.LuaLibImportKind.None })
8390
.disableSemanticCheck()
8491
.expectDiagnosticsToMatchSnapshot([unsupportedRightShiftOperator.code]);
8592
});
8693

94+
test.each(unsupportedIn53)("Unsupported bitop 5.4 (%p)", input => {
95+
util.testExpression(input)
96+
.setOptions({ luaTarget: tstl.LuaTarget.Lua54, luaLibImport: tstl.LuaLibImportKind.None })
97+
.disableSemanticCheck()
98+
.expectDiagnosticsToMatchSnapshot([unsupportedRightShiftOperator.code]);
99+
});
100+
87101
test.each(["1+1", "-1+1", "1*30+4", "1*(3+4)", "1*(3+4*2)", "10-(4+5)"])(
88102
"Binary expressions ordering parentheses (%p)",
89103
input => {

‎test/unit/language-extensions/operators.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { LuaTarget } from "../../../src";
66
import { unsupportedForTarget } from "../../../src/transformation/utils/diagnostics";
77

88
const operatorsProjectOptions: tstl.CompilerOptions = {
9-
luaTarget: LuaTarget.Lua53,
9+
luaTarget: LuaTarget.Lua54,
1010
types: [path.resolve(__dirname, "../../../language-extensions")],
1111
};
1212

‎test/unit/loops.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ for (const testCase of [
534534
[tstl.LuaTarget.Lua51]: builder => builder.expectDiagnosticsToMatchSnapshot([unsupportedForTarget.code]),
535535
[tstl.LuaTarget.Lua52]: expectContinueGotoLabel,
536536
[tstl.LuaTarget.Lua53]: expectContinueGotoLabel,
537+
[tstl.LuaTarget.Lua54]: expectContinueGotoLabel,
537538
[tstl.LuaTarget.LuaJIT]: expectContinueGotoLabel,
538539
});
539540
}

‎test/unit/spread.spec.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ describe("in function call", () => {
7777
[tstl.LuaTarget.LuaJIT]: builder => builder.tap(expectUnpack),
7878
[tstl.LuaTarget.Lua51]: builder => builder.tap(expectUnpack),
7979
[tstl.LuaTarget.Lua52]: builder => builder.tap(expectTableUnpack),
80-
[tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
80+
[tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack),
81+
[tstl.LuaTarget.Lua54]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
8182
}
8283
);
8384
});
@@ -88,7 +89,8 @@ describe("in array literal", () => {
8889
[tstl.LuaTarget.LuaJIT]: builder => builder.tap(expectUnpack),
8990
[tstl.LuaTarget.Lua51]: builder => builder.tap(expectUnpack),
9091
[tstl.LuaTarget.Lua52]: builder => builder.tap(expectTableUnpack),
91-
[tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
92+
[tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack),
93+
[tstl.LuaTarget.Lua54]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
9294
});
9395

9496
test("of array literal /w OmittedExpression", () => {

‎test/util.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable jest/no-standalone-expect */
22
import * as nativeAssert from "assert";
3-
import { lauxlib, lua, lualib } from "lua-wasm-bindings/dist/lua.53";
3+
import { lauxlib, lua, lualib } from "lua-wasm-bindings/dist/lua.54";
44
import { LUA_OK } from "lua-wasm-bindings/dist/lua";
55
import * as fs from "fs";
66
import { stringify } from "javascript-stringify";
@@ -109,7 +109,7 @@ export abstract class TestBuilder {
109109
}
110110

111111
private options: tstl.CompilerOptions = {
112-
luaTarget: tstl.LuaTarget.Lua53,
112+
luaTarget: tstl.LuaTarget.Lua54,
113113
noHeader: true,
114114
skipLibCheck: true,
115115
target: ts.ScriptTarget.ES2017,

0 commit comments

Comments
 (0)