Skip to content

Fix exit() resetting quota in some cases #3714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astralcircle merged 2 commits into from
Aug 30, 2026
Merged

Fix exit() resetting quota in some cases #3714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6dc1b2
Fix exit() resetting quota in some cases
Astralcircle Aug 29, 2026
d2ba056
Small lint pass
Astralcircle Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions lua/entities/gmod_wire_expression2/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,19 +159,17 @@ function ENT:Execute(script, context)
if not ok then
local _catchable, msg, trace = E2Lib.unpackException(msg)

if msg == "exit" then
self:UpdatePerf(selfTbl)
elseif msg == "perf" then
local trace = context.trace or trace

if msg == "perf" then
trace = context.trace or trace
self:UpdatePerf(selfTbl)
self:Error("Expression 2 (" .. selfTbl.name .. "): tick quota exceeded (at line " .. trace.start_line .. ", char " .. trace.start_col .. ")", "tick quota exceeded")
elseif trace then
self:Error("Expression 2 (" .. selfTbl.name .. "): Runtime error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
else
local trace = context.trace or trace

self:Error("Expression 2 (" .. selfTbl.name .. "): Internal error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
elseif msg ~= "exit" then
if trace then
self:Error("Expression 2 (" .. selfTbl.name .. "): Runtime error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
else
trace = context.trace or trace
self:Error("Expression 2 (" .. selfTbl.name .. "): Internal error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
end
end
end

Expand Down Expand Up @@ -245,17 +243,17 @@ function ENT:ExecuteEvent(evt, args)
if not ok then
local _catchable, msg, trace = E2Lib.unpackException(msg)

if msg == "exit" then
self:UpdatePerf(selfTbl)
elseif msg == "perf" then
local trace = context.trace
if msg == "perf" then
trace = context.trace
self:UpdatePerf(selfTbl)
self:Error("Expression 2 (" .. selfTbl.name .. "): tick quota exceeded (at line " .. trace.start_line .. ", char " .. trace.start_col .. ")", "tick quota exceeded")
elseif trace then
self:Error("Expression 2 (" .. selfTbl.name .. "): Runtime error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
else
local trace = context.trace
self:Error("Expression 2 (" .. selfTbl.name .. "): Internal error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
elseif msg ~= "exit" then
if trace then
self:Error("Expression 2 (" .. selfTbl.name .. "): Runtime error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
else
trace = context.trace
self:Error("Expression 2 (" .. selfTbl.name .. "): Internal error '" .. msg .. "' at line " .. trace.start_line .. ", char " .. trace.start_col, "script error")
end
end
end

Expand Down
Loading