X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=f85f3a7ae8a4289da67f007af80fc28f389a5446;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hp=a180bf97e603d19450d86280b36938bec46b00af;hpb=3fd8b036703c7e607daa97e6e11c20e063faf3a0;p=org.ibex.core.git diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java index a180bf9..f85f3a7 100644 --- a/src/org/xwt/Template.java +++ b/src/org/xwt/Template.java @@ -6,6 +6,7 @@ import java.util.zip.*; import java.util.*; import java.lang.*; import org.xwt.js.*; +import org.xwt.translators.*; import org.xwt.util.*; /** @@ -25,36 +26,36 @@ 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 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 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 // 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 Stream r; ///< the resource we came from // Static data/methods /////////////////////////////////////////////////////////////////// - public static Template getTemplate(Res r) { + // FIXME need to provide the XWT object too + public static Template getTemplate(Stream r) throws JSExn { try { r = r.addExtension(".xwt"); if (r.t != null) return r.t; @@ -62,42 +63,45 @@ public class Template { new TemplateHelper().parseit(r.getInputStream(), r.t); return r.t; } catch (Exception e) { - if (Log.on) Log.log(r.t.fileName, e); - return null; + throw new JSExn("Error reading template stream: " + r + "\n" + e.toString()); } } - public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) { + public static Stream resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn { // URL if (str.indexOf("://") != -1) { - if (permitAbsolute) return Res.stringToRes(str); - Log.log(Template.class, "absolute URL " + str + " not permitted here"); - return null; + if (permitAbsolute) return (Stream)xwt.url2res(str); + throw new JSExn("absolute URL " + str + " not permitted here"); } // root-relative - Res ret = xwt.rr; + Stream ret = xwt.rr; while(str.indexOf('.') != -1) { String path = str.substring(0, str.indexOf('.')); str = str.substring(str.indexOf('.') + 1); - ret = (Res)ret.get(path); + ret = (Stream)ret.get(path); } - ret = (Res)ret.get(str); + ret = (Stream)ret.get(str); return ret; } // Methods to apply templates //////////////////////////////////////////////////////// - private Template(Res r) { this.r = r; } + private Template(Stream 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); + JSScope getStatic(XWT xwt) throws JSExn { + if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null); if (staticscript == null) return staticScope; - JS.CompiledFunction temp = staticscript; + JSFunction temp = staticscript; staticscript = null; - temp.call(new JS.Array(), staticScope); + temp.cloneWithNewParentScope(staticScope).call(null, null, null, null, 0); return staticScope; } @@ -105,31 +109,68 @@ 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 */ - 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) throws JSExn { + try { + apply(b, xwt, null); + } catch (JSExn e) { + b.clear(b.VISIBLE); + b.mark_for_repack(); + throw e; + } + } + - getStatic(); + private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn { + getStatic(xwt); if (id != null) parentPis.putDollar(id, b); for(int i=0; i 0) { + switch (((String)val).charAt(0)) { + case '$': + val = pis.get(val); + if (val == null) throw new JSExn("unknown box id '"+vals[i]+"' referenced in XML attribute"); + break; + case '.': + val = resolveStringToResource(((String)val).substring(1), xwt, true); + } + } - for(int i=0; keys != null && iroot */ - void parseit(InputStream is, Template root) throws XML.XMLException, IOException { + void parseit(InputStream is, Template root) throws XML.Exn, IOException { state = STATE_INITIAL; nameOfHeaderNodeBeingProcessed = null; nodeStack.setSize(0); @@ -161,32 +202,37 @@ public class Template { parse(new InputStreamReader(is)); } - public void startElement(XML.Element c) throws XML.SchemaException { + public void startElement(XML.Element c) throws XML.Exn { switch(state) { case STATE_INITIAL: - if (!"xwt".equals(c.localName)) throw new XML.SchemaException("root element was not "); - if (c.len != 0) throw new XML.SchemaException("root element must not have attributes"); + if (!"xwt".equals(c.getLocalName())) + throw new XML.Exn("root element was not ", XML.Exn.SCHEMA, getLine(), getCol()); + if (c.getAttrLen() != 0) + throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol()); state = STATE_IN_XWT_NODE; return; case STATE_IN_XWT_NODE: - if (nameOfHeaderNodeBeingProcessed != null) throw new XML.SchemaException("can't nest header nodes"); - nameOfHeaderNodeBeingProcessed = c.localName; - if (c.localName.equals("doc")) { - // FIXME: ignore - } else if (c.localName.equals("static")) { + if (nameOfHeaderNodeBeingProcessed != null) + throw new XML.Exn("can't nest header nodes", XML.Exn.SCHEMA, getLine(), getCol()); + nameOfHeaderNodeBeingProcessed = c.getLocalName(); + //#switch(c.getLocalName()) + case "doc": + // FEATURE + return; + case "static": if (t.staticscript != null) - throw new XML.SchemaException("the header node may not appear more than once"); - if (c.len > 0) - throw new XML.SchemaException("the node may not have attributes"); - } else if (c.localName.equals("template")) { + throw new XML.Exn("the header node may only appear once", XML.Exn.SCHEMA, getLine(), getCol()); + if (c.getAttrLen() > 0) + throw new XML.Exn("the node may not have attributes", XML.Exn.SCHEMA, getLine(), getCol()); + return; + case "template": t.startLine = getLine(); state = STATE_IN_TEMPLATE_NODE; processBodyElement(c); - } else { - throw new XML.SchemaException("unrecognized header node \"" + c.localName + "\""); - } - return; + return; + //#end + throw new XML.Exn("unrecognized header node \"" + c.getLocalName() + "\"", XML.Exn.SCHEMA, getLine(), getCol()); case STATE_IN_TEMPLATE_NODE: // push the last node we were in onto the stack @@ -194,64 +240,56 @@ public class Template { // instantiate a new node, and set its fileName/importlist/preapply Template t2 = new Template(t.r); t2.startLine = getLine(); - if (!c.localName.equals("box") && !c.localName.equals("template")) - t2.preapply.addElement((c.uri == null ? "" : (c.uri + ".")) + c.localName); + if (!c.getLocalName().equals("box") && !c.getLocalName().equals("template")) + t2.preapply.addElement((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName()); // make the new node the current node t = t2; processBodyElement(c); return; case STATE_FINISHED_TEMPLATE_NODE: - throw new XML.SchemaException("no elements may appear after the