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 JS[] keys; ///< keys to be "put" to instances of this template; elements correspond to those of vals
private JS[] vals; ///< values to be "put" to instances of this template; elements correspond to those of keys
private String[] urikeys;
private String[] urivals;
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;
for(int i=0; i<urikeys.length; i++) {
if (urikeys[i] == null) continue;
// FEATURE: Cache urikeys and resolved resources
- pis.declare(JS.S(urikeys[i]));
- pis.put(JS.S(urikeys[i]), ibex.resolveString(urivals[i], true));
+ //pis.declare(JS.S(urikeys[i]));
+ // JS:FIXME: ugly
+ pis.sput(JS.S(urikeys[i]), ibex.resolveString(urivals[i], true));
}
// FIXME needs to obey the new application-ordering rules
b.putAndTriggerTraps(b.get(JS.S("numchildren")), kid);
}
- if (script != null) JS.cloneWithNewParentScope(script, pis).call(null, null, null, null, 0);
+ if (script != null) JS.cloneWithNewGlobalScope(script, pis).call(null, null, null, null, 0);
for(int i=0; keys != null && i < keys.length; i++) {
if (keys[i] == null) continue;
- String key = keys[i];
+ JS key = keys[i];
JS val = vals[i];
if ("null".equals(val)) val = null;
// FIXME: should we be resolving all of these in the XML-parsing code?
}
}
- b.putAndTriggerTraps(JS.S(key), val);
+ b.putAndTriggerTraps(key, val);
}
}
public TemplateHelper(String sourceName, JS s, Ibex ibex) throws XML.Exn, IOException, JSExn {
this.sourceName = sourceName;
this.ibex = ibex;
- InputStream is = Stream.getInputStream(s);
+ InputStream is = s.getInputStream();
Ibex.Blessing b = Ibex.Blessing.getBlessing(s).parent;
while(b != null) {
- if(b.parentkey != null) initial_uri = b.parentkey + (initial_uri.equals("") ? "" : "." + initial_uri);
+ if(b.parentkey != null) initial_uri = JS.toString(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.staticObject = new JS.O();
- t.staticScope = new PerInstantiationScope(null, ibex, null, t.staticObject);
- if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
+ JS staticScope = new PerInstantiationScope(null, ibex, null, t.staticObject);
+ if (staticScript != null) JS.cloneWithNewGlobalScope(staticScript, staticScope).call(null, null, null, null, 0);
}
private JS parseScript(StringBuffer content, int content_start) throws IOException {
break;
}
+ // FIXME: This is all wrong
if (!("ibex://ui".equals(c.getUri()) && "box".equals(c.getLocalName()))) {
String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
// GROSS hack
try {
// GROSSER hack
// t.prev2 = (Template)t.ibex.resolveString(tagname, false).call(null, null, null, null, 9999);
- throw new Error("FIXME - 9999 thing"); // FIXME:9999 thing
+ if(t.prev2 != null) throw new Error("FIXME: t.prev2 != null");
+ t.prev2 = ((Ibex.Blessing)t.ibex.resolveString(tagname, false)).getTemplate();
+ if(t.prev2 == null) throw new Exception("" + tagname + " not found");
} catch (Exception e) {
Log.error(Template.class, e);
}
return ((String)a).compareTo((String)b);
} });
- t.keys = new String[keys.size()];
+ t.keys = new JS[keys.size()];
t.vals = new JS[vals.size()];
- keys.copyInto(t.keys);
- vals.copyInto(t.vals);
-
+
// convert attributes to appropriate types and intern strings
for(int i=0; i<t.keys.length; i++) {
- t.keys[i] = t.keys[i].intern();
-
- String valString = t.vals[i].toString();
+ // FEATURE: Intern
+ t.keys[i] = JS.S((String)keys.elementAt(i));
+ String valString = (String) vals.elementAt(i);
if (valString.equals("true")) t.vals[i] = JS.T;
else if (valString.equals("false")) t.vals[i] = JS.F;
public void whitespace(char[] ch, int start, int length) throws XML.Exn { }
}
- private static class PerInstantiationScope extends JSScope {
+ private static class PerInstantiationScope extends JS.O {
Ibex ibex = null;
PerInstantiationScope parentBoxPis = null;
JS myStatic = null;
+ JS box;
void putDollar(String key, Box target) throws JSExn {
if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
JS jskey = JS.S("$" + key);
- declare(jskey);
- put(jskey, target);
+ //declare(jskey);
+ sput(jskey, target);
}
- public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JS myStatic) {
- super(parentScope);
+ // JS:FIXME: ugly
+ void sput(JS key, JS val) throws JSExn { super.put(key,val); }
+ public PerInstantiationScope(JS box, Ibex ibex, PerInstantiationScope parentBoxPis, JS myStatic) {
this.parentBoxPis = parentBoxPis;
this.ibex = ibex;
this.myStatic = myStatic;
+ this.box = box;
}
public JS get(JS key) throws JSExn {
- if (super.has(key)) return super.get(key);
if(JS.isString(key)) {
String s = JS.toString(key);
+ // JS:FIXME This is a hack
+ if (super.get(key) != null) return super.get(key);
if (s.equals("ibex")) return ibex;
if (s.equals("")) return ibex.get(key);
if (s.equals("static")) return myStatic;
}
- return super.get(key);
+ // JS:FIXME: This won't work with traps that do blocking operations
+ return box.getAndTriggerTraps(key);
}
+ // JS:FIXME: Everything below here should come from js.scope or something
+ public void put(JS key, JS val) throws JSExn { if(box != null) box.putAndTriggerTraps(key,val); else super.put(key,val); }
+ public void addTrap(JS key, JSFunction f) throws JSExn { box.addTrap(key,f); }
+ public void delTrap(JS key, JSFunction f) throws JSExn { box.delTrap(key,f); }
}
}