nerdamer 2.0.0-rc.1 → 2.0.0

package/output/core/classes/parser/constants.d.ts

@@ -101,6 +101,8 @@ export declare const DOT_PRODUCT = "dot";
 export declare const EI = "Ei";
 export declare const ERF = "erf";
 export declare const FACTOR = "factor";
+export declare const PFACTOR = "pfactor";
+export declare const PFACTORD = "pfactord";
 export declare const FLOOR = "floor";
 export declare const FRESNEL_C = "C";
 export declare const FRESNEL_S = "S";

package/output/core/classes/parser/constants.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FIB = exports.DOUBLE_FACTORIAL = exports.FACTORIAL = exports.SYMBOLIC_ACCESSOR = exports.PARSER_CONSTANTS = exports.INFINITY = exports.PI = exports.ALIASES = exports.ALL_SYMBOL = exports.INDEX_VARIABLE = exports.DEFAULT_IMAGINARY = exports.PI_SYMBOL = exports.PI_NAME = exports.E = exports.RANK = exports.EXPRESSION_TYPES = exports.dataTypes = exports.ASSUMPTION = exports.DICTIONARY = exports.SOLUTIONS_SET = exports.SET = exports.GFPOLY = exports.TERM = exports.POLYNOMIAL = exports.EQUATION = exports.MATRIX = exports.VECTOR = exports.COLLECTION = exports.EXPRESSION = exports.SCOPE = exports.RATIONAL = exports.KEY_VALUE_PAIR = exports.INDEXED_REFERENCE = exports.TOKEN = exports.WRAP = exports.CLOSE_PAREN = exports.OPEN_PAREN = exports.RETURN = exports.LINEFEED = exports.TAB = exports.NEWLINE = exports.BLANK = exports.SPACE = exports.ASSIGN = exports.COMMA = exports.DOT = exports.DIVIDE = exports.MULTIPLY = exports.PLUS = exports.MINUS = void 0;
-exports.SUM_FUNCTION = exports.SINC = exports.SI = exports.SHI = exports.TRUNC = exports.SIZE = exports.ROUND = exports.REALPART = exports.PRODUCT_FUNCTION = exports.NTHROOT = exports.MIN = exports.MAX = exports.LN = exports.LIMIT = exports.LI = exports.LAPLACE = exports.ISPRIME = exports.INTEGRATE = exports.IMATRIX = exports.IMAGPART = exports.ILAPLACE = exports.GCD = exports.FRESNEL_S = exports.FRESNEL_C = exports.FLOOR = exports.FACTOR = exports.ERF = exports.EI = exports.DOT_PRODUCT = exports.DIFF = exports.DEG = exports.DEFINT = exports.CROSS = exports.COUNT = exports.CONTENT = exports.CONTAINS = exports.CONJUGATE = exports.CI = exports.CHI = exports.CEIL = exports.CBRT = exports.CSGN = exports.SGN = exports.LOG = exports.HEAVISIDE = exports.DIRAC = exports.GAMMA = exports.MOD = exports.ABS = exports.SQRT = void 0;
-exports.INVERSE_HYPERBOLIC_TRIG = exports.HYPERBOLIC_TRIG = exports.INVERSE_TRIG = exports.TRIG = exports.ACOTH = exports.ACSCH = exports.ASECH = exports.ATANH = exports.ASINH = exports.ACOSH = exports.COTH = exports.CSCH = exports.SECH = exports.TANH = exports.COSH = exports.SINH = exports.ATAN2 = exports.ACOT = exports.ACSC = exports.ASEC = exports.ATAN = exports.COT = exports.CSC = exports.SEC = exports.ACOS = exports.ASIN = exports.TAN = exports.SIN = exports.COS = exports.TRIG_FUNCTION_NAMES = void 0;
+exports.SI = exports.SHI = exports.TRUNC = exports.SIZE = exports.ROUND = exports.REALPART = exports.PRODUCT_FUNCTION = exports.NTHROOT = exports.MIN = exports.MAX = exports.LN = exports.LIMIT = exports.LI = exports.LAPLACE = exports.ISPRIME = exports.INTEGRATE = exports.IMATRIX = exports.IMAGPART = exports.ILAPLACE = exports.GCD = exports.FRESNEL_S = exports.FRESNEL_C = exports.FLOOR = exports.PFACTORD = exports.PFACTOR = exports.FACTOR = exports.ERF = exports.EI = exports.DOT_PRODUCT = exports.DIFF = exports.DEG = exports.DEFINT = exports.CROSS = exports.COUNT = exports.CONTENT = exports.CONTAINS = exports.CONJUGATE = exports.CI = exports.CHI = exports.CEIL = exports.CBRT = exports.CSGN = exports.SGN = exports.LOG = exports.HEAVISIDE = exports.DIRAC = exports.GAMMA = exports.MOD = exports.ABS = exports.SQRT = void 0;
+exports.INVERSE_HYPERBOLIC_TRIG = exports.HYPERBOLIC_TRIG = exports.INVERSE_TRIG = exports.TRIG = exports.ACOTH = exports.ACSCH = exports.ASECH = exports.ATANH = exports.ASINH = exports.ACOSH = exports.COTH = exports.CSCH = exports.SECH = exports.TANH = exports.COSH = exports.SINH = exports.ATAN2 = exports.ACOT = exports.ACSC = exports.ASEC = exports.ATAN = exports.COT = exports.CSC = exports.SEC = exports.ACOS = exports.ASIN = exports.TAN = exports.SIN = exports.COS = exports.TRIG_FUNCTION_NAMES = exports.SUM_FUNCTION = exports.SINC = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 /**
  * Some helper constants
@@ -167,6 +167,8 @@ exports.DOT_PRODUCT = 'dot';
 exports.EI = 'Ei';
 exports.ERF = 'erf';
 exports.FACTOR = 'factor';
+exports.PFACTOR = 'pfactor';
+exports.PFACTORD = 'pfactord';
 exports.FLOOR = 'floor';
 exports.FRESNEL_C = 'C';
 exports.FRESNEL_S = 'S';

package/output/core/classes/parser/controlFlowSignals.d.ts

@@ -0,0 +1,38 @@
+import type { ParserEntity } from '../../types';
+export declare const RETURN_SIGNAL = "RETURN_SIGNAL";
+export declare const BREAK_SIGNAL = "BREAK_SIGNAL";
+export declare const CONTINUE_SIGNAL = "CONTINUE_SIGNAL";
+export declare const NULL_SIGNAL = "NULL_SIGNAL";
+/**
+ * Internal signals used to unwind late-bound parser evaluation.
+ *
+ * Deferred scripting expressions can execute after their surrounding syntax has
+ * already been parsed, so return, loop control, and no-result state must travel
+ * to the evaluation boundary that knows how to consume them.
+ *
+ * The signals live at the parser level rather than under scripting because both
+ * Parser and the scripting implementation need to recognize them. Keeping this
+ * module dependency-light avoids a Parser -> scripting -> Parser import cycle.
+ * These are evaluation mechanics, not parser result values.
+ */
+export declare abstract class ControlFlowSignal extends Error {
+    constructor();
+}
+export declare class ReturnSignal extends ControlFlowSignal {
+    readonly value: ParserEntity;
+    readonly dataType: typeof RETURN_SIGNAL;
+    constructor(value: ParserEntity);
+    static isReturnSignal(obj: unknown): obj is ReturnSignal;
+}
+export declare class BreakSignal extends ControlFlowSignal {
+    readonly dataType: typeof BREAK_SIGNAL;
+    static isBreakSignal(obj: unknown): obj is BreakSignal;
+}
+export declare class ContinueSignal extends ControlFlowSignal {
+    readonly dataType: typeof CONTINUE_SIGNAL;
+    static isContinueSignal(obj: unknown): obj is ContinueSignal;
+}
+export declare class NullSignal extends ControlFlowSignal {
+    readonly dataType: typeof NULL_SIGNAL;
+    static isNullSignal(obj: unknown): obj is NullSignal;
+}

package/output/core/classes/parser/controlFlowSignals.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NullSignal = exports.ContinueSignal = exports.BreakSignal = exports.ReturnSignal = exports.ControlFlowSignal = exports.NULL_SIGNAL = exports.CONTINUE_SIGNAL = exports.BREAK_SIGNAL = exports.RETURN_SIGNAL = void 0;
+const common_1 = require("../../common/common");
+exports.RETURN_SIGNAL = 'RETURN_SIGNAL';
+exports.BREAK_SIGNAL = 'BREAK_SIGNAL';
+exports.CONTINUE_SIGNAL = 'CONTINUE_SIGNAL';
+exports.NULL_SIGNAL = 'NULL_SIGNAL';
+/**
+ * Internal signals used to unwind late-bound parser evaluation.
+ *
+ * Deferred scripting expressions can execute after their surrounding syntax has
+ * already been parsed, so return, loop control, and no-result state must travel
+ * to the evaluation boundary that knows how to consume them.
+ *
+ * The signals live at the parser level rather than under scripting because both
+ * Parser and the scripting implementation need to recognize them. Keeping this
+ * module dependency-light avoids a Parser -> scripting -> Parser import cycle.
+ * These are evaluation mechanics, not parser result values.
+ */
+class ControlFlowSignal extends Error {
+    constructor() {
+        super();
+        this.name = new.target.name;
+    }
+}
+exports.ControlFlowSignal = ControlFlowSignal;
+class ReturnSignal extends ControlFlowSignal {
+    value;
+    dataType = exports.RETURN_SIGNAL;
+    constructor(value) {
+        super();
+        this.value = value;
+    }
+    static isReturnSignal(obj) {
+        return (0, common_1.isNerdamerNativeType)(obj, exports.RETURN_SIGNAL);
+    }
+}
+exports.ReturnSignal = ReturnSignal;
+class BreakSignal extends ControlFlowSignal {
+    dataType = exports.BREAK_SIGNAL;
+    static isBreakSignal(obj) {
+        return (0, common_1.isNerdamerNativeType)(obj, exports.BREAK_SIGNAL);
+    }
+}
+exports.BreakSignal = BreakSignal;
+class ContinueSignal extends ControlFlowSignal {
+    dataType = exports.CONTINUE_SIGNAL;
+    static isContinueSignal(obj) {
+        return (0, common_1.isNerdamerNativeType)(obj, exports.CONTINUE_SIGNAL);
+    }
+}
+exports.ContinueSignal = ContinueSignal;
+class NullSignal extends ControlFlowSignal {
+    dataType = exports.NULL_SIGNAL;
+    static isNullSignal(obj) {
+        return (0, common_1.isNerdamerNativeType)(obj, exports.NULL_SIGNAL);
+    }
+}
+exports.NullSignal = NullSignal;

package/output/core/classes/parser/operations/add.js

@@ -18,10 +18,16 @@ function add(a, b) {
     else {
         const keyA = a.keyValue();
         const keyB = b.keyValue();
-        // Distribute the multiplier if true
+        // Distribute only when an operand can actually change. distributeMultiplier()
+        // returns an independent deep copy, so calling it for ordinary operands adds
+        // substantial copy work without affecting the result.
         if (Expression_1.Expression.DISTRIBUTE_MULTIPLIER) {
-            a = a.distributeMultiplier();
-            b = b.distributeMultiplier();
+            if (a.isSum() && !a.getMultiplier().isOne() && a.isLinear()) {
+                a = a.distributeMultiplier();
+            }
+            if (b.isSum() && !b.getMultiplier().isOne() && b.isLinear()) {
+                b = b.distributeMultiplier();
+            }
         }
         // It suffices to check if their keyValues are the same since x+x will be handled.
         // We're only dealing with x^n+x^(!n) at this point.
@@ -36,7 +42,7 @@ function add(a, b) {
             retval = re.isZero() ? im : im.isZero() ? re : join(re, im); // Don't use add
         }
         else if (a.isZero()) {
-            retval = Expression_1.Expression.create(b);
+            retval = b.copy();
         }
         else if (a.value === b.value && a.type === b.type && a.getPower().eq(b.getPower())) {
             // Infinity has no finite coefficient magnitude. Same-sign infinities remain
@@ -50,24 +56,16 @@ function add(a, b) {
                 retval = a.isNegInf() ? Expression_1.Expression.NegInf() : Expression_1.Expression.Inf();
             }
             else {
-                retval = Expression_1.Expression.create(a);
                 const multiplier = a.getMultiplier().plus(b.getMultiplier());
                 if (multiplier.isZero()) {
                     retval = Expression_1.Expression.Number('0');
                 }
-                if (a.isSum() && b.isSum() && a.isLinear() && b.isLinear()) {
+                else if (a.isSum() && b.isSum() && a.isLinear() && b.isLinear()) {
                     retval = join(a, b);
                 }
                 else {
+                    retval = a.copy();
                     retval.multiplier = multiplier;
-                    if (retval.power) {
-                        // We can do this since a.power === b.power
-                        retval = Expression_1.Expression.setPower(retval, a.getPower().copy());
-                    }
-                }
-                // Put back the power
-                if (a.power) {
-                    retval = Expression_1.Expression.setPower(retval, a.getPower().copy());
                 }
             }
         }
@@ -230,8 +228,8 @@ function join(a, b, isGroup = false) {
         else {
             // Set the type
             retval.type = expressionType;
-            // Update the value
-            retval.value = Expression_1.Expression.getValue(elements, 'text', expressionType);
+            // Update derived aggregate state after the element collection changes.
+            retval.updateValue(elements);
         }
     }
     return retval;

package/output/core/classes/parser/operations/compare.js

@@ -243,6 +243,19 @@ function equal(a, b) {
     const y = (0, assume_1.getAssumptionFor)(b);
     let assumptionResult = undefined;
     let retval;
+    if (a.isComplex() && b.isComplex()) {
+        const realA = a.realPart();
+        const imaginaryA = a.imagPart();
+        const realB = b.realPart();
+        const imaginaryB = b.imagPart();
+        if (realA.isNUM() &&
+            imaginaryA.isNUM() &&
+            realB.isNUM() &&
+            imaginaryB.isNUM()) {
+            return (realA.getMultiplier().eq(realB.getMultiplier()) &&
+                imaginaryA.getMultiplier().eq(imaginaryB.getMultiplier()));
+        }
+    }
     // An assumption describes the admissible values of a variable; it does not erase
     // the identity of the variable itself. x == x remains true even when x ranges over
     // more than one value.

package/output/core/classes/parser/operations/functions.d.ts

@@ -1,9 +1,8 @@
 import { Equation } from '../../equation/Equation';
 import { Matrix } from '../../matrix/Matrix';
 import { Vector } from '../../vector/Vector';
-import { comma } from './comma';
 import type { ParserEntity } from '../../../types';
-import type { Operation, PreFixFunction, PostFixFunction, EquationConstructorCall, CommaOperation, DeferredFunctionArgument, DeferredOperation } from '../types';
+import type { Operation, PreFixFunction, PostFixFunction, EquationConstructorCall, DeferredFunctionArgument, DeferredOperation } from '../types';
 /**
  * The wrapper used to call functions within the parser.
  *
@@ -16,7 +15,7 @@ export declare function callFunction(functionName: string, args: (ParserEntity |
  * Combines all base operations into one object for parser.
  */
 export declare const _: {
-    [functionName: string]: Operation | DeferredOperation | PreFixFunction | PostFixFunction | EquationConstructorCall | CommaOperation;
+    [functionName: string]: Operation | DeferredOperation | PreFixFunction | PostFixFunction | EquationConstructorCall;
 };
 /**
  * Applies a scalar function over a copied Vector or Matrix while preserving its shape.
@@ -43,4 +42,4 @@ export declare function setEqual(a: ParserEntity, b: ParserEntity): Equation;
  * @returns The registered function signature.
  */
 export declare function functionAssign(a: ParserEntity, body: DeferredFunctionArgument): ParserEntity;
-export declare function route(a: ParserEntity, b: ParserEntity, operation: string): ParserEntity | ReturnType<typeof comma>;
+export declare function route(a: ParserEntity, b: ParserEntity, operation: string): ParserEntity;

package/output/core/classes/parser/operations/functions.js

@@ -7,7 +7,6 @@ exports.setEqual = setEqual;
 exports.functionAssign = functionAssign;
 exports.route = route;
 const math_1 = require("../../../../math/math");
-const structuredEntityUtils_1 = require("../../../common/functions/structuredEntityUtils");
 const dispatch_1 = require("../../../dispatch");
 const errors_1 = require("../../../errors");
 const setFunction_1 = require("../../../functions/setFunction");
@@ -24,7 +23,6 @@ const controlFlow_1 = require("../scripting/controlFlow");
 const functions_1 = require("../scripting/functions");
 const scope_1 = require("../scripting/scope");
 const add_1 = require("./add");
-const comma_1 = require("./comma");
 const divide_1 = require("./divide");
 const multiply_1 = require("./multiply");
 const power_1 = require("./power");
@@ -54,16 +52,24 @@ function callFunction(functionName, args) {
     // The details regarding the function
     const attributes = dispatch_1.mathFunctionRegistry[functionName];
     if (attributes === undefined) {
-        throw new errors_1.ParserError(`Unsupported function ${functionName}`);
+        throw new errors_1.ParserError((0, errors_1.message)('unsupportedFunction', { function: functionName }));
     }
     const { fn, minArgs, maxArgs, maxPrecision, equationArgs, distElWise, deferArguments, returnBoundary, } = attributes;
     // Complain if the number of arguments provided is less that what is allowed
     if (minArgs > -1 && args.length < minArgs) {
-        throw new errors_1.ParserError(`${functionName} requires a minimum of ${minArgs} arguments but ${args.length} provided!`);
+        throw new errors_1.ParserError((0, errors_1.message)('functionMinArgs', {
+            function: functionName,
+            min: String(minArgs),
+            actual: String(args.length),
+        }));
     }
     // Complain if the number of arguments provided is greater than what is allowed
     if (maxArgs > -1 && args.length > maxArgs) {
-        throw new errors_1.ParserError(`${functionName} allows a maximum of ${maxArgs} arguments but ${args.length} provided!`);
+        throw new errors_1.ParserError((0, errors_1.message)('functionMaxArgs', {
+            function: functionName,
+            max: String(maxArgs),
+            actual: String(args.length),
+        }));
     }
     let result;
     if (deferArguments) {
@@ -79,18 +85,15 @@ function callFunction(functionName, args) {
             }
             entityArgs.push(arg);
         }
-        // A structured entity carrying symbolic bracket access represents one unresolved
-        // scalar value. Normalize it before equation checks, distribution, or invocation.
-        const normalizedArgs = entityArgs.map(arg => Expression_1.Expression.fromSymbolicAccess(arg) ?? arg);
         if (attributes.level === 'system') {
-            for (let i = 0; i < normalizedArgs.length; i++) {
-                if (Equation_1.Equation.isEquation(normalizedArgs[i]) && !equationArgs?.includes(i)) {
+            for (let i = 0; i < entityArgs.length; i++) {
+                if (Equation_1.Equation.isEquation(entityArgs[i]) && !equationArgs?.includes(i)) {
                     throw new errors_1.UnexpectedDataType((0, errors_1.message)('expressionExpected', { type: 'Equation' }));
                 }
             }
         }
         const elementWiseArgs = distElWise
-            ? normalizedArgs.filter((arg) => Vector_1.Vector.isVector(arg) || Matrix_1.Matrix.isMatrix(arg))
+            ? entityArgs.filter((arg) => Vector_1.Vector.isVector(arg) || Matrix_1.Matrix.isMatrix(arg))
             : [];
         if (elementWiseArgs.length > 0) {
             const structure = elementWiseArgs[0];
@@ -107,7 +110,7 @@ function callFunction(functionName, args) {
                 }
             }
             result = distribute((_element, i, j) => {
-                const scalarArgs = normalizedArgs.map(arg => {
+                const scalarArgs = entityArgs.map(arg => {
                     let scalarArg = arg;
                     if (Vector_1.Vector.isVector(arg)) {
                         scalarArg = arg.__get__([i]);
@@ -122,15 +125,15 @@ function callFunction(functionName, args) {
         }
         // Call and return
         else if (!fn || Settings_1.Settings.DEFER_SIMPLIFICATION) {
-            result = Expression_1.Expression.toFunction(functionName, normalizedArgs);
+            result = Expression_1.Expression.toFunction(functionName, entityArgs);
         }
         else {
-            result = invokeMathFunction(fn, normalizedArgs);
+            result = invokeMathFunction(fn, entityArgs);
         }
         // Ensure that this function always returns even if it's a symbolic function. This will
         // occur if the function didn't return a value.
         if (!result) {
-            result = Expression_1.Expression.toFunction(functionName, normalizedArgs);
+            result = Expression_1.Expression.toFunction(functionName, entityArgs);
         }
     }
     // Let all future calls know that an inferior precision was used.
@@ -156,7 +159,6 @@ exports._ = {
     assertGTE: assertiveFunctions_1.assertGTE,
     assertLT: assertiveFunctions_1.assertLT,
     assertLTE: assertiveFunctions_1.assertLTE,
-    comma: comma_1.comma,
     assign: scope_1.assign,
     functionAssign: functionAssign,
     setEqual: setEqual,
@@ -220,12 +222,12 @@ function setEqual(a, b) {
  */
 function functionAssign(a, body) {
     if (!Collection_1.Collection.isCollection(a)) {
-        throw new errors_1.UnexpectedInputError(`Invalid function declaration ${a.text()}.`);
+        throw new errors_1.UnexpectedInputError((0, errors_1.message)('invalidFunctionDeclaration', { declaration: a.text() }));
     }
     const signature = [...a.getElements()];
     const functionExpression = signature.pop();
     if (!Expression_1.Expression.isExpression(functionExpression)) {
-        throw new errors_1.UnexpectedInputError(`Invalid function declaration ${a.text()}.`);
+        throw new errors_1.UnexpectedInputError((0, errors_1.message)('invalidFunctionDeclaration', { declaration: a.text() }));
     }
     const name = (0, utils_1.assertPlainVariableAndGetString)(functionExpression);
     const args = signature.map(argument => {
@@ -289,7 +291,7 @@ function percentage(a) {
     if (!Expression_1.Expression.isExpression(a)) {
         throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
     }
-    const retval = a.div(100);
+    const retval = a.div(Expression_1.Expression.create(100));
     return retval;
 }
 /**
@@ -310,25 +312,8 @@ function gte(a, b) {
 function lte(a, b) {
     return Expression_1.Expression.create(Number(a.lte(b)));
 }
-function isRoutedOperation(operation) {
-    return (operation === 'pow' ||
-        operation === 'times' ||
-        operation === 'div' ||
-        operation === 'minus' ||
-        operation === 'plus' ||
-        operation === 'eq' ||
-        operation === 'lt' ||
-        operation === 'lte' ||
-        operation === 'gt' ||
-        operation === 'gte');
-}
-function routeOperation(target, operand, operation) {
-    const retval = target[operation](operand);
-    return typeof retval === 'boolean' ? Expression_1.Expression.create(Number(retval)) : retval;
-}
 function dispatchDynamicOperation(a, b, operation) {
-    // Preserve the parser's historically loose dispatch for operator actions outside
-    // RoutedOperation. Tightening these actions may change existing runtime behavior.
+    // Preserve the parser's historically loose method dispatch for operator actions.
     const useA = a.isEnumerable || Equation_1.Equation.isEquation(a);
     const target = useA ? a : b;
     const operand = useA ? b : a;
@@ -346,82 +331,43 @@ function route(a, b, operation) {
     if (operation === 'assign') {
         retval = (0, scope_1.assign)(a, b);
     }
-    else if (operation === 'comma') {
-        retval = (0, comma_1.comma)(a, b);
-    }
     else if (operation === 'in') {
         // Membership is the infix form of contains(container, value), so reverse the operands.
         retval = callFunction('contains', [b, a]);
     }
-    else if (isRoutedOperation(operation)) {
-        if (Equation_1.Equation.isEquation(a) || Equation_1.Equation.isEquation(b)) {
-            if (Equation_1.Equation.isEquation(a) && Equation_1.Equation.isEquation(b)) {
-                if (['eq', 'lt', 'lte', 'gt', 'gte'].includes(operation)) {
-                    retval = dispatchDynamicOperation(a, b, operation);
-                }
-                else {
-                    throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
+    else if (a.isEnumerable) {
+        retval = dispatchDynamicOperation(a, b, operation);
+    }
+    else if ((Vector_1.Vector.isVector(b) || Matrix_1.Matrix.isMatrix(b)) &&
+        (operation === 'minus' || operation === 'div' || operation === 'pow')) {
+        // Scalar-left operations are not commutative. Preserve operand order while
+        // distributing the operation over the structured right-hand operand.
+        if (!Expression_1.Expression.isExpression(a)) {
+            throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
+        }
+        // A scalar base with a Matrix exponent is a matrix-function question. It must
+        // not be reversed into Matrix.pow() or silently treated as element-wise power.
+        if (Matrix_1.Matrix.isMatrix(b) && operation === 'pow') {
+            throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
+        }
+        retval = distribute(element => {
+            let elementResult;
+            if (Expression_1.Expression.isExpression(element)) {
+                if (operation === 'minus') {
+                    elementResult = (0, subtract_1.subtract)(a, element);
                 }
-            }
-            else if (Equation_1.Equation.isEquation(a)) {
-                if (['plus', 'minus', 'times', 'div'].includes(operation)) {
-                    retval = dispatchDynamicOperation(a, b, operation);
+                else if (operation === 'div') {
+                    elementResult = (0, divide_1.divide)(a, element);
                 }
                 else {
-                    throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
+                    elementResult = (0, power_1.power)(a, element);
                 }
             }
-            else if (operation === 'plus' || operation === 'times') {
-                retval = dispatchDynamicOperation(a, b, operation);
-            }
             else {
-                throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
+                elementResult = route(a, element, operation);
             }
-        }
-        else if ((0, structuredEntityUtils_1.isEnumerable)(a)) {
-            retval = routeOperation(a, b, operation);
-        }
-        else if ((Vector_1.Vector.isVector(b) || Matrix_1.Matrix.isMatrix(b)) &&
-            (operation === 'minus' || operation === 'div' || operation === 'pow')) {
-            // Scalar-left operations are not commutative. Preserve operand order while
-            // distributing the operation over the structured right-hand operand.
-            if (!Expression_1.Expression.isExpression(a)) {
-                throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
-            }
-            // A scalar base with a Matrix exponent is a matrix-function question. It must
-            // not be reversed into Matrix.pow() or silently treated as element-wise power.
-            if (Matrix_1.Matrix.isMatrix(b) && operation === 'pow') {
-                throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
-            }
-            retval = distribute(element => {
-                let elementResult;
-                if (Expression_1.Expression.isExpression(element)) {
-                    if (operation === 'minus') {
-                        elementResult = (0, subtract_1.subtract)(a, element);
-                    }
-                    else if (operation === 'div') {
-                        elementResult = (0, divide_1.divide)(a, element);
-                    }
-                    else {
-                        elementResult = (0, power_1.power)(a, element);
-                    }
-                }
-                else {
-                    const nestedResult = route(a, element, operation);
-                    if (Array.isArray(nestedResult)) {
-                        throw new errors_1.UnsupportedOperationError((0, errors_1.message)('unsupportedOperation'));
-                    }
-                    elementResult = nestedResult;
-                }
-                return elementResult;
-            }, b);
-        }
-        else if ((0, structuredEntityUtils_1.isEnumerable)(b)) {
-            retval = routeOperation(b, a, operation);
-        }
-        else {
-            retval = dispatchDynamicOperation(a, b, operation);
-        }
+            return elementResult;
+        }, b);
     }
     else {
         retval = dispatchDynamicOperation(a, b, operation);

package/output/core/classes/parser/operations/multiply.js

@@ -4,7 +4,6 @@ exports.multiply = multiply;
 exports.merge = merge;
 exports.canonicalizeRadicals = canonicalizeRadicals;
 const errors_1 = require("../../../errors");
-const errors_2 = require("../../../errors");
 const complex_1 = require("../../../functions/complex");
 const Settings_1 = require("../../../Settings");
 const Expression_1 = require("../../expression/Expression");
@@ -32,7 +31,7 @@ function multiply(a, b) {
     else {
         if (a.isZero()) {
             if (b.isInf()) {
-                throw new errors_1.UndefinedError(errors_2.ErrorMessages[Settings_1.Settings.LANGUAGE].infinityTimesZero);
+                throw new errors_1.UndefinedError((0, errors_1.message)('infinityTimesZero'));
             }
             retval = Expression_1.Expression.Number('0');
         }
@@ -63,7 +62,7 @@ function multiply(a, b) {
                 retval = retval.neg();
             }
             else if (a.isZero() || b.isZero()) {
-                throw new errors_1.UndefinedError('Infinity times zero is undefined!');
+                throw new errors_1.UndefinedError((0, errors_1.message)('infinityTimesZero'));
             }
         }
         else if (a.value === b.value) {
@@ -143,12 +142,20 @@ function merge(a, b) {
     let bCanMerge = canMerge(b);
     let setProperties = true;
     // The multiplier is carried at the top of the expression they get moved and stripped from a and b;
-    let multiplier = a.multiplier || b.multiplier ? a.getMultiplier().times(b.getMultiplier()) : undefined;
+    const aHasMultiplier = a.multiplier !== undefined;
+    const bHasMultiplier = b.multiplier !== undefined;
+    let multiplier = aHasMultiplier || bHasMultiplier
+        ? a.getMultiplier().times(b.getMultiplier())
+        : undefined;
     if (multiplier) {
-        a = new Expression_1.Expression(a);
-        b = new Expression_1.Expression(b);
-        a.multiplier = undefined;
-        b.multiplier = undefined;
+        if (aHasMultiplier) {
+            a = a.copy();
+            a.multiplier = undefined;
+        }
+        if (bHasMultiplier) {
+            b = b.copy();
+            b.multiplier = undefined;
+        }
     }
     if (a.elements && !b.elements) {
         [b, a] = [a, b]; // Swap them
@@ -192,7 +199,7 @@ function merge(a, b) {
                 elements = Object.values(retval.getElements());
             }
             else {
-                [retval, elements] = combine(new Expression_1.Expression(a), new Expression_1.Expression(b), keyA, keyB);
+                [retval, elements] = combine(a, b, keyA, keyB);
             }
         }
     }
@@ -200,7 +207,7 @@ function merge(a, b) {
     // the right type. The first object gets added to the second object's expression container.
     else if (!aCanMerge && bCanMerge) {
         const key = a.keyValue();
-        retval = new Expression_1.Expression(b);
+        retval = b.copy();
         const subExpressions = retval.getElements();
         let result;
         // No need to move the multiplier since sub elements don't carry one
@@ -223,7 +230,7 @@ function merge(a, b) {
                 result = multiply(a, existing);
             }
             else {
-                result = new Expression_1.Expression(a);
+                result = a.copy();
             }
         }
         // remove it if it resulted in one
@@ -241,7 +248,7 @@ function merge(a, b) {
     }
     // Case 3: They both have expression objects
     else {
-        retval = new Expression_1.Expression(a);
+        retval = a.copy();
         retval.multiplier = a.getMultiplier().times(b.getMultiplier());
         const retvalElements = retval.getElements();
         const bExpressions = b.getElements();
@@ -258,7 +265,7 @@ function merge(a, b) {
                 }
             }
             else {
-                retvalElements[x] = new Expression_1.Expression(e);
+                retvalElements[x] = e.copy();
             }
         }
         elements = Object.values(retvalElements);
@@ -267,8 +274,8 @@ function merge(a, b) {
     if (setProperties) {
         // Set the type
         retval.type = expressionType;
-        // Update the value
-        retval.value = Expression_1.Expression.getValue(elements, 'text', expressionType);
+        // Update derived aggregate state after the element collection changes.
+        retval.updateValue(elements);
     }
     // Put the multiplier back
     if (multiplier && !multiplier.isOne()) {