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

Pass user-supplied ScriptContext to script engine evaluation (fixes issue #21).

Browse Source
This commit is contained in:
James Roseborough
2014-03-09 16:45:57 +00:00
parent 7b97573ac8
commit 736218d1f2
3 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/jse/org/luaj/vm2/script/LuaScriptEngine.java
View File

@@ -95,6 +95,21 @@ public class LuaScriptEngine extends AbstractScriptEngine implements ScriptEngin
}
}
@Override
public Object eval(Reader reader, Bindings bindings) throws ScriptException {
return ((LuajCompiledScript) compile(reader)).eval(context.globals, bindings);
}
@Override
public Object eval(String script, Bindings bindings) throws ScriptException {
return eval(new StringReader(script), bindings);
}
@Override
protected ScriptContext getScriptContext(Bindings nn) {
throw new IllegalStateException("LuajScriptEngine should not be allocating contexts.");
}
@Override
public Bindings createBindings() {
return new SimpleBindings();
@@ -109,7 +124,7 @@ public class LuaScriptEngine extends AbstractScriptEngine implements ScriptEngin
@Override
public Object eval(Reader reader, ScriptContext context)
throws ScriptException {
return compile(reader).eval();
return compile(reader).eval(context);
}
@Override
@@ -142,7 +157,7 @@ public class LuaScriptEngine extends AbstractScriptEngine implements ScriptEngin
return eval(((LuajContext) context).globals, context.getBindings(ScriptContext.ENGINE_SCOPE));
}
private Object eval(Globals g, Bindings b) throws ScriptException {
Object eval(Globals g, Bindings b) throws ScriptException {
g.setmetatable(new BindingsMetatable(b));
LuaFunction f = function;
if (f.isclosure())