mirror of
https://github.com/leafo/moonscript.git
synced 2025-01-09 00:04:22 +00:00
only have loader active when running chunk
This commit is contained in:
parent
99437bfd4c
commit
cc6cb70ef6
11
bin/moon
11
bin/moon
@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env lua
|
#!/usr/bin/env lua
|
||||||
|
|
||||||
require "alt_getopt"
|
require "alt_getopt"
|
||||||
local moonscript = require "moonscript"
|
local moonscript = require "moonscript.base"
|
||||||
|
|
||||||
local util = require "moonscript.util"
|
local util = require "moonscript.util"
|
||||||
local errors = require "moonscript.errors"
|
local errors = require "moonscript.errors"
|
||||||
@ -70,10 +70,17 @@ end
|
|||||||
|
|
||||||
util.getfenv(moonscript_chunk).arg = new_arg
|
util.getfenv(moonscript_chunk).arg = new_arg
|
||||||
|
|
||||||
|
local function run_chunk()
|
||||||
|
moonscript.insert_loader()
|
||||||
|
moonscript_chunk(unpack(new_arg))
|
||||||
|
moonscript.remove_loader()
|
||||||
|
end
|
||||||
|
|
||||||
if not opts.d then
|
if not opts.d then
|
||||||
local err, trace
|
local err, trace
|
||||||
|
|
||||||
xpcall(function() moonscript_chunk(unpack(new_arg)) end, function(_err)
|
xpcall(function() moonscript_chunk(unpack(new_arg)) end, function(_err)
|
||||||
|
xpcall(run_chunk, function(_err)
|
||||||
err = _err
|
err = _err
|
||||||
trace = debug.traceback("", 2)
|
trace = debug.traceback("", 2)
|
||||||
end)
|
end)
|
||||||
@ -93,5 +100,5 @@ if not opts.d then
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
moonscript_chunk(unpack(new_arg))
|
run_chunk()
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user