antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Patch for rhino.languageVersion setting from Chris Langreiter:

Browse source 
http://www.langreiter.com/space/2007-12-26-r17
This commit is contained in:
hns 2008-01-02 17:13:18 +00:00
parent d8149e0bee
commit 41334905c0
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/helma/scripting/rhino/RhinoCore.java
View file

@ -75,6 +75,9 @@ public final class RhinoCore implements ScopeProvider {
// optimization level for rhino engine, ranges from -1 to 9 // optimization level for rhino engine, ranges from -1 to 9
int optLevel = 0; int optLevel = 0;
// language version
int languageVersion = 0;
// debugger/tracer flags // debugger/tracer flags
boolean hasDebugger = false; boolean hasDebugger = false;
boolean hasTracer = false; boolean hasTracer = false;
@ -117,6 +120,14 @@ public final class RhinoCore implements ScopeProvider {
} }
} }
} }
String v = app.getProperty("rhino.languageVersion");
if (v != null) {
try {
languageVersion = Integer.parseInt(v);
} catch (Exception ignore) {
app.logError("Invalid rhino.languageVersion: " + v);
}
}
wrapper = new WrapMaker(); wrapper = new WrapMaker();
wrapper.setJavaPrimitiveWrap(false); wrapper.setJavaPrimitiveWrap(false);
@ -1108,6 +1119,11 @@ public final class RhinoCore implements ScopeProvider {
protected void onContextCreated(Context cx) { protected void onContextCreated(Context cx) {
cx.setWrapFactory(wrapper); cx.setWrapFactory(wrapper);
cx.setOptimizationLevel(optLevel); cx.setOptimizationLevel(optLevel);
if (cx.isValidLanguageVersion(languageVersion)) {
cx.setLanguageVersion(languageVersion);
} else {
app.logError("Unsupported rhino.languageVersion: " + languageVersion);
}
// Set up visual debugger if rhino.debug = true // Set up visual debugger if rhino.debug = true
if (hasDebugger) if (hasDebugger)
initDebugger(cx); initDebugger(cx);