refactoring some tokens

figdice · May 16, 2014 · 40f4cb6 · 40f4cb6
1 parent e8137ea
commit 40f4cb6
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 38 deletions.
diff --git a/src/figdice/classes/TagFigInclude.php b/src/figdice/classes/TagFigInclude.php
@@ -24,6 +24,7 @@
 namespace figdice\classes;
 
 use figdice\View;
+use figdice\exceptions\RequiredAttributeException;
 
 class TagFigInclude extends TagFig {
 	const TAGNAME = 'include';
@@ -35,8 +36,9 @@ public function __construct($xmlLineNumber) {
 	public function validate()
 	{
 	  // "file" attribute is mandatory.
-	  if (! $this->hasAttribute('file')) {
-	    throw new Exception('TODO: MISSING ATTRIBUTE');
+	  if (! $this->hasAttribute('file')) {
+	    //TODO: validate() should be invoked with a filename ?
+	    throw new RequiredAttributeException(self::TAGNAME, ''/*$filename*/, $this->getLineNumber(), '"file" attribute is missing in include tag.');
 	  }
 	}
 

diff --git a/src/figdice/classes/functions/Function_first.php b/src/figdice/classes/functions/Function_first.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Gabriel Zerbib <gabriel@figdice.org>
- * @copyright 2004-2013, Gabriel Zerbib.
- * @version 2.0.0
+ * @copyright 2004-2014, Gabriel Zerbib.
+ * @version 2.1.0
  * @package FigDice
  *
  * This file is part of FigDice.
@@ -24,8 +24,8 @@
 namespace figdice\classes\functions;
 
 use \figdice\FigFunction;
-use \figdice\classes\ViewElementTag;
-use \figdice\LoggerFactory;
+use \figdice\classes\Tag;
+use \figdice\classes\Renderer;
 
 class Function_first implements FigFunction {
 	public function __construct() {
@@ -36,8 +36,8 @@ public function __construct() {
 	 * @param integer $arity
 	 * @param array $arguments
 	 */
-	public function evaluate(ViewElementTag $viewElement, $arity, $arguments) {
-		$iteration = $viewElement->getIteration();
+	public function evaluate(Tag $viewElement, Renderer $renderer, $arity, $arguments) {
+		$iteration = $renderer->getIteration();
 		return $iteration->first();
 	}
-}
+}
diff --git a/src/figdice/classes/lexer/TokenAnd.php b/src/figdice/classes/lexer/TokenAnd.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Gabriel Zerbib <gabriel@figdice.org>
- * @copyright 2004-2013, Gabriel Zerbib.
- * @version 2.0.0
+ * @copyright 2004-2014, Gabriel Zerbib.
+ * @version 2.1.0
  * @package FigDice
  *
  * This file is part of FigDice.
@@ -22,22 +22,25 @@
  */
 
 namespace figdice\classes\lexer;
-use \figdice\classes\ViewElementTag;
+
+use \figdice\classes\Tag;
+use \figdice\classes\Renderer;
 
 class TokenAnd extends TokenBinop {
 	public function __construct() {
 		parent::__construct(self::PRIORITY_AND_OR);
 	}
 
 	/**
-	 * @param ViewElement $viewElement
+	 * @param Tag $viewElement
+	 * @param Renderer $renderer
 	 * @return mixed
 	 */
-	public function evaluate(ViewElementTag $viewElement) {
+	public function evaluate(Tag $viewElement, Renderer $renderer) {
 		$opL = $this->operands[0];
-		if(true == $opL->evaluate($viewElement)) {
+		if(true == $opL->evaluate($viewElement, $renderer)) {
 			$opR = $this->operands[1];
-			return (true == $opR->evaluate($viewElement));
+			return (true == $opR->evaluate($viewElement, $renderer));
 		}
 		return false;
 	}

diff --git a/src/figdice/classes/lexer/TokenComparisonBinop.php b/src/figdice/classes/lexer/TokenComparisonBinop.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Gabriel Zerbib <gabriel@figdice.org>
- * @copyright 2004-2013, Gabriel Zerbib.
- * @version 2.0.0
+ * @copyright 2004-2014, Gabriel Zerbib.
+ * @version 2.1.0
  * @package FigDice
  *
  * This file is part of FigDice.
@@ -22,7 +22,8 @@
  */
 
 namespace figdice\classes\lexer;
-use \figdice\classes\ViewElementTag;
+use \figdice\classes\Tag;
+use \figdice\classes\Renderer;
 use \figdice\exceptions\LexerArrayToStringConversionException;
 
 
@@ -36,9 +37,9 @@ public function __construct($comparator) {
 		parent::__construct(self::PRIORITY_COMPARATOR);
 		$this->comparator = $comparator;
 	}
-	public function evaluate(ViewElementTag $viewElement) {
-		$opL = $this->operands[0]->evaluate($viewElement);
-		$opR = $this->operands[1]->evaluate($viewElement);
+	public function evaluate(Tag $viewElement, Renderer $renderer) {
+		$opL = $this->operands[0]->evaluate($viewElement, $renderer);
+		$opR = $this->operands[1]->evaluate($viewElement, $renderer);
 
 		switch($this->comparator) {
 			case 'gt' : return ($opL >  $opR);
@@ -61,7 +62,9 @@ public function evaluate(ViewElementTag $viewElement) {
 					if(is_array($opL) || is_array($opR)) {
 						//But if the other is an array, we cannot convert Array to String
 						//to perform the comparison, so we throw an error.
-						throw new LexerArrayToStringConversionException();
+
+						throw new LexerArrayToStringConversionException('Array to string conversion exception in file: ' . 
+						  $renderer->getView()->getFilename() . '('.$viewElement->getLineNumber().')');
 					}
 					else {
 						return (0 === strcmp($opL, $opR));

diff --git a/src/figdice/classes/lexer/TokenDiv.php b/src/figdice/classes/lexer/TokenDiv.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Gabriel Zerbib <gabriel@figdice.org>
- * @copyright 2004-2013, Gabriel Zerbib.
- * @version 2.0.0
+ * @copyright 2004-2014, Gabriel Zerbib.
+ * @version 2.1.0
  * @package FigDice
  *
  * This file is part of FigDice.
@@ -22,7 +22,9 @@
  */
 
 namespace figdice\classes\lexer;
-use \figdice\classes\ViewElementTag;
+
+use \figdice\classes\Tag;
+use \figdice\classes\Renderer;
 
 class TokenDiv extends TokenBinop {
 	/**
@@ -35,14 +37,14 @@ public function __construct() {
 	 * @param ViewElement $viewElement
 	 * @return mixed
 	 */
-	public function evaluate(ViewElementTag $viewElement) {
+	public function evaluate(Tag $viewElement, Renderer $renderer) {
 		$opL = $this->operands[0];
 		$opR = $this->operands[1];
 
-		$valR = $opR->evaluate($viewElement);
+		$valR = $opR->evaluate($viewElement, $renderer);
 		if($valR == 0) {
 			return 0;
 		}
-		return $opL->evaluate($viewElement) / $valR;
+		return $opL->evaluate($viewElement, $renderer) / $valR;
 	}
-}
+}
diff --git a/src/figdice/classes/lexer/TokenMul.php b/src/figdice/classes/lexer/TokenMul.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Gabriel Zerbib <gabriel@figdice.org>
- * @copyright 2004-2013, Gabriel Zerbib.
- * @version 2.0.0
+ * @copyright 2004-2014, Gabriel Zerbib.
+ * @version 2.1.0
  * @package FigDice
  *
  * This file is part of FigDice.
@@ -22,7 +22,8 @@
  */
 
 namespace figdice\classes\lexer;
-use \figdice\classes\ViewElementTag;
+use \figdice\classes\Tag;
+use \figdice\classes\Renderer;
 
 class TokenMul extends TokenOperator {
 	public function __construct() {
@@ -33,10 +34,11 @@ public function getNumOperands() {
 	}
 
 	/**
-	 * @param ViewElement $viewElement
+	 * @param Tag $viewElement
+	 * @param Renderer $renderer
 	 * @return mixed
 	 */
-	public function evaluate(ViewElementTag $viewElement) {
-		return $this->operands[0]->evaluate($viewElement) * $this->operands[1]->evaluate($viewElement);
+	public function evaluate(Tag $viewElement, Renderer $renderer) {
+		return $this->operands[0]->evaluate($viewElement, $renderer) * $this->operands[1]->evaluate($viewElement, $renderer);
 	}
 }
diff --git a/test/UserDefinedFunctionFactoryTest.php b/test/UserDefinedFunctionFactoryTest.php
@@ -2,7 +2,7 @@
 /**
  * @author Gabriel Zerbib <gabriel@figdice.org>
  * @copyright 2004-2014, Gabriel Zerbib.
- * @version 2.0.3
+ * @version 2.1.0
  * @package FigDice
  *
  * This file is part of FigDice.
@@ -27,6 +27,8 @@
 use figdice\classes\File;
 use figdice\classes\lexer\Lexer;
 use figdice\classes\ViewElementTag;
+use figdice\classes\Tag;
+use figdice\classes\Renderer;
 use figdice\exceptions\LexerUnexpectedCharException;
 
 
@@ -131,7 +133,7 @@ public function create($funcName) {
  * returns the argument multiplied by 2.
  */
 class MyCustomFigFunc implements FigFunction {
-	public function evaluate(ViewElementTag $viewElement, $arity, $arguments) {
+	public function evaluate(Tag $viewElement, Renderer $renderer, $arity, $arguments) {
 		if($arity < 1) {
 			return null;
 		}