2003/06/16 07:58:57

[org.ibex.core.git] / src / org / xwt / js / Context.java

diff --git a/src/org/xwt/js/Context.java b/src/org/xwt/js/Context.java
index ee00fc8..34e4028 100644 (file)
--- a/src/org/xwt/js/Context.java
+++ b/src/org/xwt/js/Context.java
@@ -25,13 +25,13 @@ public class Context {
     }
 
     public static String getSourceNameAndLineForThread(Thread t) {
-       CompiledFunction cf = getContextForThread(t).getCurrentFunction();
+       JS.CompiledFunction cf = getContextForThread(t).getCurrentFunction();
        if (cf == null) return "null";
        return cf.getSourceName() + ":??";
     }
 
     /** fetches the currently-executing javascript function */
-    public CompiledFunction getCurrentFunction() { return (CompiledFunction)currentFunction.get(Thread.currentThread()); }
+    public JS.CompiledFunction getCurrentFunction() { return (JS.CompiledFunction)currentFunction.get(Thread.currentThread()); }
 
     public static Context getContextForThread(Thread t) {
        Context ret = (Context)javaThreadToContextMap.get(t);
@@ -42,7 +42,6 @@ public class Context {
        return ret;
     }
 
-    public static class TryMarker { public int location; public TryMarker(int location) { this.location = location; } }
     public static class CallMarker { public CallMarker() { } }
     public static class LoopMarker {
        public int location;
@@ -52,5 +51,13 @@ public class Context {
            this.label = label;
        }
     }
+    public static class TryMarker {
+       public int location;
+       public JS.Scope scope;
+       public TryMarker(int location, JS.Scope scope) {
+           this.location = location;
+           this.scope = scope;
+       }
+    }
 
 }