X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FJS.java;h=cdc7e359d9630c89df119b173dcedda79d1db45c;hb=e8442c40f5b8c03a4e6993cbcc9ce64dddab6a90;hp=187cb4d9394c5bf8ea86d5aeaac5fb27722b4574;hpb=5f24fa01863f5f21f8ce5351f22b59cce07aa4e8;p=org.ibex.core.git

diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index 187cb4d..cdc7e35 100644
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -58,13 +58,13 @@ 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");
     }
-
-
+    
     // 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"); }
@@ -83,9 +83,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 */
@@ -133,6 +148,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();