Improved wording for primitive type conversion exception.

diff --git a/njs/njs_vm.c b/njs/njs_vm.c
index 72eb5ec8a620fe9461d5cc5901a1c8cd314bf24c..15b18642a258b3d4ed989175c6d82b83ebea2454 100644 (file)
--- 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 ae98c09ffe30c2ffd338aa688a9fc499b1307555..04069abfe4c721cf537ea98fdf1b94b833e8fd63 100644 (file)
--- 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 acba11960f5dc94416364ae54f7d109609acf7da..62be4969fc11062e1957156cd952c308a67d879f 100644 (file)
--- 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' } };"