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

Added DomExtension as standard extension.

Browse source 
Templates work again (also with _as_string).
Do not remove internal functions when cleaning up global object.
This commit is contained in:
hns 2002-05-23 19:34:59 +00:00
parent 2f3dd29223
commit 0a3a514ddc
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/helma/scripting/fesi/FesiEvaluator.java
View file

@ -22,7 +22,7 @@ import Acme.LruHashtable;
* This is the implementation of ScriptingEnvironment for the FESI EcmaScript interpreter. * This is the implementation of ScriptingEnvironment for the FESI EcmaScript interpreter.
*/ */
public class FesiEvaluator { public final class FesiEvaluator {
// the application we're running in // the application we're running in
public Application app; public Application app;
@ -50,8 +50,13 @@ public class FesiEvaluator {
"helma.scripting.fesi.extensions.ImageExtension", "helma.scripting.fesi.extensions.ImageExtension",
"helma.scripting.fesi.extensions.FtpExtension", "helma.scripting.fesi.extensions.FtpExtension",
"FESI.Extensions.JavaAccess", "FESI.Extensions.JavaAccess",
"helma.scripting.fesi.extensions.DomExtension",
"FESI.Extensions.OptionalRegExp"}; "FESI.Extensions.OptionalRegExp"};
// remember global variables from last invokation to be able to
// do lazy cleanup
Map lastGlobals = null;
public FesiEvaluator (Application app, RequestEvaluator reval) { public FesiEvaluator (Application app, RequestEvaluator reval) {
this.app = app; this.app = app;
this.reval = reval; this.reval = reval;
@ -145,12 +150,13 @@ public class FesiEvaluator {
else else
evaluateString (prototype, ff.getContent ()); evaluateString (prototype, ff.getContent ());
} }
/* for (Iterator it = prototype.templates.values().iterator(); it.hasNext(); ) { for (Iterator it = prototype.templates.values().iterator(); it.hasNext(); ) {
Template tmp = (Template) it.next (); Template tmp = (Template) it.next ();
try { try {
tmp.updateRequestEvaluator (reval); FesiActionAdapter adp = new FesiActionAdapter (tmp);
adp.updateEvaluator (this);
} catch (EcmaScriptException ignore) {} } catch (EcmaScriptException ignore) {}
} */ }
for (Iterator it = prototype.actions.values().iterator(); it.hasNext(); ) { for (Iterator it = prototype.actions.values().iterator(); it.hasNext(); ) {
ActionFile act = (ActionFile) it.next (); ActionFile act = (ActionFile) it.next ();
try { try {
@ -204,7 +210,7 @@ public class FesiEvaluator {
esv[i] = ESLoader.normalizeValue (args[i], evaluator); esv[i] = ESLoader.normalizeValue (args[i], evaluator);
} }
if (globals != null) { if (globals != null && globals != lastGlobals) {
// remember all global variables before invocation // remember all global variables before invocation
Set tmpGlobal = new HashSet (); Set tmpGlobal = new HashSet ();
for (Enumeration en = global.getAllProperties(); en.hasMoreElements(); ) { for (Enumeration en = global.getAllProperties(); en.hasMoreElements(); ) {
@ -249,6 +255,8 @@ public class FesiEvaluator {
sv = ESLoader.normalizeValue (v, evaluator); sv = ESLoader.normalizeValue (v, evaluator);
global.putHiddenProperty (k, sv); global.putHiddenProperty (k, sv);
} }
// remember the globals set on this evaluator
// lastGlobals = globals;
} }
evaluator.thread = Thread.currentThread (); evaluator.thread = Thread.currentThread ();
ESValue retval = eso.doIndirectCall (evaluator, eso, functionName, esv); ESValue retval = eso.doIndirectCall (evaluator, eso, functionName, esv);
@ -276,8 +284,10 @@ public class FesiEvaluator {
if (globalVariables != null) { if (globalVariables != null) {
for (Enumeration en = global.getAllProperties(); en.hasMoreElements(); ) { for (Enumeration en = global.getAllProperties(); en.hasMoreElements(); ) {
String g = en.nextElement ().toString (); String g = en.nextElement ().toString ();
if (!globalVariables.contains (g)) try { try {
global.deleteProperty (g, g.hashCode()); if (!globalVariables.contains (g) &&
!(global.getProperty (g, g.hashCode()) instanceof BuiltinFunctionObject))
global.deleteProperty (g, g.hashCode());
} catch (Exception x) { } catch (Exception x) {
System.err.println ("Error resetting global property: "+g); System.err.println ("Error resetting global property: "+g);
} }