- public void perform(Object val) throws JS.Exn {
- 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);
+ public void perform(Object val) {
+ try {
+ if (f.getNumFormalArgs() == 0) cascade(val);
+ TrapArgs ta = new TrapArgs(this, val);
+ JS.Thread.current().setTailCall(f, ta);
+ // FIXME: re-add autocascades
+ //if (ret != Boolean.FALSE && !ta.cascadeHappened) cascade(val);
+ } catch (Exception e) {
+ Log.log(this, "Exception thrown from within trap: " + e);
+ }