2003/06/28 06:57:08

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

diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index c7c1c54..be82e70 100644 (file)
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -15,6 +15,7 @@ import java.util.*;
  */
 public abstract class JS { 
 
+
     // Public Helper Methods //////////////////////////////////////////////////////////////////////
 
     /** parse and compile a function */
@@ -26,7 +27,14 @@ public abstract class JS {
     public static boolean toBoolean(Object o) {
         if (o == null) return false;
         if (o instanceof Boolean) return ((Boolean)o).booleanValue();
-        if (o instanceof Number) return o.equals(new Integer(0));
+        if (o instanceof Long) return ((Long)o).longValue() != 0;
+        if (o instanceof Integer) return ((Integer)o).intValue() != 0;
+        if (o instanceof Number) {
+            double d = ((Number) o).doubleValue();
+            // NOTE: d == d is a test for NaN. It should be faster than Double.isNaN()
+            return d != 0.0 && d == d;
+        }
+        if (o instanceof String) return ((String)o).length() != 0;
         return true;
     }
 
@@ -40,7 +48,9 @@ public abstract class JS {
     public static Number toNumber(Object o) {
         if (o == null) return new Long(0);
         if (o instanceof Number) return ((Number)o);
-        if (o instanceof String) try { return new Double((String)o); } catch (NumberFormatException e) { return new Double(0); }
+        // FIXME: There are about 3 pages of rules in ecma262 about string to number conversions
+        // We aren't even close to following all those rules
+        if (o instanceof String) try { return new Double((String)o); } catch (NumberFormatException e) { return new Double(Double.NaN); }
         if (o instanceof Boolean) return ((Boolean)o).booleanValue() ? new Long(1) : new Long(0);
         if (o instanceof JS) return ((JS)o).coerceToNumber();
         throw new Error("toNumber() got object of type " + o.getClass().getName() + " which we don't know how to handle");
@@ -66,6 +76,7 @@ public abstract class JS {
         private boolean sealed = false;
         public Obj() { this(false); }
         public Obj(boolean sealed) { this.sealed = sealed; }
+        /** a sealed object cannot have its properties modified */
         public void setSeal(boolean sealed) { this.sealed = sealed; }
         public Object get(Object key) { return entries.get(key); }
         public void put(Object key, Object val) { if (!sealed) entries.put(key, val); }
@@ -90,15 +101,19 @@ public abstract class JS {
         public Object elementAt(int i) { return super.elementAt(i); }
         public void addElement(Object o) { super.addElement(o); }
         public void setElementAt(Object o, int i) { super.setElementAt(o, i); }
+        public Object get(Object key) { return super._get(key); }
+        public void put(Object key, Object val) { super._put(key, val); }
     }
 
     /** Any object which becomes part of the scope chain must support this interface */ 
     public static class Scope extends ScopeImpl { 
         public Scope(Scope parentScope) { this(parentScope, false); }
         public Scope(Scope parentScope, boolean sealed) { super(parentScope, sealed); }
-        public Scope getParentScope() { return super.getParentScope(); }
+        /** transparent scopes are not returned by THIS */
         public boolean isTransparent() { return super.isTransparent(); }
         public boolean has(Object key) { return super.has(key); }
+        public Object get(Object key) { return super._get(key); }
+        public void put(Object key, Object val) { super._put(key, val); }
         public void declare(String s) { super.declare(s); }
     } 
 
@@ -109,12 +124,48 @@ public abstract class JS {
 
     /** a Callable which was compiled from JavaScript code */
     public static class CompiledFunction extends CompiledFunctionImpl {
-        public Object call(JS.Array args, JS.Scope scope) throws JS.Exn { return super.call(args, scope); }
         CompiledFunction(String sourceName, int firstLine, Reader sourceCode, Scope scope) throws IOException {
             super(sourceName, firstLine, sourceCode, scope);
         }
     }
+
+    public static final JS Math = new org.xwt.js.Math();
  
+    /** encapsulates a single JavaScript thread; the JS.Thread->java.lang.Thread mapping is 1:1 */
+    public static class Thread {
+
+        CompiledFunction currentCompiledFunction = null;
+        Vec stack = new Vec();
+        int line = -1;
+
+        /** binds this thread to the current Java Thread */
+        public void bindToCurrentJavaThread() { javaThreadToJSThread.put(java.lang.Thread.currentThread(), this); }
+
+        /** returns the line of code that is currently executing */
+        public int getLine() { return line; }
+
+        /** returns the name of the source code file which declared the currently executing function */
+        public String getSourceName() { return currentCompiledFunction == null ? null : currentCompiledFunction.getSourceName();  }
+
+        /** fetches the currently-executing javascript function */
+        public JS.CompiledFunction getCurrentCompiledFunction() { return currentCompiledFunction; }
+
+
+        // Statics ///////////////////////////////////////////////////////////////////////
+
+        private static Hashtable javaThreadToJSThread = new Hashtable();
+
+        /** returns the JS thread for a given Java thread, creating one if necessary */
+        public static JS.Thread fromJavaThread(java.lang.Thread t) {
+            JS.Thread ret = (JS.Thread)javaThreadToJSThread.get(t);
+            if (ret == null) {
+                ret = new JS.Thread();
+                ret.bindToCurrentJavaThread();
+            }
+            return ret;
+        }
+        
+    }
 }