occam-verify-cli 1.0.612 → 1.0.631

package/src/process/verify.js

@@ -295,8 +295,8 @@ class ConbinatorPass extends SimplePass {
         let success = false;
 
         const statement = statementFromStatementNode(statementNode, context),
-              assignments = null,
               stated = false,
+              assignments = null,
               statementValidates = statement.validate(assignments, stated, context);
 
         if (statementValidates) {

package/src/utilities/element.js

@@ -7,6 +7,7 @@ import { baseTypeFromNothing } from "../utilities/type";
 import { instantiateReference } from "../process/instantiate";
 import { findMetaTypeByMetaTypeName } from "../metaTypes";
 import { equivalenceStringFromTerms,
+         typeStringFromNominalTypeName,
          rulsStringFromLabelsPremisesAndConclusion,
          sectionStringFromHypothesesTopLevelAssertion,
          subproofStringFromSuppositionsAndSubDerivation,
@@ -23,16 +24,15 @@ export function typeFromTypeNode(typeNode, context) {
     type = baseType;  ///
   } else {
     const { Type } = elements,
-          typeName = typeNode.getTypeName(),
-          typePrefixName = typeNode.getTypePrefixName(),
-          nominalTypeName = typeNode.getNominalTypeName(),
-          string = nominalTypeName,  ///
           node = typeNode,  ///
-          name = typeName,  ///
-          prefixName = typePrefixName,  ///
-          superTypes = null,
-          properties = null,
-          provisional = null;
+          name = nameFromTypeNode(typeNode, context),
+          prefixName = prefixNameFromTypeNode(typeNode, context),
+          superTypes = superTypesFromTypeNode(typeNode, context),
+          properties = propertiesFromTypeNode(typeNode, context),
+          provisional = provisionalFromTypeNode(typeNode, context),
+          nominalTypeName = nominalTypeNameFromTypeNode(typeNode, context),
+          typeString = typeStringFromNominalTypeName(nominalTypeName),
+          string = typeString;  ///
 
     type = new Type(context, string, node, name, prefixName, superTypes, properties, provisional);
   }
@@ -195,7 +195,7 @@ export function theoremFromTheoremNode(theoremNode, context) {
 
 export function metaTypeFromMetaTypeNode(metaTypeNode, context) {
   const metaTypeName = metaTypeNode.getMetaTypeName(),
-        metaType = findMetaTypeByMetaTypeName(metaTypeName);
+        metaType = context.findMetaTypeByMetaTypeName(metaTypeName);
 
   return metaType;
 }
@@ -236,21 +236,15 @@ export function subproofFromSubproofNode(subproofNode, context) {
   return subproof;
 }
 
-export function equalityFromStatementNode(statementNode, context) {
-  let equality = null;
-
-  const equalityNode = statementNode.getEqualityNode();
-
-  if (equalityNode !== null) {
-    const node = equalityNode,  ///
-          string = context.nodeAsString(node),
-          leftTerm = leftTermFromEqualityNode(equalityNode, context),
-          rightTerm = rightTermFromEqualityNode(equalityNode, context);
-
-    equality = new Equality(context, string, node, leftTerm, rightTerm);
-  }
+export function equalityFromEqualityNode(equalityNode, context) {
+  const { Equality } = elements,
+        node = equalityNode, ///
+        string = context.nodeAsString(node),
+        leftTerm = leftTermFromEqualityNode(equalityNode, context),
+        rightTerm = rightTermFromEqualityNode(equalityNode, context),
+        subproof = new Equality(context, string, node, leftTerm, rightTerm);
 
-  return equality;
+  return subproof;
 }
 
 export function deductionFromDeductionNode(deductionNode, context) {
@@ -713,6 +707,13 @@ export function metavariableDeclarationFromMetavariableDeclarationNode(metavaria
   return metavariableDeclaration;
 }
 
+export function nameFromTypeNode(typeNode, context) {
+  const typeName = typeNode.getTypeName(),
+    name = typeName;  ///
+
+  return name;
+}
+
 export function typeFromTermNode(termNode, context) {
   const type = null;
 
@@ -793,6 +794,25 @@ export function referenceFromStepNode(stepNode, context) {
   return reference;
 }
 
+export function superTypesFromTypeNode(typeNode, context) {
+  const superTypes = null;
+
+  return superTypes;
+}
+
+export function propertiesFromTypeNode(typeNode, context) {
+  const properties = null;
+
+  return properties;
+}
+
+export function prefixNameFromTypeNode(typeNode, context) {
+  const typePrefixName = typeNode.getTypePrefixName(),
+    prefixName = typePrefixName;  ///
+
+  return prefixName;
+}
+
 export function conclusionFromRuleNode(ruleNode, context) {
   const conclusionNode = ruleNode.getConclusionNode(),
         conclusion = conclusionFromConclusionNode(conclusionNode, context);
@@ -833,6 +853,12 @@ export function derivationFromProofNode(proofNode, context) {
   return derivation;
 }
 
+export function provisionalFromTypeNode(typeNode, context) {
+  const provisional = null;
+
+  return provisional;
+}
+
 export function termFromConstructorNode(ocnstructorNode, context) {
   const termNode = ocnstructorNode.getTermNode(),
         term = termFromTermNode(termNode, context);
@@ -859,6 +885,13 @@ export function statementFromPremiseNode(premiseNode, context) {
   return statement;
 }
 
+export function leftTermFromEqualityNode(equalityNode, context) {
+  const leftTermNode = equalityNode.getLeftTermNode(),
+        leftTerm = termFromTermNode(leftTermNode, context);
+
+  return leftTerm;
+}
+
 export function termsFromEquivalenceNode(equivalenceNode, context) {
   const termNodes = equivalenceNode.getTermNodes(),
         terms = termsFromTermNodes(termNodes, context);
@@ -897,6 +930,25 @@ export function conjectureFromSectionNode(sectionNode, context) {
   return conjecture;
 }
 
+export function rightTermFromEqualityNode(equalityNode, context) {
+  const rightTermNode = equalityNode.getRightTermNode(),
+        rightTerm = termFromTermNode(rightTermNode, context);
+
+  return rightTerm;
+}
+
+export function equalityFromStatementNode(statementNode, context) {
+  let equality = null;
+
+  const equalityNode = statementNode.getEqualityNode();
+
+  if (equalityNode !== null) {
+    equality = equalityFromEqualityNode(equalityNode, context);
+  }
+
+  return equality;
+}
+
 export function termFromTypeAssertionNode(typeAssertionNode, context) {
   const termNode = typeAssertionNode.getTermNode(),
         term = termFromTermNode(termNode, context);
@@ -956,6 +1008,12 @@ export function stepFromStepOrSubproofNode(stepOrSubproofNode, context) {
   return step;
 }
 
+export function nominalTypeNameFromTypeNode(typeNode, context) {
+  const nominalTypeName = typeNode.getNominalTypeName();
+
+  return nominalTypeName;
+}
+
 export function assumptionFromJudgementNode(judgementNode, context) {
   const assumptionNode = judgementNode.getAssumptionNode(),
         assumption = assumptionFromAssumptionNode(assumptionNode, context);
@@ -1543,7 +1601,7 @@ export function termSubstitutionFromStatementSubstitutionNode(statementSubstitut
   const termSubstitutionNode = statementSubstitutionNode.getTermSubstitutionNode();
 
   if (termSubstitutionNode !== null) {
-    termSubstitution = termSubstitutionFromTermubstitutionNode(termSubstitutionNode, context);
+    termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);
   }
 
   return termSubstitution;
@@ -1676,4 +1734,3 @@ export function stepsOrSubproofsFromSubDerivationNode(subDerivationNode, context
 
   return stepsOrSubproofs;
 }
-

package/src/utilities/json.js

@@ -44,7 +44,7 @@ export function metaTypeFromJSON(json, context) {
     const { name } = json,
           metaTypeName = name;  ///
 
-    metaType = findMetaTypeByMetaTypeName(metaTypeName);
+    metaType = context.findMetaTypeByMetaTypeName(metaTypeName);
   }
 
   return metaType;

package/src/utilities/string.js

@@ -16,20 +16,6 @@ export function termsStringFromTerms(terms) {
   return termsString;
 }
 
-export function framesStringFromFrames(frames) {
-  const framesString = frames.reduce((framesString, frame) => {
-    const frameString = frame.getString();
-
-    framesString = (framesString !== null) ?
-                    `${framesString}, ${frameString}` :
-                       frameString;
-
-    return framesString;
-  }, null);
-
-  return framesString;
-}
-
 export function labelsStringFromLabels(labels) {
   const labelsString = labels.reduce((labelsString, label) => {
     const labelString = label.getString();
@@ -131,20 +117,6 @@ export function suppositionsStringFromSuppositions(suppositions) {
   return suppositionsString;
 }
 
-export function substitutionsStringFromSubstitutions(substitutions) {
-  const substitutionsString = substitutions.reduce((substitutionsString, substitution) => {
-    const substitutionString = substitution.getString();
-
-    substitutionsString = (substitutionsString === null) ?
-                             substitutionString : ///
-                              `${substitutionsString}, ${substitutionString}`;
-
-    return substitutionsString;
-  }, null);
-
-  return substitutionsString;
-}
-
 export function signatureStringFromTerms(terms) {
   const termsString = termsStringFromTerms(terms),
         signatureString = `[${termsString}]`;
@@ -154,11 +126,17 @@ export function signatureStringFromTerms(terms) {
 
 export function equivalenceStringFromTerms(terms) {
   const termsString = termsStringFromTerms(terms),
-        equivalenceString = termsString;  ///
+        equivalenceString = `[${termsString}]`;
 
   return equivalenceString;
 }
 
+export function typeStringFromNominalTypeName(nominalTypeName) {
+  const typeString = nominalTypeName;  ///
+
+  return typeString;
+}
+
 export function termSubstitutionStringFromTermAndVariable(term, variable) {
   const termString = term.getString(),
         variableString = variable.getString(),

package/src/utilities/substitutions.js

@@ -13,17 +13,13 @@ export function termFromTermAndSubstitutions(term, generalContext, specificConte
 
     if (termSingular) {
       const variableIdentifier = termNode.getVariableIdentifier(),
-            variable = generalContext.findVariableByVariableIdentifier(variableIdentifier);
+            substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);
 
-      if (variable !== null) {
-        const substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);
+      if (substitution !== null) {
+        const termSubstitution = substitution,  ///
+              replacementTerm = termSubstitution.getReplacementTerm();
 
-        if (substitution !== null) {
-          const termSubstitution = substitution,  ///
-                replacementTerm = termSubstitution.getReplacementTerm();
-
-          term = replacementTerm; ///
-        }
+        term = replacementTerm; ///
       }
     }
   }
@@ -40,17 +36,13 @@ export function frameFromFrameAndSubstitutions(frame, generalContext, specificCo
 
     if (frameSingular) {
       const metavariableName = frameNode.getMetavariableName(),
-            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
-
-      if (metavariable !== null) {
-        const substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);
+            substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);
 
-        if (substitution !== null) {
-          const frameSubstitution = substitution, ///
-                replacementFrame = frameSubstitution.getReplacementFrame();
+      if (substitution !== null) {
+        const frameSubstitution = substitution, ///
+              replacementFrame = frameSubstitution.getReplacementFrame();
 
-          frame = replacementFrame; ///
-        }
+        frame = replacementFrame; ///
       }
     }
   }
@@ -86,20 +78,17 @@ export function statementFromStatementAndSubstitutions(statement, generalContext
         specificContext = context;  ///
       }
 
-      const metavariableName = statementNode.getMetavariableName(),
-            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
+      const metavariableName = statementNode.getMetavariableName();
 
-      if (metavariable !== null) {
-        substitution = (substitution !== null) ?
-                         specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :
-                           specificContext.findSubstitutionByMetavariableName(metavariableName);
+      substitution = (substitution !== null) ?
+                       specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :
+                         specificContext.findSubstitutionByMetavariableName(metavariableName);
 
-        if (substitution !== null) {
-          const statementSubstitution = substitution, ///
-                replacementStatement = statementSubstitution.getReplacementStatement();
+      if (substitution !== null) {
+        const statementSubstitution = substitution, ///
+              replacementStatement = statementSubstitution.getReplacementStatement();
 
-          statement = replacementStatement; ///
-        }
+        statement = replacementStatement; ///
       }
     }
   }
@@ -119,7 +108,7 @@ export function metavariableNamesFromSubstitutions(substitutions) {
   });
 
   compress(metavariableNames, (metavariableNameA, metavariableNameB) => {
-    if (metavariableNameB !== metavariableNameB) {
+    if (metavariableNameA !== metavariableNameB) {
       return true;
     }
   });

package/lib/element/substitutions.js

@@ -1,225 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-var _occamlanguages = require("occam-languages");
-var _necessary = require("necessary");
-var _elements = require("../elements");
-var _constants = require("../constants");
-var _string = require("../utilities/string");
-function _assert_this_initialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-}
-function _call_super(_this, derived, args) {
-    derived = _get_prototype_of(derived);
-    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
-}
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _construct(Parent, args, Class) {
-    if (_is_native_reflect_construct()) {
-        _construct = Reflect.construct;
-    } else {
-        _construct = function construct(Parent, args, Class) {
-            var a = [
-                null
-            ];
-            a.push.apply(a, args);
-            var Constructor = Function.bind.apply(Parent, a);
-            var instance = new Constructor();
-            if (Class) _set_prototype_of(instance, Class.prototype);
-            return instance;
-        };
-    }
-    return _construct.apply(null, arguments);
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _get_prototype_of(o) {
-    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _get_prototype_of(o);
-}
-function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
-        }
-    });
-    if (superClass) _set_prototype_of(subClass, superClass);
-}
-function _is_native_function(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-}
-function _possible_constructor_return(self, call) {
-    if (call && (_type_of(call) === "object" || typeof call === "function")) {
-        return call;
-    }
-    return _assert_this_initialized(self);
-}
-function _set_prototype_of(o, p) {
-    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _set_prototype_of(o, p);
-}
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-function _wrap_native_super(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-    _wrap_native_super = function wrapNativeSuper(Class) {
-        if (Class === null || !_is_native_function(Class)) return Class;
-        if (typeof Class !== "function") {
-            throw new TypeError("Super expression must either be null or a function");
-        }
-        if (typeof _cache !== "undefined") {
-            if (_cache.has(Class)) return _cache.get(Class);
-            _cache.set(Class, Wrapper);
-        }
-        function Wrapper() {
-            return _construct(Class, arguments, _get_prototype_of(this).constructor);
-        }
-        Wrapper.prototype = Object.create(Class.prototype, {
-            constructor: {
-                value: Wrapper,
-                enumerable: false,
-                writable: true,
-                configurable: true
-            }
-        });
-        return _set_prototype_of(Wrapper, Class);
-    };
-    return _wrap_native_super(Class);
-}
-function _is_native_reflect_construct() {
-    try {
-        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-    } catch (_) {}
-    return (_is_native_reflect_construct = function() {
-        return !!result;
-    })();
-}
-var _Substitutions;
-var first = _necessary.arrayUtilities.first, extract = _necessary.arrayUtilities.extract, correlate = _necessary.arrayUtilities.correlate;
-var _default = (0, _elements.define)((_Substitutions = /*#__PURE__*/ function(Element) {
-    _inherits(Substitutions, Element);
-    function Substitutions() {
-        _class_call_check(this, Substitutions);
-        return _call_super(this, Substitutions, arguments);
-    }
-    _create_class(Substitutions, [
-        {
-            key: "getNonTrivialLength",
-            value: function getNonTrivialLength() {
-                var nonTrivialLength = this.reduceSubstitution(function(nonTrivialLength, substitution) {
-                    var substitutionTrivial = substitution.isTrivial();
-                    if (!substitutionTrivial) {
-                        nonTrivialLength += 1;
-                    }
-                    return nonTrivialLength;
-                }, 0);
-                return nonTrivialLength;
-            }
-        },
-        {
-            key: "getFirstSubstitution",
-            value: function getFirstSubstitution() {
-                var firstSubstitution = null;
-                var length = this.getLength();
-                if (length > 0) {
-                    firstSubstitution = first(this.array);
-                }
-                return firstSubstitution;
-            }
-        },
-        {
-            key: "extractSubstitution",
-            value: function extractSubstitution(callbcak) {
-                return extract(this.array, callbcak);
-            }
-        },
-        {
-            key: "correlateSubstitutions",
-            value: function correlateSubstitutions(substitutions) {
-                var array = substitutions.getArray(), arrayA = array, arrayB = this.array, correlates = correlate(arrayA, arrayB, function(substitutionA, substitutionB) {
-                    var substitutionAIsEQualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
-                    if (substitutionAIsEQualToSubstitutionB) {
-                        return true;
-                    }
-                });
-                return correlates;
-            }
-        },
-        {
-            key: "asString",
-            value: function asString() {
-                var string;
-                var length = this.getLength();
-                if (length === 0) {
-                    string = _constants.EMPTY_STRING;
-                } else {
-                    var substitutions = this.array, substitutionsString = (0, _string.substitutionsStringFromSubstitutions)(substitutions);
-                    string = substitutionsString; ///
-                }
-                return string;
-            }
-        }
-    ], [
-        {
-            key: "fromNothing",
-            value: function fromNothing(context) {
-                var node = null, string = _constants.EMPTY_STRING, array = [], savedArray = [], substitutions = new Substitutions(context, string, node, array, savedArray);
-                return substitutions;
-            }
-        }
-    ]);
-    return Substitutions;
-}(_wrap_native_super(_occamlanguages.Element)), _define_property(_Substitutions, "name", "Substitutions"), _Substitutions));
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3N1YnN0aXR1dGlvbnMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5pbXBvcnQgeyBhcnJheVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyBFTVBUWV9TVFJJTkcgfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyBzdWJzdGl0dXRpb25zU3RyaW5nRnJvbVN1YnN0aXR1dGlvbnMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCB7IGZpcnN0LCBleHRyYWN0LCBjb3JyZWxhdGUgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgU3Vic3RpdHV0aW9ucyBleHRlbmRzIEVsZW1lbnQge1xuICBnZXROb25Ucml2aWFsTGVuZ3RoKCkge1xuICAgIGNvbnN0IG5vblRyaXZpYWxMZW5ndGggPSB0aGlzLnJlZHVjZVN1YnN0aXR1dGlvbigobm9uVHJpdmlhbExlbmd0aCwgc3Vic3RpdHV0aW9uKSA9PiB7XG4gICAgICBjb25zdCBzdWJzdGl0dXRpb25Ucml2aWFsID0gc3Vic3RpdHV0aW9uLmlzVHJpdmlhbCgpO1xuXG4gICAgICBpZiAoIXN1YnN0aXR1dGlvblRyaXZpYWwpIHtcbiAgICAgICAgbm9uVHJpdmlhbExlbmd0aCArPSAxO1xuICAgICAgfVxuXG4gICAgICByZXR1cm4gbm9uVHJpdmlhbExlbmd0aDtcbiAgICB9LCAwKTtcblxuICAgIHJldHVybiBub25Ucml2aWFsTGVuZ3RoO1xuICB9XG5cbiAgZ2V0Rmlyc3RTdWJzdGl0dXRpb24oKSB7XG4gICAgbGV0IGZpcnN0U3Vic3RpdHV0aW9uID0gbnVsbDtcblxuICAgIGNvbnN0IGxlbmd0aCA9IHRoaXMuZ2V0TGVuZ3RoKCk7XG5cbiAgICBpZiAobGVuZ3RoID4gMCkge1xuICAgICAgZmlyc3RTdWJzdGl0dXRpb24gPSBmaXJzdCh0aGlzLmFycmF5KTtcbiAgICB9XG5cbiAgICByZXR1cm4gZmlyc3RTdWJzdGl0dXRpb247XG4gIH1cblxuICBleHRyYWN0U3Vic3RpdHV0aW9uKGNhbGxiY2FrKSB7IHJldHVybiBleHRyYWN0KHRoaXMuYXJyYXksIGNhbGxiY2FrKTsgfVxuXG4gIGNvcnJlbGF0ZVN1YnN0aXR1dGlvbnMoc3Vic3RpdHV0aW9ucykge1xuICAgIGNvbnN0IGFycmF5ID0gc3Vic3RpdHV0aW9ucy5nZXRBcnJheSgpLFxuICAgICAgICAgIGFycmF5QSA9IGFycmF5LCAvLy9cbiAgICAgICAgICBhcnJheUIgPSB0aGlzLmFycmF5LCAgLy8vXG4gICAgICAgICAgY29ycmVsYXRlcyA9IGNvcnJlbGF0ZShhcnJheUEsIGFycmF5QiwgKHN1YnN0aXR1dGlvbkEsIHN1YnN0aXR1dGlvbkIpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHN1YnN0aXR1dGlvbkFJc0VRdWFsVG9TdWJzdGl0dXRpb25CID0gc3Vic3RpdHV0aW9uQS5pc0VxdWFsVG8oc3Vic3RpdHV0aW9uQik7XG5cbiAgICAgICAgICAgIGlmIChzdWJzdGl0dXRpb25BSXNFUXVhbFRvU3Vic3RpdHV0aW9uQikge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KTtcblxuICAgIHJldHVybiBjb3JyZWxhdGVzO1xuICB9XG5cbiAgYXNTdHJpbmcoKSB7XG4gICAgbGV0IHN0cmluZztcblxuICAgIGNvbnN0IGxlbmd0aCA9IHRoaXMuZ2V0TGVuZ3RoKCk7XG5cbiAgICBpZiAobGVuZ3RoID09PSAwKSB7XG4gICAgICBzdHJpbmcgPSBFTVBUWV9TVFJJTkc7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IHN1YnN0aXR1dGlvbnMgPSB0aGlzLmFycmF5LCAvLy9cbiAgICAgICAgICAgIHN1YnN0aXR1dGlvbnNTdHJpbmcgPSBzdWJzdGl0dXRpb25zU3RyaW5nRnJvbVN1YnN0aXR1dGlvbnMoc3Vic3RpdHV0aW9ucyk7XG5cbiAgICAgIHN0cmluZyA9IHN1YnN0aXR1dGlvbnNTdHJpbmc7IC8vL1xuICAgIH1cblxuICAgIHJldHVybiBzdHJpbmc7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiU3Vic3RpdHV0aW9uc1wiO1xuXG4gIHN0YXRpYyBmcm9tTm90aGluZyhjb250ZXh0KSB7XG4gICAgY29uc3Qgbm9kZSA9IG51bGwsXG4gICAgICAgICAgc3RyaW5nID0gRU1QVFlfU1RSSU5HLFxuICAgICAgICAgIGFycmF5ID0gW10sXG4gICAgICAgICAgc2F2ZWRBcnJheSA9IFtdLFxuICAgICAgICAgIHN1YnN0aXR1dGlvbnMgPSBuZXcgU3Vic3RpdHV0aW9ucyhjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGFycmF5LCBzYXZlZEFycmF5KTtcblxuICAgIHJldHVybiBzdWJzdGl0dXRpb25zO1xuICB9XG59KTtcbiJdLCJuYW1lcyI6WyJmaXJzdCIsImFycmF5VXRpbGl0aWVzIiwiZXh0cmFjdCIsImNvcnJlbGF0ZSIsImRlZmluZSIsIlN1YnN0aXR1dGlvbnMiLCJnZXROb25Ucml2aWFsTGVuZ3RoIiwibm9uVHJpdmlhbExlbmd0aCIsInJlZHVjZVN1YnN0aXR1dGlvbiIsInN1YnN0aXR1dGlvbiIsInN1YnN0aXR1dGlvblRyaXZpYWwiLCJpc1RyaXZpYWwiLCJnZXRGaXJzdFN1YnN0aXR1dGlvbiIsImZpcnN0U3Vic3RpdHV0aW9uIiwibGVuZ3RoIiwiZ2V0TGVuZ3RoIiwiYXJyYXkiLCJleHRyYWN0U3Vic3RpdHV0aW9uIiwiY2FsbGJjYWsiLCJjb3JyZWxhdGVTdWJzdGl0dXRpb25zIiwic3Vic3RpdHV0aW9ucyIsImdldEFycmF5IiwiYXJyYXlBIiwiYXJyYXlCIiwiY29ycmVsYXRlcyIsInN1YnN0aXR1dGlvbkEiLCJzdWJzdGl0dXRpb25CIiwic3Vic3RpdHV0aW9uQUlzRVF1YWxUb1N1YnN0aXR1dGlvbkIiLCJpc0VxdWFsVG8iLCJhc1N0cmluZyIsInN0cmluZyIsIkVNUFRZX1NUUklORyIsInN1YnN0aXR1dGlvbnNTdHJpbmciLCJzdWJzdGl0dXRpb25zU3RyaW5nRnJvbVN1YnN0aXR1dGlvbnMiLCJmcm9tTm90aGluZyIsImNvbnRleHQiLCJub2RlIiwic2F2ZWRBcnJheSIsIkVsZW1lbnQiLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFXQTs7O2VBQUE7Ozs4QkFUd0I7eUJBQ087d0JBRVI7eUJBQ007c0JBQ3dCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVyRCxJQUFRQSxRQUE4QkMseUJBQWMsQ0FBNUNELE9BQU9FLFVBQXVCRCx5QkFBYyxDQUFyQ0MsU0FBU0MsWUFBY0YseUJBQWMsQ0FBNUJFO0lBRXhCLFdBQWVDLElBQUFBLGdCQUFNLGtDQUFDOzthQUFNQztnQ0FBQUE7UUFBTixPQUFBLGtCQUFNQTs7OztZQUMxQkMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLG1CQUFtQixJQUFJLENBQUNDLGtCQUFrQixDQUFDLFNBQUNELGtCQUFrQkU7b0JBQ2xFLElBQU1DLHNCQUFzQkQsYUFBYUUsU0FBUztvQkFFbEQsSUFBSSxDQUFDRCxxQkFBcUI7d0JBQ3hCSCxvQkFBb0I7b0JBQ3RCO29CQUVBLE9BQU9BO2dCQUNULEdBQUc7Z0JBRUgsT0FBT0E7WUFDVDs7O1lBRUFLLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxJQUFJQyxvQkFBb0I7Z0JBRXhCLElBQU1DLFNBQVMsSUFBSSxDQUFDQyxTQUFTO2dCQUU3QixJQUFJRCxTQUFTLEdBQUc7b0JBQ2RELG9CQUFvQmIsTUFBTSxJQUFJLENBQUNnQixLQUFLO2dCQUN0QztnQkFFQSxPQUFPSDtZQUNUOzs7WUFFQUksS0FBQUE7bUJBQUFBLFNBQUFBLG9CQUFvQkMsUUFBUTtnQkFBSSxPQUFPaEIsUUFBUSxJQUFJLENBQUNjLEtBQUssRUFBRUU7WUFBVzs7O1lBRXRFQyxLQUFBQTttQkFBQUEsU0FBQUEsdUJBQXVCQyxhQUFhO2dCQUNsQyxJQUFNSixRQUFRSSxjQUFjQyxRQUFRLElBQzlCQyxTQUFTTixPQUNUTyxTQUFTLElBQUksQ0FBQ1AsS0FBSyxFQUNuQlEsYUFBYXJCLFVBQVVtQixRQUFRQyxRQUFRLFNBQUNFLGVBQWVDO29CQUNyRCxJQUFNQyxzQ0FBc0NGLGNBQWNHLFNBQVMsQ0FBQ0Y7b0JBRXBFLElBQUlDLHFDQUFxQzt3QkFDdkMsT0FBTztvQkFDVDtnQkFDRjtnQkFFTixPQUFPSDtZQUNUOzs7WUFFQUssS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQUlDO2dCQUVKLElBQU1oQixTQUFTLElBQUksQ0FBQ0MsU0FBUztnQkFFN0IsSUFBSUQsV0FBVyxHQUFHO29CQUNoQmdCLFNBQVNDLHVCQUFZO2dCQUN2QixPQUFPO29CQUNMLElBQU1YLGdCQUFnQixJQUFJLENBQUNKLEtBQUssRUFDMUJnQixzQkFBc0JDLElBQUFBLDRDQUFvQyxFQUFDYjtvQkFFakVVLFNBQVNFLHFCQUFxQixHQUFHO2dCQUNuQztnQkFFQSxPQUFPRjtZQUNUOzs7O1lBSU9JLEtBQUFBO21CQUFQLFNBQU9BLFlBQVlDLE9BQU87Z0JBQ3hCLElBQU1DLE9BQU8sTUFDUE4sU0FBU0MsdUJBQVksRUFDckJmLFFBQVEsRUFBRSxFQUNWcUIsYUFBYSxFQUFFLEVBQ2ZqQixnQkFBZ0IsSUFBSWYsY0FBYzhCLFNBQVNMLFFBQVFNLE1BQU1wQixPQUFPcUI7Z0JBRXRFLE9BQU9qQjtZQUNUOzs7O3FCQXZFZ0RrQix1QkFBTyxJQTZEdkQsaUNBQU9DLFFBQU8ifQ==

package/src/element/substitutions.js

@@ -1,84 +0,0 @@
-"use strict";
-
-import { Element } from "occam-languages";
-import { arrayUtilities } from "necessary";
-
-import { define } from "../elements";
-import { EMPTY_STRING } from "../constants";
-import { substitutionsStringFromSubstitutions } from "../utilities/string";
-
-const { first, extract, correlate } = arrayUtilities;
-
-export default define(class Substitutions extends Element {
-  getNonTrivialLength() {
-    const nonTrivialLength = this.reduceSubstitution((nonTrivialLength, substitution) => {
-      const substitutionTrivial = substitution.isTrivial();
-
-      if (!substitutionTrivial) {
-        nonTrivialLength += 1;
-      }
-
-      return nonTrivialLength;
-    }, 0);
-
-    return nonTrivialLength;
-  }
-
-  getFirstSubstitution() {
-    let firstSubstitution = null;
-
-    const length = this.getLength();
-
-    if (length > 0) {
-      firstSubstitution = first(this.array);
-    }
-
-    return firstSubstitution;
-  }
-
-  extractSubstitution(callbcak) { return extract(this.array, callbcak); }
-
-  correlateSubstitutions(substitutions) {
-    const array = substitutions.getArray(),
-          arrayA = array, ///
-          arrayB = this.array,  ///
-          correlates = correlate(arrayA, arrayB, (substitutionA, substitutionB) => {
-            const substitutionAIsEQualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
-
-            if (substitutionAIsEQualToSubstitutionB) {
-              return true;
-            }
-          });
-
-    return correlates;
-  }
-
-  asString() {
-    let string;
-
-    const length = this.getLength();
-
-    if (length === 0) {
-      string = EMPTY_STRING;
-    } else {
-      const substitutions = this.array, ///
-            substitutionsString = substitutionsStringFromSubstitutions(substitutions);
-
-      string = substitutionsString; ///
-    }
-
-    return string;
-  }
-
-  static name = "Substitutions";
-
-  static fromNothing(context) {
-    const node = null,
-          string = EMPTY_STRING,
-          array = [],
-          savedArray = [],
-          substitutions = new Substitutions(context, string, node, array, savedArray);
-
-    return substitutions;
-  }
-});