projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004/01/13 10:27:47
[org.ibex.core.git]
/
src
/
org
/
xwt
/
Template.java
diff --git
a/src/org/xwt/Template.java
b/src/org/xwt/Template.java
index
00aedd0
..
3626eec
100644
(file)
--- a/
src/org/xwt/Template.java
+++ b/
src/org/xwt/Template.java
@@
-1,4
+1,4
@@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
package org.xwt;
import java.io.*;
package org.xwt;
import java.io.*;
@@
-33,7
+33,7
@@
public class Template {
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 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 JSFunction script = null; ///< the script on this node
+ private JS 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 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)
@@
-41,7
+41,7
@@
public class Template {
// Instance Members that are only meaningful on root Template //////////////////////////////////////
private JSScope staticScope = null; ///< the scope in which the static block is executed
// Instance Members that are only meaningful on root Template //////////////////////////////////////
private JSScope staticScope = 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
+ private JS staticscript = null; ///< the script on the static node of this template, null already performed
// Only used during parsing /////////////////////////////////////////////////////////////////
// Only used during parsing /////////////////////////////////////////////////////////////////
@@
-49,57
+49,53
@@
public class Template {
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 startLine = -1; ///< the line number that this element starts on
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 startLine = -1; ///< the line number that this element starts on
- private final Res r; ///< the resource we came from
+ private XWT xwt;
// Static data/methods ///////////////////////////////////////////////////////////////////
// Static data/methods ///////////////////////////////////////////////////////////////////
- public static Template getTemplate(Res r) throws JSExn {
+ public Template(InputStream is, XWT xwt) {
+ this.xwt = xwt;
try {
try {
- r = r.addExtension(".xwt");
- if (r.t != null) return r.t;
- r.t = new Template(r);
- new TemplateHelper().parseit(r.getInputStream(), r.t);
- return r.t;
- } catch (Exception e) { throw new JSExn(e.toString());
+ new TemplateHelper().parseit(is, this);
+ } catch (Exception e) {
+ throw new RuntimeException(e.toString());
}
}
}
}
- public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
+ public Template(XWT xwt) {
+ this.xwt = xwt;
+ }
+
+ public static JS resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
// URL
// URL
+ /* FIXME
if (str.indexOf("://") != -1) {
if (str.indexOf("://") != -1) {
- if (permitAbsolute) return (Res)xwt.url2res(str);
+ if (permitAbsolute) return (Stream)xwt.url2res(str);
throw new JSExn("absolute URL " + str + " not permitted here");
}
throw new JSExn("absolute URL " + str + " not permitted here");
}
-
+ */
// root-relative
// root-relative
- Res ret = xwt.rr;
+ JS ret = (JS)xwt.getAndTriggerTraps("");
while(str.indexOf('.') != -1) {
String path = str.substring(0, str.indexOf('.'));
str = str.substring(str.indexOf('.') + 1);
while(str.indexOf('.') != -1) {
String path = str.substring(0, str.indexOf('.'));
str = str.substring(str.indexOf('.') + 1);
- ret = (Res)ret.get(path);
+ ret = (JS)ret.get(path);
}
}
- ret = (Res)ret.get(str);
+ ret = (JS)ret.get(str);
return ret;
}
// Methods to apply templates ////////////////////////////////////////////////////////
return ret;
}
// Methods to apply templates ////////////////////////////////////////////////////////
- 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 */
/** called before this template is applied or its static object can be externally referenced */
- JSScope getStatic(XWT xwt) throws JSExn {
+ JSScope getStatic() throws JSExn {
if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null);
if (staticscript == null) return staticScope;
if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null);
if (staticscript == null) return staticScope;
- JSFunction temp = staticscript;
+ JS temp = staticscript;
staticscript = null;
staticscript = null;
- temp.cloneWithNewParentScope(staticScope).call(null, null, null, null, 0);
+ JS.cloneWithNewParentScope(temp, staticScope).call(null, null, null, null, 0);
return staticScope;
}
return staticScope;
}
@@
-107,37
+103,39
@@
public class Template {
* @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
*/
* @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, XWT xwt) {
+ void apply(Box b) throws JSExn {
try {
try {
- apply(b, xwt, null);
+ apply(b, null);
+ } catch (IOException e) {
+ b.clear(b.VISIBLE);
+ b.mark_for_repack();
+ throw new JSExn(e.toString());
} catch (JSExn e) {
b.clear(b.VISIBLE);
b.mark_for_repack();
} catch (JSExn e) {
b.clear(b.VISIBLE);
b.mark_for_repack();
- Log.info(Template.class, "WARNING: exception (below) thrown during application of template;");
- Log.info(Template.class, " setting visibility of target box to \"false\"");
- JS.log(e);
+ throw e;
}
}
}
}
-
- private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
- getStatic(xwt);
+ private void apply(Box b, PerInstantiationJSScope parentPis) throws JSExn, IOException {
+ getStatic();
if (id != null) parentPis.putDollar(id, b);
for(int i=0; i<preapply.size(); i++) {
if (id != null) parentPis.putDollar(id, b);
for(int i=0; i<preapply.size(); i++) {
- Template t = getTemplate(resolveStringToResource((String)preapply.elementAt(i), xwt, false));
+ Template t = new Template(Stream.getInputStream(resolveStringToResource((String)preapply.elementAt(i), xwt, false)), xwt);
if (t == null) throw new RuntimeException("unable to resolve resource " + preapply.elementAt(i));
if (t == null) throw new RuntimeException("unable to resolve resource " + preapply.elementAt(i));
- t.apply(b, xwt);
+ t.apply(b);
}
PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticScope);
}
PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticScope);
+
for (int i=0; children != null && i<children.size(); i++) {
Box kid = new Box();
for (int i=0; children != null && i<children.size(); i++) {
Box kid = new Box();
- ((Template)children.elementAt(i)).apply(kid, xwt, pis);
- b.putAndTriggerTraps(JS.N(b.treeSize()), kid);
+ ((Template)children.elementAt(i)).apply(kid, pis);
+ b.putAndTriggerTraps(b.get("numchildren"), kid);
}
}
- if (script != null) script.cloneWithNewParentScope(pis).call(null, null, null, null, 0);
+ if (script != null) JS.cloneWithNewParentScope(script, pis).call(null, null, null, null, 0);
Object key, val;
for(int i=0; keys != null && i < keys.length; i++) {
Object key, val;
for(int i=0; keys != null && i < keys.length; i++) {
@@
-163,7
+161,12
@@
public class Template {
if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
}
if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
}
- b.putAndTriggerTraps(key, val);
+ try {
+ b.putAndTriggerTraps(key, val);
+ } catch(JSExn e) {
+ e.addBacktrace(fileName + ":attr-" + key,0);
+ throw e;
+ }
}
}
}
}
@@
-232,7
+235,7
@@
public class Template {
// push the last node we were in onto the stack
nodeStack.addElement(t);
// instantiate a new node, and set its fileName/importlist/preapply
// push the last node we were in onto the stack
nodeStack.addElement(t);
// instantiate a new node, and set its fileName/importlist/preapply
- Template t2 = new Template(t.r);
+ Template t2 = new Template(t.xwt);
t2.startLine = getLine();
if (!c.getLocalName().equals("box") && !c.getLocalName().equals("template"))
t2.preapply.addElement((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName());
t2.startLine = getLine();
if (!c.getLocalName().equals("box") && !c.getLocalName().equals("template"))
t2.preapply.addElement((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName());
@@
-308,11
+311,11
@@
public class Template {
}
}
}
}
- private JSFunction parseScript(boolean isstatic) throws IOException {
- JSFunction thisscript = null;
+ private JS parseScript(boolean isstatic) throws IOException {
+ JS thisscript = null;
String contentString = t.content.toString();
if (contentString.trim().length() > 0)
String contentString = t.content.toString();
if (contentString.trim().length() > 0)
- thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
+ thisscript = JS.fromReader(t.fileName + (isstatic ? "._" : ""),
t.content_start,
new StringReader(contentString));
t.content = null;
t.content_start,
new StringReader(contentString));
t.content = null;
@@
-383,7
+386,7
@@
public class Template {
public Object get(Object key) throws JSExn {
if (super.has(key)) return super.get(key);
if (key.equals("xwt")) return xwt;
public Object get(Object key) throws JSExn {
if (super.has(key)) return super.get(key);
if (key.equals("xwt")) return xwt;
- if (key.equals("")) return xwt.rr;
+ if (key.equals("")) return xwt.get("");
if (key.equals("static")) return myStatic;
return super.get(key);
}
if (key.equals("static")) return myStatic;
return super.get(key);
}