Reuh/candran
1
0
Fork 0
mirror of https://github.com/Reuh/candran.git synced 2025-10-27 09:59:29 +00:00
Code Releases Activity

Allow rewriting without new traceback

Browse source
This commit is contained in:
Étienne Fildadut 2021-05-17 15:19:55 +02:00
parent a3f05f5046
commit f5752cd231
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -597,7 +597,7 @@ Please note that Candran can only wrap code directly called from Candran; if an
If you want Candran to always wrap errors, you will need to wrap your whole code in a `xpcall`: `xpcall(func, candran.messageHandler)`.
* ```candran.messageHandler(message)```: the error message handler used by Candran. Given `message` the Lua error string, returns full Candran traceback where soure files and lines are rewritten to their Candran source. You can use it as is in xpcall as a message handler.
* ```candran.messageHandler(message[, noTraceback])```: the error message handler used by Candran. Given `message` the Lua error string, returns full Candran traceback where soure files and lines are rewritten to their Candran source. You can use it as is in xpcall as a message handler. If `noTraceback` is `true`, Candran will only rewrite `message` and not add a new traceback.
Also note that the Candran message handler will add a new, rewritten, stacktrace to the error message; it can't replace the default Lua one. You will therefore see two stacktraces when raising an error, the last one being the Lua one and can be ignored.

4
candran.can
View file

@ -265,8 +265,8 @@ end
--- Candran error message handler.
-- Use it in xpcall to rewrite stacktraces to display Candran source file lines instead of compiled Lua lines.
function candran.messageHandler(message)
if not message:match("\nstack traceback:\n") then
function candran.messageHandler(message, noTraceback)
if not noTraceback and not message:match("\nstack traceback:\n") then
message = debug.traceback(message, 2)
end
return message:gsub("(\n?%s*)([^\n]-)%:(%d+)%:", function(indentation, source, line)

4
candran.lua
View file

@ -6586,8 +6586,8 @@ else -- candran.can:260
return f() -- candran.can:262
end -- candran.can:262
end -- candran.can:262
candran["messageHandler"] = function(message) -- candran.can:268
if not message:match("\
candran["messageHandler"] = function(message, noTraceback) -- candran.can:268
if not noTraceback and not message:match("\
stack traceback:\
") then -- candran.can:269
message = debug["traceback"](message, 2) -- candran.can:270