Skip to content

Fix local variables persisting in static functions #281

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

Open
NotHyper-474 wants to merge 1 commit into
base: experimental
Choose a base branch
from
Open

Fix local variables persisting in static functions #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions polymod/hscript/_internal/PolymodInterpEx.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,11 +1492,6 @@ override function resolve(id:String):Dynamic
return null;
}

if (locals.exists(id))
{
// NOTE: id may exist but be null
return locals.get(id).r;
}
if (variables.exists(id))
{
// NOTE: id may exist but be null
Expand Down Expand Up @@ -1685,10 +1680,11 @@ public function callScriptClassStaticFunction(clsName:String, fnName:String, arg

this._classDeclOverride = cls;

var localsCopy:Map<String, {r:Dynamic, ?isfinal:Null<Bool>}> = this.locals.copy();
var result:Dynamic = null;
try
{
result = this.exprReturn(fn.expr);
result = this.executeEx(fn.expr);
}
catch (err:PolymodExprEx.ErrorEx)
{
Expand Down Expand Up @@ -1720,6 +1716,7 @@ public function callScriptClassStaticFunction(clsName:String, fnName:String, arg
}
}
this._classDeclOverride = previousClassDecl;
this.locals = localsCopy;

return result;
}
Expand Down