* template.php: rearrange; rename tem_get to avoid conflict with old system.

diff --git a/template.php b/template.php
index d986a06..3eef030 100644 (file)
--- a/template.php
+++ b/template.php
@@ -57,35 +57,9 @@ function parse_template_file($filename) {
        return parse_template(file_get_contents($filename));
 }
 
-# See also parse_template and fill_template.
-
-
-# To track our position in the template and in the data, we use a linked 
-# stack structure.  Each node is a hash with a reference to the parent 
-# node along with whatever other data you want to add.  For each stack, 
-# you simply keep a variable with a reference to the top element.  Then 
-# the push and pop operations are:
-
-# $top =& tem_push($top);
-# $top =& $top['parent'];
-
-function &tem_push(&$stack = NULL) {
-       static $refs = array();
-
-       # Since a PHP reference is *not* a pointer to data, but a pointer to 
-       # a variable (or array slot), we *have* to first put the new node in
-       # $refs, and then reference it from $new.
-
-       $refs[] = array();
-       $new =& $refs[count($refs)-1];
-       if($stack) $new['parent'] =& $stack;
-       return $new;
-}
-
-
-# First we take the template string and convert it into a tree of
-# strings and sub-templates.  A template is a hash with a name string,
-# a pieces array, and possibly an args array.
+# We parse the template string into a tree of strings and sub-templates.  
+# A template is a hash with a name string, a pieces array, and possibly 
+# an args array.
 
 function parse_template($string) {
        $tem =& tem_push();
@@ -125,6 +99,58 @@ function parse_template($string) {
        return $tem;
 }
 
+function fill_template($template, &$data, &$context = NULL) {
+       if(!$context) {
+               $context =& tem_push($context);
+               $context['data'] =& $data;
+       }
+
+       foreach($template['pieces'] as $tem) {
+               if(is_string($tem)) $output .= $tem;
+               elseif($tem['pieces']) {  # sub-template
+                       $rows =& tem_get_rows($tem, $context);
+                       foreach($rows as $key => &$row) {
+                               $context =& tem_push($context);
+                               $context['data'] =& $row;
+                               $context['rows'] =& $rows;
+                                       $output .= fill_template($tem, $row, $context);
+                               $context =& $context['parent'];
+
+                       }
+               } else {  # variable
+                       $output .= tem_get_enc($tem, $context);
+               }
+       }
+       return $output;
+}
+
+
+# Implementation
+# --------------
+
+
+# To track our position in the template and in the data, we use a linked 
+# stack structure.  Each node is a hash with a reference to the parent 
+# node along with whatever other data you want to add.  For each stack, 
+# you simply keep a variable with a reference to the top element.  Then 
+# the push and pop operations are:
+
+# $top =& tem_push($top);
+# $top =& $top['parent'];
+
+function &tem_push(&$stack = NULL) {
+       static $refs = array();
+
+       # Since a PHP reference is *not* a pointer to data, but a pointer to 
+       # a variable (or array slot), we *have* to first put the new node in
+       # $refs, and then reference it from $new.
+
+       $refs[] = array();
+       $new =& $refs[count($refs)-1];
+       if($stack) $new['parent'] =& $stack;
+       return $new;
+}
+
 # To fill out a template, we do a depth-first traversal of the template 
 # tree, replacing all tags with the data values.
 
@@ -167,7 +193,7 @@ function tem_find_scope($key, $context) {
        return array('parent' => $context);
 }
 
-function tem_get($key, $context) {
+function tem_find_value($key, $context) {
        $scope = tem_find_scope($key, $context);
        if($scope) return $scope['data'][$key];
 }
@@ -197,7 +223,7 @@ function &tem_get_rows($tag, $context)
 function tem_get_enc($tag, $context)
 {
        $key = $tag['name'];
-       $value = tem_get($key, $context);
+       $value = tem_find_value($key, $context);
        foreach($tag['args'] as $encoding) {
                $func = "enc_$encoding";
                if(function_exists($func)) $value = $func($value, $key);
@@ -206,31 +232,6 @@ function tem_get_enc($tag, $context)
        return $value;
 }
 
-function fill_template($template, &$data, &$context = NULL) {
-       if(!$context) {
-               $context =& tem_push($context);
-               $context['data'] =& $data;
-       }
-
-       foreach($template['pieces'] as $tem) {
-               if(is_string($tem)) $output .= $tem;
-               elseif($tem['pieces']) {  # sub-template
-                       $rows =& tem_get_rows($tem, $context);
-                       foreach($rows as $key => &$row) {
-                               $context =& tem_push($context);
-                               $context['data'] =& $row;
-                               $context['rows'] =& $rows;
-                                       $output .= fill_template($tem, $row, $context);
-                               $context =& $context['parent'];
-
-                       }
-               } else {  # variable
-                       $output .= tem_get_enc($tem, $context);
-               }
-       }
-       return $output;
-}
-
 
 
 # Return a hash containing the top-level sub-templates of tem.