Finished expr-eval testing

common/src/lib/expr-eval/expression.mjs

@@ -111,7 +111,7 @@ function simplify(tokens, unaryOps, binaryOps, ternaryOps, values) {
  * In the given instructions, replaces variable by expr.
  * @param {Instruction[]} tokens
  * @param {string} variable
- * @param {number} expr
+ * @param {ExprEvalExpression} expr
  * @return {Instruction[]}
  */
 function substitute(tokens, variable, expr) {
@@ -487,18 +487,6 @@ export class ExprEvalExpression {
         return evaluate(this.tokens, this, values)
     }
 
-    /**
-     * Returns a list of symbols (string of characters) in the expressions.
-     * Can be functions, constants, or variables.
-     * @returns {string[]}
-     */
-    symbols(options) {
-        options = options || {}
-        const vars = []
-        getSymbols(this.tokens, vars, options)
-        return vars
-    }
-
     toString() {
         return expressionToString(this.tokens, false)
     }

common/src/lib/expr-eval/parser.mjs

@@ -120,18 +120,13 @@ export class Parser {
             min: Polyfill.min,
             max: Polyfill.max,
             hypot: Math.hypot || Polyfill.hypot,
-            pyt: Math.hypot || Polyfill.hypot, // backward compat
+            pyt: Math.hypot || Polyfill.hypot,
             pow: Math.pow,
             atan2: Math.atan2,
             "if": Polyfill.condition,
             gamma: Polyfill.gamma,
             "Γ": Polyfill.gamma,
             roundTo: Polyfill.roundTo,
-            map: Polyfill.arrayMap,
-            fold: Polyfill.arrayFold,
-            filter: Polyfill.arrayFilter,
-            indexOf: Polyfill.stringOrArrayIndexOf,
-            join: Polyfill.arrayJoin
         }
 
         // These constants will automatically be replaced the MOMENT they are parsed.
@@ -156,10 +151,6 @@ export class Parser {
         return new ExprEvalExpression(instr, this)
     }
 
-    evaluate(expr, variables) {
-        return this.parse(expr).evaluate(variables)
-    }
-
     isOperatorEnabled(op) {
         const optionName = optionNameMap.hasOwnProperty(op) ? optionNameMap[op] : op
         const operators = this.options.operators || {}

common/src/lib/expr-eval/polyfill.mjs

@@ -210,9 +210,8 @@ export function gamma(n) {
 }
 
 export function stringOrArrayLength(s) {
-    if(Array.isArray(s)) {
+    if(Array.isArray(s))
         return s.length
-    }
     return String(s).length
 }
 
@@ -296,58 +295,6 @@ export function min(array) {
     }
 }
 
-export function arrayMap(f, a) {
-    if(typeof f !== "function") {
-        throw new EvalError(qsTranslate("error", "First argument to map is not a function."))
-    }
-    if(!Array.isArray(a)) {
-        throw new EvalError(qsTranslate("error", "Second argument to map is not an array."))
-    }
-    return a.map(function(x, i) {
-        return f(x, i)
-    })
-}
-
-export function arrayFold(f, init, a) {
-    if(typeof f !== "function") {
-        throw new EvalError(qsTranslate("error", "First argument to fold is not a function."))
-    }
-    if(!Array.isArray(a)) {
-        throw new EvalError(qsTranslate("error", "Second argument to fold is not an array."))
-    }
-    return a.reduce(function(acc, x, i) {
-        return f(acc, x, i)
-    }, init)
-}
-
-export function arrayFilter(f, a) {
-    if(typeof f !== "function") {
-        throw new EvalError(qsTranslate("error", "First argument to filter is not a function."))
-    }
-    if(!Array.isArray(a)) {
-        throw new EvalError(qsTranslate("error", "Second argument to filter is not an array."))
-    }
-    return a.filter(function(x, i) {
-        return f(x, i)
-    })
-}
-
-export function stringOrArrayIndexOf(target, s) {
-    if(!(Array.isArray(s) || typeof s === "string")) {
-        throw new Error(qsTranslate("error", "Second argument to indexOf is not a string or array."))
-    }
-
-    return s.indexOf(target)
-}
-
-export function arrayJoin(sep, a) {
-    if(!Array.isArray(a)) {
-        throw new Error(qsTranslate("error", "Second argument to join is not an array."))
-    }
-
-    return a.join(sep)
-}
-
 export function sign(x) {
     return ((x > 0) - (x < 0)) || +x
 }

common/src/module/expreval.mjs

@@ -19,7 +19,7 @@
 import { Module } from "./common.mjs"
 import { Parser } from "../lib/expr-eval/parser.mjs"
 
-const evalVariables = {
+const EVAL_VARIABLES = {
     // Variables not provided by expr-eval.js, needs to be provided manually
     "pi": Math.PI,
     "PI": Math.PI,
@@ -42,7 +42,7 @@ class ExprParserAPI extends Module {
         this.currentVars = {}
         this.#parser = new Parser()
 
-        this.#parser.consts = Object.assign({}, this.#parser.consts, evalVariables)
+        this.#parser.consts = Object.assign({}, this.#parser.consts, EVAL_VARIABLES)
 
         this.#parser.functions.integral = this.integral.bind(this)
         this.#parser.functions.derivative = this.derivative.bind(this)