Fix AUTO_RELOAD option

This commit is contained in:
bzick 2013-08-23 00:55:53 +04:00
parent 75c8d983d8
commit ecc842cc04
7 changed files with 39 additions and 13 deletions

2
.gitignore vendored
View File

@ -11,3 +11,5 @@ tests/resources/template/*
benchmark/compile/*
benchmark/templates/inheritance/smarty
benchmark/templates/inheritance/twig
benchmark/sandbox/compiled/*
!.gitkeep

View File

View File

@ -2,6 +2,10 @@
require_once __DIR__.'/../../vendor/autoload.php';
$t = new Fenom\Tokenizer('some "asd {$$ddd} dfg" some');
$fenom = Fenom::factory(__DIR__.'/templates', __DIR__.'/compiled', Fenom::FORCE_COMPILE);
var_dump($t->tokens);
$fenom->display("greeting.tpl", array(
"user" => array(
"name" => "Ivka"
)
));

View File

@ -0,0 +1,8 @@
Greeting,
{if $user}
{$user.name}!
{else}
anonymous?
{/if}
3

View File

@ -757,13 +757,16 @@ class Fenom
protected function _load($tpl, $opts)
{
$file_name = $this->_getCacheName($tpl, $opts);
if (!is_file($this->_compile_dir . "/" . $file_name)) {
return $this->compile($tpl, true, $opts);
} else {
if (is_file($this->_compile_dir . "/" . $file_name)) {
$fenom = $this;
return include($this->_compile_dir . "/" . $file_name);
$_tpl = include($this->_compile_dir . "/" . $file_name);
/* @var Fenom\Render $tpl */
if($_tpl->isValid()) {
return $_tpl;
}
}
return $this->compile($tpl, true, $opts);
}
/**
* Generate unique name of compiled template

View File

@ -99,7 +99,7 @@ class Template extends Render
private $_filters = array();
private static $_checkers = array(
protected static $_tests = array(
'integer' => 'is_int(%s)',
'int' => 'is_int(%s)',
'float' => 'is_float(%s)',
@ -223,6 +223,10 @@ class Template extends Render
unset($comment); // cleanup
break;
default:
// var_dump($this->_src[$pos]);
if($this->_src[$pos] === "\n") {
$pos++;
}
$this->_appendText(substr($this->_src, $pos, $start - $pos));
$end = $start + 1;
do {
@ -260,6 +264,9 @@ class Template extends Render
}
gc_collect_cycles();
if($end < strlen($this->_src) && $this->_src[$end + 1] === "\n") {
$end++;
}
$this->_appendText(substr($this->_src, $end ? $end + 1 : 0)); // append tail of the template
if ($this->_stack) {
$_names = array();
@ -466,6 +473,7 @@ class Template extends Render
*/
public function addDepend(Render $tpl)
{
// var_dump($tpl->getScm(),"$tpl", (new \Exception())->getTraceAsString() );
$this->_depends[$tpl->getScm()][$tpl->getName()] = $tpl->getTime();
}
@ -1007,7 +1015,7 @@ class Template extends Render
/**
* Parse 'is' and 'is not' operators
* @see $_checkers
* @see _tests
* @param Tokenizer $tokens
* @param string $value
* @param bool $variable
@ -1030,10 +1038,10 @@ class Template extends Render
if (!$variable && ($action == "set" || $action == "empty")) {
$action = "_$action";
$tokens->next();
return $invert . sprintf(self::$_checkers[$action], $value);
} elseif (isset(self::$_checkers[$action])) {
return $invert . sprintf(self::$_tests[$action], $value);
} elseif (isset(self::$_tests[$action])) {
$tokens->next();
return $invert . sprintf(self::$_checkers[$action], $value);
return $invert . sprintf(self::$_tests[$action], $value);
} elseif ($tokens->isSpecialVal()) {
$tokens->next();
return '(' . $value . ' ' . $equal . '= ' . $action . ')';

View File

@ -65,7 +65,8 @@ class MacrosTest extends TestCase
// $this->fenom->compile("macro_recursive.tpl")->display([]);
// $this->fenom->flush();
// var_dump($this->fenom->fetch("macro_recursive.tpl", []));
var_dump( $this->fenom->compile("macro_recursive_import.tpl")->getTemplateCode([]));
var_dump( $this->fenom->compile("macro_recursive_import.tpl")->display([]));
var_dump( $this->fenom->display("macro_recursive_import.tpl", []));
} catch (\Exception $e) {
var_dump($e->getMessage() . ": " . $e->getTraceAsString());
}