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

Add incorrect case

databind
vitalif 2013-08-26 09:05:40 +00:00 committed by Vitaliy Filippov
parent 6232f8b902
commit bf6d4a8bd3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bug.tpl Normal file
View File

@ -0,0 +1,2 @@
This template produces incorrect output:
<!-- coord[0] = coord[2] -->

6
template.parser.php
View File

@ -774,8 +774,10 @@ class VMXTemplateLexer
} }
elseif ($subst_pos === false || $code_pos !== false && $subst_pos > $code_pos) elseif ($subst_pos === false || $code_pos !== false && $subst_pos > $code_pos)
{ {
// Code starts closer
if ($code_pos > $this->pos) if ($code_pos > $this->pos)
{ {
// We didn't yet reach the code beginning
$str = substr($this->code, $this->pos, $code_pos-$this->pos); $str = substr($this->code, $this->pos, $code_pos-$this->pos);
if ($this->options->eat_code_line) if ($this->options->eat_code_line)
{ {
@ -785,8 +787,9 @@ class VMXTemplateLexer
$this->lineno += substr_count($r[1], "\n"); $this->lineno += substr_count($r[1], "\n");
$this->pos = $code_pos; $this->pos = $code_pos;
} }
else elseif ($code_pos !== false)
{ {
// We are at the code beginning ($this->pos == $code_pos)
$i = $this->pos+strlen($this->options->begin_code); $i = $this->pos+strlen($this->options->begin_code);
while ($i < $this->codelen && (($c = $this->code{$i}) == ' ' || $c == "\t")) while ($i < $this->codelen && (($c = $this->code{$i}) == ' ' || $c == "\t"))
{ {
@ -808,6 +811,7 @@ class VMXTemplateLexer
} }
else else
{ {
// Substitution is closer
if ($subst_pos > $this->pos) if ($subst_pos > $this->pos)
{ {
$r = array('literal', "'".addcslashes(substr($this->code, $this->pos, $subst_pos-$this->pos), "'\\")."'"); $r = array('literal', "'".addcslashes(substr($this->code, $this->pos, $subst_pos-$this->pos), "'\\")."'");