Changeset 2542 for lang/php

Timestamp:

12/06/07 13:16:58 (5 years ago)

Author:

tasuku

Message:

r270@dhcp158 (orig r13): tasuku | 2007-09-06 04:58:53 +0900
extends dekita--!!!!

Files:

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

lang/php/mumu/trunk/GunyaTemplate.php

@@ -88 +88 @@
 
 // 1�ĤΥƥ�졼�ȥե������ѡ�����������
-// ��������˽Ф���������class GTFile {
-  private $nodelist;        // �ե������ѡ�������NodeList
+// ��������˽Ф���������class GTFile extends GTNode {
+  public $nodelist;        // �ե������ѡ�������NodeList
   private $block_dict;      // nodelist�������ock̾ => GTBlockNode(�λ���
-  function __construct($nodelist, $block_dict) {
+  private $parent_tfile;    // extends���������ƥƥ�졼��  function __construct($nodelist, $block_dict, $parentPath = false) {
     $this->nodelist = $nodelist;
     $this->block_dict = $block_dict;
+    if ($parentPath) {
+      $p = new GTParser();
+      if (($this->parent_tfile = $p->parse_from_file($parentPath)) === FALSE) {
+        // TODO: ���顼���������ƥ�졼�������˶����Ƥ�����     }
+    }
   }
   public function render($raw_context) {
@@ -99 +104 @@
   }
   public function _render($context) {
-    return $this->nodelist->_render($context);
+    if ($this->parent_tfile) {
+      foreach ($this->block_dict as $blockname => $blocknode) {
+        if (($parent_block = $this->parent_tfile->get_block($blockname)) === FALSE) {
+          if ($this->parent_tfile->is_child()) {
+            $this->parent_tfile->append_block(&$blocknode);
+          }
+        } else {
+          $parent_block->parent = &$blocknode->parent;
+          $parent_block->add_parent(&$parent_block->nodelist);
+          $parent_block->nodelist = &$blocknode->nodelist;
+        }
+      }
+      return $this->parent_tfile->_render($context);
+    } else {
+      return $this->nodelist->_render($context);
+    }
   }
   public function get_block($blockname) {
-    if (array_key_exists($blockname, $block_dict)) {
-      return $nodelist[$block_dict[$blockname]];
+    if (array_key_exists($blockname, $this->block_dict)) {
+      return $this->block_dict[$blockname];
     } else {
       return false;
@@ -112 +132 @@
     // �ƤοƤˤ���������������ᡢ
     // ¹�����˥֥������
-
-    // �����Ĥη���TExtendsNode
-    $nodelist[$extends_index]->append_block($blocknode);
+    $this->nodelist->push($blocknode);
+    $this->block_dict[$blocknode->name] = &$blocknode;
   }
   public function is_child() {
-    return is_numeric($extends_index);
+    return ($parent_tfile !== FALSE);
   }
 }
@@ -138 +157 @@
   public function _render($context) {
     return $this->filter_expression->resolve($context);
-  }
-}
-
-class GTExtendsNode extends GTNode {
-  private $nodelist;
-  private $block_dict;
-  private $parent_tplfile;
-  function __construct($nodelist, $block_dict, $parentPath) {
-    // FIXME: �������ƥ�����å���̵�¥롼�ץ���å�
-    $this->nodelist = $nodelist;
-    $this->block_dict = $block_dict;
-    $p = new GTParser();
-    if (($this->parent_tplfile = $p->parse_from_file($parentPath)) === FALSE) {
-      // TODO: ���顼���������ƥ�졼�������˶����Ƥ�����   }
-  }
-
-  function _render($context) {
-    if ($parent_nodelist) {
-      $parent_is_child = $parent_tplfile->is_child();
-      $bidxs = $parent_tplfile->get_block_indexes();
-      foreach ($bidxs as $bidx) {
-      }
-    } else {
-      return 'extends error';
-    }
-  }
-
-  function append_block($blocknode) {
-    array_push($this->nodelist, $blocknode);
   }
 }
@@ -185 +175 @@
 
 class GTBlockNode extends GTNode {
-  private $name;
-  private $nodelist;
-  private $parent;
+  public $name;
+  public $nodelist;
+  public $parent;
 
   private $context; // for block.super
@@ -592 +582 @@
     $this->template = $t;
     $nl = $this->_parse(0, strlen($t));
-    if ($this->extends !== FALSE) {
-      $nl = new GTExtendsNode($nl);
-    }
     unset($this->template);
-    return new GTFile($nl, $this->block_dict);
+    return new GTFile($nl, $this->block_dict, $this->extends);
   }