retoor/wren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix closures in methods.

Browse Source 
A local name inside a method should always resolve to a self send even
if there is a local variable with that name outside of the method.
This commit is contained in:
Bob Nystrom
2015-10-05 07:44:51 -07:00
parent e968b4bf98
commit 24cbb7f399
4 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm/wren_compiler.c
+7 -3
View File
@@ -1230,9 +1230,13 @@ static int addUpvalue(Compiler* compiler, bool isLocal, int index)
// not close over local variables.
static int findUpvalue(Compiler* compiler, const char* name, int length)
{
// If we are at a method boundary or the top level, we didn't find it.
if (compiler->parent == NULL || compiler->enclosingClass != NULL) return -1;
// If we are at the top level, we didn't find it.
if (compiler->parent == NULL) return -1;
// If we hit the method boundary (and the name isn't a static field), then
// stop looking for it. We'll instead treat it as a self send.
if (name[0] != '_' && compiler->parent->enclosingClass != NULL) return -1;
// See if it's a local variable in the immediately enclosing function.
int local = resolveLocal(compiler->parent, name, length);
if (local != -1)