From 2951276b31e04d7bff330b5c7af42d87cf766cd0 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Fri, 5 May 2017 14:08:13 +1000 Subject: src/ldebug.js: Fix incorrect error messages Previously could get odd things, e.g. `1-nil` would throw: > attempt to perform arithmetic on a number value --- src/ldebug.js | 3 +-- tests/ldebug.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ldebug.js b/src/ldebug.js index b411e0a..50625e5 100644 --- a/src/ldebug.js +++ b/src/ldebug.js @@ -551,8 +551,7 @@ const luaG_concaterror = function(L, p1, p2) { ** Error when both values are convertible to numbers, but not to integers */ const luaG_opinterror = function(L, p1, p2, msg) { - let temp = lvm.tonumber(p1); - if (temp !== false) + if (lvm.tonumber(p1) === false) p2 = p1; luaG_typeerror(L, p2, msg); }; diff --git a/tests/ldebug.js b/tests/ldebug.js index ba5c966..fe6e83d 100644 --- a/tests/ldebug.js +++ b/tests/ldebug.js @@ -175,7 +175,7 @@ test('luaG_opinterror', function (t) { }, "JS Lua program ran without error"); t.ok( - lua.lua_tojsstring(L, -1).endsWith("attempt to perform arithmetic on a string value"), + lua.lua_tojsstring(L, -1).endsWith("attempt to perform arithmetic on a table value"), "Correct error was thrown" ); }); -- cgit v1.2.3-70-g09d2