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=6492ed204c939d82e5a7c972541dafd19bc560b2;hb=2d6763644359578428d56d004b998edd10463a84;hpb=76982fccac3c46ccc47621dd22dc0c96b6b9cd62 diff --git a/src/org/ibex/core/Ibex.java b/src/org/ibex/core/Ibex.java index 6492ed2..e14a970 100644 --- a/src/org/ibex/core/Ibex.java +++ b/src/org/ibex/core/Ibex.java @@ -15,11 +15,11 @@ public final class Ibex extends JS implements JS.Cloneable { // FIXME remove this private final JS rr; - public Ibex(Stream rr) { try { this.rr = bless(rr);} catch(JSExn e) { throw new Error("should never happen"); } } + 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 @@ -37,28 +37,29 @@ public final class Ibex extends JS implements JS.Cloneable { /** 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(JS key, JS val) throws JSExn { Ibex.this.put(this.key + "." + JS.toString(key), val); } - public JS get(JS key) throws JSExn { return Ibex.this.get(this.key + "." + JS.toString(key)); } + 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 JS callMethod(JS method, JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn { - return Ibex.this.callMethod(this.key + "." + JS.toString(method), a0, a1, a2, rest, nargs); + 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 JS get(JS key) throws JSExn { return JS.isString(key) ? get(JS.toString(key)) : null; } - JS get(String 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; @@ -66,8 +67,8 @@ public final class Ibex extends JS implements 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; @@ -75,30 +76,30 @@ public final class Ibex extends JS implements JS.Cloneable { 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": 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 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": return getSub(name); case "undocumented.initialOrigin": return JS.S(Main.origin); case "undocumented.initialTemplate": return JS.S(Main.initialTemplate); - case "thread": return getSub("thread"); + 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; @@ -109,16 +110,16 @@ public final class Ibex extends JS implements 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; @@ -127,9 +128,8 @@ public final class Ibex extends JS implements JS.Cloneable { return null; } - public void put(JS key, JS value) throws JSExn { if(JS.isString(key)) put(JS.toString(key),value); else super.put(key,value); } - void put(Object name, final JS 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(JS.toString(value)); return; case "ui.frame": Platform.createSurface((Box)value, true, true); return; @@ -143,38 +143,34 @@ public final class Ibex extends JS implements JS.Cloneable { } public JS callMethod(JS name, JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn { - if(JS.isString(name)) return callMethod(JS.toString(name),a,b,c,rest,nargs); - return super.callMethod(name,a,b,c,rest,nargs); - } - JS callMethod(String 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(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 == 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(JS.toString(a)); return null; - case "stream.unzip": return new Stream.Zip((Stream)a); - case "stream.uncab": return new Stream.Cab((Stream)a); + 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 = JS.toString(a); @@ -196,22 +192,23 @@ public final class Ibex extends JS implements JS.Cloneable { 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 JS.S(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(JS.toString(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(JS.toString(c))); + case "ui.font.width": return N(Font.getFont(a, JS.toInt(b)).textwidth(JS.toString(c))); //#end break; } @@ -224,7 +221,7 @@ public final class Ibex extends JS implements 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); @@ -250,7 +247,7 @@ public final class Ibex extends JS implements JS.Cloneable { // 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 { - //#switch(JS.toString(key)) + //#jswitch(key) case "isNaN": return METHOD; case "isFinite": return METHOD; case "NaN": return METHOD; @@ -259,7 +256,7 @@ public final class Ibex extends JS implements JS.Cloneable { return super.get(key); } public JS callMethod(JS name, JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn { - //#switch(JS.toString(name)) + //#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); @@ -272,7 +269,7 @@ public final class Ibex extends JS implements JS.Cloneable { public static final JS ibexString = new JS() { private JS gs = /*new JSScope.Global();*/ null; // FIXME: Global scope public JS get(JS key) throws JSExn { - //#switch(JS.toString(key)) + //#jswitch(key) case "parseInt": return METHOD; case "parseFloat": return METHOD; case "decodeURI": return METHOD; @@ -286,7 +283,7 @@ public final class Ibex extends JS implements JS.Cloneable { return super.get(key); } public JS callMethod(JS name, JS a, JS b, JS c, JS[] rest, int nargs) throws JSExn { - //#switch(JS.toString(name)) + //#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); @@ -333,7 +330,7 @@ public final class Ibex extends JS implements JS.Cloneable { 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) { @@ -349,6 +346,7 @@ public final class Ibex extends JS implements JS.Cloneable { // FEATURE: move this into builtin.xwar 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; @@ -369,41 +367,52 @@ public final class Ibex extends JS implements JS.Cloneable { 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(JS.S(JS.toString(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) { - JS res = (JS) parent.get(JS.S(JS.toString(parentkey) + ".t")); - t = Template.buildTemplate(res.unclone().toString(), res, ibex); + // 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.staticScope; + return t != null ? t.staticScope : null; } catch (Exception e) { Log.error(this, e); return null; } } + 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 { - // GROSS hack - if (nargs != 1 && nargs != 9999) throw new JSExn("FIXME can only call with one arg"); + 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;*/ throw new Error("FIXME"); // FIXME: 9999 stuff 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; + } } }