fix: use overloads for pcall and xpcall types

ark120202 · ark120202 · commit 9722c408f667 · 2019-03-14T17:36:24.000+05:00
diff --git a/core/global.d.ts b/core/global.d.ts
@@ -116,28 +116,15 @@ declare function pairs<T>(t: T): [(t: T, index?: any) => [any, any], T];
  * Calls function f with the given arguments in protected mode. This means that any error inside f is not propagated; instead, pcall catches the error and returns a status code. Its first result is the status code (a boolean), which is true if the call succeeds without errors. In such case, pcall also returns all results from the call, after this first result. In case of any error, pcall returns false plus the error message.
  * @tupleReturn
  */
-declare function pcall<T extends (...args: any[]) => any>(
-  f: T,
-  ...args: T extends (this: infer This, ...args: infer Args) => any
-    ? void extends This
-      ? Args
-      : Args extends [infer T1]
-      ? [{} extends This ? any : This, T1]
-      : Args extends [infer T1, infer T2]
-      ? [{} extends This ? any : This, T1, T2]
-      : Args extends [infer T1, infer T2, infer T3]
-      ? [{} extends This ? any : This, T1, T2, T3]
-      : Args extends [infer T1, infer T2, infer T3, infer T4]
-      ? [{} extends This ? any : This, T1, T2, T3, T4]
-      : Args extends [infer T1, infer T2, infer T3, infer T4, infer T5]
-      ? [{} extends This ? any : This, T1, T2, T3, T4, T5]
-      : Args extends [infer T1, infer T2, infer T3, infer T4, infer T5, infer T6]
-      ? [{} extends This ? any : This, T1, T2, T3, T4, T5, T6]
-      : Args extends [infer T1, infer T2, infer T3, infer T4, infer T5, infer T6, infer T7]
-      ? [{} extends This ? any : This, T1, T2, T3, T4, T5, T6, T7]
-      : [{} extends This ? any : This, ...Args[number][]]
-    : never
-): [true, ReturnType<T>] | [false, string];
+declare function pcall<This, Args extends any[], R>(
+  f: (this: This, ...args: Args) => R,
+  context: This,
+  ...args: Args
+): [true, R] | [false, string];
+declare function pcall<A extends any[], R>(
+  f: (this: void, ...args: A) => R,
+  ...args: A
+): [true, R] | [false, string];
 
 /**
  * Receives any number of arguments and prints their values to stdout, using the tostring function to convert each argument to a string. print is not intended for formatted output, but only as a quick way to show a value, for instance for debugging. For complete control over the output, use string.format and io.write.
diff --git a/special/5.2-plus-or-jit.d.ts b/special/5.2-plus-or-jit.d.ts
@@ -37,29 +37,17 @@ declare function loadfile(
  * This function is similar to pcall, except that it sets a new message handler msgh.
  * @tupleReturn
  */
-declare function xpcall<T extends (...args: any[]) => any, E>(
-  f: T,
+declare function xpcall<This, Args extends any[], R, E>(
+  f: (this: This, ...args: Args) => R,
   msgh: (err: any) => E,
-  ...args: T extends (this: infer This, ...args: infer Args) => any
-    ? void extends This
-      ? Args
-      : Args extends [infer T1]
-      ? [{} extends This ? any : This, T1]
-      : Args extends [infer T1, infer T2]
-      ? [{} extends This ? any : This, T1, T2]
-      : Args extends [infer T1, infer T2, infer T3]
-      ? [{} extends This ? any : This, T1, T2, T3]
-      : Args extends [infer T1, infer T2, infer T3, infer T4]
-      ? [{} extends This ? any : This, T1, T2, T3, T4]
-      : Args extends [infer T1, infer T2, infer T3, infer T4, infer T5]
-      ? [{} extends This ? any : This, T1, T2, T3, T4, T5]
-      : Args extends [infer T1, infer T2, infer T3, infer T4, infer T5, infer T6]
-      ? [{} extends This ? any : This, T1, T2, T3, T4, T5, T6]
-      : Args extends [infer T1, infer T2, infer T3, infer T4, infer T5, infer T6, infer T7]
-      ? [{} extends This ? any : This, T1, T2, T3, T4, T5, T6, T7]
-      : [{} extends This ? any : This, ...Args[number][]]
-    : never
-): [true, ReturnType<T>] | [false, E];
+  context: This,
+  ...args: Args
+): [true, R] | [false, E];
+declare function xpcall<A extends any[], R, E>(
+  f: (this: void, ...args: A) => R,
+  msgh: (err: any) => E,
+  ...args: A
+): [true, R] | [false, E];
 
 declare namespace debug {
   interface FunctionInfo<T extends Function> {
