private Vec children = new Vec(); ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
private JS script = null; ///< the script on this node
Template prev;
+ Template prev2;
JSScope staticScope = null; ///< the scope in which the static block is executed
+ JS staticObject = null;
// Only used during parsing /////////////////////////////////////////////////////////////////
private void apply(Box b, PerInstantiationScope parentPis) throws JSExn, IOException {
if (prev != null) prev.apply(b, null);
+ if (prev2 != null) prev2.apply(b, null);
// FIXME this dollar stuff is all wrong
if (id != null) parentPis.putDollar(id, b);
- PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticScope);
+ PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticObject);
for(int i=0; i<urikeys.length; i++) {
+ if (urikeys[i] == null) continue;
pis.declare(urikeys[i]);
pis.put(urikeys[i], ibex.resolveString(urivals[i], true));
}
// FIXME: should we be resolving all of these in the XML-parsing code?
}
}
-
b.putAndTriggerTraps(key, val);
}
}
// XML Parsing /////////////////////////////////////////////////////////////////
- public static Template buildTemplate(String sourceName, InputStream is, Ibex ibex) {
+ public static Template buildTemplate(String sourceName, Object s, Ibex ibex) {
try {
- return new TemplateHelper(sourceName, is, ibex).t;
+ return new TemplateHelper(sourceName, s, ibex).t;
} catch (Exception e) {
Log.error(Template.class, e);
return null;
int meta = 0;
Ibex ibex;
- public TemplateHelper(String sourceName, InputStream is, Ibex ibex) throws XML.Exn, IOException, JSExn {
+ String initial_uri = "";
+
+ public TemplateHelper(String sourceName, Object s, Ibex ibex) throws XML.Exn, IOException, JSExn {
this.sourceName = sourceName;
this.ibex = ibex;
+ InputStream is = Stream.getInputStream(s);
+ Ibex.Blessing b = Ibex.Blessing.getBlessing(s).parent;
+ while(b != null) {
+ if(b.parentkey != null) initial_uri = b.parentkey + (initial_uri.equals("") ? "" : "." + initial_uri);
+ b = b.parent;
+ }
+ initial_uri = "";
parse(new InputStreamReader(is));
JS staticScript = parseScript(static_content, static_content_start);
- t.staticScope = new PerInstantiationScope(null, ibex, null, null);
+ t.staticObject = new JS();
+ t.staticScope = new PerInstantiationScope(null, ibex, null, t.staticObject);
if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
}
throw new XML.Exn("root element was not <ibex>", XML.Exn.SCHEMA, getLine(), getCol());
if (c.getAttrLen() != 0)
throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
+ if (c.getUri("ui") == null || "".equals(c.getUri("ui"))) c.addUri("ui", "ibex://ui");
+ if (c.getUri("meta") == null || "".equals(c.getUri("meta"))) c.addUri("meta", "ibex://meta");
+ if (c.getUri("") == null || "".equals(c.getUri(""))) c.addUri("", initial_uri);
state = STATE_IN_ROOT_NODE;
return;
case STATE_IN_ROOT_NODE:
- if ("meta".equals(c.getPrefix())) { state = STATE_IN_META_NODE; meta = 0; return; }
+ if ("ibex://meta".equals(c.getUri())) { state = STATE_IN_META_NODE; meta = 0; return; }
state = STATE_IN_TEMPLATE_NODE;
t = (t == null) ? new Template(ibex) : new Template(t, getLine());
break;
break;
}
- if (!(/* "ui".equals(c.getPrefix()) && */ "box".equals(c.getLocalName()))) {
+ if (!("ibex://ui".equals(c.getUri()) && "box".equals(c.getLocalName()))) {
String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
// GROSS hack
try {
- t.prev = (Template)t.ibex.resolveString(tagname, false).call(null, null, null, null, 9999);
+ // GROSSER hack
+ t.prev2 = (Template)t.ibex.resolveString(tagname, false).call(null, null, null, null, 9999);
} catch (Exception e) {
Log.error(Template.class, e);
}
while(uriEnumeration.hasMoreElements()) {
String key = (String)uriEnumeration.nextElement();
String val = (String)urimap.get(key);
+ if (val.equals("ibex://ui")) continue;
+ if (val.equals("ibex://meta")) continue;
t.urikeys[ii] = key;
- if (val.charAt(0) == '.') val = val.substring(1);
+ if (val.length() > 0 && val.charAt(0) == '.') val = val.substring(1);
t.urivals[ii] = val;
ii++;
}
// process attributes into Vecs, dealing with any XML Namespaces in the process
ATTR: for (int i=0; i < c.getAttrLen(); i++) {
- //#switch(c.getAttrKey(i))
- case "id":
+ if (c.getAttrKey(i).equals("id")) {
t.id = c.getAttrVal(i).toString().intern();
continue ATTR;
- //#end
+ }
// treat value starting with '.' as resource reference
String uri = c.getAttrUri(i); if (!uri.equals("")) uri = '.' + uri;
private static class PerInstantiationScope extends JSScope {
Ibex ibex = null;
PerInstantiationScope parentBoxPis = null;
- JSScope myStatic = null;
+ JS myStatic = null;
void putDollar(String key, Box target) throws JSExn {
if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
declare("$" + key);
put("$" + key, target);
}
- public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JSScope myStatic) {
+ public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JS myStatic) {
super(parentScope);
this.parentBoxPis = parentBoxPis;
this.ibex = ibex;
projects / org.ibex.core.git / blobdiff