Changeset 2555

Timestamp:

12/06/07 13:17:06 (5 years ago)

Author:

tasuku

Message:

r283@dhcp158 (orig r26): tasuku | 2007-09-08 04:02:49 +0900
nest if/for nankani taiou...!?

Files:

• lang/php/mumu/trunk/GunyaTemplate.php (modified) (14 diffs)

lang/php/mumu/trunk/GunyaTemplate.php

@@ -155 +155 @@
     $this->block_dict = $block_dict;
     if ($parentPath) {
-      $p = new GTParser();
-      if (($this->parent_tfile = $p->parse_from_file($parentPath)) === FALSE) {
+      if (($this->parent_tfile = GTParser::parse_from_file($parentPath)) === FALSE) {
         // TODO: ���顼���������ƥ�졼�������˶����Ƥ�����     }
     }
@@ -224 +223 @@
   function __construct($includePath) {
     // FIXME: �������ƥ�����å���̵�¥롼�ץ���å�
-    $p = new GTParser();
-    if (($this->tplfile = $p->parse_from_file($includePath)) === FALSE) {
+    if (($this->tplfile = GTParser::parse_from_file($includePath)) === FALSE) {
       // TODO: ���顼���������ƥ�졼�������˶����Ƥ�����     $this->tplfile = new GTTextNode('include error');
     }
@@ -479 +477 @@
 
 class GTParser {
-  private $template;             // �ѡ�����Υƥ�졼����� private $errorStr;             // ���顼ʸ�� private $block_dict = array(); // block���� => block�ؤλ���  private $extends = false;      // extends�ξ��Υե�����
+  private $template;             // �ѡ�����Υƥ�졼����� private $template_len;         // �ƥ�졼�����Ĺ��
+  private $errorStr;             // ���顼ʸ�� private $block_dict = array(); // block���� => block�ؤλ���  private $extends = false;      // extends�ξ��Υե�����
 
   # template syntax constants
@@ -497 +496 @@
   function __construct($template) {
     $this->template = $template;
+    $this->template_len = strlen($template);
   }
 
@@ -598 +598 @@
 
   // ��λ����(#}�Ȥ�)����ơ����ΰ�֤��
-  private function find_closetag(&$spos, &$epos, $closetag) {
-    if (($fpos = strpos($this->template, $closetag, $spos)) === FALSE || $fpos >= $epos) {
+  private function find_closetag(&$spos, $closetag) {
+    if (($fpos = strpos($this->template, $closetag, $spos)) === FALSE) {
       $this->errorStr = "������������Ƥʤ��褦�Ǥ�($closetag�����Ĥ�������";
       return FALSE;
@@ -606 +606 @@
   }
 
-  // ľ��else��dblock��dif��dfor���
-  private function find_endtags($spos, &$epos, $endtags) {
-    // �ޤ���ľ���֥������ϥ��������    while (($spos = strpos($this->template, self::BLOCK_TAG_START, $spos)) !== FALSE
-           && $spos < $epos) {
-      $spos += 2;
-      if (($lpos = $this->find_closetag($spos, $epos, self::BLOCK_TAG_END)) !== FALSE
-          && $lpos < $epos) {
-        // �������m���ƥ���å�
-        $c = trim(substr($this->template, $spos, $lpos - $spos));
-        if (in_array($c, $endtags)) {
-          return array($spos - 2, $lpos + 2, $c);
-        }
-        $spos = $lpos + 2;
-      }
-    }
-    $this->errorStr = "block/if/for��������Ƥ��ʤ��褦�Ǥ���";
-    return FALSE;
-  }
-
   // {% %}�����������ơ�GTNode�����
   // extends����˽񤫤ʤ��Ȥ����ʤ�
-  private function parse_block(&$spos, &$epos) {
+  private function parse_block(&$spos) {
     $spos += 2;
-    if (($lpos = $this->find_closetag($spos, $epos, self::BLOCK_TAG_END)) === FALSE) {
+    if (($lpos = $this->find_closetag($spos, self::BLOCK_TAG_END)) === FALSE) {
       return FALSE;
     }
@@ -673 +654 @@
           return FALSE;
         }
-        $lpos += 2;
-        if ((list($bepos, $blpos) = $this->find_endtags($lpos, $epos, array('endblock'))) === FALSE) {
-          return FALSE;
-        }
-        $nodelist = $this->_parse($lpos, $bepos);
+        $spos = $lpos + 2;
+        list($nodelist) = $this->_parse($spos, array('endblock'));
         $node = new GTBlockNode($blockname, $nodelist);
         $this->block_dict[$blockname] = &$node; // reference
-        $spos = $blpos;
         break;
       case 'for': // endfor
@@ -698 +675 @@
           $reversed = False;
         }
-        $lpos += 2;
-        if ((list($bepos, $blpos) = $this->find_endtags($lpos, $epos, array('endfor'))) === FALSE) {
-          return FALSE;
-        }
-        $nodelist = $this->_parse($lpos, $bepos);
+        $spos = $lpos + 2;
+        list($nodelist) = $this->_parse($spos, array('endfor'));
         $node = new GTForNode($in[1], $in[3], $reversed, $nodelist);
-        $spos = $blpos;
         break;
       case 'cycle':
@@ -753 +726 @@
           }
         }
-        $lpos += 2;
-        if ((list($bepos, $eblpos, $nexttag) =
-               $this->find_endtags($lpos, $epos, array('else', 'endif'))) === FALSE) {
-          return FALSE;
-        }
-        $nodelist_true = $this->_parse($lpos, $bepos);
+        $spos = $lpos + 2;
+        list($nodelist_true, $nexttag) =
+          $this->_parse($spos, array('else', 'endif'));
         if ($nexttag == 'else') {
-          if ((list($bepos, $blpos, $nexttag) =
-                    $this->find_endtags($eblpos, $epos, array('endif'))) === FALSE) {
-            return FALSE;
-          }
-          $nodelist_false = $this->_parse($eblpos, $bepos);
-          $spos = $blpos;
+          list($nodelist_false) = $this->_parse($spos, array('endif'));
         } else {
           $nodelist_false = new GTNodeList();
-          $spos = $eblpos;
         }
         $node = new GTIfNode($boolvars, $nodelist_true, $nodelist_false, $link_type);
@@ -794 +758 @@
           return FALSE;
         }
-        $lpos += 2;
-        if ((list($bepos, $blpos) = $this->find_endtags($lpos, $epos, array('endfilter'))) === FALSE) {
-          return FALSE;
-        }
+        $spos += 2;
         $filter_expr = new GTFilterExpression('var|'. $in[1]);
-        $nodelist = $this->_parse($lpos, $bepos);
+        list($nodelist) = $this->_parse($spos, array('endfilter'));
         $node = new GTFilterNode($filter_expr, $nodelist);
-        $spos = $blpos;
+        break;
+      case 'endblock':
+      case 'else':
+      case 'endif':
+      case 'endfor':
+      case 'endfilter':
+        $node = $in[0]; // raw string
+        $spos = $lpos + 2;
         break;
       default:
@@ -811 +779 @@
   }
 
-  private function parse_variable(&$spos, &$epos) {
+  private function parse_variable(&$spos) {
     $spos += 2;
-    if (($lpos = $this->find_closetag($spos, $epos, self::VARIABLE_TAG_END)) === FALSE) {
+    if (($lpos = $this->find_closetag($spos, self::VARIABLE_TAG_END)) === FALSE) {
       return FALSE;
     }
@@ -823 +791 @@
   }
 
-  private function parse_comment(&$spos, &$epos) {
+  private function parse_comment(&$spos) {
     $spos += 2;
-    if (($lpos = $this->find_closetag($spos, $epos, self::COMMENT_TAG_END)) === FALSE) {
+    if (($lpos = $this->find_closetag($spos, self::COMMENT_TAG_END)) === FALSE) {
       return FALSE;
     }
@@ -837 +805 @@
     }
     $p = new GTParser($t);
-    $nl = $p->_parse(0, strlen($t));
+    $spos = 0;
+    list($nl) = $p->_parse($spos, array());
     return new GTFile($nl, $p->block_dict, $p->extends);
   }
@@ -843 +812 @@
   static public function parse($templateStr) {
     $p = new GTParser($templateStr);
-    $nl = $p->_parse(0, strlen($templateStr));
+    $spos = 0;
+    list($nl) = $p->_parse($spos, array());
     return new GTFile($nl, $p->block_dict);
   }
 
-  private function _parse($spos, $epos) {
+  private function add_textnode(&$nodelist, &$tspos, &$epos) {
+    if ($tspos < $epos) {
+      $nodelist->push(new GTTextNode(
+        substr($this->template, $tspos, $epos - $tspos)));
+    }
+  }
+
+  private function _parse(&$spos, $parse_until) {
     $nl = new GTNodeList();
-    while ($spos < $epos) {
-      $nspos = strpos($this->template, self::SINGLE_BRACE_START, $spos);
-      if ($nspos === FALSE) {
-        $nspos = $epos;
-      }
-      if ($spos < $nspos) {
-        // non-tag strings are stored to GTTextNode
-        $nl->push(new GTTextNode(substr($this->template, $spos, $nspos - $spos)));
-      }
-      if ($nspos < $epos) {
-        switch (substr($this->template, $nspos, 2)) {
-          case self::BLOCK_TAG_START:
-            if (($node = $this->parse_block($nspos, $epos)) === FALSE) {
-              unset($this->template);
-              return FALSE;
+    $tspos = $spos;
+    while (true) {
+      echo "*** spos:$spos tspos:$tspos\n";
+      $spos = strpos($this->template, self::SINGLE_BRACE_START, $spos);
+      if ($spos === FALSE) {
+        $this->add_textnode($nl, $tspos, $this->template_len);
+        return array($nl, null);
+      }
+      switch (substr($this->template, $spos, 2)) {
+        case self::BLOCK_TAG_START:
+          $this->add_textnode($nl, $tspos, $spos);
+          if (($node = $this->parse_block($spos)) === FALSE) {
+            return FALSE;
+          }
+          $tspos = $spos;
+          if (is_string($node)) {
+            // close tag
+            if (in_array($node, $parse_until)) {
+              return array($nl, $node);
+            } else {
+              // invalid close tag
             }
+          } else {
             $nl->push($node);
-            break;
-          case self::VARIABLE_TAG_START:
-            if (($node = $this->parse_variable($nspos, $epos)) === FALSE) {
-              unset($this->template);
-              return FALSE;
-            }
-            $nl->push($node);
-            break;
-          case self::COMMENT_TAG_START:
-            if (($node = $this->parse_comment($nspos, $epos)) === FALSE) {
-              unset($this->template);
-              return FALSE;
-            }
-            $nl->push($node);
-            break;
-          default:
-            // { only
-            $nspos += 1;
-        }
-      }
-      $spos = $nspos;
-    }
-    return $nl;
+          }
+          break;
+        case self::VARIABLE_TAG_START:
+          $this->add_textnode($nl, $tspos, $spos);
+          if (($node = $this->parse_variable($spos)) === FALSE) {
+            return FALSE;
+          }
+          $nl->push($node);
+          $tspos = $spos;
+          break;
+        case self::COMMENT_TAG_START:
+          $this->add_textnode($nl, $tspos, $spos);
+          if (($node = $this->parse_comment($spos)) === FALSE) {
+            return FALSE;
+          }
+          $nl->push($node);
+          $tspos = $spos;
+          break;
+        default:
+          // { only
+          $spos += 1;
+      }
+    }
   }
 }