mathjs 9.2.0 → 9.4.0

package/lib/cjs/expression/node/FunctionNode.js

@@ -1,28 +1,30 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFunctionNode = void 0;
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _is = require("../../utils/is.js");
 
 var _string = require("../../utils/string.js");
 
 var _object = require("../../utils/object.js");
 
-var _array = require("../../utils/array.js");
-
 var _customs = require("../../utils/customs.js");
 
+var _scope = require("../../utils/scope.js");
+
 var _factory = require("../../utils/factory.js");
 
 var _latex = require("../../utils/latex.js");
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 var name = 'FunctionNode';
 var dependencies = ['math', 'Node', 'SymbolNode'];
 var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
@@ -90,7 +92,7 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
     } // compile arguments
 
 
-    var evalArgs = (0, _array.map)(this.args, function (arg) {
+    var evalArgs = this.args.map(function (arg) {
       return arg._compile(math, argNames);
     });
 
@@ -100,32 +102,58 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
       var fn = _name in math ? (0, _customs.getSafeProperty)(math, _name) : undefined;
       var isRaw = typeof fn === 'function' && fn.rawArgs === true;
 
+      var resolveFn = function resolveFn(scope) {
+        if (scope.has(_name)) {
+          return scope.get(_name);
+        }
+
+        if (_name in math) {
+          return (0, _customs.getSafeProperty)(math, _name);
+        }
+
+        return FunctionNode.onUndefinedFunction(_name);
+      };
+
       if (isRaw) {
         // pass unevaluated parameters (nodes) to the function
         // "raw" evaluation
         var rawArgs = this.args;
         return function evalFunctionNode(scope, args, context) {
-          return (_name in scope ? (0, _customs.getSafeProperty)(scope, _name) : fn)(rawArgs, math, _extends({}, scope, args));
+          var fn = resolveFn(scope);
+          return fn(rawArgs, math, (0, _scope.createSubScope)(scope, args), scope);
         };
       } else {
         // "regular" evaluation
-        if (evalArgs.length === 1) {
-          var evalArg0 = evalArgs[0];
-          return function evalFunctionNode(scope, args, context) {
-            return (_name in scope ? (0, _customs.getSafeProperty)(scope, _name) : fn)(evalArg0(scope, args, context));
-          };
-        } else if (evalArgs.length === 2) {
-          var _evalArg = evalArgs[0];
-          var evalArg1 = evalArgs[1];
-          return function evalFunctionNode(scope, args, context) {
-            return (_name in scope ? (0, _customs.getSafeProperty)(scope, _name) : fn)(_evalArg(scope, args, context), evalArg1(scope, args, context));
-          };
-        } else {
-          return function evalFunctionNode(scope, args, context) {
-            return (_name in scope ? (0, _customs.getSafeProperty)(scope, _name) : fn).apply(null, (0, _array.map)(evalArgs, function (evalArg) {
-              return evalArg(scope, args, context);
-            }));
-          };
+        switch (evalArgs.length) {
+          case 0:
+            return function evalFunctionNode(scope, args, context) {
+              var fn = resolveFn(scope);
+              return fn();
+            };
+
+          case 1:
+            return function evalFunctionNode(scope, args, context) {
+              var fn = resolveFn(scope);
+              var evalArg0 = evalArgs[0];
+              return fn(evalArg0(scope, args, context));
+            };
+
+          case 2:
+            return function evalFunctionNode(scope, args, context) {
+              var fn = resolveFn(scope);
+              var evalArg0 = evalArgs[0];
+              var evalArg1 = evalArgs[1];
+              return fn(evalArg0(scope, args, context), evalArg1(scope, args, context));
+            };
+
+          default:
+            return function evalFunctionNode(scope, args, context) {
+              var fn = resolveFn(scope);
+              var values = evalArgs.map(function (evalArg) {
+                return evalArg(scope, args, context);
+              });
+              return fn.apply(void 0, (0, _toConsumableArray2["default"])(values));
+            };
         }
       }
     } else if ((0, _is.isAccessorNode)(this.fn) && (0, _is.isIndexNode)(this.fn.index) && this.fn.index.isObjectProperty()) {
@@ -138,11 +166,16 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
         var object = evalObject(scope, args, context);
         (0, _customs.validateSafeMethod)(object, prop);
         var isRaw = object[prop] && object[prop].rawArgs;
-        return isRaw ? object[prop](_rawArgs, math, _extends({}, scope, args)) // "raw" evaluation
-        : object[prop].apply(object, (0, _array.map)(evalArgs, function (evalArg) {
+
+        if (isRaw) {
+          return object[prop](_rawArgs, math, (0, _scope.createSubScope)(scope, args), scope); // "raw" evaluation
+        } else {
           // "regular" evaluation
-          return evalArg(scope, args, context);
-        }));
+          var values = evalArgs.map(function (evalArg) {
+            return evalArg(scope, args, context);
+          });
+          return object[prop].apply(object, values);
+        }
       };
     } else {
       // node.fn.isAccessorNode && !node.fn.index.isObjectProperty()
@@ -153,11 +186,16 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
       return function evalFunctionNode(scope, args, context) {
         var fn = evalFn(scope, args, context);
         var isRaw = fn && fn.rawArgs;
-        return isRaw ? fn(_rawArgs2, math, _extends({}, scope, args)) // "raw" evaluation
-        : fn.apply(fn, (0, _array.map)(evalArgs, function (evalArg) {
+
+        if (isRaw) {
+          return fn(_rawArgs2, math, (0, _scope.createSubScope)(scope, args), scope); // "raw" evaluation
+        } else {
           // "regular" evaluation
-          return evalArg(scope, args, context);
-        }));
+          var values = evalArgs.map(function (evalArg) {
+            return evalArg(scope, args, context);
+          });
+          return fn.apply(fn, values);
+        }
       };
     }
   };
@@ -201,6 +239,15 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
 
   FunctionNode.prototype.clone = function () {
     return new FunctionNode(this.fn, this.args.slice(0));
+  };
+  /**
+   * Throws an error 'Undefined function {name}'
+   * @param {string} name
+   */
+
+
+  FunctionNode.onUndefinedFunction = function (name) {
+    throw new Error('Undefined function ' + name);
   }; // backup Node's toString function
   // @private
 
@@ -223,7 +270,7 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
     var customString;
     var name = this.fn.toString(options);
 
-    if (options && _typeof(options.handler) === 'object' && (0, _object.hasOwnProperty)(options.handler, name)) {
+    if (options && (0, _typeof2["default"])(options.handler) === 'object' && (0, _object.hasOwnProperty)(options.handler, name)) {
       // callback is a map of callback functions
       customString = options.handler[name](this, options);
     }
@@ -329,7 +376,7 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
 
         if (match[2] === undefined) {
           // no square brackets
-          switch (_typeof(property)) {
+          switch ((0, _typeof2["default"])(property)) {
             case 'string':
               latex += property;
               break;
@@ -389,7 +436,7 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
   FunctionNode.prototype.toTex = function (options) {
     var customTex;
 
-    if (options && _typeof(options.handler) === 'object' && (0, _object.hasOwnProperty)(options.handler, this.name)) {
+    if (options && (0, _typeof2["default"])(options.handler) === 'object' && (0, _object.hasOwnProperty)(options.handler, this.name)) {
       // callback is a map of callback functions
       customTex = options.handler[this.name](this, options);
     }
@@ -420,14 +467,14 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
     } // toTex property on the function itself
 
 
-    if (math[this.name] && (typeof math[this.name].toTex === 'function' || _typeof(math[this.name].toTex) === 'object' || typeof math[this.name].toTex === 'string')) {
+    if (math[this.name] && (typeof math[this.name].toTex === 'function' || (0, _typeof2["default"])(math[this.name].toTex) === 'object' || typeof math[this.name].toTex === 'string')) {
       // .toTex is a callback function
       latexConverter = math[this.name].toTex;
     }
 
     var customToTex;
 
-    switch (_typeof(latexConverter)) {
+    switch ((0, _typeof2["default"])(latexConverter)) {
       case 'function':
         // a callback function
         customToTex = latexConverter(this, options);
@@ -440,7 +487,7 @@ var createFunctionNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies
 
       case 'object':
         // an object with different "converters" for different numbers of arguments
-        switch (_typeof(latexConverter[args.length])) {
+        switch ((0, _typeof2["default"])(latexConverter[args.length])) {
           case 'function':
             customToTex = latexConverter[args.length](this, options);
             break;

package/lib/cjs/expression/node/IndexNode.js

@@ -1,10 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createIndexNode = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _is = require("../../utils/is.js");
 
 var _array = require("../../utils/array.js");
@@ -15,18 +19,6 @@ var _factory = require("../../utils/factory.js");
 
 var _customs = require("../../utils/customs.js");
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 var name = 'IndexNode';
 var dependencies = ['Range', 'Node', 'size'];
 var createIndexNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
@@ -151,7 +143,7 @@ var createIndexNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, f
       var dimensions = (0, _array.map)(evalDimensions, function (evalDimension) {
         return evalDimension(scope, args, context);
       });
-      return index.apply(void 0, _toConsumableArray(dimensions));
+      return index.apply(void 0, (0, _toConsumableArray2["default"])(dimensions));
     };
   };
   /**

package/lib/cjs/expression/node/Node.js

@@ -1,10 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createNode = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _is = require("../../utils/is.js");
 
 var _keywords = require("../keywords.js");
@@ -13,7 +19,7 @@ var _object = require("../../utils/object.js");
 
 var _factory = require("../../utils/factory.js");
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+var _map = require("../../utils/map.js");
 
 var name = 'Node';
 var dependencies = ['mathWithTransform'];
@@ -58,7 +64,7 @@ var createNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, functi
     var context = null;
 
     function evaluate(scope) {
-      var s = scope || {};
+      var s = (0, _map.createMap)(scope);
 
       _validateScope(s);
 
@@ -361,8 +367,8 @@ var createNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, functi
 
 
   Node.prototype._getCustomString = function (options) {
-    if (options && _typeof(options) === 'object') {
-      switch (_typeof(options.handler)) {
+    if (options && (0, _typeof2["default"])(options) === 'object') {
+      switch ((0, _typeof2["default"])(options.handler)) {
         case 'object':
         case 'undefined':
           return;
@@ -401,11 +407,11 @@ var createNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, functi
 
 
   function _validateScope(scope) {
-    for (var symbol in scope) {
-      if ((0, _object.hasOwnProperty)(scope, symbol)) {
-        if (symbol in _keywords.keywords) {
-          throw new Error('Scope contains an illegal symbol, "' + symbol + '" is a reserved keyword');
-        }
+    for (var _i = 0, _arr = (0, _toConsumableArray2["default"])(_keywords.keywords); _i < _arr.length; _i++) {
+      var symbol = _arr[_i];
+
+      if (scope.has(symbol)) {
+        throw new Error('Scope contains an illegal symbol, "' + symbol + '" is a reserved keyword');
       }
     }
   }

package/lib/cjs/expression/node/ObjectNode.js

@@ -1,10 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createObjectNode = void 0;
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _is = require("../../utils/is.js");
 
 var _string = require("../../utils/string.js");
@@ -15,8 +19,6 @@ var _object = require("../../utils/object.js");
 
 var _factory = require("../../utils/factory.js");
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 var name = 'ObjectNode';
 var dependencies = ['Node'];
 var createObjectNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
@@ -36,7 +38,7 @@ var createObjectNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
     this.properties = properties || {}; // validate input
 
     if (properties) {
-      if (!(_typeof(properties) === 'object') || !Object.keys(properties).every(function (key) {
+      if (!((0, _typeof2["default"])(properties) === 'object') || !Object.keys(properties).every(function (key) {
         return (0, _is.isNode)(properties[key]);
       })) {
         throw new TypeError('Object containing Nodes expected');

package/lib/cjs/expression/node/SymbolNode.js

@@ -75,12 +75,12 @@ var createSymbolNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
       };
     } else if (name in math) {
       return function (scope, args, context) {
-        return name in scope ? (0, _customs.getSafeProperty)(scope, name) : (0, _customs.getSafeProperty)(math, name);
+        return scope.has(name) ? scope.get(name) : (0, _customs.getSafeProperty)(math, name);
       };
     } else {
       var isUnit = isValuelessUnit(name);
       return function (scope, args, context) {
-        return name in scope ? (0, _customs.getSafeProperty)(scope, name) : isUnit ? new Unit(null, name) : undef(name);
+        return scope.has(name) ? scope.get(name) : isUnit ? new Unit(null, name) : SymbolNode.onUndefinedSymbol(name);
       };
     }
   };
@@ -109,9 +109,9 @@ var createSymbolNode = /* #__PURE__ */(0, _factory.factory)(name, dependencies,
    */
 
 
-  function undef(name) {
+  SymbolNode.onUndefinedSymbol = function (name) {
     throw new Error('Undefined symbol ' + name);
-  }
+  };
   /**
    * Create a clone of this node, a shallow copy
    * @return {SymbolNode}

package/lib/cjs/expression/node/utils/access.js

@@ -1,16 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.accessFactory = accessFactory;
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _errorTransform = require("../../transform/utils/errorTransform.js");
 
 var _customs = require("../../../utils/customs.js");
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function accessFactory(_ref) {
   var subset = _ref.subset;
 
@@ -35,7 +37,7 @@ function accessFactory(_ref) {
       } else if (typeof object === 'string') {
         // TODO: move getStringSubset into a separate util file, use that
         return subset(object, index);
-      } else if (_typeof(object) === 'object') {
+      } else if ((0, _typeof2["default"])(object) === 'object') {
         if (!index.isObjectProperty()) {
           throw new TypeError('Cannot apply a numeric index as object property');
         }

package/lib/cjs/expression/node/utils/assign.js

@@ -1,16 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignFactory = assignFactory;
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _errorTransform = require("../../transform/utils/errorTransform.js");
 
 var _customs = require("../../../utils/customs.js");
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function assignFactory(_ref) {
   var subset = _ref.subset,
       matrix = _ref.matrix;
@@ -40,7 +42,7 @@ function assignFactory(_ref) {
       } else if (typeof object === 'string') {
         // TODO: move setStringSubset into a separate util file, use that
         return subset(object, index, value);
-      } else if (_typeof(object) === 'object') {
+      } else if ((0, _typeof2["default"])(object) === 'object') {
         if (!index.isObjectProperty()) {
           throw TypeError('Cannot apply a numeric index as object property');
         }

package/lib/cjs/expression/parse.js

@@ -1,10 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createParse = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _factory = require("../utils/factory.js");
 
 var _is = require("../utils/is.js");
@@ -13,8 +17,6 @@ var _collection = require("../utils/collection.js");
 
 var _object = require("../utils/object.js");
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 var name = 'parse';
 var dependencies = ['typed', 'numeric', 'config', 'AccessorNode', 'ArrayNode', 'AssignmentNode', 'BlockNode', 'ConditionalNode', 'ConstantNode', 'FunctionAssignmentNode', 'FunctionNode', 'IndexNode', 'ObjectNode', 'OperatorNode', 'ParenthesisNode', 'RangeNode', 'RelationalNode', 'SymbolNode'];
 var createParse = /* #__PURE__ */(0, _factory.factory)(name, dependencies, function (_ref) {
@@ -326,14 +328,21 @@ var createParse = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
         while (parse.isHexDigit(currentCharacter(state))) {
           state.token += currentCharacter(state);
           next(state);
-        } // check for word size suffix
-
+        }
 
-        var sign = currentCharacter(state);
+        if (currentCharacter(state) === '.') {
+          // this number has a radix point
+          state.token += '.';
+          next(state); // get the digits after the radix
 
-        if (sign === 'i') {
-          state.token += sign;
-          next(state);
+          while (parse.isHexDigit(currentCharacter(state))) {
+            state.token += currentCharacter(state);
+            next(state);
+          }
+        } else if (currentCharacter(state) === 'i') {
+          // this number has a word size suffix
+          state.token += 'i';
+          next(state); // get the word size
 
           while (parse.isDigit(currentCharacter(state))) {
             state.token += currentCharacter(state);
@@ -574,12 +583,10 @@ var createParse = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
 
   function parseStart(expression, extraNodes) {
     var state = initialState();
-
-    _extends(state, {
+    (0, _extends2["default"])(state, {
       expression: expression,
       extraNodes: extraNodes
     });
-
     getToken(state);
     var node = parseBlock(state); // check for garbage at the end of the expression
     // an expression ends with a empty character '' and tokenType DELIMITER
@@ -1099,34 +1106,30 @@ var createParse = /* #__PURE__ */(0, _factory.factory)(name, dependencies, funct
       // Match the "number /" part of the pattern "number / number symbol"
       if (state.token === '/' && (0, _is.isConstantNode)(last)) {
         // Look ahead to see if the next token is a number
-        tokenStates.push(_extends({}, state));
+        tokenStates.push((0, _extends2["default"])({}, state));
         getTokenSkipNewline(state); // Match the "number / number" part of the pattern
 
         if (state.tokenType === TOKENTYPE.NUMBER) {
           // Look ahead again
-          tokenStates.push(_extends({}, state));
+          tokenStates.push((0, _extends2["default"])({}, state));
           getTokenSkipNewline(state); // Match the "symbol" part of the pattern, or a left parenthesis
 
           if (state.tokenType === TOKENTYPE.SYMBOL || state.token === '(') {
             // We've matched the pattern "number / number symbol".
             // Rewind once and build the "number / number" node; the symbol will be consumed later
-            _extends(state, tokenStates.pop());
-
+            (0, _extends2["default"])(state, tokenStates.pop());
             tokenStates.pop();
             last = parseUnary(state);
             node = new OperatorNode('/', 'divide', [node, last]);
           } else {
             // Not a match, so rewind
             tokenStates.pop();
-
-            _extends(state, tokenStates.pop());
-
+            (0, _extends2["default"])(state, tokenStates.pop());
             break;
           }
         } else {
           // Not a match, so rewind
-          _extends(state, tokenStates.pop());
-
+          (0, _extends2["default"])(state, tokenStates.pop());
           break;
         }
       } else {

package/lib/cjs/expression/transform/utils/compileInlineExpression.js

@@ -7,6 +7,8 @@ exports.compileInlineExpression = compileInlineExpression;
 
 var _is = require("../../../utils/is.js");
 
+var _scope = require("../../../utils/scope.js");
+
 /**
  * Compile an inline expression like "x > 0"
  * @param {Node} expression
@@ -18,7 +20,7 @@ var _is = require("../../../utils/is.js");
 function compileInlineExpression(expression, math, scope) {
   // find an undefined symbol
   var symbol = expression.filter(function (node) {
-    return (0, _is.isSymbolNode)(node) && !(node.name in math) && !(node.name in scope);
+    return (0, _is.isSymbolNode)(node) && !(node.name in math) && !scope.has(node.name);
   })[0];
 
   if (!symbol) {
@@ -28,10 +30,10 @@ function compileInlineExpression(expression, math, scope) {
 
   var name = symbol.name; // variable name
 
-  var subScope = Object.create(scope);
+  var subScope = (0, _scope.createSubScope)(scope);
   var eq = expression.compile();
   return function inlineExpression(x) {
-    subScope[name] = x;
+    subScope.set(name, x);
     return eq.evaluate(subScope);
   };
 }

package/lib/cjs/factoriesAny.js

@@ -159,6 +159,24 @@ Object.defineProperty(exports, "createMatrix", {
     return _matrix.createMatrix;
   }
 });
+Object.defineProperty(exports, "createMatrixFromFunction", {
+  enumerable: true,
+  get: function get() {
+    return _matrixFromFunction.createMatrixFromFunction;
+  }
+});
+Object.defineProperty(exports, "createMatrixFromRows", {
+  enumerable: true,
+  get: function get() {
+    return _matrixFromRows.createMatrixFromRows;
+  }
+});
+Object.defineProperty(exports, "createMatrixFromColumns", {
+  enumerable: true,
+  get: function get() {
+    return _matrixFromColumns.createMatrixFromColumns;
+  }
+});
 Object.defineProperty(exports, "createSplitUnit", {
   enumerable: true,
   get: function get() {
@@ -2036,6 +2054,12 @@ var _fraction = require("./type/fraction/function/fraction.js");
 
 var _matrix = require("./type/matrix/function/matrix.js");
 
+var _matrixFromFunction = require("./function/matrix/matrixFromFunction.js");
+
+var _matrixFromRows = require("./function/matrix/matrixFromRows.js");
+
+var _matrixFromColumns = require("./function/matrix/matrixFromColumns.js");
+
 var _splitUnit = require("./type/unit/function/splitUnit.js");
 
 var _unaryMinus = require("./function/arithmetic/unaryMinus.js");