TypeScriptToLua · lolleko · Mar 6, 2021 · Mar 5, 2021 · Mar 5, 2021
diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -49,6 +49,7 @@ export enum LuaTarget {
     Lua51 = "5.1",
     Lua52 = "5.2",
     Lua53 = "5.3",
+    Lua54 = "5.4",
     LuaJIT = "JIT",
 }
 

diff --git a/test/cli/parse.spec.ts b/test/cli/parse.spec.ts
@@ -221,6 +221,7 @@ describe("tsconfig", () => {
             ["luaTarget", "5.1", { luaTarget: tstl.LuaTarget.Lua51 }],
             ["luaTarget", "5.2", { luaTarget: tstl.LuaTarget.Lua52 }],
             ["luaTarget", "5.3", { luaTarget: tstl.LuaTarget.Lua53 }],
+            ["luaTarget", "5.4", { luaTarget: tstl.LuaTarget.Lua54 }],
             ["luaTarget", "jit", { luaTarget: tstl.LuaTarget.LuaJIT }],
 
             ["luaBundle", "foo", { luaBundle: "foo" }],

diff --git a/test/unit/__snapshots__/expressions.spec.ts.snap b/test/unit/__snapshots__/expressions.spec.ts.snap
@@ -335,6 +335,87 @@ ____exports.__result = a | b
 return ____exports"
 `;
 
+exports[`Bitop [5.4] ("~a") 1`] = `
+"local ____exports = {}
+____exports.__result = ~a
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a&=b") 1`] = `
+"local ____exports = {}
+____exports.__result = (function()
+    a = a & b
+    return a
+end)()
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a&b") 1`] = `
+"local ____exports = {}
+____exports.__result = a & b
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a<<=b") 1`] = `
+"local ____exports = {}
+____exports.__result = (function()
+    a = a << b
+    return a
+end)()
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a<<b") 1`] = `
+"local ____exports = {}
+____exports.__result = a << b
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a>>>=b") 1`] = `
+"local ____exports = {}
+____exports.__result = (function()
+    a = a >> b
+    return a
+end)()
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a>>>b") 1`] = `
+"local ____exports = {}
+____exports.__result = a >> b
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a^=b") 1`] = `
+"local ____exports = {}
+____exports.__result = (function()
+    a = a ~ b
+    return a
+end)()
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a^b") 1`] = `
+"local ____exports = {}
+____exports.__result = a ~ b
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a|=b") 1`] = `
+"local ____exports = {}
+____exports.__result = (function()
+    a = a | b
+    return a
+end)()
+return ____exports"
+`;
+
+exports[`Bitop [5.4] ("a|b") 1`] = `
+"local ____exports = {}
+____exports.__result = a | b
+return ____exports"
+`;
+
 exports[`Bitop [JIT] ("~a") 1`] = `
 "local ____exports = {}
 ____exports.__result = bit.bnot(a)
@@ -553,3 +634,22 @@ return ____exports"
 `;
 
 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."`;
+
+exports[`Unsupported bitop 5.4 ("a>>=b"): code 1`] = `
+"local ____exports = {}
+____exports.__result = (function()
+    a = a >> b
+    return a
+end)()
+return ____exports"
+`;
+
+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."`;
+
+exports[`Unsupported bitop 5.4 ("a>>b"): code 1`] = `
+"local ____exports = {}
+____exports.__result = a >> b
+return ____exports"
+`;
+
+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."`;
diff --git a/test/unit/builtins/math.spec.ts b/test/unit/builtins/math.spec.ts
@@ -34,6 +34,7 @@ util.testEachVersion("Math.atan2", () => util.testExpression`Math.atan2(4, 5)`,
     [tstl.LuaTarget.Lua51]: builder => builder.tap(expectMathAtan2),
     [tstl.LuaTarget.Lua52]: builder => builder.tap(expectMathAtan2),
     [tstl.LuaTarget.Lua53]: builder => builder.tap(expectMathAtan),
+    [tstl.LuaTarget.Lua54]: builder => builder.tap(expectMathAtan2),
 });
 
 test("Math.atan2(4, 5)", () => {

diff --git a/test/unit/expressions.spec.ts b/test/unit/expressions.spec.ts
@@ -46,8 +46,8 @@ test.each(["a+=b", "a-=b", "a*=b", "a/=b", "a%=b", "a**=b"])("Binary expressions
 });
 
 const supportedInAll = ["~a", "a&b", "a&=b", "a|b", "a|=b", "a^b", "a^=b", "a<<b", "a<<=b", "a>>>b", "a>>>=b"];
-const unsupportedIn53 = ["a>>b", "a>>=b"];
-const allBinaryOperators = [...supportedInAll, ...unsupportedIn53];
+const unsupportedIn53And54 = ["a>>b", "a>>=b"];
+const allBinaryOperators = [...supportedInAll, ...unsupportedIn53And54];
 test.each(allBinaryOperators)("Bitop [5.1] (%p)", input => {
     // Bit operations not supported in 5.1, expect an exception
     util.testExpression(input)
@@ -77,13 +77,27 @@ test.each(supportedInAll)("Bitop [5.3] (%p)", input => {
         .expectLuaToMatchSnapshot();
 });
 
-test.each(unsupportedIn53)("Unsupported bitop 5.3 (%p)", input => {
+test.each(supportedInAll)("Bitop [5.4] (%p)", input => {
+    util.testExpression(input)
+        .setOptions({ luaTarget: tstl.LuaTarget.Lua54, luaLibImport: tstl.LuaLibImportKind.None })
+        .disableSemanticCheck()
+        .expectLuaToMatchSnapshot();
+});
+
+test.each(unsupportedIn53And54)("Unsupported bitop 5.3 (%p)", input => {
     util.testExpression(input)
         .setOptions({ luaTarget: tstl.LuaTarget.Lua53, luaLibImport: tstl.LuaLibImportKind.None })
         .disableSemanticCheck()
         .expectDiagnosticsToMatchSnapshot([unsupportedRightShiftOperator.code]);
 });
 
+test.each(unsupportedIn53And54)("Unsupported bitop 5.4 (%p)", input => {
+    util.testExpression(input)
+        .setOptions({ luaTarget: tstl.LuaTarget.Lua54, luaLibImport: tstl.LuaLibImportKind.None })
+        .disableSemanticCheck()
+        .expectDiagnosticsToMatchSnapshot([unsupportedRightShiftOperator.code]);
+});
+
 test.each(["1+1", "-1+1", "1*30+4", "1*(3+4)", "1*(3+4*2)", "10-(4+5)"])(
     "Binary expressions ordering parentheses (%p)",
     input => {

diff --git a/test/unit/language-extensions/operators.spec.ts b/test/unit/language-extensions/operators.spec.ts
@@ -6,7 +6,7 @@ import { LuaTarget } from "../../../src";
 import { unsupportedForTarget } from "../../../src/transformation/utils/diagnostics";
 
 const operatorsProjectOptions: tstl.CompilerOptions = {
-    luaTarget: LuaTarget.Lua53,
+    luaTarget: LuaTarget.Lua54,
     types: [path.resolve(__dirname, "../../../language-extensions")],
 };
 

diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -534,6 +534,7 @@ for (const testCase of [
         [tstl.LuaTarget.Lua51]: builder => builder.expectDiagnosticsToMatchSnapshot([unsupportedForTarget.code]),
         [tstl.LuaTarget.Lua52]: expectContinueGotoLabel,
         [tstl.LuaTarget.Lua53]: expectContinueGotoLabel,
+        [tstl.LuaTarget.Lua54]: expectContinueGotoLabel,
         [tstl.LuaTarget.LuaJIT]: expectContinueGotoLabel,
     });
 }

diff --git a/test/unit/spread.spec.ts b/test/unit/spread.spec.ts
@@ -77,7 +77,8 @@ describe("in function call", () => {
             [tstl.LuaTarget.LuaJIT]: builder => builder.tap(expectUnpack),
             [tstl.LuaTarget.Lua51]: builder => builder.tap(expectUnpack),
             [tstl.LuaTarget.Lua52]: builder => builder.tap(expectTableUnpack),
-            [tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
+            [tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack),
+            [tstl.LuaTarget.Lua54]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
         }
     );
 });
@@ -88,7 +89,8 @@ describe("in array literal", () => {
         [tstl.LuaTarget.LuaJIT]: builder => builder.tap(expectUnpack),
         [tstl.LuaTarget.Lua51]: builder => builder.tap(expectUnpack),
         [tstl.LuaTarget.Lua52]: builder => builder.tap(expectTableUnpack),
-        [tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
+        [tstl.LuaTarget.Lua53]: builder => builder.tap(expectTableUnpack),
+        [tstl.LuaTarget.Lua54]: builder => builder.tap(expectTableUnpack).expectToMatchJsResult(),
     });
 
     test("of array literal /w OmittedExpression", () => {

diff --git a/test/util.ts b/test/util.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-standalone-expect */
 import * as nativeAssert from "assert";
-import { lauxlib, lua, lualib } from "lua-wasm-bindings/dist/lua.53";
+import { lauxlib, lua, lualib } from "lua-wasm-bindings/dist/lua.54";
 import { LUA_OK } from "lua-wasm-bindings/dist/lua";
 import * as fs from "fs";
 import { stringify } from "javascript-stringify";
@@ -109,7 +109,7 @@ export abstract class TestBuilder {
     }
 
     private options: tstl.CompilerOptions = {
-        luaTarget: tstl.LuaTarget.Lua53,
+        luaTarget: tstl.LuaTarget.Lua54,
         noHeader: true,
         skipLibCheck: true,
         target: ts.ScriptTarget.ES2017,