X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=2dbaa3b5116660342ad6242d2574d6c700e2c0ce;hb=0f94de16d032aa04fcfa50056f7964de2fcd2d58;hp=3234c01d67bc7194105a86a4220b62bf558dc4ff;hpb=55ba92deb32e860a485d544479850e98288cee43;p=org.ibex.core.git
diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 3234c01..2dbaa3b 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -25,31 +25,30 @@ public class Template {
// 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 Function 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 Function 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 content
- private int content_lines = 0; ///< number of lines in content
- 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 content
+ private int startLine = -1; ///< the line number that this element starts on
+ private final Res r; ///< the resource we came from
// Static data/methods ///////////////////////////////////////////////////////////////////
@@ -59,10 +58,11 @@ public class Template {
r = r.addExtension(".xwt");
if (r.t != null) return r.t;
r.t = new Template(r);
- new TemplateHelper().parseit(r.getInputStream(), r.t);
+ try { new TemplateHelper().parseit(r.getInputStream(), r.t); }
+ catch (FileNotFoundException e) { Log.log(Template.class, "template not found: "+r); }
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;
}
}
@@ -70,7 +70,7 @@ public class Template {
public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) {
// URL
if (str.indexOf("://") != -1) {
- if (permitAbsolute) return Res.stringToRes(str);
+ if (permitAbsolute) return (Res)xwt.callMethod("res.url", str, null, null, null, 1);
Log.log(Template.class, "absolute URL " + str + " not permitted here");
return null;
}
@@ -89,24 +89,29 @@ public class Template {
// Methods to apply templates ////////////////////////////////////////////////////////
- private Template(Res r) { this.r = r; }
+ private Template(Res r) {
+ this.r = r;
+ String f = r.toString();
+ if (f != null && !f.equals(""))
+ fileName = f.substring(f.lastIndexOf('/')+1, f.endsWith(".xwt") ? f.length() - 4 : f.length());
+ }
/** 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;
- Function temp = staticscript;
+ JSScope getStatic() {
+ if (staticJSScope == null) staticJSScope = new JSScope(null);
+ if (staticscript == null) return staticJSScope;
+ JSFunction temp = staticscript;
staticscript = null;
- new JS.Context(temp, staticScope).resume();
- return staticScope;
+ temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
+ 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();
@@ -114,24 +119,22 @@ public class Template {
for(int i=0; i header node may not appear more than once");
@@ -210,23 +213,23 @@ public class Template {
private void processBodyElement(XML.Element c) {
Hash h = new Hash(c.len * 2, 3);
+
+ // WARNING: c.keys.length != c.len; USE c.len
for(int i=0; i 0)
+ thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
+ t.content_start,
+ new StringReader(contentString));
} catch (IOException ioe) {
if (Log.on) Log.log(this, " ERROR: " + ioe.getMessage());
thisscript = null;
}
t.content = null;
t.content_start = 0;
- t.content_lines = 0;
return thisscript;
}
@@ -309,6 +315,9 @@ public class Template {
t = (Template)nodeStack.lastElement();
nodeStack.setSize(nodeStack.size() - 1);
t.children.addElement(oldt);
+
+ int oldt_lines = getLine() - oldt.startLine;
+ for (int i=0; oldt_lines > i; i++) t.content.append('\n');
}
}
}
@@ -321,12 +330,10 @@ public class Template {
if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
if (t.content == null) {
t.content_start = getLine();
- t.content_lines = 0;
t.content = new StringBuffer();
}
t.content.append(ch, start, length);
- t.content_lines++;
} else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) {
throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content");
@@ -336,16 +343,16 @@ public class Template {
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) {
+ public PerInstantiationJSScope(JSScope parentScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
super(parentScope);
this.parentBoxPis = parentBoxPis;
this.xwt = xwt;
@@ -357,9 +364,9 @@ public class Template {
if (key.equals("static")) return myStatic;
return super.get(key);
}
- public Object put(Object key, Object val) {
- if (super.has(key)) return super.put(key, val);
- return super.put(key, val);
+ public void put(Object key, Object val) {
+ if (super.has(key)) super.put(key, val);
+ else super.put(key, val);
}
}