aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Scripting: use pcall and better load() approach

Browse Source 
thanks to Pete Hall
This commit is contained in:
Andrew Tridgell 2022-11-27 06:42:33 +11:00
parent 2409b69245
commit c1000041a6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_Scripting/applets/Aerobatics/FixedWing/plane_aerobatics.lua
View File

@ -52,7 +52,7 @@ ACRO_YAW_RATE = Parameter('ACRO_YAW_RATE')
ARSPD_FBW_MIN = Parameter("ARSPD_FBW_MIN")
SCALING_SPEED = Parameter("SCALING_SPEED")
local GRAVITY_MSS = 9.80665
GRAVITY_MSS = 9.80665
--[[
list of attributes that can be added to a path element
@ -2679,12 +2679,12 @@ end
it can be used in schedules
--]]
function parse_function(line, file)
_, _, funcname, args = string.find(line, "^function%s*([%w_]+)(.*)$")
_, _, funcname = string.find(line, "^function%s*([%w_]+).*$")
if not funcname then
gcs:send_text(0, string.format("Parse error: %s", line))
return
end
local funcstr = "function" .. args .. "\n"
local funcstr = line .. "\n"
while true do
local line = file:read()
if not line then
@ -2696,12 +2696,17 @@ function parse_function(line, file)
break
end
end
local f, errloc, err = load("return " .. funcstr, funcname, "t", _ENV)
local f, errloc, err = load(funcstr, funcname, "t", _ENV)
if not f then
gcs:send_text(0,string.format("Error %s: %s", errloc, err))
return
end
load_table[funcname] = f()
-- fun the function code, which creates the function
local success, err = pcall(f)
if not success then
gcs:send_text(0,string.format("Error %s: %s", funcname, err))
end
load_table[funcname] = _ENV[funcname]
end
--[[