Changeset 2605 for lang/php

Timestamp:

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

Author:

tasuku

Message:

r333@dhcp158 (orig r76): tasuku | 2007-09-17 03:25:49 +0900
muda na path wo hozonsinai

Files:

• lang/php/mumu/trunk/mumu.php (modified) (5 diffs)

lang/php/mumu/trunk/mumu.php

@@ -280 +280 @@
   private $block_dict;     // nodelist�������ock̾ => MuBlockNode(�λ���
   public $include_paths;   // include�����ե��������ʥ�����������ǻȤ���  public $path;            // ��ʬ�Υե�����
-  private $parent_path;    // extends�Υե�����
   private $parent_tfile;   // extends���������ƥƥ�졼��  function __construct($nodelist, $block_dict, $include_paths,
                        $path = null, $parent_path = null) {
@@ -288 +287 @@
     $this->path = $path;
     if ($parent_path && $path) {
-      if (($this->parent_path = MuUtil::getpath($path, $parent_path)) === false
-          || ($this->parent_tfile = MuParser::parse_from_file($this->parent_path)) === false) {
+      if (($epath = MuUtil::getpath($path, $parent_path)) === false
+          || ($this->parent_tfile = MuParser::parse_from_file($epath)) === false) {
         throw new MuParserException('invalid filename specified on extends');
       }
@@ -339 +338 @@
       }
     }
-    if (isset($this->parent_path)) {
-      if ($cache_mtime < filemtime($this->parent_path)) {
+    if (isset($this->parent_tfile)) {
+      if ($cache_mtime < filemtime($this->parent_tfile->path)) {
         return false;
       }
@@ -1419 +1418 @@
       }
     }
+    // ���������ʤ��ä����
     if (!isset($mf)) {
       if (($t = file_get_contents($template_path)) === false) {
@@ -1431 +1431 @@
       }
       $mf = new MuFile($nl, $p->block_dict, $p->include_paths, $template_path, $p->extends);
+      // ��ꤷ�����������¸
       if (isset($sfpath)) {
         MuUtil::serialize_to_file($mf, $sfpath);