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

Add |raw modifier support

Browse Source
This commit is contained in:
bzick 2013-07-06 14:03:05 +04:00
parent 404ee7a819
commit 3d0475e95c
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Fenom/Template.php
View File

@ -391,8 +391,15 @@ class Template extends Render {
return parent::fetch($values); return parent::fetch($values);
} }
private function _print($data) { /**
if($this->_options & Fenom::AUTO_ESCAPE) { * Output the value
*
* @param $data
* @param $tag
* @return string
*/
private function _print($data, $tag) {
if($this->_options & Fenom::AUTO_ESCAPE && !$tag->raw) {
return "echo htmlspecialchars($data, ENT_COMPAT, 'UTF-8')"; return "echo htmlspecialchars($data, ENT_COMPAT, 'UTF-8')";
} else { } else {
return "echo $data"; return "echo $data";
@ -419,9 +426,9 @@ class Template extends Render {
} elseif ($tokens->is('/')) { } elseif ($tokens->is('/')) {
return $this->_end($tokens); return $this->_end($tokens);
} elseif ($tokens->is('#')) { } elseif ($tokens->is('#')) {
return $this->_print($this->parseConst($tokens)).';'; return $this->_print($this->parseConst($tokens), $tokens).';';
} else { } else {
return $code = $this->_print($this->parseExp($tokens)).";"; return $code = $this->_print($this->parseExp($tokens), $tokens).";";
} }
} catch (InvalidUsageException $e) { } catch (InvalidUsageException $e) {
throw new CompileException($e->getMessage()." in {$this} line {$this->_line}", 0, E_ERROR, $this->_name, $this->_line, $e); throw new CompileException($e->getMessage()." in {$this} line {$this->_line}", 0, E_ERROR, $this->_name, $this->_line, $e);
@ -467,12 +474,12 @@ class Template extends Render {
if($tokens->is(Tokenizer::MACRO_STRING)) { if($tokens->is(Tokenizer::MACRO_STRING)) {
$action = $tokens->getAndNext(); $action = $tokens->getAndNext();
} else { } else {
return $this->_print($this->parseExp($tokens)).';'; // may be math and/or boolean expression return $this->_print($this->parseExp($tokens), $tokens).';'; // may be math and/or boolean expression
} }
if($tokens->is("(", T_NAMESPACE, T_DOUBLE_COLON)) { // just invoke function or static method if($tokens->is("(", T_NAMESPACE, T_DOUBLE_COLON)) { // just invoke function or static method
$tokens->back(); $tokens->back();
return $this->_print($this->parseExp($tokens)).";"; return $this->_print($this->parseExp($tokens), $tokens).";";
} elseif($tokens->is('.')) { } elseif($tokens->is('.')) {
$name = $tokens->skip()->get(Tokenizer::MACRO_STRING); $name = $tokens->skip()->get(Tokenizer::MACRO_STRING);
if($action !== "macro") { if($action !== "macro") {
@ -876,6 +883,11 @@ class Template extends Render {
while($tokens->is("|")) { while($tokens->is("|")) {
$mods = $this->_fenom->getModifier( $modifier_name = $tokens->getNext(Tokenizer::MACRO_STRING) ); $mods = $this->_fenom->getModifier( $modifier_name = $tokens->getNext(Tokenizer::MACRO_STRING) );
if($modifier_name == "raw") {
$tokens->raw = false;
$tokens->next();
continue;
}
$tokens->next(); $tokens->next();
$args = array(); $args = array();

1
src/Fenom/Tokenizer.php
View File

@ -81,6 +81,7 @@ class Tokenizer {
public $tokens; public $tokens;
public $p = 0; public $p = 0;
public $quotes = 0; public $quotes = 0;
public $raw = false;
private $_max = 0; private $_max = 0;
private $_last_no = 0; private $_last_no = 0;