Skip to content

Update compiler.lua #93

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
levno-710 merged 3 commits into from
Oct 30, 2022
Merged

Update compiler.lua #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffb679a
Update compiler.lua
SpinnySpiwal Oct 12, 2022
3e85ba0
Merge pull request #91 from SpinnySpiwal/patch-2
levno-710 Oct 12, 2022
38061cd
fix bug in compiler
levno-710 Oct 30, 2022
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
15 changes: 14 additions & 1 deletion src/prometheus/compiler/compiler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,19 @@ function Compiler:compileStatement(statement, funcDepth)
self:addStatement(self:setRegister(scope, varRegs[i], Ast.NilExpression()), {varRegs[i]}, {}, false);
end

-- Upvalue fix
for i, id in ipairs(statement.ids) do
if(self:isUpvalue(statement.scope, id)) then
local varreg = varRegs[i];
local tmpReg = self:allocRegister(false);
scope:addReferenceToHigherScope(self.scope, self.allocUpvalFunction);
self:addStatement(self:setRegister(scope, tmpReg, Ast.FunctionCallExpression(Ast.VariableExpression(self.scope, self.allocUpvalFunction), {})), {tmpReg}, {}, false);
self:addStatement(self:setUpvalueMember(scope, self:register(scope, tmpReg), self:register(scope, varreg)), {}, {tmpReg, varreg}, true);
self:addStatement(self:copyRegisters(scope, {varreg}, {tmpReg}), {varreg}, {tmpReg}, false);
self:freeRegister(tmpReg, false);
end
end

self:compileBlock(statement.body, funcDepth);
self:addStatement(self:setPos(scope, checkBlock.id), {self.POS_REGISTER}, {}, false);
self:setActiveBlock(finalBlock);
Expand Down Expand Up @@ -2345,7 +2358,7 @@ function Compiler:compileExpression(expression, funcDepth, numReturns)
return regs;
end

logger:error(string.format("%s is not an compileable expression!", expression.kind));
logger:error(string.format("%s is not an compliable expression!", expression.kind));
end

return Compiler;