occam-verify-cli 0.0.482 → 0.0.483

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/verify/statement.js +1 -4
  2. package/lib/verify/statementTypeAssertion.js +7 -7
  3. package/package.json +3 -3
  4. package/src/verify/statement.js +0 -4
  5. package/src/verify/statementTypeAssertion.js +6 -6
package/lib/verify/statement.js CHANGED
@@ -26,11 +26,8 @@ function verifyStatement(statementNode, proofContext) {
26
26
  var statementTypeAssertionVerified = (0, _statementTypeAssertion.default)(statementNode, proofContext);
27
27
  statementVerified = statementTypeAssertionVerified; ///
28
28
  }
29
- if (!statementVerified) {
30
- statementVerified = true; ///
31
- }
32
29
  statementVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
33
30
  return statementVerified;
34
31
  }
35
32
 
36
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudEFzRXF1YWxpdHlcIjtcbmltcG9ydCB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uIGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50VHlwZUFzc2VydGlvblwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBzdGF0ZW1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dC5iZWdpbihzdGF0ZW1lbnROb2RlKTtcblxuICBpZiAoIXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgY29uc3QgZXF1YWxpdHlWZXJpZmllZEFzRXF1YWxpdHkgPSB2ZXJpZnlTdGF0ZW1lbnRBc0VxdWFsaXR5KHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IGVxdWFsaXR5VmVyaWZpZWRBc0VxdWFsaXR5OyAvLy9cbiAgfVxuXG4gIGlmICghc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uVmVyaWZpZWQgPSB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uKHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IHN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZDsgLy8vXG4gIH1cblxuICBpZiAoIXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgc3RhdGVtZW50VmVyaWZpZWQgPSB0cnVlOyAvLy9cbiAgfVxuXG4gIHN0YXRlbWVudFZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUoc3RhdGVtZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQoc3RhdGVtZW50Tm9kZSk7XG5cbiAgcmV0dXJuIHN0YXRlbWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVN0YXRlbWVudCIsInN0YXRlbWVudE5vZGUiLCJwcm9vZkNvbnRleHQiLCJzdGF0ZW1lbnRWZXJpZmllZCIsImJlZ2luIiwiZXF1YWxpdHlWZXJpZmllZEFzRXF1YWxpdHkiLCJ2ZXJpZnlTdGF0ZW1lbnRBc0VxdWFsaXR5Iiwic3RhdGVtZW50VHlwZUFzc2VydGlvblZlcmlmaWVkIiwidmVyaWZ5U3RhdGVtZW50VHlwZUFzc2VydGlvbiIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBS0E7OztlQUF3QkE7Ozt3RUFIYzsyRUFDRzs7Ozs7O0FBRTFCLFNBQVNBLGdCQUFnQkMsYUFBYSxFQUFFQyxZQUFZLEVBQUU7SUFDbkUsSUFBSUMsb0JBQW9CLEtBQUs7SUFFN0JELGFBQWFFLEtBQUssQ0FBQ0g7SUFFbkIsSUFBSSxDQUFDRSxtQkFBbUI7UUFDdEIsSUFBTUUsNkJBQTZCQyxJQUFBQSw0QkFBeUIsRUFBQ0wsZUFBZUM7UUFFNUVDLG9CQUFvQkUsNEJBQTRCLEdBQUc7SUFDckQsQ0FBQztJQUVELElBQUksQ0FBQ0YsbUJBQW1CO1FBQ3RCLElBQU1JLGlDQUFpQ0MsSUFBQUEsK0JBQTRCLEVBQUNQLGVBQWVDO1FBRW5GQyxvQkFBb0JJLGdDQUFnQyxHQUFHO0lBQ3pELENBQUM7SUFFRCxJQUFJLENBQUNKLG1CQUFtQjtRQUN0QkEsb0JBQW9CLElBQUksRUFBRSxHQUFHO0lBQy9CLENBQUM7SUFFREEsb0JBQ0VELGFBQWFPLFFBQVEsQ0FBQ1IsaUJBQ3BCQyxhQUFhUSxJQUFJLENBQUNULGNBQWM7SUFFcEMsT0FBT0U7QUFDVCJ9
33
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudEFzRXF1YWxpdHlcIjtcbmltcG9ydCB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uIGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50VHlwZUFzc2VydGlvblwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBzdGF0ZW1lbnRWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dC5iZWdpbihzdGF0ZW1lbnROb2RlKTtcblxuICBpZiAoIXN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgY29uc3QgZXF1YWxpdHlWZXJpZmllZEFzRXF1YWxpdHkgPSB2ZXJpZnlTdGF0ZW1lbnRBc0VxdWFsaXR5KHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IGVxdWFsaXR5VmVyaWZpZWRBc0VxdWFsaXR5OyAvLy9cbiAgfVxuXG4gIGlmICghc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uVmVyaWZpZWQgPSB2ZXJpZnlTdGF0ZW1lbnRUeXBlQXNzZXJ0aW9uKHN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IHN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZDsgLy8vXG4gIH1cblxuICBzdGF0ZW1lbnRWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKHN0YXRlbWVudE5vZGUpIDpcbiAgICAgIHByb29mQ29udGV4dC5oYWx0KHN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwicHJvb2ZDb250ZXh0Iiwic3RhdGVtZW50VmVyaWZpZWQiLCJiZWdpbiIsImVxdWFsaXR5VmVyaWZpZWRBc0VxdWFsaXR5IiwidmVyaWZ5U3RhdGVtZW50QXNFcXVhbGl0eSIsInN0YXRlbWVudFR5cGVBc3NlcnRpb25WZXJpZmllZCIsInZlcmlmeVN0YXRlbWVudFR5cGVBc3NlcnRpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUtBOzs7ZUFBd0JBOzs7d0VBSGM7MkVBQ0c7Ozs7OztBQUUxQixTQUFTQSxnQkFBZ0JDLGFBQWEsRUFBRUMsWUFBWSxFQUFFO0lBQ25FLElBQUlDLG9CQUFvQixLQUFLO0lBRTdCRCxhQUFhRSxLQUFLLENBQUNIO0lBRW5CLElBQUksQ0FBQ0UsbUJBQW1CO1FBQ3RCLElBQU1FLDZCQUE2QkMsSUFBQUEsNEJBQXlCLEVBQUNMLGVBQWVDO1FBRTVFQyxvQkFBb0JFLDRCQUE0QixHQUFHO0lBQ3JELENBQUM7SUFFRCxJQUFJLENBQUNGLG1CQUFtQjtRQUN0QixJQUFNSSxpQ0FBaUNDLElBQUFBLCtCQUE0QixFQUFDUCxlQUFlQztRQUVuRkMsb0JBQW9CSSxnQ0FBZ0MsR0FBRztJQUN6RCxDQUFDO0lBRURKLG9CQUNFRCxhQUFhTyxRQUFRLENBQUNSLGlCQUNwQkMsYUFBYVEsSUFBSSxDQUFDVCxjQUFjO0lBRXBDLE9BQU9FO0FBQ1QifQ==
package/lib/verify/statementTypeAssertion.js CHANGED
@@ -20,7 +20,7 @@ function _interopRequireDefault(obj) {
20
20
  }
21
21
  var termNodeQuery = (0, _query.nodeQuery)("/typeAssertion/term"), typeNodeQuery = (0, _query.nodeQuery)("/typeAssertion/type"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!");
22
22
  function verifyStatementTypeAssertion(statementNode, proofContext) {
23
- var typeAssertionVerified = false;
23
+ var statementTypeAssertionVerified = false;
24
24
  proofContext.begin(statementNode);
25
25
  var statementString = (0, _string.nodeAsString)(statementNode);
26
26
  proofContext.debug("Verifying the '".concat(statementString, "' statement type assertion..."));
@@ -33,18 +33,18 @@ function verifyStatementTypeAssertion(statementNode, proofContext) {
33
33
  var context = proofContext, termNode = termNodeQuery(typeAssertionNode), variables = [], termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, context);
34
34
  if (termVerifiedAsVariable) {
35
35
  var variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);
36
- typeAssertionVerified = variableTypeAssertionVerified; ///
36
+ statementTypeAssertionVerified = variableTypeAssertionVerified; ///
37
37
  } else {
38
38
  var termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);
39
- typeAssertionVerified = termTypeAssertionVerified; ///
39
+ statementTypeAssertionVerified = termTypeAssertionVerified; ///
40
40
  }
41
41
  }
42
42
  }
43
- if (typeAssertionVerified) {
43
+ if (statementTypeAssertionVerified) {
44
44
  proofContext.info("Verified the '".concat(statementString, "' statement type assertion."));
45
45
  }
46
- typeAssertionVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
47
- return typeAssertionVerified;
46
+ statementTypeAssertionVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
47
+ return statementTypeAssertionVerified;
48
48
  }
49
49
  function verifyTermTypeAssertion(typeAssertionNode, proofContext) {
50
50
  var termTypeAssertionVerified = false;
@@ -79,4 +79,4 @@ function verifyVariableTypeAssertion(typeAssertionNode, proofContext) {
79
79
  return variableTypeAssertionVerified;
80
80
  }
81
81
 
82
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementTypeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { verifyTermAsVariable, verifyTermAgainstConstructors } from \"../verify/term\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nexport default function verifyStatementTypeAssertion(statementNode, proofContext) {\n  let typeAssertionVerified = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement type assertion...`);\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          typePresent = proofContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      proofContext.error(`The ${typeName} type is not present.`);\n    } else {\n      const context = proofContext, ///\n            termNode = termNodeQuery(typeAssertionNode),\n            variables = [],\n            termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context);\n\n      if (termVerifiedAsVariable) {\n        const variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);\n\n        typeAssertionVerified = variableTypeAssertionVerified;  ///\n      } else {\n        const termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);\n\n        typeAssertionVerified = termTypeAssertionVerified;  ///\n      }\n    }\n  }\n\n  if (typeAssertionVerified) {\n    proofContext.info(`Verified the '${statementString}' statement type assertion.`);\n  }\n\n  typeAssertionVerified ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return typeAssertionVerified;\n}\n\nfunction verifyTermTypeAssertion(typeAssertionNode, proofContext) {\n  let termTypeAssertionVerified = false;\n\n  const types = [],\n        context = proofContext, ///\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context);\n\n  if (termVerifiedAgainstConstructors) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          assertedTypeName = typeName,  ///\n          assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n          firstType = first(types),\n          termType = firstType,\n          assertedTypeEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);\n\n    if (!assertedTypeEqualToOrSubTypeOfTermType) {\n      const termString = nodeAsString(termNode);\n\n      proofContext.error(`The asserted type is not equal to or a sub-type of the '${termString}' term type.`);\n    } else {\n      termTypeAssertionVerified = true;\n    }\n  }\n\n  return termTypeAssertionVerified;\n}\n\nfunction verifyVariableTypeAssertion(typeAssertionNode, proofContext) {\n  let variableTypeAssertionVerified = false;\n\n  const context = proofContext, ///\n        variables = [],\n        termNode = termNodeQuery(typeAssertionNode);\n\n  verifyTermAsVariable(termNode, variables, context);\n\n  const typeNode = typeNodeQuery(typeAssertionNode),\n        typeName = typeNameFromTypeNode(typeNode),\n        assertedTypeName = typeName,  ///\n        assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n        firstVariable = first(variables),\n        variable = firstVariable, ///\n        variableName = variable.getName(),\n        variableType = variable.getType();\n\n  const assertedTypeEqualToOrSubTypeOfVariableType = (variableType === null) ?\n                                                        true :  ///\n                                                          assertedType.isEqualToOrSubTypeOf(variableType);\n\n  if (!assertedTypeEqualToOrSubTypeOfVariableType) {\n    proofContext.error(`The asserted type is not equal to or a sub-type of the '${variableName}' variable type.`);\n  } else {\n    const derived = proofContext.isDerived();\n\n    if (!derived) {\n      const type = assertedType,  ///\n            name = variableName,  ///\n            variable = Variable.fromTypeAndName(type, name);\n\n      proofContext.addVariable(variable);\n    }\n\n    variableTypeAssertionVerified = true;\n  }\n\n  return variableTypeAssertionVerified;\n}\n"],"names":["verifyStatementTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNodeQuery","statementNode","proofContext","typeAssertionVerified","begin","statementString","nodeAsString","debug","typeAssertionNode","typeNode","typeName","typeNameFromTypeNode","typePresent","isTypePresentByTypeName","error","context","termNode","variables","termVerifiedAsVariable","verifyTermAsVariable","variableTypeAssertionVerified","verifyVariableTypeAssertion","termTypeAssertionVerified","verifyTermTypeAssertion","info","complete","halt","types","termVerifiedAgainstConstructors","verifyTermAgainstConstructors","assertedTypeName","assertedType","findTypeByTypeName","firstType","first","termType","assertedTypeEqualToOrSubTypeOfTermType","isEqualToOrSubTypeOf","termString","firstVariable","variable","variableName","getName","variableType","getType","assertedTypeEqualToOrSubTypeOfVariableType","derived","isDerived","type","name","Variable","fromTypeAndName","addVariable"],"mappings":"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"}
82
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementTypeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { verifyTermAsVariable, verifyTermAgainstConstructors } from \"../verify/term\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nexport default function verifyStatementTypeAssertion(statementNode, proofContext) {\n  let statementTypeAssertionVerified = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement type assertion...`);\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          typePresent = proofContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      proofContext.error(`The ${typeName} type is not present.`);\n    } else {\n      const context = proofContext, ///\n            termNode = termNodeQuery(typeAssertionNode),\n            variables = [],\n            termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context);\n\n      if (termVerifiedAsVariable) {\n        const variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);\n\n        statementTypeAssertionVerified = variableTypeAssertionVerified;  ///\n      } else {\n        const termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);\n\n        statementTypeAssertionVerified = termTypeAssertionVerified;  ///\n      }\n    }\n  }\n\n  if (statementTypeAssertionVerified) {\n    proofContext.info(`Verified the '${statementString}' statement type assertion.`);\n  }\n\n  statementTypeAssertionVerified ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return statementTypeAssertionVerified;\n}\n\nfunction verifyTermTypeAssertion(typeAssertionNode, proofContext) {\n  let termTypeAssertionVerified = false;\n\n  const types = [],\n        context = proofContext, ///\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context);\n\n  if (termVerifiedAgainstConstructors) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          assertedTypeName = typeName,  ///\n          assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n          firstType = first(types),\n          termType = firstType,\n          assertedTypeEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);\n\n    if (!assertedTypeEqualToOrSubTypeOfTermType) {\n      const termString = nodeAsString(termNode);\n\n      proofContext.error(`The asserted type is not equal to or a sub-type of the '${termString}' term type.`);\n    } else {\n      termTypeAssertionVerified = true;\n    }\n  }\n\n  return termTypeAssertionVerified;\n}\n\nfunction verifyVariableTypeAssertion(typeAssertionNode, proofContext) {\n  let variableTypeAssertionVerified = false;\n\n  const context = proofContext, ///\n        variables = [],\n        termNode = termNodeQuery(typeAssertionNode);\n\n  verifyTermAsVariable(termNode, variables, context);\n\n  const typeNode = typeNodeQuery(typeAssertionNode),\n        typeName = typeNameFromTypeNode(typeNode),\n        assertedTypeName = typeName,  ///\n        assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n        firstVariable = first(variables),\n        variable = firstVariable, ///\n        variableName = variable.getName(),\n        variableType = variable.getType();\n\n  const assertedTypeEqualToOrSubTypeOfVariableType = (variableType === null) ?\n                                                        true :  ///\n                                                          assertedType.isEqualToOrSubTypeOf(variableType);\n\n  if (!assertedTypeEqualToOrSubTypeOfVariableType) {\n    proofContext.error(`The asserted type is not equal to or a sub-type of the '${variableName}' variable type.`);\n  } else {\n    const derived = proofContext.isDerived();\n\n    if (!derived) {\n      const type = assertedType,  ///\n            name = variableName,  ///\n            variable = Variable.fromTypeAndName(type, name);\n\n      proofContext.addVariable(variable);\n    }\n\n    variableTypeAssertionVerified = true;\n  }\n\n  return variableTypeAssertionVerified;\n}\n"],"names":["verifyStatementTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNodeQuery","statementNode","proofContext","statementTypeAssertionVerified","begin","statementString","nodeAsString","debug","typeAssertionNode","typeNode","typeName","typeNameFromTypeNode","typePresent","isTypePresentByTypeName","error","context","termNode","variables","termVerifiedAsVariable","verifyTermAsVariable","variableTypeAssertionVerified","verifyVariableTypeAssertion","termTypeAssertionVerified","verifyTermTypeAssertion","info","complete","halt","types","termVerifiedAgainstConstructors","verifyTermAgainstConstructors","assertedTypeName","assertedType","findTypeByTypeName","firstType","first","termType","assertedTypeEqualToOrSubTypeOfTermType","isEqualToOrSubTypeOf","termString","firstVariable","variable","variableName","getName","variableType","getType","assertedTypeEqualToOrSubTypeOfVariableType","derived","isDerived","type","name","Variable","fromTypeAndName","addVariable"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "0.0.482",
4
+ "version": "0.0.483",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.21",
14
14
  "necessary": "^11.2.1",
15
- "occam-custom-grammars": "^5.0.376",
15
+ "occam-custom-grammars": "^5.0.377",
16
16
  "occam-dom": "^3.1.1",
17
- "occam-file-system": "^5.0.135",
17
+ "occam-file-system": "^5.0.136",
18
18
  "occam-grammar-utilities": "^7.0.66"
19
19
  },
20
20
  "devDependencies": {
package/src/verify/statement.js CHANGED
@@ -20,10 +20,6 @@ export default function verifyStatement(statementNode, proofContext) {
20
20
  statementVerified = statementTypeAssertionVerified; ///
21
21
  }
22
22
 
23
- if (!statementVerified) {
24
- statementVerified = true; ///
25
- }
26
-
27
23
  statementVerified ?
28
24
  proofContext.complete(statementNode) :
29
25
  proofContext.halt(statementNode);
package/src/verify/statementTypeAssertion.js CHANGED
@@ -12,7 +12,7 @@ const termNodeQuery = nodeQuery("/typeAssertion/term"),
12
12
  typeAssertionNodeQuery = nodeQuery("/statement/typeAssertion!");
13
13
 
14
14
  export default function verifyStatementTypeAssertion(statementNode, proofContext) {
15
- let typeAssertionVerified = false;
15
+ let statementTypeAssertionVerified = false;
16
16
 
17
17
  proofContext.begin(statementNode);
18
18
 
@@ -38,24 +38,24 @@ export default function verifyStatementTypeAssertion(statementNode, proofContext
38
38
  if (termVerifiedAsVariable) {
39
39
  const variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);
40
40
 
41
- typeAssertionVerified = variableTypeAssertionVerified; ///
41
+ statementTypeAssertionVerified = variableTypeAssertionVerified; ///
42
42
  } else {
43
43
  const termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);
44
44
 
45
- typeAssertionVerified = termTypeAssertionVerified; ///
45
+ statementTypeAssertionVerified = termTypeAssertionVerified; ///
46
46
  }
47
47
  }
48
48
  }
49
49
 
50
- if (typeAssertionVerified) {
50
+ if (statementTypeAssertionVerified) {
51
51
  proofContext.info(`Verified the '${statementString}' statement type assertion.`);
52
52
  }
53
53
 
54
- typeAssertionVerified ?
54
+ statementTypeAssertionVerified ?
55
55
  proofContext.complete(statementNode) :
56
56
  proofContext.halt(statementNode);
57
57
 
58
- return typeAssertionVerified;
58
+ return statementTypeAssertionVerified;
59
59
  }
60
60
 
61
61
  function verifyTermTypeAssertion(typeAssertionNode, proofContext) {