mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Fix '~=' operator

Browse Source
This commit is contained in:
bzick 2014-06-08 23:50:43 +04:00
parent f6c4da8297
commit f3de50813e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Fenom/Template.php
View File

@ -724,16 +724,21 @@ class Template extends Render
break; break;
} }
} elseif ($tokens->is('~')) { // string concatenation operator: 'asd' ~ $var } elseif ($tokens->is('~')) { // string concatenation operator: 'asd' ~ $var
$concat = array(array_pop($exp)); if($tokens->isNext('=')) { // ~=
while ($tokens->is('~')) { $exp[] = ".=";
$tokens->next(); $tokens->next()->next();
if ($tokens->is(T_LNUMBER, T_DNUMBER)) { } else {
$concat[] = "strval(" . $this->parseTerm($tokens) . ")"; $concat = array(array_pop($exp));
} else { while ($tokens->is('~')) {
$concat[] = $this->parseTerm($tokens); $tokens->next();
if ($tokens->is(T_LNUMBER, T_DNUMBER)) {
$concat[] = "strval(" . $this->parseTerm($tokens) . ")";
} else {
$concat[] = $this->parseTerm($tokens);
}
} }
$exp[] = "(" . implode(".", $concat) . ")";
} }
$exp[] = "(" . implode(".", $concat) . ")";
} else { } else {
break; break;
} }

2
tests/cases/Fenom/TemplateTest.php
View File

@ -1170,6 +1170,7 @@ class TemplateTest extends TestCase
array('{"string" ~ ++$one ~ "end"}', "string2end"), array('{"string" ~ ++$one ~ "end"}', "string2end"),
array('{"string" ~ "one" ~ "end"}', "stringoneend"), array('{"string" ~ "one" ~ "end"}', "stringoneend"),
array('{"string" ~ 1 ~ "end"}', "string1end"), array('{"string" ~ 1 ~ "end"}', "string1end"),
array('{$one ~= "string"} is {$one}', "1string is 1string"),
); );
} }
@ -1536,6 +1537,7 @@ class TemplateTest extends TestCase
/** /**
* @dataProvider providerConcat * @dataProvider providerConcat
* @group testConcat
*/ */
public function testConcat($code, $result) public function testConcat($code, $result)
{ {