Merge branch 'master' into dev

1 files changed, 21 insertions, 0 deletions

diff --git a/src/NXP/MathExecutor.php b/src/NXP/MathExecutor.php
index 80f0bde..c5c7add 100644
--- a/src/NXP/MathExecutor.php
+++ b/src/NXP/MathExecutor.php
@@ -157,6 +157,16 @@ class MathExecutor
     }
 
     /**
+     * Get all registered operators to executor
+     *
+     * @return array of operator class names
+     */
+    public function getOperators()
+    {
+        return $this->tokenFactory->getOperators();
+    }
+
+    /**
      * Add function to executor
      *
      * @param  string       $name     Name of function
@@ -172,6 +182,17 @@ class MathExecutor
     }
 
     /**
+     * Get all registered functions
+     *
+     * @return array containing callback and places indexed by
+     *         function name
+     */
+    public function getFunctions()
+    {
+        return $this->tokenFactory->getFunctions();
+    }
+
+    /**
      * Execute expression
      *
      * @param $expression