Merge branch 'release/1.0.14'

Author: budnix

README.md

@@ -61,7 +61,7 @@ always keep evaluated value. If error occurs `error` property will be set as:
  * `#NAME?` Not recognised function name or variable name;
  * `#N/A` Indicates that a value is not available to a formula;
  * `#NUM!` Occurs when formula encounters an invalid number;
- * `#VALUE?` Occurs when one of formula arguments is of the wrong type.
+ * `#VALUE!` Occurs when one of formula arguments is of the wrong type.
 
 ```js
 parser.parse('(1 + 5 + (5 * 10)) / 10'); // returns `Object {error: null, result: 5.6}`

dist/formula-parser.js

@@ -1,6 +1,6 @@
 {
   "name": "hot-formula-parser",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Formula parser",
   "main": "dist/formula-parser.js",
   "scripts": {

dist/formula-parser.js.map

@@ -220,10 +220,10 @@ number
 
 error
   : '#' VARIABLE '!' {
-      $$ = $1 + $2 + $3;
+      $$ = yy.throwError($1 + $2 + $3);
     }
   | VARIABLE '#' VARIABLE '!' {
-      $$ = $2 + $3 + $4;
+      $$ = yy.throwError($2 + $3 + $4);
     }
 ;
 

dist/formula-parser.min.js

@@ -19,6 +19,7 @@ class Parser extends Emitter {
       toNumber,
       trimEdges,
       invertNumber,
+      throwError: (errorName) => this._throwError(errorName),
       callVariable: (variable) => this._callVariable(variable),
       evaluateByOperator,
       callFunction: evaluateByOperator,
@@ -171,6 +172,23 @@ class Parser extends Emitter {
 
     return value;
   }
+
+  /**
+   * Try to throw error by its name.
+   *
+   * @param {String} errorName Error name.
+   * @returns {String}
+   * @private
+   */
+  _throwError(errorName) {
+    const parsedError = errorParser(errorName);
+
+    if (parsedError) {
+      throw Error(parsedError);
+    }
+
+    return errorName;
+  }
 }
 
 export {Parser};