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

Some fixes and new classes

databind
vitalif 2013-03-29 20:57:58 +00:00 committed by Vitaliy Filippov
parent bfeba781f7
commit 4f15c395f2
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
template.php
View File

@ -10,6 +10,8 @@
# Author: Vitaliy Filippov, 2006-2013
# $Id$
# TODO for perl version - rewrite it and prevent auto-vivification on a.b
class VMXTemplateState
{
// Old-style blocks
@ -820,16 +822,17 @@ class VMXTemplateParser
var $tokens, $tokpos, $tokline, $ptr;
// Possible tokens consisting of special characters
static $chartokens = '# + - = * / % ! , . < > ( ) { } [ ] | .. || && == != <= >= =>';
static $chartokens = '# + - = * / % ! , . < > ( ) { } [ ] & .. || && == != <= >= =>';
// ops_and: ops_eq | ops_eq "&&" ops_and | ops_eq "AND" ops_and
// ops_and: ops_bitand | ops_bitand "&&" ops_and | ops_bitand "AND" ops_and
// ops_bitand: ops_eq | ops_eq "&" ops_bitand
// ops_eq: ops_cmp | ops_cmp "==" ops_cmp | ops_cmp "!=" ops_cmp
// ops_cmp: ops_add | ops_add '<' ops_add | ops_add '>' ops_add | ops_add "<=" ops_add | ops_add ">=" ops_add
// ops_add: ops_mul | ops_mul '+' ops_add | ops_mul '-' ops_add
// ops_mul: exp_neg | exp_neg '*' ops_mul | exp_neg '/' ops_mul | exp_neg '%' ops_mul
static $ops = array(
'or' => array(array('||', '$or', '$xor'), 'and', true),
'and' => array(array('&&', '$and'), 'eq', true),
'and' => array(array('&&', '$and'), 'bitand', true),
'bitand' => array(array('&'), 'eq', true),
'eq' => array(array('==', '!='), 'cmp', false),
'cmp' => array(array('<', '>', '<=', '>='), 'add', false),
'add' => array(array('+', '-'), 'mul', true),
@ -1109,8 +1112,8 @@ class VMXTemplateParser
}
$text = "Unexpected $tok, expected ";
if (count($expected) > 1)
$text .= "one of '";
$text .= implode("', '", $expected)."'";
$text .= "one of ";
$text .= "'".implode("', '", $expected)."'";
$this->raise($text);
}
@ -1531,6 +1534,7 @@ $varref = array_pop(\$stack);";
if ($this->tok() == ',')
$this->ptr++;
}
$this->ptr++;
}
$code = false;
if ($this->tok() == '=')
@ -1871,7 +1875,7 @@ $varref_index = \$stack[count(\$stack)-1]++;";
}
$r = "\$this->parent->call_block($parts[0], $args, \"".addslashes($this->errorinfo())."\")";
}
if (count($parts) == 1)
elseif (count($parts) == 1)
{
$fn = strtolower($parts[0]);
if (isset(self::$functions[$fn]))

3
template.y
View File

@ -26,7 +26,8 @@ elseif: "ELSE" "IF" | "ELSIF" | "ELSEIF"
exp: p4 | p4 ".." exp
p4: p5 | p5 "||" p4 | p5 "OR" p4 | p5 "XOR" p4
p5: p6 | p6 "&&" p5 | p6 "AND" p5
p5: bitand | bitand "&&" p5 | bitand "AND" p5
bitand: p6 | p6 "&" bitand
p6: p7 | p7 "==" p7 | p7 "!=" p7
p7: p8 | p8 '<' p8 | p8 '>' p8 | p8 "<=" p8 | p8 ">=" p8
p8: p9 | p9 '+' p8 | p9 '-' p8