X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2Fjs%2FJS.java;h=be1fd2c91375fa3d121b12d4657bb0e9a409d57c;hb=a984e442a61421212d173b061dbe59632feace99;hp=48eb61b738e01a35723467e49b3922bef0fdd9a0;hpb=b5b84ec73713b8ff40e177d4122dda19bd84bf8e;p=org.ibex.core.git

diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index 48eb61b..be1fd2c 100644
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -58,17 +58,33 @@ public abstract class JS {
         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");
     }
-
-
+    
+    /** coerce an object to a String */
+    public static String toString(Object o) {
+        if(o == null) return "null";
+        if(o instanceof String) return (String) o;
+        if(o instanceof Integer || o instanceof Long || o instanceof Boolean) return o.toString();
+        if(o instanceof JS) return ((JS)o).coerceToString();
+        if(o instanceof Double || o instanceof Float) {
+            double d = ((Number)o).doubleValue();
+            if((int)d == d) return Integer.toString((int)d);
+            return o.toString();
+        }
+        return o.toString();
+    }
+    
     // Instance Methods ////////////////////////////////////////////////////////////////////
  
     public abstract Object get(Object key) throws JS.Exn; 
     public abstract void put(Object key, Object val) throws JS.Exn; 
     public abstract Object[] keys(); 
+    public abstract Object callMethod(Object method, JS.Array args, boolean justChecking);
 
-    public Number coerceToNumber() { throw new Error("you cannot coerce a " + this.getClass().getName() + " into a Number"); }
-    public String coerceToString() { throw new Error("you cannot coerce a " + this.getClass().getName() + " into a String"); }
-    public boolean coerceToBoolean() { throw new Error("you cannot coerce a " + this.getClass().getName() + " into a Boolean"); }
+    public Number coerceToNumber() { return new Integer(0); }
+    public String coerceToString() { throw new JS.Exn("tried to coerce a JavaScript object to a String"); }
+    public boolean coerceToBoolean() { return true; }
+    
+    public String typeName() { return "object"; }
 
 
     // Inner Classes /////////////////////////////////////////////////////////////////////////
@@ -81,9 +97,24 @@ public abstract class JS {
         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); }
         public Object[] keys() { return(entries.keys()); }
+        public Object get(Object key) {
+            if(callMethod((String)key,null,true) == Boolean.TRUE)
+                return new Internal.CallableStub(this,key);
+            return entries.get(key);
+        }
+        public Object callMethod(Object method, JS.Array args, boolean checkOnly) throws JS.Exn {
+            if(checkOnly) return Boolean.FALSE;
+            Object o = get(method);
+            if(o instanceof JS.Callable) {
+                return ((JS.Callable)o).call(args);
+            } else if(o == null) {
+                throw new JS.Exn("Attempted to call non-existent method: " + method);
+            } else {
+                throw new JS.Exn("Attempted to call a non-method: " +method);
+            }
+        }
     }
 
     /** An exception which can be thrown and caught by JavaScript code */
@@ -131,6 +162,12 @@ public abstract class JS {
             super(sourceName, firstLine, sourceCode, scope);
         }
     }
+    
+    /** a scope that is populated with js objects and functions normally found in the global scope */
+    public static class GlobalScope extends GlobalScopeImpl {
+        public GlobalScope() { this(null); }
+        public GlobalScope(JS.Scope parent) { super(parent); }
+    }
 
     public static final JS Math = new org.xwt.js.Math();