JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index 6c37fcd..bb15ede 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -97,10 +97,16 @@ class Pman_Core_JsTemplate extends Pman {
         $ar = preg_split('/(\{[^\}]+})/', $contents, -1, PREG_SPLIT_DELIM_CAPTURE);
         //echo '<PRE>' . htmlspecialchars(print_r($ar,true));
         
-        $ret = array();
+        $out= array();
         
-        $ret[] = "var $name = function(t) {\n    var ret=[];\n";
+        $head = "var $name = function(t) {\n    var ret=[];\n";
+        
+        $funcs = array();
+        // do not allow nested functions..?
+        $fstart = -1;
         $indent = 1;
+        
+        $ret = &$out;
         foreach($ar as $item) {
             $in = str_repeat("    ", $indent);
             
@@ -113,7 +119,7 @@ class Pman_Core_JsTemplate extends Pman {
                     if (!strlen(trim($item))) {
                         continue;
                     }
-                    $ret[] = $in . "ret+= ". json_encode($item) . ";";
+                    $ret[] = $in . "ret += ". json_encode($item) . ";";
                     continue;
                 
                 case (substr($item,1,3) == 'if('):
@@ -125,6 +131,10 @@ class Pman_Core_JsTemplate extends Pman {
                     $indent--;
                     $in = str_repeat("    ", $indent);
                     $ret[] = $in . "}";
+                    if ($fstart == $indent) {
+                        $fstart = -1;
+                        $ret = &$out;
+                    }
                     continue;
                 
                 case (substr($item,1,7) == 'return:'):
@@ -132,7 +142,9 @@ class Pman_Core_JsTemplate extends Pman {
                     continue;
                 
                 case (substr($item,1,9) == 'function:'):
+                    $fstart = $indent;
                     $indent++;
+                    $ret = &$funcs;
                     $def  = substr($item,10,-1) ;
                     list($name,$body) = explode('(', $def, 2);
                     
@@ -154,8 +166,8 @@ class Pman_Core_JsTemplate extends Pman {
         }
         $in = str_repeat("    ", $indent);
         $ret[] = $in .  "return ret.join('');\n}\n";
-        return implode("\n",$ret);
-        echo '<PRE>' . htmlspecialchars(implode("\n",$ret));
+        return $head . implode("\n",$funcs) . "\n" .implode("\n",$out) ;
+        //echo '<PRE>' . htmlspecialchars(implode("\n",$ret));