From a30130a3c77db37fa32796d2844449ec5d3d18d8 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Mon, 20 Aug 2018 18:58:03 +0300 Subject: [PATCH] Improved wording for primitive type conversion exception. --- njs/njs_vm.c | 3 ++- njs/test/njs_interactive_test.c | 2 +- njs/test/njs_unit_test.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/njs/njs_vm.c b/njs/njs_vm.c index 72eb5ec8..15b18642 100644 --- a/njs/njs_vm.c +++ b/njs/njs_vm.c @@ -3204,7 +3204,8 @@ njs_primitive_value(njs_vm_t *vm, njs_value_t *value, nxt_uint_t hint) } if (ret == NXT_ERROR) { - njs_type_error(vm, "cannot evaluate an object's value"); + njs_type_error(vm, + "Cannot convert object to primitive value"); } return ret; diff --git a/njs/test/njs_interactive_test.c b/njs/test/njs_interactive_test.c index ae98c09f..04069abf 100644 --- a/njs/test/njs_interactive_test.c +++ b/njs/test/njs_interactive_test.c @@ -215,7 +215,7 @@ static njs_interactive_test_t njs_test[] = { nxt_string("var o = { toString: function() { return [1] } }" ENTER "o" ENTER), - nxt_string("TypeError: cannot evaluate an object's value\n" + nxt_string("TypeError: Cannot convert object to primitive value\n" " at main (native)\n") }, }; diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c index acba1196..62be4969 100644 --- a/njs/test/njs_unit_test.c +++ b/njs/test/njs_unit_test.c @@ -4322,7 +4322,7 @@ static njs_unit_test_t njs_test[] = { nxt_string("var r = { toString: function() { return /45/ } };" "'123456'.search(r)"), - nxt_string("TypeError: cannot evaluate an object's value") }, + nxt_string("TypeError: Cannot convert object to primitive value") }, { nxt_string("var r = { toString: function() { return /34/ }," " valueOf: function() { return 45 } };" @@ -4456,7 +4456,7 @@ static njs_unit_test_t njs_test[] = { nxt_string("var r = { toString: function() { return /45/ } };" "'123456'.match(r)"), - nxt_string("TypeError: cannot evaluate an object's value") }, + nxt_string("TypeError: Cannot convert object to primitive value") }, { nxt_string("var r = { toString: function() { return /34/ }," " valueOf: function() { return 45 } };" @@ -5927,10 +5927,10 @@ static njs_unit_test_t njs_test[] = nxt_string("o:OK") }, { nxt_string("var o = { toString: function() { return [1] } }; o"), - nxt_string("TypeError: cannot evaluate an object's value") }, + nxt_string("TypeError: Cannot convert object to primitive value") }, { nxt_string("var o = { toString: function() { return [1] } }; 'o:' + o"), - nxt_string("TypeError: cannot evaluate an object's value") }, + nxt_string("TypeError: Cannot convert object to primitive value") }, { nxt_string("var a = { valueOf: function() { return '3' } };" "var b = { toString: function() { return 10 - a + 'OK' } };" -- 2.47.3