X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FTemplate.java;h=fb9f4cca87edfc8365d45e42855883e002041260;hb=5a0dc838ac580ec1eb3bd9cc391b8c82f77782d4;hp=28ff21544571cd83d696483f0a84de2d7e0cf8fe;hpb=c28ed126fbc51fb5794bb367f51a8755dc20140e;p=org.ibex.core.git

diff --git a/src/org/ibex/Template.java b/src/org/ibex/Template.java
index 28ff215..fb9f4cc 100644
--- a/src/org/ibex/Template.java
+++ b/src/org/ibex/Template.java
@@ -34,6 +34,7 @@ public class Template {
     Template prev;
     Template prev2;
     JSScope staticScope = null;         ///< the scope in which the static block is executed
+    JS staticObject = null;
 
 
     // Only used during parsing /////////////////////////////////////////////////////////////////
@@ -81,7 +82,7 @@ public class Template {
         // FIXME this dollar stuff is all wrong
         if (id != null) parentPis.putDollar(id, b);
 
-        PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticScope);
+        PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticObject);
         for(int i=0; i<urikeys.length; i++) {
             if (urikeys[i] == null) continue;
             pis.declare(urikeys[i]);
@@ -155,31 +156,20 @@ public class Template {
         String initial_uri = "";
 
 	public TemplateHelper(String sourceName, Object s, Ibex ibex) throws XML.Exn, IOException, JSExn {
-            System.out.println("1");
             this.sourceName = sourceName;
-            System.out.println("2");
             this.ibex = ibex;
-            System.out.println("3");
             InputStream is = Stream.getInputStream(s);
-            System.out.println("4");
             Ibex.Blessing b = Ibex.Blessing.getBlessing(s).parent;
-            System.out.println("5");
-            /*
             while(b != null) {
                 if(b.parentkey != null) initial_uri = b.parentkey + (initial_uri.equals("") ? "" : "." + initial_uri);
                 b = b.parent;
             }
-            */
             initial_uri = "";
-            System.out.println("6");
             parse(new InputStreamReader(is));
-            System.out.println("7");
             JS staticScript = parseScript(static_content, static_content_start);
-            System.out.println("8");
-            t.staticScope = new PerInstantiationScope(null, ibex, null, null);
-            System.out.println("9");
+            t.staticObject = new JS();
+            t.staticScope = new PerInstantiationScope(null, ibex, null, t.staticObject);
             if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
-            System.out.println("10");
         }
 
         private JS parseScript(StringBuffer content, int content_start) throws IOException {
@@ -245,11 +235,10 @@ public class Template {
 
             // 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 "id":
+                if (c.getAttrKey(i).equals("id")) {
                     t.id = c.getAttrVal(i).toString().intern();
                     continue ATTR;
-                //#end
+                }
 
                 // treat value starting with '.' as resource reference
                 String uri = c.getAttrUri(i); if (!uri.equals("")) uri = '.' + uri;
@@ -339,13 +328,13 @@ public class Template {
     private static class PerInstantiationScope extends JSScope {
         Ibex ibex = null;
         PerInstantiationScope parentBoxPis = null;
-        JSScope myStatic = null;
+        JS myStatic = null;
         void putDollar(String key, Box target) throws JSExn {
             if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
             declare("$" + key);
             put("$" + key, target);
         }
-        public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JSScope myStatic) {
+        public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JS myStatic) {
             super(parentScope);
             this.parentBoxPis = parentBoxPis;
             this.ibex = ibex;