From f55f0193140d17313595193b78d6b4e466170764 Mon Sep 17 00:00:00 2001
From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 06:50:48 +0000
Subject: [PATCH] 2002/10/16 06:22:38

darcs-hash:20040130065048-2ba56-8b2ef7b6a51baf252ebd38f29a7970b642d61184.gz
---
 CHANGES                                   |    3 +++
 src/org/mozilla/javascript/Arguments.java |    4 ++++
 src/org/xwt/Trap.java                     |    7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/CHANGES b/CHANGES
index 742757c..2f3eecd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -440,3 +440,6 @@
               3.3 miscompiles Trap.java
 
 15-Oct megacz Resources.java: hackaround for broken libgcj java.util.zip
+
+15-Oct megacz Arguments.java, Trap.java: arguments.trapname
+
diff --git a/src/org/mozilla/javascript/Arguments.java b/src/org/mozilla/javascript/Arguments.java
index 66da72d..119b32f 100644
--- a/src/org/mozilla/javascript/Arguments.java
+++ b/src/org/mozilla/javascript/Arguments.java
@@ -88,6 +88,10 @@ class Arguments extends ScriptableObject {
 
         } else if (name.equals("trapee")) {
             return org.xwt.Trap.currentTrapee();
+
+        } else if (name.equals("trapname")) {
+            return org.xwt.Trap.currentTrapname();
+
         }
 
         return super.get(name, start);
diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index 94624ae..23a3455 100644
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -148,6 +148,13 @@ public class Trap {
         else return current.trapee;
     }
 
+    /** 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;
+    }
+
     /** removes all traps whose function's ultimate parent scope is <tt>b</tt>. Used for retheming */
     public static void removeAllTrapsByBox(Box b) {
         Enumeration e = allTraps.keys();
-- 
1.7.10.4