X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=bd57bf9878fbc07605e28b0e9b28ff42fd95981f;hb=8c1756ef3fd42cc2f324baf47e13a83f51045efe;hp=ef6a6f39db5e7cb51bdb2619a9bf5d5b43797137;hpb=5ef18e2b3993d3c515a0b51a1326b2ad11285f4a;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index ef6a6f3..bd57bf9 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -25,43 +25,44 @@ 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;                            ///< 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 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 <tt>content</tt>
-    private int content_lines = 0;       ///< number of lines in <tt>content</tt>
-    private int startLine = -1;          ///< the line number that this element starts on
-    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 <tt>content</tt>
+    private int content_lines = 0;         ///< number of lines in <tt>content</tt>
+    private int startLine = -1;            ///< the line number that this element starts on
+    private final Res r;                   ///< the resource we came from
 
 
     // Static data/methods ///////////////////////////////////////////////////////////////////
 
     public static Template getTemplate(Res r) {
         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) {
-            if (Log.on) Log.log(r.t.fileName, e);
+            if (Log.on) Log.log(r.t == null ? "null" : r.t.fileName, e);
             return null;
         }
     }
@@ -69,8 +70,9 @@ public class Template {
     public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) {
         // URL
         if (str.indexOf("://") != -1) {
-            if (permitAbsolute) return str;
-            Log.log("absolute URL " + str + " not permitted here");
+            // FIXME
+            //if (permitAbsolute) return Res.fromString(str);
+            Log.log(Template.class, "absolute URL " + str + " not permitted here");
             return null;
         }
 
@@ -88,46 +90,47 @@ public class Template {
 
     // Methods to apply templates ////////////////////////////////////////////////////////
 
-    private Template() { this.r = r; }
+    private Template(Res r) { this.r = r; }
 
     /** 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;
-        JS.CompiledFunction temp = staticscript;
+    JSScope getStatic() {
+        if (staticJSScope == null) staticJSScope = new JSScope(null);
+        if (staticscript == null) return staticJSScope;
+        JSFunction temp = staticscript;
         staticscript = null;
-        temp.call(new JS.Array(), staticScope);
-        return staticScope;
+        temp.cloneWithNewParentJSScope(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();
 
-        if (id != null) parentPis.putDollar(id, this);
+        if (id != null) parentPis.putDollar(id, b);
         for(int i=0; i<preapply.size(); i++) {
-            Template t = getTemplate(resolveStringToResource((String)preapply.elementAt(i), xwt));
+            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, callback, numerator, denominator, xwt);
+            t.apply(b, xwt);
         }
 
-        PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis);
-        for (int i=0; children != null && i<children.length; i++) {
-            Box kid = new Box();
-            getTemplate(resolveStringToResource((String)children.elementAt(i), xwt)).apply(kid, callback, xwt, pis);
-            b.put(b.numChildren(), kid);
+        PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticJSScope);
+        for (int i=0; children != null && i<children.size(); i++) {
+            Box kid = new BoxTree();
+            ((Template)children.elementAt(i)).apply(kid, xwt, pis);
+            b.putAndTriggerJSTraps(JS.N(b.numchildren), kid);
         }
 
-        if (script != null) script.call(new JS.Array(), pis);
+        if (script != null) script.cloneWithNewParentJSScope(pis).call(null, null, null, null, 0);
 
         for(int i=0; keys != null && i<keys.length; i++)
-            if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.put(keys[i], pis.get(vals[i]));
-            else b.put(keys[i], vals[i]);
+            if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.putAndTriggerJSTraps(keys[i], pis.get(vals[i]));
+            else if ("image".equals(keys[i])) b.putAndTriggerJSTraps("image", resolveStringToResource((String)vals[i], xwt, true));
+            else if (keys[i] != null) b.putAndTriggerJSTraps(keys[i], vals[i]);
     }
 
 
@@ -164,28 +167,38 @@ public class Template {
             case STATE_INITIAL:
                 if (!"xwt".equals(c.localName)) throw new XML.SchemaException("root element was not <xwt>");
                 if (c.len != 0) throw new XML.SchemaException("root element must not have attributes");
-                state = STATE_IN_XWT_NODE
+                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
+                    // FEATURE
                 } else if (c.localName.equals("static")) {
-                    if (staticscript != null)
+                    if (t.staticscript != null)
                         throw new XML.SchemaException("the <static> header node may not appear more than once");
                     if (c.len > 0)
                         throw new XML.SchemaException("the <static> node may not have attributes");
                 } else if (c.localName.equals("template")) {
                     t.startLine = getLine();
                     state = STATE_IN_TEMPLATE_NODE;
+                    processBodyElement(c);
                 } else {
                     throw new XML.SchemaException("unrecognized header node \"" + c.localName + "\"");
                 }
                 return;
 
             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.localName.equals("box") && !c.localName.equals("template"))
+                    t2.preapply.addElement((c.uri == null ? "" : (c.uri + ".")) + c.localName);
+                // make the new node the current node
+                t = t2;
                 processBodyElement(c);
                 return;
 
@@ -195,23 +208,11 @@ public class Template {
         }        
 
         private void processBodyElement(XML.Element c) {
-            // 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.fileName);
-            t2.startLine = getLine();
-            if (!c.localName.equals("box"))
-                t2.preapply.addElement((c.uri == null ? "" : (c.uri + ".")) + c.localName);
-            // make the new node the current node
-            t = t2;
-            
-            t.keys = new String[c.len];
-            t.vals = new Object[c.len];
             Hash h = new Hash(c.len * 2, 3);
             for(int i=0; i<c.len; i++) {
+                if (c.keys[i] == null) continue;
                 if (c.keys[i].endsWith(":image")) {
-                    String uri = c.urimap.get(c.keys[i].substring(0, c.keys[i].indexOf(':')));
+                    String uri = (String)c.urimap.get(c.keys[i].substring(0, c.keys[i].indexOf(':')));
                     c.keys[i] = c.keys[i].substring(c.keys[i].lastIndexOf(':') + 1);
                     c.vals[i] = uri + "." + c.vals[i];
                 }                    
@@ -223,18 +224,23 @@ public class Template {
                     }
                     StringTokenizer tok = new StringTokenizer(c.vals[i].toString(), " ");
                     while(tok.hasMoreTokens()) t.preapply.addElement(uri + tok.nextToken());
+                    c.keys[i] = c.keys[c.keys.length - 1];
+                    c.vals[i] = c.vals[c.vals.length - 1];
+                    i--;
                     continue;
                 }
                 h.put(c.keys[i], c.vals[i]);
             }
+            t.keys = new String[h.size()];
+            t.vals = new Object[h.size()];
 
             Vec v = new Vec(h.size(), c.keys);
             v.sort(new Vec.CompareFunc() { public int compare(Object a, Object b) { return ((String)a).compareTo((String)b); } });
             for(int i=0; i<h.size(); i++) {
-                if (t.keys[i].equals("thisbox")) {
+                if (c.keys[i].equals("thisbox")) {
                     for(int j=i; j>0; j--) { t.keys[j] = t.keys[j - 1]; t.vals[j] = t.vals[j - 1]; }
                     t.keys[0] = (String)v.elementAt(i);
-                    t.vals[0] = h.get(t.keys[i]);
+                    t.vals[0] = h.get(t.keys[0]);
                 } else {
                     t.keys[i] = (String)v.elementAt(i);
                     t.vals[i] = h.get(t.keys[i]);
@@ -272,10 +278,12 @@ public class Template {
             }
         }
 
-        private JS.CompiledFunction parseScript(boolean isstatic) {
-            JS.CompiledFunction thisscript = null;
+        private JSFunction parseScript(boolean isstatic) {
+            JSFunction thisscript = null;
             try {
-                thisscript = JS.parse(t.fileName + (isstatic ? "._" : ""), t.content_start, new StringReader(t.content.toString()));
+                String contentString = t.content.toString();
+                if (contentString.trim().length() > 0)
+                    thisscript = JS.parse(t.fileName + (isstatic ? "._" : ""), t.content_start, new StringReader(contentString));
             } catch (IOException ioe) {
                 if (Log.on) Log.log(this, "  ERROR: " + ioe.getMessage());
                 thisscript = null;
@@ -322,7 +330,7 @@ public class Template {
                 t.content.append(ch, start, length);
                 t.content_lines++;
 
-            } else if (nameOfHeaderNodeBeingProcessed != null) {
+            } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) {
                 throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content");
             }
         }
@@ -330,34 +338,30 @@ 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;
+        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) {
-            super(parentScope);
+        public PerInstantiationJSScope(JSScope parentJSScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
+            super(parentJSScope);
             this.parentBoxPis = parentBoxPis;
             this.xwt = xwt;
+            this.myStatic = myStatic;
         }
-        public boolean isTransparent() { return true; }
-        public boolean has(Object key) { return false; }
-        public void declare(String s) { super.declare(s); }
         public Object get(Object key) {
-            if (key.equals("xwt")) return xwt;
-            if (Box.SpecialBoxProperty.specialBoxProperties.get(key) != null) return parentScope.get(key);
             if (super.has(key)) return super.get(key);
-            Object ret = xwt.rr.get(key);
-            if (ret != null) return ret;
-            throw new JS.Exn("must declare " + key + " before using it!");
+            if (key.equals("xwt")) return xwt;
+            if (key.equals("static")) return myStatic;
+            return super.get(key);
         }
         public void put(Object key, Object val) {
-            if (Box.SpecialBoxProperty.specialBoxProperties.get(key) == null) parentScope.put(key, val);
-            else if (super.has(key)) super.put(key, val); 
-            else throw new JS.Exn("must declare " + key + " before using it!");
+            if (super.has(key)) super.put(key, val);
+            else super.put(key, val);
         }
     }