Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Compiler for new Parser output.

Browse Source
This commit is contained in:
Justin Hileman
2013-05-15 13:37:05 -07:00
parent 8f5be9e470
commit 87a734e60c
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Compiler.php
+8 -10
View File
@@ -373,13 +373,11 @@ class Mustache_Compiler
*/
private function text($text, $level)
{
if ($text === "\n") {
$this->indentNextLine = true;
$indentNextLine = (substr($text, -1) === "\n");
$code = sprintf($this->prepare(self::TEXT, $level), $this->flushIndent(), var_export($text, true));
$this->indentNextLine = $indentNextLine;
return $this->prepare(self::LINE, $level);
} else {
return sprintf($this->prepare(self::TEXT, $level), $this->flushIndent(), var_export($text, true));
}
return $code;
}
/**
@@ -467,12 +465,12 @@ class Mustache_Compiler
*/
private function flushIndent()
{
if ($this->indentNextLine) {
if (!$this->indentNextLine) {
return '';
}
$this->indentNextLine = false;
return self::LINE_INDENT;
} else {
return '';
}
}
}
test/Mustache/Test/CompilerTest.php
+2 -4
View File
@@ -105,8 +105,7 @@ class Mustache_Test_CompilerTest extends PHPUnit_Framework_TestCase
array(
'',
array(
$this->createTextToken('foo'),
$this->createTextToken("\n"),
$this->createTextToken("foo\n"),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_ESCAPED,
Mustache_Tokenizer::NAME => 'name',
@@ -123,8 +122,7 @@ class Mustache_Test_CompilerTest extends PHPUnit_Framework_TestCase
'UTF-8',
array(
"\nclass Monkey extends Mustache_Template",
'$buffer .= $indent . \'foo\'',
'$buffer .= "\n"',
"\$buffer .= \$indent . 'foo\n';",
'$value = $this->resolveValue($context->find(\'name\'), $context, $indent);',
'$buffer .= htmlspecialchars($value, '.ENT_COMPAT.', \'UTF-8\');',
'$value = $this->resolveValue($context->last(), $context, $indent);',