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

Fixed missing whitespace in some continue code generation

Browse source 
Also made Candran returns slightly more usefull error messages
This commit is contained in:
Étienne Fildadut 2018-08-02 17:11:46 +02:00
parent 4517ee110f
commit debf0bc464
3 changed files with 110 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

17
candran.can
View file

@ -160,7 +160,14 @@ function candran.load(chunk, chunkname, env, options={})
options = util.merge({ chunkname = tostring(chunkname or chunk) }, options)
codeCache[options.chunkname] = candran.make(chunk, options)
local f = util.load(codeCache[options.chunkname], options.chunkname, env)
local f, err = util.load(codeCache[options.chunkname], options.chunkname, env)
-- Um. Candran isn't supposed to generate invalid Lua code, so this is a major issue.
-- This is not going to raise an error because this is supposed to behave similarly to Lua's load function.
-- But the error message will likely be useless unless you know how Candran works.
if f == nil then
return f, "Candran unexpectedly generated invalid code: "..err
end
if options.rewriteErrors == false then
return f
@ -185,7 +192,13 @@ end
--- Candran equivalent to the Lua 5.3's dofile funtion.
-- Will rewrite errors by default.
function candran.dofile(filename, options)
return candran.loadfile(filename, nil, options)()
local f, err = candran.loadfile(filename, nil, options)
if f == nil then
error(err)
else
return f()
end
end
--- Candran error message handler.