refactor(lualib): use builtins for the 5.0 branches instead of a version check

YoRyan · YoRyan · commit fdcea36ba616 · 2022-08-29T06:20:34.000Z
diff --git a/src/LuaLib.ts b/src/LuaLib.ts
@@ -45,7 +45,6 @@ export enum LuaLibFeature {
     Generator = "Generator",
     InstanceOf = "InstanceOf",
     InstanceOfObject = "InstanceOfObject",
-    IsLua50 = "IsLua50",
     Iterator = "Iterator",
     LuaIteratorSpread = "LuaIteratorSpread",
     Map = "Map",
diff --git a/src/lualib/CountVarargs.ts b/src/lualib/CountVarargs.ts
@@ -1,11 +1,9 @@
 /** @noSelfInFile */
 
-import { __TS__IsLua50 } from "./IsLua50";
-
 export function __TS__CountVarargs<T>(...args: T[]): number {
     // select() is not available in Lua 5.0. In that version, the arg table
     // includes trailing nils.
     // It is important that the select() branch come first as we need vararg
     // optimization for this call.
-    return !__TS__IsLua50 ? select("#", ...args) : args.length;
+    return select ? select("#", ...args) : args.length;
 }
diff --git a/src/lualib/IsLua50.ts b/src/lualib/IsLua50.ts
diff --git a/src/lualib/Match.ts b/src/lualib/Match.ts
@@ -1,9 +1,9 @@
 /** @noSelfInFile */
 
-import { __TS__IsLua50 } from "./IsLua50";
-
 export function __TS__Match(s: string, pattern: string, init?: number): LuaMultiReturn<string[]> {
-    if (__TS__IsLua50) {
+    if (string.match) {
+        return string.match(s, pattern, init);
+    } else {
         const [start, end, ...captures] = string.find(s, pattern, init);
         if (start === undefined || end === undefined) {
             return $multi();
@@ -12,7 +12,5 @@ export function __TS__Match(s: string, pattern: string, init?: number): LuaMulti
         } else {
             return $multi(...(captures as string[]));
         }
-    } else {
-        return string.match(s, pattern, init);
     }
 }
diff --git a/src/lualib/NumberToString.ts b/src/lualib/NumberToString.ts
@@ -1,13 +1,11 @@
-import { __TS__IsLua50 } from "./IsLua50";
-
 const radixChars = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 function modf(this: void, x: number): LuaMultiReturn<[number, number]> {
-    if (__TS__IsLua50) {
+    if (math.modf) {
+        return math.modf(x);
+    } else {
         const integral = x > 0 ? Math.floor(x) : Math.ceil(x);
         return $multi(integral, x - integral);
-    } else {
-        return math.modf(x);
     }
 }
 
diff --git a/src/lualib/SourceMapTraceBack.ts b/src/lualib/SourceMapTraceBack.ts
@@ -1,7 +1,6 @@
 // TODO: In the future, change this to __TS__RegisterFileInfo and provide tstl interface to
 // get some metadata about transpilation.
 
-import { __TS__IsLua50 } from "./IsLua50";
 import { __TS__Match } from "./Match";
 
 interface SourceMap {
@@ -21,7 +20,8 @@ export function __TS__SourceMapTraceBack(this: void, fileName: string, sourceMap
             let trace: string;
             if (thread === undefined && message === undefined && level === undefined) {
                 trace = originalTraceback();
-            } else if (__TS__IsLua50) {
+            } else if (string.sub(_VERSION, 7, 7) === "0") {
+                // For Lua 5.0, which doesn't support the thread argument.
                 trace = originalTraceback(message, level);
             } else {
                 trace = originalTraceback(thread, message, level);

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`/** @noSelfInFile */`
`2`	`2`
`3`		`-import { __TS__IsLua50 } from "./IsLua50";`
`4`		`-`
`5`	`3`	`export function __TS__Match(s: string, pattern: string, init?: number): LuaMultiReturn<string[]> {`
`6`		`- if (__TS__IsLua50) {`
	`4`	`+ if (string.match) {`
	`5`	`+ return string.match(s, pattern, init);`
	`6`	`+ } else {`
`7`	`7`	`const [start, end, ...captures] = string.find(s, pattern, init);`
`8`	`8`	`if (start === undefined \|\| end === undefined) {`
`9`	`9`	`return $multi();`
`@@ -12,7 +12,5 @@ export function __TS__Match(s: string, pattern: string, init?: number): LuaMulti`
`12`	`12`	`} else {`
`13`	`13`	`return $multi(...(captures as string[]));`
`14`	`14`	`}`
`15`		`- } else {`
`16`		`- return string.match(s, pattern, init);`
`17`	`15`	`}`
`18`	`16`	`}`