Commits

Bill Welliver committed d31cc6a

fix simple embedded pike templates so that they use the newest internal conventions.

Comments (0)

Files changed (2)

lib/Fins.pmod/Template.pmod/Template.pike

   }
 
   if(!template || !sizeof(template))
-   {
-	 Log.debug("Error loading template %s", templatename);
-     throw(Fins.Errors.Template("Template does not exist or is empty: " + templatename + "\n"));
-   }
-   Log.debug("Successfully loaded template %s.", templatename);
-   return template;
+  {
+    Log.debug("Error loading template %s", templatename);
+    throw(Fins.Errors.Template("Template does not exist or is empty: " + templatename + "\n"));
+  }
+
+  Log.debug("Successfully loaded template %s.", templatename);
+  return template;
 }
 
 string load_internal_template(string inttn, void|object context)

lib/Fins.pmod/Template.pmod/ePike.pike

   // now, let's render some pike!
   string pikescript = "", header = "";
 
-  array(Block) contents = psp_to_blocks(file, realname, compilecontext);
+  BlockHolder contents = psp_to_blocks(file, realname, compilecontext);
   string ps, h;
  
   [ps, h] = render_psp(contents, "", "", compilecontext);
     }
   }
 
- string|array(Block) parse_directive(string exp, object|void compilecontext)
+ string|BlockHolder parse_directive(string exp, object|void compilecontext)
  {
    exp = String.trim_all_whites(exp);
  
    }
  }
 
- string|array(Block) process_project(string exp, object|void compilecontext)
+ string|BlockHolder process_project(string exp, object|void compilecontext)
  {
 	string project;
 	
  }
 
  // we don't handle absolute includes yet.
- array(Block) process_include(string exp, object|void compilecontext)
+ BlockHolder process_include(string exp, object|void compilecontext)
  {
    string file;
    string contents;
  
    if(contents)
    {
-     array x = psp_to_blocks(contents, file, compilecontext);
+     BlockHolder x = psp_to_blocks(contents, file, compilecontext);
      //werror("blocks: %O\n", x);
      return x;
    }