X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fibex%2Fxt%2FTemplate.java;h=4ab16d65dba427acd0a2eef04b15bbeac4129a8f;hb=d1d2ce9951e43cd3e9253cf4f4b92dc2338b057d;hp=cbe272d6b9ed45e838a9e00a314ac1e57c9ba2db;hpb=50cd2b0cdda6355214e16e8e9f8dd65a31fe6934;p=org.ibex.xt-crawshaw.git

diff --git a/src/java/org/ibex/xt/Template.java b/src/java/org/ibex/xt/Template.java
index cbe272d..4ab16d6 100644
--- a/src/java/org/ibex/xt/Template.java
+++ b/src/java/org/ibex/xt/Template.java
@@ -1,4 +1,4 @@
-package ibex.xt;
+package org.ibex.xt;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -8,28 +8,29 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.io.IOException;
+import java.io.FileNotFoundException;
 
 import java.util.*;
-import ibex.util.*;
-import ibex.js.*;
+import org.ibex.util.*;
+import org.ibex.js.*;
 
 public class Template extends JSElement {
-    public static Template parse(String path, Template.Scope s) throws IOException, XML.Exn {
+    public static Template parse(String path, Template.Scope s) throws FileNotFoundException, IOException {
         Reader xmlreader = new BufferedReader(new InputStreamReader(new FileInputStream(path)));
         XML.Document doc = new XML.Document();
         doc.parse(xmlreader);
         return new Template(doc.getRoot(), s);
     }
 
-    public static XML.Element wrap(XML.Element e, Template.Scope s) throws IOException, XML.Exn {
+    public static XML.Element wrap(XML.Element e, Template.Scope s) throws IOException {
         final String uri = e.getUri();
 
         if (uri.equals("http://xt.ibex.org/")) {
             //#switch(e.getLocalName())
-            case "if":          e = new Template.If(e); break;
             case "js":          e = new Template.JSTag(e); break;
             case "foreach":     e = new Template.ForEach(e); break;
             case "children":    e = new Template.Children(e); break;
+            case "redirect":    e = new Template.Redirect(e); break;
             case "transaction": e = new Template.Transaction(e, s); break;
             //#end
 
@@ -37,16 +38,18 @@ public class Template extends JSElement {
             //#switch(uri.substring(19))
             case "io": System.out.println("ibex.xt.io not yet implemented"); // TODO
             //#end
-            throw new RuntimeException("Unknown XT library: "+uri);
+            //throw new JSElement.Exn("Unknown XT library: "+uri);
 
         } else if (uri.startsWith("local:")) {
-            Template t = parse(s.getLocalPath() + uri.substring(6), s);
+            // merge a new template into this tree
+            String path = uri.substring(6) + e.getLocalName() + ".xt";
+            Template t = parse(s.getLocalPath() + path, s);
 
             List c = e.getChildren();
             if (c.size() > 0) {
                 // move all children from e to placeholder
                 XML.Element placeholder = findPlaceholder(t);
-                if (placeholder == null) throw new RuntimeException(
+                if (placeholder == null) throw new JSElement.Exn(
                     "<"+e.getQName()+"> attempted to include children into a " +
                     "template which does not contain an <xt:children /> tag.");
 
@@ -54,11 +57,25 @@ public class Template extends JSElement {
                 e.getChildren().clear();
             }
 
-            // merge original attributes with replacement template
-            e = new JSElement.Merge(t, e);
+            XML.Element merged = new JSElement.Merge(t, e);
 
-        } else if (uri.startsWith("java:")) {
-            e = new Java(e);
+            // remap the parent of the original element
+            if (e.getParent() != null) {
+                List ch = e.getParent().getChildren();
+                ch.set(ch.indexOf(e), merged);
+            }
+
+            return wrap(merged, s);
+        }
+
+        XML.Attributes a = e.getAttributes();
+        for (int i=0; i < a.attrSize(); i++) {
+            // FIXME: questionable abuse of XML namespaces here
+            if ("if".equals(a.getKey(i)) && (
+                "http://xt.ibex.org/".equals(e.getUri()) ||
+                "http://xt.ibex.org/".equals(a.getUri(i)))) {
+                e = new Template.IfWrap(e);
+            }
         }
 
         // wrap children
@@ -70,12 +87,14 @@ public class Template extends JSElement {
     }
 
     /** Returns the first Template.Children child found. */
-    private static Template.Children findPlaceholder(XML.Element e) {
-        if (e instanceof Template.Children) return (Template.Children)e;
+    private static XML.Element findPlaceholder(XML.Element e) {
+        if ("http://xt.ibex.org/".equals(e.getUri()) && "children".equals(e.getLocalName()))
+            return e;
+
         List c = e.getChildren();
         for (int i=0; i < c.size(); i++) {
             if (!(c.get(i) instanceof XML.Element)) continue;
-            Template.Children ret = findPlaceholder((XML.Element)c.get(i));
+            XML.Element ret = findPlaceholder((XML.Element)c.get(i));
             if (ret != null) return ret;
         }
         return null;
@@ -87,20 +106,18 @@ public class Template extends JSElement {
 
     public JSScope getParentScope() { return tscope; }
 
+    public static final class IfWrap extends JSElement {
+        public IfWrap(XML.Element e) { super(e); }
 
-    public static final class If extends JSElement {
-        public If(XML.Element e) { super(e); }
-
-        public void toXML(Writer w) throws IOException {
-            super.toXML(w);
+        public void out(Writer w) throws IOException {
+            loadAttr();
 
             try {
                 Object varIf = get("if"); if (varIf != null) undeclare("if");
-                if (varIf != null && !Boolean.getBoolean((String)varIf)) return;
-            } catch (JSExn e) { throw new RuntimeException(e); }
+                if (varIf != null && !"true".equals(varIf)) return;
+            } catch (JSExn e) { throw new JSElement.Exn(e); }
 
-            List c = getChildren();
-            for (int i=0; i < c.size(); i++) ((XML.Block)c.get(i)).toXML(w);
+            wrapped.out(w);
         }
     }
 
@@ -109,48 +126,41 @@ public class Template extends JSElement {
             super(e);
             List c = getChildren();
             for (int i=0; i < c.size(); i++)
-                if (c.get(i) instanceof XML.Element) throw new RuntimeException(
+                if (c.get(i) instanceof XML.Element) throw new JSElement.Exn(
                     "<"+getPrefix()+":js> tags may not have child elements");
         }
 
-        public void toXML(Writer w) throws IOException {
-            super.toXML(w);
-
-            try {
-                Object varIf = get("if"); if (varIf != null) undeclare("if");
-                if (varIf != null && !Boolean.getBoolean((String)varIf)) return;
+        public void out(Writer w) throws IOException {
+            loadAttr();
 
-                List c = getChildren();
-                StringWriter s = new StringWriter();
-                for (int i=0; i < c.size(); i++) ((XML.Block)c.get(i)).toXML(s);
-                exec(s.toString());
-            } catch (JSExn e) { throw new RuntimeException(e); }
+            List c = getChildren();
+            StringWriter s = new StringWriter();
+            for (int i=0; i < c.size(); i++) ((Tree.Leaf)c.get(i)).out(s);
+            exec(s.toString());
         }
     }
 
     public static final class ForEach extends JSElement {
         public ForEach(XML.Element e) { super(e); }
 
-        public void toXML(Writer w) throws IOException {
-            super.toXML(w);
+        public void out(Writer w) throws IOException {
+            loadAttr();
 
             try {
                 Object varIn = get("in"); if (varIn != null) undeclare("in");
                 Object varPut = get("put"); if (varPut != null) undeclare("put");
-                Object varIf = get("if"); if (varIf != null) undeclare("if");
-                if (varIf != null && !Boolean.getBoolean((String)varIf)) return;
 
                 varIn = exec("return (" + varIn + ");");
-                if (varIn == null || (varIn instanceof JSArray)) throw new RuntimeException(
+                if (varIn == null || (varIn instanceof JSArray)) throw new JSElement.Exn(
                     "<"+getPrefix()+":foreach> requires attribute 'in' to specify " +
                     "the name of a valid js array in the current scope, not in='"+varIn+"'.");
 
                 if (varPut == null) varPut = "x";
                 else if (!(varPut instanceof String) || get(varPut) != null)
-                    throw new RuntimeException(
+                    throw new JSElement.Exn(
                     "<"+getPrefix()+":foreach> 'put' attribute requires the name of "+
                     "an undeclared variable, not put='"+varPut+"'.");
-                if (get(varPut) != null) throw new RuntimeException(
+                if (get(varPut) != null) throw new JSElement.Exn(
                     "<"+getPrefix()+":foreach> has no 'put' attribute defined and the "+
                     "default variable 'x' already exists in the current scope.");
 
@@ -159,9 +169,9 @@ public class Template extends JSElement {
                 declare((String)varPut);
                 Iterator it = ((JSArray)varIn).toList().iterator(); while (it.hasNext()) {
                     put(varPut, it.next());
-                    for (int i=0; i < c.size(); i++) ((XML.Block)c.get(i)).toXML(w);
+                    for (int i=0; i < c.size(); i++) ((Tree.Leaf)c.get(i)).out(w);
                 }
-            } catch (JSExn e) { throw new RuntimeException(e); }
+            } catch (JSExn e) { throw new JSElement.Exn(e); }
         }
     }
 
@@ -169,29 +179,40 @@ public class Template extends JSElement {
         public Children(XML.Element e) { super(e); }
     }
 
+    public static final class Redirect extends JSElement {
+        public Redirect(XML.Element e) { super(e); }
+
+        public void out(Writer w) throws IOException {
+            loadAttr();
+
+            try {
+                Object p = get("page"); if (p != null) undeclare("page");
+                if (p == null || !(p instanceof String) || ((String)p).trim().equals(""))
+                    throw new JSElement.Exn("<"+getPrefix()+":redirect> requires 'page' "+
+                                            "attribute to be a valid template path");
+                throw new RedirectSignal((String)p);
+            } catch (JSExn e) { throw new JSElement.Exn(e); }
+        }
+    }
+
     // TODO: finish
     public static final class Transaction extends JSElement {
         private final Template.Scope scope; // FIXME: HACK. unstatisise all tags, or do this to all
         public Transaction(XML.Element e, Template.Scope s) { super(e); scope = s;} // TODO: check kids
 
-        public void toXML(Writer w) throws IOException {
-            super.toXML(w);
+        public void out(Writer w) throws IOException {
+            loadAttr();
 
             // TODO: <xt:use />
             List c = getChildren();
             StringWriter sw = new StringWriter();
-            for (int i=0; i < c.size(); i++) ((XML.Block)c.get(i)).toXML(sw);
+            for (int i=0; i < c.size(); i++) ((Tree.Leaf)c.get(i)).out(sw);
             JS t = JS.fromReader("input", 0, new StringReader(sw.toString()));
             t = JS.cloneWithNewParentScope(t, new JSScope(null));
             scope.transaction(t);
         }
     }
 
-    public static final class Java extends JSElement {
-        // TODO what exactly?
-        public Java(XML.Element w) { super(w); }
-    }
-
     public abstract static class Scope extends JSScope {
         public Scope(JSScope j) { super(j); }
 
@@ -202,4 +223,11 @@ public class Template extends JSElement {
         public abstract void transaction(JS t);
     }
 
+    public static class Signal extends RuntimeException {}
+    public static class ReturnSignal extends Signal { }
+    public static class RedirectSignal extends Signal {
+        protected String target;
+        public RedirectSignal(String target) { super(); this.target = target; }
+        public String getTarget() { return target; }
+    }
 }