X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FIbex.java;h=e14a970aa19aec306bd30388809d8b4e37243ed5;hp=011b9bb2e3de27532edcc4f058f5eda7c5455da7;hb=2d6763644359578428d56d004b998edd10463a84;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b

diff --git a/src/org/ibex/core/Ibex.java b/src/org/ibex/core/Ibex.java
index 011b9bb..e14a970 100644
--- a/src/org/ibex/core/Ibex.java
+++ b/src/org/ibex/core/Ibex.java
@@ -10,16 +10,16 @@ import org.ibex.net.*;
 import org.ibex.crypto.*;
 
 /** Singleton class that provides all functionality in the ibex.* namespace */
-public final class Ibex extends JS.Cloneable {
+public final class Ibex extends JS implements JS.Cloneable {
 
     // FIXME remove this
     private final JS rr;
 
-    public Ibex(Stream rr) { this.rr = bless(rr); }
+    public Ibex(Stream rr) { try { this.rr = bless(rr);} catch(JSExn e) { throw new Error("should never happen: " + e); } }
 
     public JS resolveString(String str, boolean permitAbsolute) throws JSExn {
         if (str.indexOf("://") != -1) {
-            if (permitAbsolute) return (Stream)url2res(str);
+            if (permitAbsolute) return url2res(str);
             throw new JSExn("absolute URL " + str + " not permitted here");
         }
         // root-relative
@@ -29,35 +29,37 @@ public final class Ibex extends JS.Cloneable {
         while(str.indexOf('.') != -1) {
             String path = str.substring(0, str.indexOf('.'));
             str = str.substring(str.indexOf('.') + 1);
-            ret = (JS)ret.get(path);
+            ret = ret.get(JS.S(path));
         }
-        if (!"".equals(str)) ret = (JS)ret.get(str);
+        if (!"".equals(str)) ret = ret.get(JS.S(str));
         return ret;
     }
 
     /** lets us put multi-level get/put/call keys all in the same method */
     private class Sub extends JS {
-        String key;
-        Sub(String key) { this.key = key; }
-        public void put(Object key, Object val) throws JSExn { Ibex.this.put(this.key + "." + key, val); }
-        public Object get(Object key) throws JSExn { return Ibex.this.get(this.key + "." + key); }
-        public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
+        JS key;
+        Sub(JS key) { this.key = key; }
+        public void put(JS key, JS val) throws JSExn { Ibex.this.put(JS.S(JS.toString(this.key) + "." + JS.toString(key)), val); }
+        public JS get(JS key) throws JSExn { return Ibex.this.get(JS.S(JS.toString(this.key) + "." + JS.toString(key))); }
+        public JS call(JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn {
             return Ibex.this.callMethod(this.key, a0, a1, a2, rest, nargs);
         }
-        public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
-            return Ibex.this.callMethod(this.key + "." + method, a0, a1, a2, rest, nargs);
+        public JS callMethod(JS method, JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn {
+            return Ibex.this.callMethod(JS.S(JS.toString(this.key) + "." + JS.toString(method)), a0, a1, a2, rest, nargs);
         }
     }
     private Cache subCache = new Cache(20);
-    private Sub getSub(String s) {
-        Sub ret = (Sub)subCache.get(s);
-        if (ret == null) subCache.put(s, ret = new Sub(s));
+    private Sub getSub(JS key) {
+        Sub ret = (Sub)subCache.get(key);
+        if (ret == null) subCache.put(key, ret = new Sub(key));
         return ret;
     }
 
-    public Object get(Object name) throws JSExn {
-        if (name instanceof String && ((String)name).length() == 0) return rr;
-        //#switch(name)
+    public JS get(JS name) throws JSExn {
+        // FIXME: SHouldn't need this (just trap [""])
+        if (JS.isString(name) && JS.toString(name).length() == 0) return rr;
+        // FEATURE: Preprocessor hack to generate specialized JS instances (avoid all this string concatenation)
+        //#jswitch(name)
         case "math": return ibexMath;
         case "string": return ibexString;
         case "date": return METHOD;
@@ -65,39 +67,39 @@ public final class Ibex extends JS.Cloneable {
         case "clone": return METHOD;
         case "bless": return METHOD;
         case "regexp": return METHOD;
-        case "ui": return getSub("ui");
-        case "ui.font": return getSub("ui.font");
+        case "ui": return getSub(name);
+        case "ui.font": return getSub(name);
         case "ui.font.wait": return METHOD;
         case "ui.font.width": return METHOD;
         case "ui.font.height": return METHOD;
-        case "ui.font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf");
-        case "ui.font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf");
-        case "ui.font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf");
+        case "ui.font.sansserif": return Main.builtin.get(JS.S("fonts/vera/Vera.ttf"));
+        case "ui.font.monospace": return Main.builtin.get(JS.S("fonts/vera/VeraMono.ttf"));
+        case "ui.font.serif": return Main.builtin.get(JS.S("fonts/vera/VeraSe.ttf"));
         case "ui.browser": return METHOD;
-        case "ui.mouse": return getSub("ui.mouse");
+        case "ui.mouse": return getSub(name);
         case "ui.mouse.button":
             if (Surface.button1 && !Surface.button2 && !Surface.button3) return N(1);
             else if (!Surface.button1 && Surface.button2 && !Surface.button3) return N(2);
             else if (!Surface.button1 && !Surface.button2 && Surface.button3) return N(3);
             else return ZERO;
-        case "ui.key": return getSub("ui.key");
-        case "ui.key.name": return getSub("ui.key.name");
-        case "ui.key.name.alt": return Platform.altKeyName();
+        case "ui.key": return getSub(name);
+        case "ui.key.name": return getSub(name);
+        case "ui.key.name.alt": return JS.S(Platform.altKeyName());
         case "ui.key.alt": return Surface.alt ? T : F;
         case "ui.key.control": return Surface.control ? T : F;
         case "ui.key.shift": return Surface.shift ? T : F;
-        case "ui.clipboard": return Platform.getClipBoard();
+        case "ui.clipboard": return JS.S((String)Platform.getClipBoard());
         case "ui.maxdim": return N(Short.MAX_VALUE);
-        case "ui.screen": return getSub("ui.screen");
+        case "ui.screen": return getSub(name);
         case "ui.screen.width": return N(Platform.getScreenWidth());
         case "ui.screen.height": return N(Platform.getScreenHeight());
-        case "undocumented": return getSub("undocumented");
-        case "undocumented.initialOrigin": return Main.origin;
-        case "undocumented.initialTemplate": return Main.initialTemplate;
-        case "thread": return getSub("thread");
+        case "undocumented": return getSub(name);
+        case "undocumented.initialOrigin": return JS.S(Main.origin);
+        case "undocumented.initialTemplate": return JS.S(Main.initialTemplate);
+        case "thread": return getSub(name);
         case "thread.yield": return METHOD;
         case "thread.sleep": return METHOD;
-        case "stream": return getSub("stream");
+        case "stream": return getSub(name);
         case "stream.homedir": return url2res("file:" + System.getProperty("user.home"));
         case "stream.tempdir": return url2res("file:" + System.getProperty("java.io.tempdir"));
         case "stream.watch": return METHOD;
@@ -108,28 +110,28 @@ public final class Ibex extends JS.Cloneable {
         case "stream.parse.html": return METHOD;
         case "stream.parse.xml": return METHOD;
         case "stream.parse.utf8": return METHOD;
-        case "net": return getSub("net");
-        case "net.rpc": return getSub("net.rpc");
+        case "net": return getSub(name);
+        case "net.rpc": return getSub(name);
         case "net.rpc.xml": return METHOD;
         case "net.rpc.soap": return METHOD;
-        case "log": return getSub("log");
+        case "log": return getSub(name);
         case "log.debug": return METHOD;
         case "log.info": return METHOD;
         case "log.warn": return METHOD;
         case "log.error": return METHOD;
-        case "crypto": return getSub("crypto");
+        case "crypto": return getSub(name);
         case "crypto.rsa": return METHOD;
         case "crypto.md5": return METHOD;
         case "crypto.sha1": return METHOD;
         case "crypto.rc4": return METHOD;
         //#end
-        return super.get(name);
+        return null;
     }
 
-    public void put(Object name, final Object value) throws JSExn {
-        //#switch(name)
+    public void put(JS name, JS value) throws JSExn {
+        //#jswitch(name)
         case "thread": Scheduler.add((Task)value); return;
-        case "ui.clipboard": Platform.setClipBoard((String)value); return;
+        case "ui.clipboard": Platform.setClipBoard(JS.toString(value)); return;
         case "ui.frame": Platform.createSurface((Box)value, true, true); return;
         case "ui.window": Platform.createSurface((Box)value, false, true); return;
         case "undocumented.proxyAuthorization":
@@ -140,38 +142,38 @@ public final class Ibex extends JS.Cloneable {
         throw new JSExn("attempted to put unknown property: ibex."+name);
     }
 
-    public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JSExn {
+    public JS callMethod(JS name, JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn {
         try {
-            //#switch(name)
+            //#jswitch(name)
             case "date": return new JSDate(a, b, c, rest, nargs);
-            case "net.rpc.soap": return new SOAP((String)a, "", (String)b, (String)c);
+            case "net.rpc.soap": return new SOAP(JS.toString(a), "", JS.toString(b), JS.toString(c));
                 // FIXME support object dumping
-            case "log.debug":    JS.debug(a== null ? "**null**" : a.toString()); return null;
-            case "log.info":     JS.info(a== null ? "**null**" : a.toString()); return null;
-            case "log.warn":     JS.warn(a== null ? "**null**" : a.toString()); return null;
-            case "log.error":    JS.error(a== null ? "**null**" : a.toString()); return null;
+            case "log.debug":    JS.debug(a== null ? "**null**" : JS.debugToString(a)); return null;
+            case "log.info":     JS.info(a== null ? "**null**" : JS.debugToString(a)); return null;
+            case "log.warn":     JS.warn(a== null ? "**null**" : JS.debugToString(a)); return null;
+            case "log.error":    JS.error(a== null ? "**null**" : JS.debugToString(a)); return null;
             //#end
  
             switch (nargs) {
                 case 0:
-                    //#switch(name)
+                    //#jswitch(name)
                     case "thread.yield": sleep(0); return null;
                     //#end
                     break;
                 case 1:
-                    //#switch(name)
+                    //#jswitch(name)
                     case "clone":
-                        if (!(a instanceof JS.Cloneable)) throw new JSExn("cannot clone a " + a.getClass().getName());
-                        return ((JS.Cloneable)a).jsclone();
+                        if(a == null) throw new JSExn("can't clone the null value");
+                        return ((JS)a).jsclone();
                     case "bless": return bless((JS)a);
-                    case "ui.browser": Platform.newBrowserWindow((String)a); return null;
-                    case "stream.unzip": return new Stream.Zip((Stream)a);
-                    case "stream.uncab": return new Stream.Cab((Stream)a);
+                    case "ui.browser": Platform.newBrowserWindow(JS.toString(a)); return null;
+                    case "stream.unzip": return a == null ? null : new Stream.Zip(a);
+                    case "stream.uncab": return a == null ? null : new Stream.Cab(a);
                     case "stream.cache":
-                        try { return new Stream.CachedStream((Stream)a, "resources", true); }
+                        try { return a == null ? null : new Stream.CachedStream(a, "resources", true); }
                         catch (Stream.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); }
                     case "stream.url": {
-                        String url = (String)a;
+                        String url = JS.toString(a);
                         if (url.startsWith("http://")) return new Stream.HTTP(url);
                         else if (url.startsWith("https://")) return new Stream.HTTP(url);
                         else if (url.startsWith("data:")) return new Stream.ByteArray(Base64.decode(url.substring(5)), null);
@@ -184,28 +186,29 @@ public final class Ibex extends JS.Cloneable {
                     }
                     case "thread.sleep": sleep(JS.toInt(a)); return null;
                     case "regexp": return new JSRegexp(a, null);
-                    case "net.rpc.xml": return new XMLRPC((String)a, "");
+                    case "net.rpc.xml": return new XMLRPC(JS.toString(a), "");
                     case "crypto.rsa": /* FEATURE */ return null;
                     case "crypto.md5": /* FEATURE */ return null;
                     case "crypto.sha1": /* FEATURE */ return null;
                     case "crypto.rc4": /* FEATURE */ return null;
                     case "stream.parse.html": throw new JSExn("not implemented yet"); //return null;
-                    case "stream.parse.xml": new XMLHelper((JS)b).doParse((JS)a); return null;
+                    case "stream.parse.xml": if(a == null) return null; new XMLHelper(b).doParse(a); return null;
                         // FIXME backgrounding
-                    case "stream.parse.utf8": try { return new String(InputStreamToByteArray.convert(Stream.getInputStream(a))); }
+                    case "stream.parse.utf8": if(a == null) return null;
+                                              try { return JS.S(new String(InputStreamToByteArray.convert(a.getInputStream()))); }
                                               catch (Exception e) { Log.warn(this, e); }
                     //#end
                     break;
                 case 2:
-                    //#switch(name)
-                    case "stream.watch": return new Stream.ProgressWatcher((Stream)a, (JS)b);
+                    //#jswitch(name)
+                    case "stream.watch": return new Stream.ProgressWatcher(a, b);
                     case "regexp": return new JSRegexp(a, b);
                     //#end
                 case 3:
-                    //#switch(name)
-                    case "ui.font.height": return N(Font.getFont((Stream)a, JS.toInt(b)).textheight((String)c));
+                    //#jswitch(name)
+                    case "ui.font.height": return N(Font.getFont(a, JS.toInt(b)).textheight(JS.toString(c)));
                     case "ui.font.wait": throw new Error("FIXME: ibex.ui.font.wait not implemented");
-                    case "ui.font.width": return N(Font.getFont((Stream)a, JS.toInt(b)).textwidth((String)c));
+                    case "ui.font.width": return N(Font.getFont(a, JS.toInt(b)).textwidth(JS.toString(c)));
                     //#end
                     break;
             }
@@ -218,7 +221,7 @@ public final class Ibex extends JS.Cloneable {
         throw new JSExn("invalid number of arguments ("+nargs+") for ibex object method "+name+"()");
     }
 
-    public Stream url2res(String url) throws JSExn {
+    public JS url2res(String url) throws JSExn {
         if (url.startsWith("http://")) return new Stream.HTTP(url);
         else if (url.startsWith("https://")) return new Stream.HTTP(url);
         else if (url.startsWith("data:")) return new Stream.ByteArray(Base64.decode(url.substring(5)), null);
@@ -241,70 +244,93 @@ public final class Ibex extends JS.Cloneable {
     }
     
     public static final JSMath ibexMath = new JSMath() {
-            private JS gs = new JSScope.Global();
-            public Object get(Object key) throws JSExn {
-                //#switch(key)
-                case "isNaN": return gs.get("isNaN");
-                case "isFinite": return gs.get("isFinite");
-                case "NaN": return gs.get("NaN");
-                case "Infinity": return gs.get("Infinity");
+            // FEATURE: find a cleaner way to do this
+            private JS gs = /*new JSScope.Global();*/ null; // FIXME: Global scope
+            public JS get(JS key) throws JSExn {
+                //#jswitch(key)
+                case "isNaN": return METHOD;
+                case "isFinite": return METHOD;
+                case "NaN": return METHOD;
+                case "Infinity": return METHOD;
                 //#end
                 return super.get(key);
             }
-        };
+            public JS callMethod(JS name, JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn {
+                //#jswitch(name)
+                case "isNaN": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "isFinite": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "NaN": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "Infinity": return gs.callMethod(name,a,b,c,rest,nargs);
+                //#end
+                return super.callMethod(name,a,b,c,rest,nargs);
+            }
+    };
 
     public static final JS ibexString = new JS() {
-            private JS gs = new JSScope.Global();
-            public void put(Object key, Object val) { }
-            public Object get(Object key) throws JSExn {
-                //#switch(key)
-                case "parseInt": return gs.get("parseInt");
-                case "parseFloat": return gs.get("parseFloat");
-                case "decodeURI": return gs.get("decodeURI");
-                case "decodeURIComponent": return gs.get("decodeURIComponent");
-                case "encodeURI": return gs.get("encodeURI");
-                case "encodeURIComponent": return gs.get("encodeURIComponent");
-                case "escape": return gs.get("escape");
-                case "unescape": return gs.get("unescape");
-                case "fromCharCode": return gs.get("stringFromCharCode");
+            private JS gs = /*new JSScope.Global();*/ null; // FIXME: Global scope
+            public JS get(JS key) throws JSExn {
+                //#jswitch(key)
+                case "parseInt": return METHOD;
+                case "parseFloat": return METHOD;
+                case "decodeURI": return METHOD;
+                case "decodeURIComponent": return METHOD;
+                case "encodeURI": return METHOD;
+                case "encodeURIComponent": return METHOD;
+                case "escape": return METHOD;
+                case "unescape": return METHOD;
+                case "fromCharCode": return METHOD;
                 //#end
-                return null;
+                return super.get(key);
             }
-        };
+            public JS callMethod(JS name, JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn {
+                //#jswitch(name)
+                case "parseInt": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "parseFloat": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "decodeURI": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "decodeURIComponent": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "encodeURI": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "encodeURIComponent": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "escape": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "unescape": return gs.callMethod(name,a,b,c,rest,nargs);
+                case "fromCharCode": return gs.callMethod(name,a,b,c,rest,nargs);
+                //#end
+                return super.callMethod(name,a,b,c,rest,nargs);
+            }
+    };
 
     private class XMLHelper extends XML {
         private class Wrapper extends XML.Exn { public JSExn wrapee; public Wrapper(JSExn jse) { super(""); wrapee = jse; } }
         private JS characters, whitespace, endElement, startElement;
         public XMLHelper(JS b) throws JSExn {
             super(BUFFER_SIZE);
-            startElement = (JS)b.getAndTriggerTraps("startElement");
-            endElement   = (JS)b.getAndTriggerTraps("endElement");
-            characters   = (JS)b.getAndTriggerTraps("characters");
-            whitespace   = (JS)b.getAndTriggerTraps("whitespace");
+            startElement = b.getAndTriggerTraps(JS.S("startElement"));
+            endElement   = b.getAndTriggerTraps(JS.S("endElement"));
+            characters   = b.getAndTriggerTraps(JS.S("characters"));
+            whitespace   = b.getAndTriggerTraps(JS.S("whitespace"));
         }
 
         public void startElement(XML.Element c) throws XML.Exn { try {
-                JS attrs = new JS();
+                JS attrs = new JS.O();
                 // FIXME attribute URIs? add an additional hash?
-                for(int i=0; i<c.getAttrLen(); i++) attrs.put(c.getAttrKey(i), c.getAttrVal(i));
-                startElement.call(c.getLocalName(), attrs, c.getUri(), null, 3);
+                for(int i=0; i<c.getAttrLen(); i++) attrs.put(JS.S(c.getAttrKey(i)), JS.S(c.getAttrVal(i)));
+                startElement.call(JS.S(c.getLocalName()), attrs, JS.S(c.getUri()), null, 3);
         } catch (JSExn jse) { throw new Wrapper(jse); } }
 
         public void endElement(XML.Element c) throws XML.Exn { try {
-                endElement.call(c.getLocalName(), c.getUri(), null, null, 2);
+                endElement.call(JS.S(c.getLocalName()), JS.S(c.getUri()), null, null, 2);
         } catch (JSExn jse) { throw new Wrapper(jse); } }
 
         public void characters(char[] ch, int start, int length) throws XML.Exn { try {
-                characters.call(new String(ch, start, length), null, null, null, 1);
+                characters.call(JS.S(new String(ch, start, length)), null, null, null, 1);
         } catch (JSExn jse) { throw new Wrapper(jse); } }
 
         public void whitespace(char[] ch, int start, int length) throws XML.Exn { try {
-                whitespace.call(new String(ch, start, length), null, null, null, 1);
+                whitespace.call(JS.S(new String(ch, start, length)), null, null, null, 1);
         } catch (JSExn jse) { throw new Wrapper(jse); } }
 
         public void doParse(JS s) throws JSExn {
             try { 
-                parse(new BufferedReader(new InputStreamReader(Stream.getInputStream(s))));
+                parse(new BufferedReader(new InputStreamReader(s.getInputStream())));
             } catch (Wrapper e) {
                 throw e.wrapee;
             } catch (XML.Exn e) {
@@ -318,60 +344,75 @@ public final class Ibex extends JS.Cloneable {
     }
 
     // FEATURE: move this into builtin.xwar
-    public Blessing bless(JS b) { return new Ibex.Blessing((JS.Cloneable)b, this, null, null); }
+    public Blessing bless(JS b) throws JSExn { return new Ibex.Blessing(b, this, null, null); }
+    // FIXME: Does this really need to extends JS.Clone?
+    // FEATURE: Mandate that Blessings use only String keys?
     public static class Blessing extends JS.Clone {
         private Ibex ibex;
         private Template t = null;
-        public Object parentkey = null;
+        public JS parentkey = null;
         public Blessing parent = null;
         private Hash cache = new Hash();
-        public Blessing(JS.Cloneable clonee, Ibex ibex, Blessing parent, Object parentkey) {
+        public Blessing(JS clonee, Ibex ibex, Blessing parent, JS parentkey) throws JSExn {
             super(clonee); this.ibex = ibex; this.parentkey = parentkey; this.parent = parent; }
-        public Object get(Object key) throws JSExn {
-            if (key.equals("")) return ((Object)getStatic());
-            if (cache.get(key) != null) return cache.get(key);
-            Object ret = new Blessing((JS.Cloneable)clonee.get(key), ibex, this, key);
+        public JS get(JS key) throws JSExn {
+            if (JS.isString(key) && JS.toString(key).equals("")) return getStatic();
+            if (cache.get(key) != null) return (JS)cache.get(key);
+            JS ret = new Blessing(clonee.get(key), ibex, this, key);
             cache.put(key, ret);
             return ret;
         }
-        public static Blessing getBlessing(Object o) {
-            if (!(o instanceof JS)) return null;
-            JS js = (JS)o;
+        public static Blessing getBlessing(JS js) {
             while (js instanceof JS.Clone && !(js instanceof Blessing)) js = ((JS.Clone)js).getClonee();
             if (!(js instanceof Blessing)) return null;
             return (Blessing)js;
         }
+        // FEATURE: This is a gross hack
         public InputStream getImage() throws JSExn {
             try {
-                InputStream in = Stream.getInputStream(this);
+                InputStream in = getInputStream();
                 if (in != null) return in;
             } catch (IOException e) { /* DELIBERATE */ }
             String[] exts = new String[] { ".png", ".jpeg", ".gif" };
             for (int i=0; i < exts.length; i++)
                 try {
-                    InputStream in = Stream.getInputStream(parent.get(parentkey + exts[i]));
+                    InputStream in = parent.get(JS.S(JS.toString(parentkey) + exts[i])).getInputStream();
                     if (in != null) return in;
                 } catch (IOException f) { /* DELIBERATE */ }
             return null;
         }
-        public JSScope getStatic() {
+        public JSScope getStatic() throws JSExn {
             try {
-                if (t == null) t = Template.buildTemplate(parentkey + ".t", parent.get(parentkey + ".t"), ibex);
-                return t.staticScope;
+                if (t == null) {
+                    // FEATURE: Might want to handle the ".t" part better
+                    JS res = parent.get(JS.S(JS.toString(parentkey) + ".t"));
+                    t = Template.buildTemplate(description(), res, ibex);
+                }
+                return t != null ? t.staticScope : null;
             } catch (Exception e) {
                 Log.error(this, e);
                 return null;
             }
         }
-        public Object call(Object a, Object b, Object c, Object[] rest, int nargs) throws JSExn {
-            // GROSS hack
-            if (nargs != 1 && nargs != 9999) throw new JSExn("FIXME can only call with one arg");
+        private String description() {
+            String s = JS.debugToString(parentkey);
+            for(Blessing b = parent; b != null; b = b.parent) s = JS.debugToString(parentkey) + "." + s;
+            return s;
+        }
+        public JS call(JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn {
+            if (nargs != 1) throw new JSExn("can only call a template with one arg");
             getStatic();
             if (t == null) throw new JSExn("No such template " + parentkey);
-            if (nargs == 9999) return t;
+            if(!(a instanceof Box)) throw new JSExn("can only apply templates to boxes");
             t.apply((Box)a);
             return a;
         }
+        // FEATURE: This is a gross hack
+        Template getTemplate()  throws JSExn {
+            getStatic();
+            if (t == null) throw new JSExn("No such template " + JS.debugToString(parentkey));
+            return t;
+        }
     }
 
 }