occam-verify-cli 1.0.172 → 1.0.175

package/src/node.js

@@ -2,4 +2,26 @@
 
 import { NonTerminalNode } from "occam-parsers";
 
-export default class Node extends NonTerminalNode {}
+import nodeMixins from "./mixins/node";
+
+class Node extends NonTerminalNode {
+  static fromRuleNameChildNodesAndOpacity(Class, ruleName, childNodes, opacity, ...remainingArguments) {
+    if (opacity === undefined) {
+      opacity = childNodes; ///
+
+      childNodes = ruleName;  ///
+
+      ruleName = Class; ///
+
+      Class = Node; ///
+    }
+
+    const node = NonTerminalNode.fromRuleNameChildNodesAndOpacity(Class, ruleName, childNodes, opacity, ...remainingArguments);
+
+    return node;
+  }
+}
+
+Object.assign(Node.prototype, nodeMixins);
+
+export default Node;

package/src/nodeMap.js

@@ -16,6 +16,7 @@ import SubproofNode from "./node/subproof"
 import PropertyNode from "./node/property"
 import MetaTypeNode from "./node/metaType"
 import EqualityNode from "./node/equality"
+import VariableNode from "./node/variable"
 import StatementNode from "./node/statement"
 import ReferenceNode from "./node/reference"
 import DeductionNode from "./node/deduction"
@@ -41,6 +42,7 @@ import PropertyAssertionNode from "./node/assertion/property";
 import SubproofAssertionNode from "./node/assertion/subproof";
 import ContainedAssertionNode from "./node/assertion/contained";
 import SatisfiesAssertionNode from "./node/assertion/satisfies";
+import PropertyDeclarationNode from "./node/declaration/property";
 import variableDeclarationNode from "./node/declaration/variable";
 import combinatorDeclarationNode from "./node/declaration/combinator";
 import complexTypeDeclarationNode from "./node/declaration/complexType";
@@ -62,6 +64,7 @@ import { RULE_RULE_NAME,
          SUBPROOF_RULE_NAME,
          PROPERTY_RULE_NAME,
          EQUALITY_RULE_NAME,
+         VARIABLE_RULE_NAME,
          META_TYPE_RULE_NAME,
          DEDUCTION_RULE_NAME,
          JUDGEMENT_RULE_NAME,
@@ -88,6 +91,7 @@ import { RULE_RULE_NAME,
          PROPERTY_ASSERTION_RULE_NAME,
          CONTAINED_ASSERTION_RULE_NAME,
          SATISFIES_ASSERTION_RULE_NAME,
+         PROPERTY_DECLARATION_RULE_NAME,
          VARIABLE_DECLARATION_RULE_NAME,
          COMBINATOR_DECLARATION_RULE_NAME,
          CONSTRUCTOR_DECLARATION_RULE_NAME,
@@ -108,8 +112,9 @@ const ruleMap = {
   [THEOREM_RULE_NAME]: TheoremNode,
   [PREMISE_RULE_NAME]: PremiseNode,
   [PROPERTY_RULE_NAME]: PropertyNode,
-  [EQUALITY_RULE_NAME]: EqualityNode,
   [SUBPROOF_RULE_NAME]: SubproofNode,
+  [EQUALITY_RULE_NAME]: EqualityNode,
+  [VARIABLE_RULE_NAME]: VariableNode,
   [REFERENCE_RULE_NAME]: ReferenceNode,
   [JUDGEMENT_RULE_NAME]: JudgementNode,
   [META_TYPE_RULE_NAME]: MetaTypeNode,
@@ -137,6 +142,7 @@ const ruleMap = {
   [SATISFIES_ASSERTION_RULE_NAME]: SatisfiesAssertionNode,
   [CONTAINED_ASSERTION_RULE_NAME]: ContainedAssertionNode,
   [VARIABLE_DECLARATION_RULE_NAME]: variableDeclarationNode,
+  [PROPERTY_DECLARATION_RULE_NAME]: PropertyDeclarationNode,
   [COMBINATOR_DECLARATION_RULE_NAME]: combinatorDeclarationNode,
   [CONSTRUCTOR_DECLARATION_RULE_NAME]: constructorDeclarationNode,
   [COMPLEX_TYPE_DECLARATION_RULE_NAME]: complexTypeDeclarationNode,

package/src/ruleNames.js

@@ -14,6 +14,7 @@ export const THEOREM_RULE_NAME = "theorem";
 export const PREMISE_RULE_NAME = "premise";
 export const PROPERTY_RULE_NAME = "property";
 export const EQUALITY_RULE_NAME = "equality";
+export const VARIABLE_RULE_NAME = "variable";
 export const SUBPROOF_RULE_NAME = "subproof";
 export const META_TYPE_RULE_NAME = "metaType";
 export const PARAMETER_RULE_NAME = "parameter";
@@ -41,6 +42,7 @@ export const PROPERTY_ASSERTION_RULE_NAME = "propertyAssertion";
 export const SUBPROOF_ASSERTION_RULE_NAME = "subproofAssertion";
 export const CONTAINED_ASSERTION_RULE_NAME = "containedAssertion";
 export const SATISFIES_ASSERTION_RULE_NAME = "satisfiesAssertion";
+export const PROPERTY_DECLARATION_RULE_NAME = "propertyDeclaration";
 export const VARIABLE_DECLARATION_RULE_NAME = "variableDeclaration";
 export const COMBINATOR_DECLARATION_RULE_NAME = "combinatorDeclaration";
 export const CONSTRUCTOR_DECLARATION_RULE_NAME = "constructorDeclaration";

package/src/unifier/metavariable.js

@@ -4,7 +4,6 @@ import dom from "../dom";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
-import { typeNameFromTypeNode } from "../utilities/name";
 
 const typeNodeQuery = nodeQuery("/type"),
       termNodeQuery = nodeQuery("/term");
@@ -32,7 +31,7 @@ class MetavariableUnifier extends Unifier {
         const { Term } = dom,
               typeNode = generalTypeNode, ///
               termNode = specificTermNode, ///
-              typeName = typeNameFromTypeNode(typeNode),
+              typeName = typeNode.getTypeName(),
               type = generalContext.findTypeByTypeName(typeName),
               context = specificContext, ///
               term = Term.fromTermNode(termNode, context),

package/src/unifier/statementWithCombinator.js

@@ -4,7 +4,6 @@ import dom from "../dom";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
-import { typeNameFromTypeNode } from "../utilities/name";
 
 const termNodeQuery = nodeQuery("/term"),
       typeNodeQuery = nodeQuery("/type"),
@@ -87,7 +86,7 @@ class StatementWithCombinatorUnifier extends Unifier {
         const { Term } = dom,
               typeNode = generalTypeNode, ///
               termNode = specificTermNode, ///
-              typeName = typeNameFromTypeNode(typeNode);
+              typeName = typeNode.getTypeName();
 
         let context;
 

package/src/unifier/termWithConstructor.js

@@ -4,7 +4,6 @@ import dom from "../dom";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
-import { typeNameFromTypeNode } from "../utilities/name";
 
 const termNodeQuery = nodeQuery("/term"),
       typeNodeQuery = nodeQuery("/type");
@@ -31,7 +30,7 @@ class TermWithConstructorUnifier extends Unifier {
 
         const { Term } = dom,
               typeNode = generalTypeNode, ///
-              typeName = typeNameFromTypeNode(typeNode),
+              typeName = typeNode.getTypeName(),
               type = context.findTypeByTypeName(typeName);
 
         if (type !== null) {

package/src/utilities/node.js

@@ -0,0 +1,72 @@
+"use strict";
+
+import dom from "../dom";
+
+import { objectType } from "../dom/type";
+import { TYPE_RULE_NAME, VARIABLE_RULE_NAME, PROPERTY_RULE_NAME, PROPERTY_DECLARATION_RULE_NAME } from "../ruleNames";
+
+export function isNodeTypeNode(node) { return isNodeRuleNode(node, TYPE_RULE_NAME); }
+
+export function isNodeVariableNode(node) { return isNodeRuleNode(node, VARIABLE_RULE_NAME); }
+
+export function isNodePropertyNode(node) { return isNodeRuleNode(node, PROPERTY_RULE_NAME); }
+
+export function isNodePropertyDeclarationNode(node) { return isNodeRuleNode(node, PROPERTY_DECLARATION_RULE_NAME); }
+
+export function typeFromTypeNode(typeNode) {
+  let type;
+
+  if (typeNode === null) {
+    type = objectType;
+  } else {
+    const { Type } = dom,
+          typeName = typeNode.getTypeName(),
+          name = typeName,  ///
+          string = name,  ///
+          superTypes = null,
+          properties = null,
+          provisional = null;
+
+    type = new Type(string, name, superTypes, properties, provisional);
+  }
+
+  return type;
+}
+
+export function termFromTermNode(termNode, context) {
+  const { Term } = dom,
+        node = termNode,  ///
+        string = context.nodeAsString(node),
+        type = null,
+        term = new Term(string, node, type);
+
+  return term;
+}
+
+export function statementFromStatementNode(statementNode, context) {
+  const { Statement } = dom,
+        node = statementNode, ///
+        tokens = context.nodeAsTokens(node),
+        string = context.tokensAsString(tokens),
+        statement = new Statement(string, node, tokens);
+
+  return statement;
+}
+
+function isNodeRuleNode(node, ruleName) {
+  let nodeRuleNode = false;
+
+  const nodeNonTerminalNode = node.isNonTerminalNode();
+
+  if (nodeNonTerminalNode) {
+    const nonTerminalNode = node, ///
+          nonTerminalNodeRuleName = nonTerminalNode.getRuleName(),
+          nonTerminalNodeRuleNameRuleName = (nonTerminalNodeRuleName === ruleName);
+
+    if (nonTerminalNodeRuleNameRuleName) {
+      nodeRuleNode = true;
+    }
+  }
+
+  return nodeRuleNode;
+}

package/src/verifier/combinator.js

@@ -5,7 +5,6 @@ import Verifier from "../verifier";
 import LocalContext from "../context/local";
 
 import { nodeQuery } from "../utilities/query";
-import { typeNameFromTypeNode } from "../utilities/name";
 
 const termNodeQuery = nodeQuery("/term"),
       typeNodeQuery = nodeQuery("/type"),
@@ -60,7 +59,7 @@ class CombinatorVerifier extends Verifier {
       verify: (typeNode, fileContext) => {
         let typeVerified = false;
 
-        const typeName = typeNameFromTypeNode(typeNode),
+        const typeName = typeNode.getTypeName(),
               typePresent = fileContext.isTypePresentByTypeName(typeName);
 
         if (typePresent) {

package/src/verifier/constructor.js

@@ -8,7 +8,6 @@ import LocalContext from "../context/local";
 
 import { nodeQuery } from "../utilities/query";
 import { TYPE_TYPE } from "../constants";
-import { typeNameFromTypeNode } from "../utilities/name";
 
 const { last } = arrayUtilities;
 
@@ -74,7 +73,7 @@ class ConstructorVerifier extends Verifier {
       verify: (typeNode, fileContext, verifyAhead) => {
         let typeVerified;
 
-        const typeName = typeNameFromTypeNode(typeNode),
+        const typeName = typeNode.getTypeName(),
               typePresent = fileContext.isTypePresentByTypeName(typeName);
 
         if (typePresent) {

package/lib/utilities/name.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get metaTypeNameFromMetaTypeNode () {
-        return metaTypeNameFromMetaTypeNode;
-    },
-    get metavariableNameFromMetavariableNode () {
-        return metavariableNameFromMetavariableNode;
-    },
-    get typeNameFromTypeNode () {
-        return typeNameFromTypeNode;
-    },
-    get variableNameFromVariableNode () {
-        return variableNameFromVariableNode;
-    }
-});
-var _query = require("../utilities/query");
-var typeTerminalNodeQuery = (0, _query.nodeQuery)("/type/@type"), nameTerminalNodeQuery = (0, _query.nodeQuery)("/variable|metavariable/@name"), metaTypeTerminalNodeQuery = (0, _query.nodeQuery)("/metaType/@meta-type");
-function typeNameFromTypeNode(typeNode) {
-    var typeTerminalNode = typeTerminalNodeQuery(typeNode), typeTerminalNodeContent = typeTerminalNode.getContent(), typeName = typeTerminalNodeContent; ///
-    return typeName;
-}
-function variableNameFromVariableNode(variableNode) {
-    var nameTerminalNode = nameTerminalNodeQuery(variableNode), nameTerminalNodeContent = nameTerminalNode.getContent(), variableName = nameTerminalNodeContent; ///
-    return variableName;
-}
-function metaTypeNameFromMetaTypeNode(metaTypeNode) {
-    var metaTypeTerminalNode = metaTypeTerminalNodeQuery(metaTypeNode), metaTypeTerminalNodeContent = metaTypeTerminalNode.getContent(), metaTypeName = metaTypeTerminalNodeContent; ///
-    return metaTypeName;
-}
-function metavariableNameFromMetavariableNode(metavariableNode) {
-    var nameTerminalNode = nameTerminalNodeQuery(metavariableNode), nameTerminalNodeContent = nameTerminalNode.getContent(), metavariableName = nameTerminalNodeContent; ///
-    return metavariableName;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbmFtZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB0eXBlVGVybWluYWxOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdHlwZS9AdHlwZVwiKSxcbiAgICAgIG5hbWVUZXJtaW5hbE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi92YXJpYWJsZXxtZXRhdmFyaWFibGUvQG5hbWVcIiksXG4gICAgICBtZXRhVHlwZVRlcm1pbmFsTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGFUeXBlL0BtZXRhLXR5cGVcIik7XG5cbmV4cG9ydCBmdW5jdGlvbiB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSkge1xuICBjb25zdCB0eXBlVGVybWluYWxOb2RlID0gdHlwZVRlcm1pbmFsTm9kZVF1ZXJ5KHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVRlcm1pbmFsTm9kZUNvbnRlbnQgPSB0eXBlVGVybWluYWxOb2RlLmdldENvbnRlbnQoKSxcbiAgICAgICAgdHlwZU5hbWUgPSB0eXBlVGVybWluYWxOb2RlQ29udGVudDsgLy8vXG5cbiAgcmV0dXJuIHR5cGVOYW1lO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpIHtcbiAgY29uc3QgbmFtZVRlcm1pbmFsTm9kZSA9IG5hbWVUZXJtaW5hbE5vZGVRdWVyeSh2YXJpYWJsZU5vZGUpLFxuICAgICAgICBuYW1lVGVybWluYWxOb2RlQ29udGVudCA9IG5hbWVUZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpLFxuICAgICAgICB2YXJpYWJsZU5hbWUgPSBuYW1lVGVybWluYWxOb2RlQ29udGVudDsgLy8vXG5cbiAgcmV0dXJuIHZhcmlhYmxlTmFtZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1ldGFUeXBlTmFtZUZyb21NZXRhVHlwZU5vZGUobWV0YVR5cGVOb2RlKSB7XG4gICAgY29uc3QgbWV0YVR5cGVUZXJtaW5hbE5vZGUgPSBtZXRhVHlwZVRlcm1pbmFsTm9kZVF1ZXJ5KG1ldGFUeXBlTm9kZSksXG4gICAgICAgICAgbWV0YVR5cGVUZXJtaW5hbE5vZGVDb250ZW50ID0gbWV0YVR5cGVUZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpLFxuICAgICAgICAgIG1ldGFUeXBlTmFtZSA9IG1ldGFUeXBlVGVybWluYWxOb2RlQ29udGVudDsgLy8vXG5cbiAgcmV0dXJuIG1ldGFUeXBlTmFtZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1ldGF2YXJpYWJsZU5hbWVGcm9tTWV0YXZhcmlhYmxlTm9kZShtZXRhdmFyaWFibGVOb2RlKSB7XG4gIGNvbnN0IG5hbWVUZXJtaW5hbE5vZGUgPSBuYW1lVGVybWluYWxOb2RlUXVlcnkobWV0YXZhcmlhYmxlTm9kZSksXG4gICAgICAgIG5hbWVUZXJtaW5hbE5vZGVDb250ZW50ID0gbmFtZVRlcm1pbmFsTm9kZS5nZXRDb250ZW50KCksXG4gICAgICAgIG1ldGF2YXJpYWJsZU5hbWUgPSBuYW1lVGVybWluYWxOb2RlQ29udGVudDsgLy8vXG5cbiAgcmV0dXJuIG1ldGF2YXJpYWJsZU5hbWU7XG59XG4iXSwibmFtZXMiOlsibWV0YVR5cGVOYW1lRnJvbU1ldGFUeXBlTm9kZSIsIm1ldGF2YXJpYWJsZU5hbWVGcm9tTWV0YXZhcmlhYmxlTm9kZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSIsInR5cGVUZXJtaW5hbE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIm5hbWVUZXJtaW5hbE5vZGVRdWVyeSIsIm1ldGFUeXBlVGVybWluYWxOb2RlUXVlcnkiLCJ0eXBlTm9kZSIsInR5cGVUZXJtaW5hbE5vZGUiLCJ0eXBlVGVybWluYWxOb2RlQ29udGVudCIsImdldENvbnRlbnQiLCJ0eXBlTmFtZSIsInZhcmlhYmxlTm9kZSIsIm5hbWVUZXJtaW5hbE5vZGUiLCJuYW1lVGVybWluYWxOb2RlQ29udGVudCIsInZhcmlhYmxlTmFtZSIsIm1ldGFUeXBlTm9kZSIsIm1ldGFUeXBlVGVybWluYWxOb2RlIiwibWV0YVR5cGVUZXJtaW5hbE5vZGVDb250ZW50IiwibWV0YVR5cGVOYW1lIiwibWV0YXZhcmlhYmxlTm9kZSIsIm1ldGF2YXJpYWJsZU5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQXdCZ0JBO2VBQUFBOztRQVFBQztlQUFBQTs7UUF4QkFDO2VBQUFBOztRQVFBQztlQUFBQTs7O3FCQWRVO0FBRTFCLElBQU1DLHdCQUF3QkMsSUFBQUEsZ0JBQVMsRUFBQyxnQkFDbENDLHdCQUF3QkQsSUFBQUEsZ0JBQVMsRUFBQyxpQ0FDbENFLDRCQUE0QkYsSUFBQUEsZ0JBQVMsRUFBQztBQUVyQyxTQUFTSCxxQkFBcUJNLFFBQVE7SUFDM0MsSUFBTUMsbUJBQW1CTCxzQkFBc0JJLFdBQ3pDRSwwQkFBMEJELGlCQUFpQkUsVUFBVSxJQUNyREMsV0FBV0YseUJBQXlCLEdBQUc7SUFFN0MsT0FBT0U7QUFDVDtBQUVPLFNBQVNULDZCQUE2QlUsWUFBWTtJQUN2RCxJQUFNQyxtQkFBbUJSLHNCQUFzQk8sZUFDekNFLDBCQUEwQkQsaUJBQWlCSCxVQUFVLElBQ3JESyxlQUFlRCx5QkFBeUIsR0FBRztJQUVqRCxPQUFPQztBQUNUO0FBRU8sU0FBU2hCLDZCQUE2QmlCLFlBQVk7SUFDckQsSUFBTUMsdUJBQXVCWCwwQkFBMEJVLGVBQ2pERSw4QkFBOEJELHFCQUFxQlAsVUFBVSxJQUM3RFMsZUFBZUQsNkJBQTZCLEdBQUc7SUFFdkQsT0FBT0M7QUFDVDtBQUVPLFNBQVNuQixxQ0FBcUNvQixnQkFBZ0I7SUFDbkUsSUFBTVAsbUJBQW1CUixzQkFBc0JlLG1CQUN6Q04sMEJBQTBCRCxpQkFBaUJILFVBQVUsSUFDckRXLG1CQUFtQlAseUJBQXlCLEdBQUc7SUFFckQsT0FBT087QUFDVCJ9

package/src/utilities/name.js

@@ -1,39 +0,0 @@
-"use strict";
-
-import { nodeQuery } from "../utilities/query";
-
-const typeTerminalNodeQuery = nodeQuery("/type/@type"),
-      nameTerminalNodeQuery = nodeQuery("/variable|metavariable/@name"),
-      metaTypeTerminalNodeQuery = nodeQuery("/metaType/@meta-type");
-
-export function typeNameFromTypeNode(typeNode) {
-  const typeTerminalNode = typeTerminalNodeQuery(typeNode),
-        typeTerminalNodeContent = typeTerminalNode.getContent(),
-        typeName = typeTerminalNodeContent; ///
-
-  return typeName;
-}
-
-export function variableNameFromVariableNode(variableNode) {
-  const nameTerminalNode = nameTerminalNodeQuery(variableNode),
-        nameTerminalNodeContent = nameTerminalNode.getContent(),
-        variableName = nameTerminalNodeContent; ///
-
-  return variableName;
-}
-
-export function metaTypeNameFromMetaTypeNode(metaTypeNode) {
-    const metaTypeTerminalNode = metaTypeTerminalNodeQuery(metaTypeNode),
-          metaTypeTerminalNodeContent = metaTypeTerminalNode.getContent(),
-          metaTypeName = metaTypeTerminalNodeContent; ///
-
-  return metaTypeName;
-}
-
-export function metavariableNameFromMetavariableNode(metavariableNode) {
-  const nameTerminalNode = nameTerminalNodeQuery(metavariableNode),
-        nameTerminalNodeContent = nameTerminalNode.getContent(),
-        metavariableName = nameTerminalNodeContent; ///
-
-  return metavariableName;
-}