2002/10/16 06:22:38

darcs-hash:20040130065048-2ba56-8b2ef7b6a51baf252ebd38f29a7970b642d61184.gz

diff --git a/CHANGES b/CHANGES
index 742757c..2f3eecd 100644 (file)
--- 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 (file)
--- a/src/org/mozilla/javascript/Arguments.java
+++ b/src/org/mozilla/javascript/Arguments.java
@@ -88,6 +88,10 @@ class Arguments extends ScriptableObject {
 \r
         } else if (name.equals("trapee")) {\r
             return org.xwt.Trap.currentTrapee();\r
+\r
+        } else if (name.equals("trapname")) {\r
+            return org.xwt.Trap.currentTrapname();\r
+\r
         }\r
 \r
         return super.get(name, start);\r

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index 94624ae..23a3455 100644 (file)
--- 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();