vitalif
/
VMXTemplate
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip to directive beginning also if just exited

databind
vitalif 2013-04-21 21:25:07 +00:00 committed by Vitaliy Filippov
parent 2c1587c7de
commit 684122d2ef
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
template.parser.php
View File

@ -554,13 +554,17 @@ class VMXTemplateLexer
try
{
$parser->reset();
$in = false;
while ($t = $this->read_token())
{
$success = $parser->eat($t[0], $t[1]);
if (!$success)
{
$this->skip_error(end($parser->parser->errors));
// Pass $in from last step so we skip to the beginning
// of directive even if it just ended and $this->in_* == 0
$this->skip_error(end($parser->parser->errors), $in);
}
$in = $this->in_code || $this->in_subst;
}
$parser->eat_eof();
}
@ -595,12 +599,12 @@ class VMXTemplateLexer
/**
* Skip a directive
*/
function skip_error($e)
function skip_error($e, $force = false)
{
if (substr($e, 0, 18) !== 'error not expected')
{
$this->warn($e);
if ($this->in_code || $this->in_subst)
if ($this->in_code || $this->in_subst || $force)
{
$this->in_code = $this->in_subst = 0;
$this->pos = $this->last_start;
@ -745,7 +749,7 @@ class VMXTemplateLexer
}
}
}
if ($this->in_subst)
elseif ($this->in_subst)
{
$this->in_subst += ($t === $this->options->begin_subst);
$this->in_subst -= ($t === $this->options->end_subst);

2
template.php
View File

@ -770,7 +770,7 @@ class VMXTemplateOptions
implode('</li><li>', array_map('html_pbr', $this->errors)).
'</li></ul>';
$fp = fopen("php://stderr", 'a');
fprintf($fp, "VMXTemplate errors:\n".implode("\n", $this->errors));
fputs($fp, "VMXTemplate errors:\n".implode("\n", $this->errors));
fclose($fp);
}
}