// Instance Members ///////////////////////////////////////////////////////
- String id = null; ///< the id of this box
- String redirect = null; ///< the id of the redirect target; only meaningful on a root node
- private String[] keys; ///< keys to be "put" to instances of this template; elements correspond to those of vals
- private Object[] vals; ///< values to be "put" to instances of this template; elements correspond to those of keys
- private Vec children = new Vec(); ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
- private int numunits = -1; ///< see numUnits(); -1 means that this value has not yet been computed
+ String id = null; ///< the id of this box
+ String redirect = null; ///< the id of the redirect target; only meaningful on a root node
+ private String[] keys; ///< keys to be "put" to instances of this template; elements correspond to those of vals
+ private Object[] vals; ///< values to be "put" to instances of this template; elements correspond to those of keys
+ private Vec children = new Vec(); ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
+ private int numunits = -1; ///< see numUnits(); -1 means that this value has not yet been computed
- private JS.CompiledFunction script = null; ///< the script on this node
- private String fileName = "unknown"; ///< the filename this node came from; used only for debugging
- private Vec preapply = new Vec(); ///< templates that should be preapplied (in the order of application)
+ private JSFunction script = null; ///< the script on this node
+ private String fileName = "unknown"; ///< the filename this node came from; used only for debugging
+ private Vec preapply = new Vec(); ///< templates that should be preapplied (in the order of application)
// Instance Members that are only meaningful on root Template //////////////////////////////////////
- private JS.Scope staticScope = null; ///< the scope in which the static block is executed
- private JS.CompiledFunction staticscript = null; ///< the script on the static node of this template, null already performed
+ private JSScope staticJSScope = null; ///< the scope in which the static block is executed
+ private JSFunction staticscript = null; ///< the script on the static node of this template, null already performed
// Only used during parsing /////////////////////////////////////////////////////////////////
- private StringBuffer content = null; ///< during XML parsing, this holds partially-read character data; null otherwise
- private int content_start = 0; ///< line number of the first line of <tt>content</tt>
- private int content_lines = 0; ///< number of lines in <tt>content</tt>
- private int startLine = -1; ///< the line number that this element starts on
- private final Res r; ///< the resource we came from
+ private StringBuffer content = null; ///< during XML parsing, this holds partially-read character data; null otherwise
+ private int content_start = 0; ///< line number of the first line of <tt>content</tt>
+ private int content_lines = 0; ///< number of lines in <tt>content</tt>
+ private int startLine = -1; ///< the line number that this element starts on
+ private final Res r; ///< the resource we came from
// Static data/methods ///////////////////////////////////////////////////////////////////
new TemplateHelper().parseit(r.getInputStream(), r.t);
return r.t;
} catch (Exception e) {
- if (Log.on) Log.log(r.t.fileName, e);
+ if (Log.on) Log.log(r.t == null ? "null" : r.t.fileName, e);
return null;
}
}
public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) {
// URL
if (str.indexOf("://") != -1) {
- if (permitAbsolute) return Res.stringToRes(str);
+ // FIXME
+ //if (permitAbsolute) return Res.fromString(str);
Log.log(Template.class, "absolute URL " + str + " not permitted here");
return null;
}
private Template(Res r) { this.r = r; }
/** called before this template is applied or its static object can be externally referenced */
- JS.Scope getStatic() {
- if (staticScope == null) staticScope = new JS.Scope(null);
- if (staticscript == null) return staticScope;
- JS.CompiledFunction temp = staticscript;
+ JSScope getStatic() {
+ if (staticJSScope == null) staticJSScope = new JSScope(null);
+ if (staticscript == null) return staticJSScope;
+ JSFunction temp = staticscript;
staticscript = null;
- new JS.Thread(temp, staticScope).resume();
- return staticScope;
+ temp.cloneWithNewParentJSScope(staticJSScope).call(new JSArray());
+ return staticJSScope;
}
/** Applies the template to Box b
* @param pboxes a vector of all box parents on which to put $-references
* @param ptemplates a vector of the fileNames to recieve private references on the pboxes
*/
- void apply(Box b, JS.Callable c, XWT xwt) { apply(b, c, xwt, null); }
- void apply(Box b, JS.Callable callback, XWT xwt, PerInstantiationScope parentPis) {
+ void apply(Box b, XWT xwt) { apply(b, xwt, null); }
+ void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) {
getStatic();
for(int i=0; i<preapply.size(); i++) {
Template t = getTemplate(resolveStringToResource((String)preapply.elementAt(i), xwt, false));
if (t == null) throw new RuntimeException("unable to resolve resource " + preapply.elementAt(i));
- t.apply(b, callback, xwt);
+ t.apply(b, xwt);
}
- PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis, staticScope);
+ PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticJSScope);
for (int i=0; children != null && i<children.size(); i++) {
- Box kid = new Box();
- ((Template)children.elementAt(i)).apply(kid, callback, xwt, pis);
-
- // FIXME: can't actually pass a null tailcall here
- b.put(b.numChildren(), kid, null);
+ Box kid = new BoxTree();
+ ((Template)children.elementAt(i)).apply(kid, xwt, pis);
+ b.putAndTriggerJSTraps(JSObj.N(b.numchildren), kid);
}
- if (script != null) new JS.Thread(script, pis).resume();
+ if (script != null) script.cloneWithNewParentJSScope(pis).call(new JSArray());
for(int i=0; keys != null && i<keys.length; i++)
- if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.put(keys[i], pis.get(vals[i]));
- else if ("image".equals(keys[i])) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
- else if (keys[i] != null) b.put(keys[i], vals[i]);
+ if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.putAndTriggerJSTraps(keys[i], pis.get(vals[i]));
+ else if ("image".equals(keys[i])) b.putAndTriggerJSTraps("image", resolveStringToResource((String)vals[i], xwt, true));
+ else if (keys[i] != null) b.putAndTriggerJSTraps(keys[i], vals[i]);
}
if (nameOfHeaderNodeBeingProcessed != null) throw new XML.SchemaException("can't nest header nodes");
nameOfHeaderNodeBeingProcessed = c.localName;
if (c.localName.equals("doc")) {
- // FIXME: ignore
+ // FEATURE
} else if (c.localName.equals("static")) {
if (t.staticscript != null)
throw new XML.SchemaException("the <static> header node may not appear more than once");
private void processBodyElement(XML.Element c) {
Hash h = new Hash(c.len * 2, 3);
for(int i=0; i<c.len; i++) {
+ if (c.keys[i] == null) continue;
if (c.keys[i].endsWith(":image")) {
String uri = (String)c.urimap.get(c.keys[i].substring(0, c.keys[i].indexOf(':')));
c.keys[i] = c.keys[i].substring(c.keys[i].lastIndexOf(':') + 1);
}
}
- private JS.CompiledFunction parseScript(boolean isstatic) {
- JS.CompiledFunction thisscript = null;
+ private JSFunction parseScript(boolean isstatic) {
+ JSFunction thisscript = null;
try {
- thisscript = JS.parse(t.fileName + (isstatic ? "._" : ""), t.content_start, new StringReader(t.content.toString()));
+ String contentString = t.content.toString();
+ if (contentString.trim().length() > 0)
+ thisscript = JS.parse(t.fileName + (isstatic ? "._" : ""), t.content_start, new StringReader(contentString));
} catch (IOException ioe) {
if (Log.on) Log.log(this, " ERROR: " + ioe.getMessage());
thisscript = null;
public void whitespace(char[] ch, int start, int length) throws XML.SchemaException { }
}
- private static class PerInstantiationScope extends JS.Scope {
+ private static class PerInstantiationJSScope extends JSScope {
XWT xwt = null;
- PerInstantiationScope parentBoxPis = null;
- JS.Scope myStatic = null;
+ PerInstantiationJSScope parentBoxPis = null;
+ JSScope myStatic = null;
void putDollar(String key, Box target) {
if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
declare("$" + key);
put("$" + key, target);
}
- public PerInstantiationScope(Scope parentScope, XWT xwt, PerInstantiationScope parentBoxPis, JS.Scope myStatic) {
- super(parentScope);
+ public PerInstantiationJSScope(JSScope parentJSScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
+ super(parentJSScope);
this.parentBoxPis = parentBoxPis;
this.xwt = xwt;
this.myStatic = myStatic;
}
- public boolean isTransparent() { return true; }
public Object get(Object key) {
if (super.has(key)) return super.get(key);
if (key.equals("xwt")) return xwt;
}
public void put(Object key, Object val) {
if (super.has(key)) super.put(key, val);
- super.put(key, val);
+ else super.put(key, val);
}
}
projects / org.ibex.core.git / blobdiff