Working with hoa\math, exit exprlib

Author: stephpy

.gitignore

@@ -1,2 +1,3 @@
+bin
 vendor
 composer.lock

composer.json

@@ -11,11 +11,35 @@
     }],
     "require": {
         "php": ">=5.3.2",
-        "rezzza/exprlib": "1.0.*"
+        "hoa/math"    : "master",
+        "hoa/core"    : "master",
+        "hoa/iterator": "master",
+        "hoa/compiler": "master"
     },
     "require-dev": {
         "mageekguy/atoum": "master"
     },
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "version": "master",
+                "name": "hoa/math",
+                "replace": {
+                    "hoa/math": "*"
+                },
+                "source": {
+                    "url": "https://github.com/rezzza/Math.git",
+                    "type": "git",
+                    "reference": "evaluer"
+                },
+                "dist": {
+                    "url": "https://github.com/rezzza/Math/zipball/master",
+                    "type": "zip"
+                }
+            }
+        }
+    ],
     "autoload":     {
         "psr-0": {
             "Rezzza\\Formulate": "src/"

src/Rezzza/Formulate/Renderer/AbstractFormulaRenderer.php

@@ -7,6 +7,10 @@
 use Rezzza\Formulate\Exception\RenderFormulaException;
 use exprlib\Parser;
 
+from ('Hoa')
+    ->import('Math.Evaluer.~');
+
+
 /**
  * AbstractFormulaRenderer
  *
@@ -27,15 +31,20 @@ abstract class AbstractFormulaRenderer implements FormulaRendererInterface
      */
     public function render(Formula $formula, TokenCollectorInterface $tokenCollector)
     {
-		foreach ($formula->getSubFormulas() as $key => $subformula) {
-			$tokenCollector->set($key, $this->render($subformula, $tokenCollector));
-		}
+        foreach ($formula->getSubFormulas() as $key => $subformula) {
+            $tokenCollector->set($key, $this->render($subformula, $tokenCollector));
+        }
 
         $formulaString = $this->prepare($formula->formula);
 
         $formulaString = $this->replace($formulaString, $this->buildReplacements($tokenCollector->getGlobals()));
 
-		return $formula->isCalculable() ? (string) Parser::build($formulaString)->evaluate() : $formulaString;
+        if ($formula->isCalculable()) {
+            $evaluer       = new \Hoa\Math\Evaluer\Evaluer();
+            $formulaString = (string) $evaluer->evaluate($formulaString);
+        }
+
+        return $formulaString;
     }
 
     /**