occam-verify-cli 1.0.359 → 1.0.360

package/src/dom/declaration.js

@@ -7,11 +7,11 @@ import { domAssigned } from "../dom";
 import { unifyStatementIntrinsically } from "../utilities/unification";
 
 export default domAssigned(class Declaration {
-  constructor(string, node, statement, simpleReference) {
+  constructor(string, node, statement, metavariable) {
     this.string = string;
     this.node = node;
     this.statement = statement;
-    this.simpleReference = simpleReference;
+    this.metavariable = metavariable;
   }
 
   getString() {
@@ -26,8 +26,8 @@ export default domAssigned(class Declaration {
     return this.statement;
   }
 
-  getSimpleReference() {
-    return this.simpleReference;
+  getMetavariable() {
+    return this.metavariable;
   }
 
   isSimple() {
@@ -47,7 +47,7 @@ export default domAssigned(class Declaration {
     const simple = this.isSimple();
 
     if (simple) {
-      const judgement = context.findJudgementBySimpleReference(this.simpleReference);
+      const judgement = context.findJudgementByMetavariable(this.metavariable);
 
       if (judgement !== null) {
         const declaration = judgement.getDeclaration();
@@ -56,9 +56,9 @@ export default domAssigned(class Declaration {
       }
     } else {
       const statement = substitution.getStatement(),
-            simpleReference = substitution.getMetavariable(),
+            metavariable = substitution.getMetavariable(),
             statementEqualToStatement = this.statement.isEqualTo(statement),
-            metavariableEqualToMetavariable = this.simpleReference.isEqualTo(simpleReference);
+            metavariableEqualToMetavariable = this.metavariable.isEqualTo(metavariable);
 
       if (metavariableEqualToMetavariable && statementEqualToStatement) {
         substitutionMatches = true;
@@ -119,17 +119,17 @@ export default domAssigned(class Declaration {
     let metavariableVerifiesAsReference;
 
     const declarationString = this.string,
-          metavariableString = this.simpleReference.getString();
+          metavariableString = this.metavariable.getString();
 
-    context.trace(`Verifying the '${declarationString}' declaration's '${metavariableString}' simpleReference as a reference...`);
+    context.trace(`Verifying the '${declarationString}' declaration's '${metavariableString}' metavariable as a reference...`);
 
-    const reference = referenceFromMetavariable(this.simpleReference, context),
+    const reference = referenceFromMetavariable(this.metavariable, context),
           referenceVerifies = reference.verify(context);
 
     metavariableVerifiesAsReference = referenceVerifies;  ///
 
     if (metavariableVerifiesAsReference) {
-      context.debug(`...verified the '${declarationString}' declaration's '${metavariableString}' simpleReference as a reference.`);
+      context.debug(`...verified the '${declarationString}' declaration's '${metavariableString}' metavariable as a reference.`);
     }
 
     return metavariableVerifiesAsReference;
@@ -163,14 +163,14 @@ export default domAssigned(class Declaration {
     let verifiesAsMetavariable;
 
     const declarationString = this.string,  ///
-          metavariableString = this.simpleReference.getString();
+          metavariableString = this.metavariable.getString();
 
-    context.trace(`Verifying the '${declarationString}' declaration's '${metavariableString}' simpleReference...`);
+    context.trace(`Verifying the '${declarationString}' declaration's '${metavariableString}' metavariable...`);
 
-    verifiesAsMetavariable = this.simpleReference.verify(context);
+    verifiesAsMetavariable = this.metavariable.verify(context);
 
     if (verifiesAsMetavariable) {
-      context.debug(`...verified the '${declarationString}' declaration's '${metavariableString}' simpleReference.`);
+      context.debug(`...verified the '${declarationString}' declaration's '${metavariableString}' metavariable.`);
     }
 
     return verifiesAsMetavariable;
@@ -183,7 +183,7 @@ export default domAssigned(class Declaration {
 
     context.trace(`Verifying the '${declarationString}' stated declaration...`);
 
-    const reference = referenceFromMetavariable(this.simpleReference, context),
+    const reference = referenceFromMetavariable(this.metavariable, context),
           metavariablePresent = context.isMetavariablePresentByReference(reference);
 
     if (metavariablePresent) {
@@ -215,7 +215,7 @@ export default domAssigned(class Declaration {
 
     context.trace(`Verifying the '${declarationString}' derived declaration...`);
 
-    const reference = referenceFromMetavariable(this.simpleReference, context),
+    const reference = referenceFromMetavariable(this.metavariable, context),
           metaLemmaMetatheoremPresent = context.isMetaLemmaMetatheoremPresentByReference(reference);
 
     verifiesWhenDerived = metaLemmaMetatheoremPresent; ///
@@ -264,7 +264,7 @@ export default domAssigned(class Declaration {
 
     context.trace(`Unifying the '${labelString}' label with the '${declarationString}' declaration...`);
 
-    const reference = referenceFromMetavariable(this.simpleReference, context),
+    const reference = referenceFromMetavariable(this.metavariable, context),
           labelUnifies = reference.unifyLabel(label, substitutions, context);
 
     labelUnifiesWithReference = labelUnifies; ///
@@ -332,9 +332,9 @@ export default domAssigned(class Declaration {
   }
 });
 
-function referenceFromMetavariable(simpleReference, context) {
+function referenceFromMetavariable(metavariable, context) {
   const { Reference } = dom,
-        metavariableNode = simpleReference.getNode(),
+        metavariableNode = metavariable.getNode(),
         reference = Reference.fromMetavariableNode(metavariableNode, context);
 
   return reference;
@@ -344,9 +344,9 @@ function declarationFromDeclarationNode(declarationNode, context) {
   const { Metavariable, Declaration, Statement } = dom,
         node = declarationNode,  ///
         string = context.nodeAsString(node),
-        simpleReference = Metavariable.fromDeclarationNode(declarationNode, context),
+        metavariable = Metavariable.fromDeclarationNode(declarationNode, context),
         statement = Statement.fromDeclarationNode(declarationNode, context),
-        declaration = new Declaration(string, node, statement, simpleReference);
+        declaration = new Declaration(string, node, statement, metavariable);
 
   return declaration;
 }

package/src/dom/metavariable.js

@@ -494,27 +494,6 @@ export default domAssigned(class Metavariable {
     return metavariable;
   }
 
-  static fromSimpleReferenceNode(simpleReferenceNode, context) {
-    const { Metavariable } = dom;
-
-    let node;
-
-    const type = null,
-          name = simpleReferenceNode.getName();
-
-    node = simpleReferenceNode;  ///
-
-    const string = context.nodeAsString(node),
-          tokens = context.nodeAsTokens(node),
-          metaType = null;
-
-    node = null;
-
-    const metavariable = new Metavariable(string, node, tokens, name, type, metaType);
-
-    return metavariable;
-  }
-
   static fromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
     const { MetaType } = dom,
           metavariableNode = metavariableDeclarationNode.getMetavariableNode(),

package/src/dom/reference.js

@@ -214,8 +214,8 @@ export default domAssigned(class Reference {
   }
 
   static fromSatisfiesAssertionNode(satisfiesAssertionNode, context) {
-    const simpleReferenceNode = satisfiesAssertionNode.getSimpleReferenceNode(),
-          reference = referenceFromSimpleReferenceNode(simpleReferenceNode, context);
+    const metavariableNode = satisfiesAssertionNode.getMetavariableNode(),
+          reference = referenceFromMetavariableNode(metavariableNode, context);
 
     return reference;
   }
@@ -236,11 +236,3 @@ function referenceFromMetavariableNode(metavariableNode, context) {
 
   return reference;
 }
-
-function referenceFromSimpleReferenceNode(simpleReferenceNode, context) {
-  const { Reference, Metavariable } = dom,
-        metavariable = Metavariable.fromSimpleReferenceNode(simpleReferenceNode, context),
-        reference = new Reference(metavariable);
-
-  return reference;
-}

package/src/index.js

@@ -39,7 +39,6 @@ import Metavariable from "./dom/metavariable";
 import ProcedureCall from "./dom/procedureCall";
 import SubDerivation from "./dom/subDerivation";
 import TypeAssertion from "./dom/assertion/type";
-import SimpleReference from "./dom/simpleReference";
 import DefinedAssertion from "./dom/assertion/defined";
 import PropertyRelation from "./dom/propertyRelation";
 import TermSubstitution from "./dom/substitution/term";

package/src/node/assertion/satisfies.js

@@ -2,7 +2,7 @@
 
 import NonTerminalNode from "../../node/nonTerminal";
 
-import { SIGNATURE_RULE_NAME, SIMPLE_REFERENCE_RULE_NAME } from "../../ruleNames";
+import { SIGNATURE_RULE_NAME, METAVARIABLE_RULE_NAME } from "../../ruleNames";
 
 export default class SatisfiesAssertionNode extends NonTerminalNode {
   getSignatureNode() {
@@ -12,11 +12,11 @@ export default class SatisfiesAssertionNode extends NonTerminalNode {
     return signatureNode;
   }
 
-  getSimpleReferenceNode() {
-    const ruleName = SIMPLE_REFERENCE_RULE_NAME,
-          simpleReferenceNode = this.getNodeByRuleName(ruleName);
+  getMetavariableNode() {
+    const ruleName = METAVARIABLE_RULE_NAME,
+          metavariableNode = this.getNodeByRuleName(ruleName);
 
-    return simpleReferenceNode;
+    return metavariableNode;
   }
 
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SatisfiesAssertionNode, ruleName, childNodes, opacity, precedence); }

package/src/nonTerminalNodeMap.js

@@ -57,7 +57,6 @@ import TypeAssertionNode from "./node/assertion/type";
 import ConjectureBodyNode from "./node/body/conjecture";
 import MetatheoremBodyNode from "./node/body/metatheorem";
 import MetaLemmaHeaderNode from "./node/header/metaLemma";
-import SimpleReferenceNode from "./node/simpleReference";
 import PropertyRelationNode from "./node/propertyRelation"
 import DefinedAssertionNode from "./node/assertion/defined";
 import TermSubstitutionNode from "./node/substitution/term";
@@ -216,7 +215,6 @@ const NonTerminalNodeMap = {
   [THEOREM_HEADER_RULE_NAME]: TheoremHeaderNode,
   [META_LEMMA_BODY_RULE_NAME]: MetaLemmaBodyNode,
   [CONJECTURE_BODY_RULE_NAME]: ConjectureBodyNode,
-  [SIMPLE_REFERENCE_RULE_NAME]: SimpleReferenceNode,
   [METATHEOREM_BODY_RULE_NAME]: MetatheoremBodyNode,
   [META_LEMMA_HEADER_RULE_NAME]: MetaLemmaHeaderNode,
   [CONJECTURE_HEADER_RULE_NAME]: ConjectureHeaderNode,

package/src/ruleNames.js

@@ -56,7 +56,6 @@ export const THEOREM_HEADER_RULE_NAME = "theoremHeader";
 export const META_LEMMA_BODY_RULE_NAME = "metaLemmaBody";
 export const CONJECTURE_BODY_RULE_NAME = "conjectureBody";
 export const METATHEOREM_BODY_RULE_NAME = "metatheoremBody";
-export const SIMPLE_REFERENCE_RULE_NAME = "simpleReference";
 export const META_LEMMA_HEADER_RULE_NAME = "metaLemmaHeader";
 export const PROPERTY_RELATION_RULE_NAME = "propertyRelation";
 export const DEFINED_ASSERTION_RULE_NAME = "definedAssertion";

package/lib/node/simpleReference.js

@@ -1,116 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return SimpleReferenceNode;
-    }
-});
-var _nonTerminal = /*#__PURE__*/ _interop_require_default(require("../node/nonTerminal"));
-var _ruleNames = require("../ruleNames");
-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 _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 _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 _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-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 _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 SimpleReferenceNode = /*#__PURE__*/ function(NonTerminalNode) {
-    _inherits(SimpleReferenceNode, NonTerminalNode);
-    function SimpleReferenceNode() {
-        _class_call_check(this, SimpleReferenceNode);
-        return _call_super(this, SimpleReferenceNode, arguments);
-    }
-    _create_class(SimpleReferenceNode, [
-        {
-            key: "getMetavariableNode",
-            value: function getMetavariableNode() {
-                var ruleName = _ruleNames.METAVARIABLE_RULE_NAME, metavariableNode = this.getNodeByRuleName(ruleName);
-                return metavariableNode;
-            }
-        }
-    ], [
-        {
-            key: "fromRuleNameChildNodesOpacityAndPrecedence",
-            value: function fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) {
-                return _nonTerminal.default.fromRuleNameChildNodesOpacityAndPrecedence(SimpleReferenceNode, ruleName, childNodes, opacity, precedence);
-            }
-        }
-    ]);
-    return SimpleReferenceNode;
-}(_nonTerminal.default);
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub2RlL3NpbXBsZVJlZmVyZW5jZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IE5vblRlcm1pbmFsTm9kZSBmcm9tIFwiLi4vbm9kZS9ub25UZXJtaW5hbFwiO1xuXG5pbXBvcnQgeyBNRVRBVkFSSUFCTEVfUlVMRV9OQU1FIH0gZnJvbSBcIi4uL3J1bGVOYW1lc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBTaW1wbGVSZWZlcmVuY2VOb2RlIGV4dGVuZHMgTm9uVGVybWluYWxOb2RlIHtcbiAgZ2V0TWV0YXZhcmlhYmxlTm9kZSgpIHtcbiAgICBjb25zdCBydWxlTmFtZSA9IE1FVEFWQVJJQUJMRV9SVUxFX05BTUUsXG4gICAgICAgICAgbWV0YXZhcmlhYmxlTm9kZSA9IHRoaXMuZ2V0Tm9kZUJ5UnVsZU5hbWUocnVsZU5hbWUpO1xuXG4gICAgcmV0dXJuIG1ldGF2YXJpYWJsZU5vZGU7XG4gIH1cblxuICBzdGF0aWMgZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlKHJ1bGVOYW1lLCBjaGlsZE5vZGVzLCBvcGFjaXR5LCBwcmVjZWRlbmNlKSB7IHJldHVybiBOb25UZXJtaW5hbE5vZGUuZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlKFNpbXBsZVJlZmVyZW5jZU5vZGUsIHJ1bGVOYW1lLCBjaGlsZE5vZGVzLCBvcGFjaXR5LCBwcmVjZWRlbmNlKTsgfVxufVxuIl0sIm5hbWVzIjpbIlNpbXBsZVJlZmVyZW5jZU5vZGUiLCJnZXRNZXRhdmFyaWFibGVOb2RlIiwicnVsZU5hbWUiLCJNRVRBVkFSSUFCTEVfUlVMRV9OQU1FIiwibWV0YXZhcmlhYmxlTm9kZSIsImdldE5vZGVCeVJ1bGVOYW1lIiwiZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlIiwiY2hpbGROb2RlcyIsIm9wYWNpdHkiLCJwcmVjZWRlbmNlIiwiTm9uVGVybWluYWxOb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU1xQkE7OztrRUFKTzt5QkFFVzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUV4QixJQUFBLEFBQU1BLG9DQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtRQUFOLE9BQUEsa0JBQU1BOztrQkFBQUE7O1lBQ25CQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUMsV0FBV0MsaUNBQXNCLEVBQ2pDQyxtQkFBbUIsSUFBSSxDQUFDQyxpQkFBaUIsQ0FBQ0g7Z0JBRWhELE9BQU9FO1lBQ1Q7Ozs7WUFFT0UsS0FBQUE7bUJBQVAsU0FBT0EsMkNBQTJDSixRQUFRLEVBQUVLLFVBQVUsRUFBRUMsT0FBTyxFQUFFQyxVQUFVO2dCQUFJLE9BQU9DLG9CQUFlLENBQUNKLDBDQUEwQyxDQVI3SU4scUJBUW1LRSxVQUFVSyxZQUFZQyxTQUFTQztZQUFhOzs7V0FSL01UO0VBQTRCVSxvQkFBZSJ9

package/src/node/simpleReference.js

@@ -1,16 +0,0 @@
-"use strict";
-
-import NonTerminalNode from "../node/nonTerminal";
-
-import { METAVARIABLE_RULE_NAME } from "../ruleNames";
-
-export default class SimpleReferenceNode extends NonTerminalNode {
-  getMetavariableNode() {
-    const ruleName = METAVARIABLE_RULE_NAME,
-          metavariableNode = this.getNodeByRuleName(ruleName);
-
-    return metavariableNode;
-  }
-
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SimpleReferenceNode, ruleName, childNodes, opacity, precedence); }
-}