Details
Comments, small changes in the manual, an extra test for errors in error handling, small changes in tests.
This commit is contained in:
@@ -45,7 +45,7 @@ end
|
||||
-- test error message with no extra info
|
||||
assert(doit("error('hi', 0)") == 'hi')
|
||||
|
||||
-- test error message with no info
|
||||
-- test nil error message
|
||||
assert(doit("error()") == nil)
|
||||
|
||||
|
||||
@@ -555,7 +555,7 @@ if not _soft then
|
||||
|
||||
-- error in error handling
|
||||
local res, msg = xpcall(error, error)
|
||||
assert(not res and type(msg) == 'string')
|
||||
assert(not res and msg == 'error in error handling')
|
||||
print('+')
|
||||
|
||||
local function f (x)
|
||||
@@ -586,6 +586,27 @@ if not _soft then
|
||||
end
|
||||
|
||||
|
||||
do -- errors in error handle that not necessarily go forever
|
||||
local function err (n) -- function to be used as message handler
|
||||
-- generate an error unless n is zero, so that there is a limited
|
||||
-- loop of errors
|
||||
if type(n) ~= "number" then -- some other error?
|
||||
return n -- report it
|
||||
elseif n == 0 then
|
||||
return "END" -- that will be the final message
|
||||
else error(n - 1) -- does the loop
|
||||
end
|
||||
end
|
||||
|
||||
local res, msg = xpcall(error, err, 170)
|
||||
assert(not res and msg == "END")
|
||||
|
||||
-- too many levels
|
||||
local res, msg = xpcall(error, err, 300)
|
||||
assert(not res and msg == "C stack overflow")
|
||||
end
|
||||
|
||||
|
||||
do
|
||||
-- non string messages
|
||||
local t = {}
|
||||
|
||||
@@ -310,8 +310,11 @@ checkprogout("ZYX)\nXYZ)\n")
|
||||
-- bug since 5.2: finalizer called when closing a state could
|
||||
-- subvert finalization order
|
||||
prepfile[[
|
||||
-- should be called last
|
||||
-- ensure tables will be collected only at the end of the program
|
||||
collectgarbage"stop"
|
||||
|
||||
print("creating 1")
|
||||
-- this finalizer should be called last
|
||||
setmetatable({}, {__gc = function () print(1) end})
|
||||
|
||||
print("creating 2")
|
||||
|
||||
@@ -199,7 +199,7 @@ do
|
||||
__index = function (_,k) pos1 = k end,
|
||||
__newindex = function (_,k) pos2 = k; error() end, })
|
||||
local st, msg = pcall(table.move, a, f, e, t)
|
||||
assert(not st and not msg and pos1 == x and pos2 == y)
|
||||
assert(not st and pos1 == x and pos2 == y)
|
||||
end
|
||||
checkmove(1, maxI, 0, 1, 0)
|
||||
checkmove(0, maxI - 1, 1, maxI - 1, maxI)
|
||||
|
||||
Reference in New Issue
Block a user