open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed issue: #68

Browse Source
This commit is contained in:
UnlegitDqrk
2026-03-02 14:37:27 +01:00
parent 7f7185aa08
commit c735ac67a0
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
jse/src/main/java/org/luaj/vm2/ast/NameResolver.class Normal file
View File

Binary file not shown.

12
jse/src/main/java/org/luaj/vm2/ast/NameResolver.java
View File

@@ -21,6 +21,7 @@ import org.luaj.vm2.ast.Stat.NumericFor;
public class NameResolver extends Visitor { public class NameResolver extends Visitor {
private NameScope scope = null; private NameScope scope = null;
private boolean injectMethodSelf;
private void pushScope() { private void pushScope() {
scope = new NameScope(scope); scope = new NameScope(scope);
@@ -43,6 +44,9 @@ public class NameResolver extends Visitor {
pushScope(); pushScope();
scope.functionNestingCount++; scope.functionNestingCount++;
body.scope = scope; body.scope = scope;
if (injectMethodSelf) {
scope.define("self");
}
super.visit(body); super.visit(body);
popScope(); popScope();
} }
@@ -76,7 +80,13 @@ public class NameResolver extends Visitor {
public void visit(FuncDef stat) { public void visit(FuncDef stat) {
stat.name.name.variable = resolveNameReference(stat.name.name); stat.name.name.variable = resolveNameReference(stat.name.name);
stat.name.name.variable.hasassignments = true; stat.name.name.variable.hasassignments = true;
super.visit(stat); boolean previousInjectMethodSelf = injectMethodSelf;
injectMethodSelf = stat.name.method != null;
try {
super.visit(stat);
} finally {
injectMethodSelf = previousInjectMethodSelf;
}
} }
public void visit(Assign stat) { public void visit(Assign stat) {

25
jse/src/test/java/org/luaj/vm2/compiler/LuaParserTests.java
View File

@@ -1,5 +1,10 @@
package org.luaj.vm2.compiler; package org.luaj.vm2.compiler;
import org.luaj.vm2.ast.Chunk;
import org.luaj.vm2.ast.Exp;
import org.luaj.vm2.ast.NameResolver;
import org.luaj.vm2.ast.Stat;
import org.luaj.vm2.ast.Variable;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
import org.luaj.vm2.compiler.CompilerUnitTests; import org.luaj.vm2.compiler.CompilerUnitTests;
import org.luaj.vm2.parser.LuaParser; import org.luaj.vm2.parser.LuaParser;
@@ -37,4 +42,24 @@ public class LuaParserTests extends CompilerUnitTests {
fail(e.getMessage()); fail(e.getMessage());
} }
} }
public void testMethodDefinitionInjectsHiddenSelf() {
try {
Reader r = new StringReader("function t:f() return self end");
LuaParser parser = new LuaParser(r);
Chunk chunk = parser.Chunk();
new NameResolver().visit(chunk);
Stat.FuncDef stat = (Stat.FuncDef) chunk.block.stats.get(0);
Variable self = stat.body.scope.namedVariables.get("self");
assertNotNull(self);
assertTrue(self.isLocal());
Stat.Return ret = (Stat.Return) stat.body.block.stats.get(0);
Exp.NameExp selfRef = (Exp.NameExp) ret.values.get(0);
assertSame(self, selfRef.name.variable);
} catch (Exception e) {
fail(e.getMessage());
}
}
} }