From 25450d8a12e83aabe9894bc7b1a7f3f7e65a97a7 Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Wed, 22 Jul 2015 18:14:45 +0200 Subject: [PATCH] Error constructor prototypes should be Function JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com --- .../ecma/builtin-objects/ecma-builtins.inc.h | 14 +++++++------- tests/jerry/object-define-properties.js | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h index 6074962f4..5f85ad982 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h @@ -188,7 +188,7 @@ BUILTIN (ECMA_BUILTIN_ID_ERROR_PROTOTYPE, /* The Error object (15.11.1) */ BUILTIN (ECMA_BUILTIN_ID_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, error) @@ -204,7 +204,7 @@ BUILTIN (ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, /* The EvalError object (15.11.6.1) */ BUILTIN (ECMA_BUILTIN_ID_EVAL_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, eval_error) @@ -220,7 +220,7 @@ BUILTIN (ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE, /* The RangeError object (15.11.6.2) */ BUILTIN (ECMA_BUILTIN_ID_RANGE_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, range_error) @@ -236,7 +236,7 @@ BUILTIN (ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE, /* The ReferenceError object (15.11.6.3) */ BUILTIN (ECMA_BUILTIN_ID_REFERENCE_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, reference_error) @@ -252,7 +252,7 @@ BUILTIN (ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE, /* The SyntaxError object (15.11.6.4) */ BUILTIN (ECMA_BUILTIN_ID_SYNTAX_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, syntax_error) @@ -268,7 +268,7 @@ BUILTIN (ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE, /* The TypeError object (15.11.6.5) */ BUILTIN (ECMA_BUILTIN_ID_TYPE_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, type_error) @@ -284,7 +284,7 @@ BUILTIN (ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE, /* The URIError object (15.11.6.6) */ BUILTIN (ECMA_BUILTIN_ID_URI_ERROR, ECMA_OBJECT_TYPE_FUNCTION, - ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE, + ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, true, uri_error) diff --git a/tests/jerry/object-define-properties.js b/tests/jerry/object-define-properties.js index 2508f91b3..0d0470b7f 100644 --- a/tests/jerry/object-define-properties.js +++ b/tests/jerry/object-define-properties.js @@ -131,7 +131,7 @@ var props = { writable: true, }, get bar() { - throw TypeError; + throw new TypeError("foo"); return { value : 2, writable : true }; }, prop2: { @@ -149,6 +149,7 @@ try { assert (false); } catch (e) { assert (e instanceof TypeError); + assert (e.message === "foo"); } // Define get method which deletes a property