X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTrap.java;h=bb32ee42501711f414c1e2f8215d35d3762a87d4;hb=1a8dcf7794ae435c5c2811b8d7c2b75832047595;hp=94624ae2686e0740b519d6baadb0247280a8661b;hpb=9d0d07d829e691bfb4f74f4451676e6ed0618cb6;p=org.ibex.core.git diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java index 94624ae..bb32ee4 100644 --- a/src/org/xwt/Trap.java +++ b/src/org/xwt/Trap.java @@ -1,9 +1,9 @@ // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; -import org.xwt.util.*; import java.util.*; -import org.mozilla.javascript.*; +import org.xwt.js.*; +import org.xwt.util.*; /** * This class encapsulates a single trap placed on a given node. The @@ -15,6 +15,22 @@ public class Trap { // Static Data ////////////////////////////////////////////////////////////// + /** the arguments.cascade() function */ + public static final JS.Callable cascadeFunction = new JS.Callable() { + public Object call(JS.Array args) { + Trap currentTrap = TrapContext.get().currentTrap; + if (args.length() != 0) TrapContext.get().putCascadeHappened = true; + Trap t = currentTrap.next; + // if we've hit the end of the trap stack, just do a put(,,,true) + if (t == null) { + if (args.length() == 0) return currentTrap.trapee.get(currentTrap.name, true); + currentTrap.trapee.put(currentTrap.name, args.elementAt(0), true); + return null; + } + return t.perform(args); + } + }; + /** a vector of weak references to all instances of Trap; used for retheming */ private static Hashtable allTraps = new Hashtable(1000); @@ -41,10 +57,10 @@ public class Trap { private Box trapee = null; /** If this trap was actually placed on a root proxy, this is a reference to the proxy */ - private Scriptable rp = null; + private JS rp = null; /** the function for this trap */ - Function f = null; + JS.CompiledFunction f = null; /** the name of the property that this trap was placed on */ private String name = null; @@ -72,15 +88,17 @@ public class Trap { * @param isreadtrap true iff this is a read (double-underscore) trap * @param rp if this trap is being placed via a rootproxy, this is that proxy object. */ - static void addTrap(Box trapee, String name, Function f, boolean isreadtrap, Scriptable rp) { + static void addTrap(Box trapee, String name, JS.CompiledFunction f, boolean isreadtrap, JS rp) { if (PROHIBITED.get(name) != null || name.startsWith("xwt_")) { - System.out.println("Error: you cannot place traps on special property \"" + name + "\""); + Log.log(Trap.class, "Error: you cannot place traps on special property \"" + name + "\""); return; } // find out what script is currently running - String placerNodeName = JSObject.getCurrentFunctionSourceName(); + JS.CompiledFunction placer = JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction(); + if (placer == null) { Log.log(Trap.class, "placer is null"); return; } + String placerNodeName = placer.getSourceName(); // check if this script has already placed a trap on this property if (trapee.traps == null) trapee.traps = new Hash(10, 3); @@ -108,7 +126,7 @@ public class Trap { public static Trap getTrap(Box b, String name) { if (b.traps == null) return null; - String currentFunctionNodeName = JSObject.getCurrentFunctionSourceName(); + String currentFunctionNodeName = JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction().getSourceName(); for(Trap cur = (Trap)b.traps.get(name); cur != null; cur = cur.next) if (cur.placerNodeName.equals(currentFunctionNodeName)) return cur; @@ -116,30 +134,6 @@ public class Trap { return null; } - /** Called by Rhino's arguments.cascade. Note: cx will be null if this was invoked from perform() rather than from a script. */ - public static final Function cascadeFunction = new CascadeFunction(); - private static class CascadeFunction extends JSObject implements Function { - CascadeFunction() { setSeal(true); } - public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; } - public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) { - Trap currentTrap = TrapContext.get().currentTrap; - if (currentTrap == null || (cx != null && Context.getCurrentContext().currentFunction != currentTrap.f)) { - if (Log.on) Log.log(this, "attempt to cascade() by a function that was not invoked as a trap at " + - cx.interpreterSourceFile + ":" + cx.interpreterLine); - return null; - } - if (args.length != 0) TrapContext.get().putCascadeHappened = true; - Trap t = currentTrap.next; - // if we've hit the end of the trap stack, just do a put(,,,true) - if (t == null) { - if (args.length == 0) return currentTrap.trapee.get(currentTrap.name, currentTrap.trapee, true); - currentTrap.trapee.put(currentTrap.name, currentTrap.trapee, args[0], true); - return null; - } - return t.perform(args); - } - }; - /** called by Rhino's arguments.trapee hack */ public static Object currentTrapee() { Trap current = TrapContext.get().currentTrap; @@ -148,23 +142,11 @@ public class Trap { else return current.trapee; } - /** removes all traps whose function's ultimate parent scope is b. Used for retheming */ - public static void removeAllTrapsByBox(Box b) { - Enumeration e = allTraps.keys(); - while(e.hasMoreElements()) { - Weak w = (Weak)e.nextElement(); - Trap t = (Trap)w.get(); - if (t == null) { - allTraps.remove(w); - continue; - } - for(Scriptable cur = t.f; cur != null; cur = cur.getParentScope()) { - if (cur == b) { - t.delete(); - break; - } - } - } + /** called by Rhino's arguments.trapname hack */ + public static String currentTrapname() { + Trap current = TrapContext.get().currentTrap; + if (current == null) return null; + else return current.name; } @@ -173,7 +155,7 @@ public class Trap { private Trap() { allTraps.put(myWeak, dummy); } /** perform this trap -- arg.length == 0 if this is a get; otherwise it contains a single element to be put */ - public Object perform(Object[] arg) { + public Object perform(JS.Array args) { TrapContext tc = TrapContext.get(); // save both thread-locals on the stack and update their values @@ -185,28 +167,25 @@ public class Trap { // invoke the trap function try { - if (!isreadtrap && arg.length == 0) return cascadeFunction.call(null, null, null, arg); + if (!isreadtrap && args.length() == 0) return cascadeFunction.call(args); if (f == null) { if (Log.verbose) Log.log(this, "debug: reclaimed a dangling trap on property " + name); - Object ret = cascadeFunction.call(null, null, null, arg); + Object ret = cascadeFunction.call(args); delete(); return ret; } - Object ret = f.call(Context.enter(), f.getParentScope(), f.getParentScope(), arg); + Object ret = f.call(args); // autocascade if required - if (arg.length > 0 && !isreadtrap && !tc.putCascadeHappened) cascadeFunction.call(null, null, null, arg); + if (args.length() > 0 && !isreadtrap && !tc.putCascadeHappened) cascadeFunction.call(args); return ret; - } catch (EcmaError e) { - if (Log.on) Log.log(this, "WARNING: uncaught interpreter exception: " + e.getMessage()); - if (Log.on) Log.log(this, " thrown from within trap '" + name + "' at " + e.getSourceName() + ":" + e.getLineNumber()); - } catch (JavaScriptException e) { - if (Log.on) Log.log(this, "WARNING: uncaught ecmascript exception: " + e.getMessage()); - if (Log.on) Log.log(this, " thrown from within trap '" + name + "' at " + e.sourceFile + ":" + e.line); + } catch (JS.Exn e) { + if (Log.on) Log.log(this, e); + } finally { // restore the thread-locals tc.putCascadeHappened = save_putCascadeHappened; @@ -241,7 +220,7 @@ public class Trap { /** returns the TrapContext for the current thread */ static TrapContext get() { - TrapContext ret = (TrapContext)trapContextByThread.get(Thread.currentThread()); + TrapContext ret = (TrapContext)trapContextByThread.get(java.lang.Thread.currentThread()); if (ret == null) { ret = new TrapContext(); trapContextByThread.put(Thread.currentThread(), ret);