private Trap() { }
public Object perform() throws JS.Exn {
- if (f.getNumFormalArgs() > 0) return cascade();
- return f.call(new TrapArgs(this));
+ try {
+ if (f.getNumFormalArgs() > 0) return cascade();
+ return f.call(new TrapArgs(this));
+ } catch (Exception e) {
+ Log.log(this, "Exception thrown from within trap: " + e);
+ return null;
+ }
}
public void perform(Object val) throws JS.Exn {
- if (f.getNumFormalArgs()== 0) cascade(val);
- f.call(new TrapArgs(this, val));
+ try {
+ if (f.getNumFormalArgs() == 0) cascade(val);
+ TrapArgs ta = new TrapArgs(this, val);
+ Object ret = f.call(ta);
+ if (ret != Boolean.FALSE && !ta.cascadeHappened) cascade(val);
+ } catch (Exception e) {
+ Log.log(this, "Exception thrown from within trap: " + e);
+ }
}
public Object cascade() {
private static class TrapArgs extends JS.Array {
private Trap t;
+ public boolean cascadeHappened = false;
public TrapArgs(Trap t) { this.t = t; }
public TrapArgs(Trap t, Object value) { this.t = t; addElement(value); }
public void put(Object key, Object val) {
- if (key.equals("cascade")) t.cascade(val);
+ if (key.equals("cascade")) { cascadeHappened = true; t.cascade(val); }
else super.put(key, val);
}