fix throwing strings and update tests

TheLartians · TheLartians · commit 893cc7a34fe9 · 2019-09-29T22:30:57.000+02:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -2851,6 +2851,7 @@ export class LuaTransformer {
 
         if (statement.expression) {
             parameters.push(this.transformExpression(statement.expression));
+            parameters.push(tstl.createNumericLiteral(0));
         }
 
         return tstl.createExpressionStatement(
diff --git a/src/lualib/Error.ts b/src/lualib/Error.ts
@@ -24,7 +24,7 @@ function __TS__GetErrorString(this: void, error: Error): string {
     return error.message !== "" ? `${error.name}: ${error.message}` : error.name;
 }
 
-function __TS__InitErrorClass<T>(Type: ErrorType<T>, name?: string): any {
+function __TS__InitErrorClass<T>(Type: ErrorType<T>, name: string): any {
     if (name) {
         Type.name = name;
     }
@@ -34,17 +34,19 @@ function __TS__InitErrorClass<T>(Type: ErrorType<T>, name?: string): any {
 }
 
 Error = __TS__InitErrorClass(
-    class Error {
+    class {
         public name = "Error";
         public message: string;
         public stack: string;
 
         constructor(message = "") {
             this.message = message;
             this.stack = __TS__GetErrorStack((this.constructor as any).new);
-            getmetatable(this).__tostring = __TS__GetErrorString;
+            const mt = getmetatable(this);
+            mt.__tostring = mt.__tostring || __TS__GetErrorString;
         }
-    }
+    },
+    "Error"
 );
 
 for (const errorName of ["RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError"]) {
diff --git a/test/unit/error.spec.ts b/test/unit/error.spec.ts
@@ -286,15 +286,18 @@ test("return from nested finally", () => {
     expect(util.transpileAndExecute(code)).toBe("finally AB");
 });
 
-test("throw and catch custom error object", () => {
-    util.testFunction`
+test.each([`"Hello error string!"`, `42`, `true`, `false`, `undefined`, `{ x: "Hello error object!" }`])(
+    "throw and catch custom error object",
+    error => {
+        util.testFunction`
         try {
-            throw { x: "Hello error object!" };
+            throw ${error};
         } catch (error) {
-            return error.x;
+            return error;
         }
     `.expectToMatchJsResult();
-});
+    }
+);
 
 test.each(["Error", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError"])(
     "throw builtin Errors as classes",
@@ -304,7 +307,7 @@ test.each(["Error", "RangeError", "ReferenceError", "SyntaxError", "TypeError",
                 throw new ${errorType}("message")
             } catch (error) {
                 if (error instanceof Error) {
-                    return \`\${error}\`;
+                    return error.toString();
                 } else {
                     throw Error("This error serves to prevent false positives from .expectNoExecutionError()");
                 }
@@ -321,7 +324,7 @@ test.each(["Error", "RangeError", "ReferenceError", "SyntaxError", "TypeError",
                 throw ${errorType}("message")
             } catch (error) {
                 if (error instanceof Error) {
-                    return \`\${error}\`;
+                    return error.toString();
                 } else {
                     throw Error("This error serves to prevent false positives from .expectNoExecutionError()");
                 }
@@ -333,14 +336,14 @@ test.each(["Error", "RangeError", "ReferenceError", "SyntaxError", "TypeError",
 test("subclass Error", () => {
     util.testFunction`
         class MyError extends Error {
-            name: "MyError"
+            public name = "MyError";
         }
         
         try {
             throw new MyError();
         } catch (error) {
             if (error instanceof Error) {
-                return \'\$error\';
+                return error.toString();
             } else {
                 throw Error("This error serves to prevent false positives from .expectNoExecutionError()");
             }

Original file line number	Diff line number	Diff line change
`@@ -2851,6 +2851,7 @@ export class LuaTransformer {`
`2851`	`2851`
`2852`	`2852`	`if (statement.expression) {`
`2853`	`2853`	`parameters.push(this.transformExpression(statement.expression));`
	`2854`	`+ parameters.push(tstl.createNumericLiteral(0));`
`2854`	`2855`	`}`
`2855`	`2856`
`2856`	`2857`	`return tstl.createExpressionStatement(`