X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=2cc62420e61021993a5953448a3eb93b2588140c;hp=69af74a416de57ac4d79acef1b9d22f731106e53;hb=16c24a73c1c1b2955db0bbbaf5a940215329bca1;hpb=7e9239a7088d4cd772a31a76e1a53e1c681638bc

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 69af74a..2cc6242 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -26,22 +26,16 @@ 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
-
-    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 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
+    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 String[] urikeys;
+    private String[] urivals;
+    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;
+    JSScope staticScope = null;   ///< the scope in which the static block is executed
 
 
     // Only used during parsing /////////////////////////////////////////////////////////////////
@@ -49,96 +43,59 @@ 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 final Stream r;                   ///< the resource we came from
+    private XWT xwt;
 
 
     // Static data/methods ///////////////////////////////////////////////////////////////////
 
-    // 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;
-            r.t = new Template(r);
-            new TemplateHelper().parseit(r.getInputStream(), r.t);
-            return r.t;
-        } catch (Exception e) {
-            throw new JSExn("Error reading template stream: " + r + "\n" + e.toString());
-        }
-    }
-
-    public static Stream resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
-        // URL
-        if (str.indexOf("://") != -1) {
-            if (permitAbsolute) return (Stream)xwt.url2res(str);
-            throw new JSExn("absolute URL " + str + " not permitted here");
-        }
-
-        // root-relative
-        Stream ret = xwt.rr;
-        while(str.indexOf('.') != -1) {
-            String path = str.substring(0, str.indexOf('.'));
-            str = str.substring(str.indexOf('.') + 1);
-            ret = (Stream)ret.get(path);
-        }
-        ret = (Stream)ret.get(str);
-        return ret;
-    }
-
+    // for non-root nodes
+    private Template(Template t, int startLine) { prev = t; this.xwt = t.xwt; this.startLine = startLine; }
+    private Template(XWT xwt) { this.xwt = xwt; }
+    
 
     // Methods to apply templates ////////////////////////////////////////////////////////
 
-    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 */
-    JSScope getStatic(XWT xwt) throws JSExn {
-        if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null);
-        if (staticscript == null) return staticScope;
-        JSFunction temp = staticscript;
-        staticscript = null;
-        temp.cloneWithNewParentScope(staticScope).call(null, null, null, null, 0);
-        return staticScope;
-    }
-    
+   
     /** 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, XWT xwt) throws JSExn {
+    void apply(Box b) throws JSExn {
         try {
-            apply(b, xwt, null);
+            apply(b, null);
+        } catch (IOException e) {
+            b.clear(b.VISIBLE);
+            b.mark_for_repack();
+            Log.warn(this, e);
+            throw new JSExn(e.toString());
         } catch (JSExn e) {
             b.clear(b.VISIBLE);
             b.mark_for_repack();
+            Log.warn(this, e);
             throw e;
         }
     }
 
+    private void apply(Box b, PerInstantiationScope parentPis) throws JSExn, IOException {
+        if (prev != null) prev.apply(b, null);
 
-    private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-        getStatic(xwt);
-
+        // FIXME this dollar stuff is all wrong
         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));
-            if (t == null) throw new RuntimeException("unable to resolve resource " + preapply.elementAt(i));
-            t.apply(b, xwt);
-        }
 
-        PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticScope);
+        PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis, staticScope);
+        for(int i=0; i<urikeys.length; i++) {
+            pis.declare(urikeys[i]);
+            pis.put(urikeys[i], xwt.resolveString(urivals[i], true));
+        }
 
+        // FIXME needs to obey the new application-ordering rules
         for (int i=0; children != null && i<children.size(); i++) {
             Box kid = new Box();
-            ((Template)children.elementAt(i)).apply(kid, xwt, pis);
+            ((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++) {
@@ -155,21 +112,13 @@ public class Template {
                         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);
+                        val = xwt.resolveString(((String)val).substring(1), false);
+                    // FIXME: url case
+                    // FIXME: should we be resolving all of these in the XML-parsing code?
                 }
             }
 
-            if (val != null && "redirect".equals(key)) {
-                val = pis.get("$"+val);
-                if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
-            }
-
-            try {
-                b.putAndTriggerTraps(key, val);
-            } catch(JSExn e) {
-                e.addBacktrace(fileName + ":attr-" + key,0);
-                throw e;
-            }
+            b.putAndTriggerTraps(key, val);
         }
     }
 
@@ -177,94 +126,97 @@ public class Template {
 
     // XML Parsing /////////////////////////////////////////////////////////////////
 
+    public static Template buildTemplate(InputStream is, XWT xwt) {
+        try {
+            return new TemplateHelper(is, xwt).t;
+        } catch (Exception e) {
+            Log.error(Template.class, e);
+            return null;
+        }
+    }
+
     /** handles XML parsing; builds a Template tree as it goes */
     static final class TemplateHelper extends XML {
 
-        TemplateHelper() { }
-
-        private int state;
+        private int state = STATE_INITIAL;
         private static final int STATE_INITIAL = 0;
         private static final int STATE_IN_XWT_NODE = 1;
-        private static final int STATE_IN_TEMPLATE_NODE = 2;
-        private static final int STATE_FINISHED_TEMPLATE_NODE = 3;
+        private static final int STATE_IN_TEMPLATE_NODE = 2; 
+        private static final int STATE_IN_META_NODE = 3;
 
-        private String nameOfHeaderNodeBeingProcessed;
+        StringBuffer static_content = null;
+        int static_content_start = 0;
+        Vec nodeStack = new Vec();
+        Template t = null;
+        int meta = 0;
+        XWT xwt;
 
-        Vec nodeStack = new Vec();  ///< stack of Templates whose XML elements we have seen open-tags for but not close-tags
-        Template t = null;          ///< the template we're currently working on
+        public TemplateHelper(InputStream is, XWT xwt) throws XML.Exn, IOException, JSExn {
+            this.xwt = xwt;
+            parse(new InputStreamReader(is));
+            JS staticScript = parseScript(static_content, static_content_start);
+            t.staticScope = new PerInstantiationScope(null, xwt, null, null);
+            if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
+        }
 
-        /** parse an XML input stream, building a Template tree off of <tt>root</tt> */
-        void parseit(InputStream is, Template root) throws XML.Exn, IOException {
-            state = STATE_INITIAL;
-            nameOfHeaderNodeBeingProcessed = null;
-            nodeStack.setSize(0);
-            t = root;
-            parse(new InputStreamReader(is)); 
+        private JS parseScript(StringBuffer content, int content_start) throws IOException {
+            if (content == null) return null;
+            String contentString = content.toString();
+            if (contentString.trim().length() > 0) return JS.fromReader("FIXME", content_start, new StringReader(contentString));
+            return null;
         }
 
         public void startElement(XML.Element c) throws XML.Exn {
             switch(state) {
-            case STATE_INITIAL:
-                if (!"xwt".equals(c.getLocalName()))
-                    throw new XML.Exn("root element was not <xwt>", 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.Exn("can't nest header nodes", XML.Exn.SCHEMA, getLine(), getCol());
-                nameOfHeaderNodeBeingProcessed = c.getLocalName();
-                //#switch(c.getLocalName())
-                case "doc":
-                    // FEATURE
+                case STATE_IN_META_NODE: { meta++; return; }
+                case STATE_INITIAL:
+                    if (!"ibex".equals(c.getLocalName()))
+                        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());
+                    state = STATE_IN_XWT_NODE;
                     return;
-                case "static":
-                    if (t.staticscript != null)
-                        throw new XML.Exn("the <static> header node may only appear once", XML.Exn.SCHEMA, getLine(), getCol());
-                    if (c.getAttrLen() > 0)
-                        throw new XML.Exn("the <static> node may not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
-                    return;
-                case "template":
-                    t.startLine = getLine();
+                case STATE_IN_XWT_NODE:
+                    if ("meta".equals(c.getPrefix())) { state = STATE_IN_META_NODE; meta = 0; return; }
                     state = STATE_IN_TEMPLATE_NODE;
-                    processBodyElement(c);
-                    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
-                nodeStack.addElement(t);
-                // instantiate a new node, and set its fileName/importlist/preapply
-                Template t2 = new Template(t.r);
-                t2.startLine = getLine();
-                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.Exn("no elements may appear after the <template> node", XML.Exn.SCHEMA, getLine(), getCol());
+                    t = (t == null) ? new Template(xwt) : new Template(t, getLine());
+                    break;
+                case STATE_IN_TEMPLATE_NODE:
+                    nodeStack.addElement(t);
+                    t = new Template(xwt);
+                    break;
             }
-        }        
 
-        private void processBodyElement(XML.Element c) {
+            if (!("ui".equals(c.getPrefix()) && "box".equals(c.getLocalName()))) {
+                String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
+                // GROSS hack
+                try {
+                    t.prev = (Template)t.xwt.resolveString(tagname, false).call(null, null, null, null, 9999);
+                } catch (Exception e) {
+                    Log.error(Template.class, e);
+                }
+            }
+                
+            Hash urimap = c.getUriMap();
+            t.urikeys = new String[urimap.size()];
+            t.urivals = new String[urimap.size()];
+            Enumeration uriEnumeration = urimap.keys();
+            int ii = 0;
+            while(uriEnumeration.hasMoreElements()) {
+                String key = (String)uriEnumeration.nextElement();
+                String val = (String)urimap.get(key);
+                t.urikeys[ii] = key;
+                if (val.charAt(0) == '.') val = val.substring(1);
+                t.urivals[ii] = val;
+                ii++;
+            }
+            
             Vec keys = new Vec(c.getAttrLen());
             Vec vals = new Vec(c.getAttrLen());
 
             // 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 "preapply":
-                    String uri = c.getAttrUri(i); if (!uri.equals("")) uri += ".";
-                    StringTokenizer tok = new StringTokenizer(c.getAttrVal(i).toString(), " ");
-                    while(tok.hasMoreTokens()) t.preapply.addElement(uri + tok.nextToken());
-                    continue ATTR;
-
                 case "id":
                     t.id = c.getAttrVal(i).toString().intern();
                     continue ATTR;
@@ -314,73 +266,57 @@ public class Template {
             }
         }
 
-        private JSFunction parseScript(boolean isstatic) throws IOException {
-            JSFunction thisscript = null;
-            String contentString = t.content.toString();
-            if (contentString.trim().length() > 0)
-                thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
-                                                   t.content_start,
-                                                   new StringReader(contentString));
-            t.content = null;
-            t.content_start = 0;
-            return thisscript;
-        }
-
         public void endElement(XML.Element c) throws XML.Exn, IOException {
-            if (state == STATE_IN_XWT_NODE) {
-                if ("static".equals(nameOfHeaderNodeBeingProcessed) && t.content != null) t.staticscript = parseScript(true);
-                nameOfHeaderNodeBeingProcessed = null;
-                
-            } else if (state == STATE_IN_TEMPLATE_NODE) {
-                if (t.content != null) t.script = parseScript(false);
-                if (nodeStack.size() == 0) {
-                    // </template>
-                    state = STATE_FINISHED_TEMPLATE_NODE;
-                    
-                } else {
-                    // add this template as a child of its parent
+            switch(state) {
+                case STATE_IN_META_NODE: if (meta-- < 0) state = STATE_IN_XWT_NODE; return;
+                case STATE_IN_XWT_NODE: return;
+                case STATE_IN_TEMPLATE_NODE: {
+                    if (t.content != null) { t.script = parseScript(t.content, t.content_start); t.content = null; }
+                    if (nodeStack.size() == 0) { state = STATE_IN_XWT_NODE; return; }
                     Template oldt = t;
                     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');
                 }
             }
-         }
+        }
 
         public void characters(char[] ch, int start, int length) throws XML.Exn {
-            // invoke the no-tab crusade
             for (int i=0; length >i; i++) if (ch[start+i] == '\t')
                 Log.error(Template.class, "tabs are not allowed in XWT files ("+getLine()+":"+getCol()+")");
-
-            if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
-                if (t.content == null) {
-                    t.content_start = getLine();
-                    t.content = new StringBuffer();
-                }
-
-                t.content.append(ch, start, length);
-
-            } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) { throw new XML.Exn(
-                "header node <" +nameOfHeaderNodeBeingProcessed+ "> cannot have text content", XML.Exn.SCHEMA, getLine(), getCol());
+            switch(state) {
+                case STATE_IN_TEMPLATE_NODE:
+                    if (t.content == null) {
+                        t.content_start = getLine();
+                        t.content = new StringBuffer();
+                    }
+                    t.content.append(ch, start, length);
+                    return;
+                case STATE_IN_XWT_NODE:
+                    if (static_content == null) {
+                        static_content_start = getLine();
+                        static_content = new StringBuffer();
+                    }
+                    static_content.append(ch, start, length);
+                    return;
             }
         }
 
         public void whitespace(char[] ch, int start, int length) throws XML.Exn { }
     }
 
-    private static class PerInstantiationJSScope extends JSScope {
+    private static class PerInstantiationScope extends JSScope {
         XWT xwt = null;
-        PerInstantiationJSScope parentBoxPis = null;
+        PerInstantiationScope parentBoxPis = null;
         JSScope myStatic = null;
         void putDollar(String key, Box target) throws JSExn {
             if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
             declare("$" + key);
             put("$" + key, target);
         }
-        public PerInstantiationJSScope(JSScope parentScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
+        public PerInstantiationScope(JSScope parentScope, XWT xwt, PerInstantiationScope parentBoxPis, JSScope myStatic) {
             super(parentScope);
             this.parentBoxPis = parentBoxPis;
             this.xwt = xwt;
@@ -389,14 +325,10 @@ public class Template {
         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);
         }
-        public void put(Object key, Object val) throws JSExn {
-            if (super.has(key)) super.put(key, val);
-            else super.put(key, val);
-        }
     }
 
 }