occam-verify-cli 1.0.814 → 1.0.816
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.
- package/lib/context/ephemeral.js +5 -1
- package/lib/context/liminal.js +3 -3
- package/lib/context.js +1 -1
- package/lib/element/assertion/defined.js +9 -8
- package/lib/element/signature.js +5 -5
- package/lib/element/substitution/term.js +3 -3
- package/lib/element/substitution.js +9 -1
- package/lib/element/term.js +18 -1
- package/lib/element/variable.js +2 -2
- package/lib/node/term.js +10 -1
- package/lib/utilities/equivalences.js +3 -3
- package/package.json +1 -1
- package/src/context/ephemeral.js +8 -0
- package/src/context/liminal.js +2 -2
- package/src/context.js +1 -1
- package/src/element/assertion/defined.js +9 -8
- package/src/element/signature.js +4 -4
- package/src/element/substitution/term.js +4 -4
- package/src/element/substitution.js +13 -0
- package/src/element/term.js +28 -0
- package/src/element/variable.js +1 -1
- package/src/node/term.js +14 -0
- package/src/utilities/equivalences.js +2 -2
package/lib/element/variable.js
CHANGED
|
@@ -131,7 +131,7 @@ const _default = (0, _elements.define)(class Variable extends _occamlanguages.El
|
|
|
131
131
|
} else {
|
|
132
132
|
let context;
|
|
133
133
|
context = generalContext; ///
|
|
134
|
-
const variableNode = variable.
|
|
134
|
+
const variableNode = variable.getNode();
|
|
135
135
|
variable = context.findVariableByVariableNode(variableNode);
|
|
136
136
|
context = specificContext; ///
|
|
137
137
|
const termNode = term.getNode();
|
|
@@ -170,4 +170,4 @@ const _default = (0, _elements.define)(class Variable extends _occamlanguages.El
|
|
|
170
170
|
}
|
|
171
171
|
});
|
|
172
172
|
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/variable.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\n\nimport elements from \"../elements\";\n\nimport { define } from \"../elements\";\nimport { instantiate } from \"../utilities/context\";\nimport { instantiateVariable } from \"../process/instantiate\";\nimport { typeFromJSON, typeToTypeJSON } from \"../utilities/json\";\nimport { variableFromTermNode, identifierFromVarialbeNode } from \"../utilities/element\";\n\nexport default define(class Variable extends Element {\n  constructor(context, string, node, type, identifier) {\n    super(context, string, node);\n\n    this.type = type;\n    this.identifier = identifier;\n  }\n\n  getIdentifier() {\n    return this.identifier;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  getVariableNode() {\n    const node = this.getNode(),\n          variableNode = node;  //\n\n    return variableNode;\n  }\n\n  getTypeString() { return this.type.getString(); }\n\n  isIdentifierEqualTo(identifier) {\n    const identifierEqualTo = (this.identifier === identifier);\n\n    return identifierEqualTo;\n  }\n\n  compareVariable(variable) {\n    const variableIdentifier = variable.getIdentifier(),\n          comparesToVariable = (this.identifier === variableIdentifier);\n\n    return comparesToVariable;\n  }\n\n  compareParamter(parameter) {\n    const identifier = parameter.getIdentifier(),\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToParamter = identifierEqualTo; ///\n\n    return comparesToParamter;\n  }\n\n  compareVariableIdentifier(variableIdentifier) {\n    const identifier = variableIdentifier, ///\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToVariableIdentifier = identifierEqualTo; ///\n\n    return comparesToVariableIdentifier;\n  }\n\n  validate(context) {\n    let variable = null;\n\n    const variableString = this.getString(); ///\n\n    context.trace(`Validating the '${variableString}' variable...`);\n\n    let validates = false;\n\n    const variableIdentifier = this.identifier, ///\n          declaredVariable = context.findDeclaredVariableByVariableIdentifier(variableIdentifier);\n\n    if (declaredVariable !== null) {\n      const type = declaredVariable.getType(),\n            typeString = type.getString(),\n            variableString = this.getString();  ///\n\n      context.trace(`Setting the '${variableString}' variable's type to the '${typeString}' type.`);\n\n      this.type = type;\n\n      validates = true;\n    } else {\n      context.debug(`The '${variableString}' variable is not present.`);\n    }\n\n    if (validates) {\n      variable = this;  ///\n\n      context.debug(`...validated the '${variableString}' variable.`);\n    }\n\n    return variable;\n  }\n\n  unifyTerm(term, generalContext, specificContext) {\n    let termUnifies = false;\n\n    const context = specificContext,  ///\n          termString = term.getString(),\n          variableString = this.getString(); ///\n\n    context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);\n\n    let variable,\n        substitution;\n\n    variable = this; ///\n\n    const variableNode = variable.getNode();\n\n    substitution = context.findSubstitutionByVariableNode(variableNode);\n\n    if (substitution !== null) {\n      const substitutionComparesToTerm = substitution.compareTerm(term, context);\n\n      if (substitutionComparesToTerm) {\n        const termSubstitution = substitution,  ///\n              termSubstitutionString = termSubstitution.getString();\n\n        context.trace(`The '${termSubstitutionString}' term substitution is already present.`);\n\n        termUnifies = true;\n      }\n    } else {\n      let context;\n\n      context = generalContext;  ///\n\n      const variableNode = variable.getIdentifier();\n\n      variable = context.findVariableByVariableNode(variableNode);\n\n      context = specificContext;  ///\n\n      const termNode = term.getNode();\n\n      term = context.findTermByTermNode(termNode);\n\n      const termType = term.getType(),\n            variableType = variable.getType(),\n            termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);\n\n      if (termTypeEqualToOrSubTypeOfVariableType) {\n        const { TermSubstitution } = elements,\n              termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, context);\n\n        termSubstitution.validate(generalContext, specificContext);\n\n        termUnifies = true;\n      }\n    }\n\n    if (termUnifies) {\n      context.debug(`...unified the '${termString}' term with the '${variableString}' variable.`);\n    }\n\n    return termUnifies;\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          type = typeJSON,  ///\n          string = this.getString(), ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static name = \"Variable\";\n\n  static fromJSON(json, context) {\n    return instantiate((context) => {\n      const { string } = json,\n            variableNode = instantiateVariable(string, context),\n            node = variableNode,  ///\n            type = typeFromJSON(json, context),\n            identifier = identifierFromVarialbeNode(variableNode, context);\n\n      context = null;\n\n      const variable = new Variable(context, string, node, type, identifier);\n\n      return variable;\n    }, context);\n  }\n\n  static fromTerm(term, context) {\n    const termNode = term.getNode(),\n          variable = variableFromTermNode(termNode, context);\n\n    return variable;\n  }\n});\n"],"names":["define","Variable","Element","context","string","node","type","identifier","getIdentifier","getType","setType","getVariableNode","getNode","variableNode","getTypeString","getString","isIdentifierEqualTo","identifierEqualTo","compareVariable","variable","variableIdentifier","comparesToVariable","compareParamter","parameter","comparesToParamter","compareVariableIdentifier","comparesToVariableIdentifier","validate","variableString","trace","validates","declaredVariable","findDeclaredVariableByVariableIdentifier","typeString","debug","unifyTerm","term","generalContext","specificContext","termUnifies","termString","substitution","findSubstitutionByVariableNode","substitutionComparesToTerm","compareTerm","termSubstitution","termSubstitutionString","findVariableByVariableNode","termNode","findTermByTermNode","termType","variableType","termTypeEqualToOrSubTypeOfVariableType","isEqualToOrSubTypeOf","TermSubstitution","elements","fromTermAndVariable","toJSON","typeJSON","typeToTypeJSON","json","name","fromJSON","instantiate","instantiateVariable","typeFromJSON","identifierFromVarialbeNode","fromTerm","variableFromTermNode"],"mappings":"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"}
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/variable.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\n\nimport elements from \"../elements\";\n\nimport { define } from \"../elements\";\nimport { instantiate } from \"../utilities/context\";\nimport { instantiateVariable } from \"../process/instantiate\";\nimport { typeFromJSON, typeToTypeJSON } from \"../utilities/json\";\nimport { variableFromTermNode, identifierFromVarialbeNode } from \"../utilities/element\";\n\nexport default define(class Variable extends Element {\n  constructor(context, string, node, type, identifier) {\n    super(context, string, node);\n\n    this.type = type;\n    this.identifier = identifier;\n  }\n\n  getIdentifier() {\n    return this.identifier;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  getVariableNode() {\n    const node = this.getNode(),\n          variableNode = node;  //\n\n    return variableNode;\n  }\n\n  getTypeString() { return this.type.getString(); }\n\n  isIdentifierEqualTo(identifier) {\n    const identifierEqualTo = (this.identifier === identifier);\n\n    return identifierEqualTo;\n  }\n\n  compareVariable(variable) {\n    const variableIdentifier = variable.getIdentifier(),\n          comparesToVariable = (this.identifier === variableIdentifier);\n\n    return comparesToVariable;\n  }\n\n  compareParamter(parameter) {\n    const identifier = parameter.getIdentifier(),\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToParamter = identifierEqualTo; ///\n\n    return comparesToParamter;\n  }\n\n  compareVariableIdentifier(variableIdentifier) {\n    const identifier = variableIdentifier, ///\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToVariableIdentifier = identifierEqualTo; ///\n\n    return comparesToVariableIdentifier;\n  }\n\n  validate(context) {\n    let variable = null;\n\n    const variableString = this.getString(); ///\n\n    context.trace(`Validating the '${variableString}' variable...`);\n\n    let validates = false;\n\n    const variableIdentifier = this.identifier, ///\n          declaredVariable = context.findDeclaredVariableByVariableIdentifier(variableIdentifier);\n\n    if (declaredVariable !== null) {\n      const type = declaredVariable.getType(),\n            typeString = type.getString(),\n            variableString = this.getString();  ///\n\n      context.trace(`Setting the '${variableString}' variable's type to the '${typeString}' type.`);\n\n      this.type = type;\n\n      validates = true;\n    } else {\n      context.debug(`The '${variableString}' variable is not present.`);\n    }\n\n    if (validates) {\n      variable = this;  ///\n\n      context.debug(`...validated the '${variableString}' variable.`);\n    }\n\n    return variable;\n  }\n\n  unifyTerm(term, generalContext, specificContext) {\n    let termUnifies = false;\n\n    const context = specificContext,  ///\n          termString = term.getString(),\n          variableString = this.getString(); ///\n\n    context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);\n\n    let variable,\n        substitution;\n\n    variable = this; ///\n\n    const variableNode = variable.getNode();\n\n    substitution = context.findSubstitutionByVariableNode(variableNode);\n\n    if (substitution !== null) {\n      const substitutionComparesToTerm = substitution.compareTerm(term, context);\n\n      if (substitutionComparesToTerm) {\n        const termSubstitution = substitution,  ///\n              termSubstitutionString = termSubstitution.getString();\n\n        context.trace(`The '${termSubstitutionString}' term substitution is already present.`);\n\n        termUnifies = true;\n      }\n    } else {\n      let context;\n\n      context = generalContext;  ///\n\n      const variableNode = variable.getNode();\n\n      variable = context.findVariableByVariableNode(variableNode);\n\n      context = specificContext;  ///\n\n      const termNode = term.getNode();\n\n      term = context.findTermByTermNode(termNode);\n\n      const termType = term.getType(),\n            variableType = variable.getType(),\n            termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);\n\n      if (termTypeEqualToOrSubTypeOfVariableType) {\n        const { TermSubstitution } = elements,\n              termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, context);\n\n        termSubstitution.validate(generalContext, specificContext);\n\n        termUnifies = true;\n      }\n    }\n\n    if (termUnifies) {\n      context.debug(`...unified the '${termString}' term with the '${variableString}' variable.`);\n    }\n\n    return termUnifies;\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          type = typeJSON,  ///\n          string = this.getString(), ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static name = \"Variable\";\n\n  static fromJSON(json, context) {\n    return instantiate((context) => {\n      const { string } = json,\n            variableNode = instantiateVariable(string, context),\n            node = variableNode,  ///\n            type = typeFromJSON(json, context),\n            identifier = identifierFromVarialbeNode(variableNode, context);\n\n      context = null;\n\n      const variable = new Variable(context, string, node, type, identifier);\n\n      return variable;\n    }, context);\n  }\n\n  static fromTerm(term, context) {\n    const termNode = term.getNode(),\n          variable = variableFromTermNode(termNode, context);\n\n    return variable;\n  }\n});\n"],"names":["define","Variable","Element","context","string","node","type","identifier","getIdentifier","getType","setType","getVariableNode","getNode","variableNode","getTypeString","getString","isIdentifierEqualTo","identifierEqualTo","compareVariable","variable","variableIdentifier","comparesToVariable","compareParamter","parameter","comparesToParamter","compareVariableIdentifier","comparesToVariableIdentifier","validate","variableString","trace","validates","declaredVariable","findDeclaredVariableByVariableIdentifier","typeString","debug","unifyTerm","term","generalContext","specificContext","termUnifies","termString","substitution","findSubstitutionByVariableNode","substitutionComparesToTerm","compareTerm","termSubstitution","termSubstitutionString","findVariableByVariableNode","termNode","findTermByTermNode","termType","variableType","termTypeEqualToOrSubTypeOfVariableType","isEqualToOrSubTypeOf","TermSubstitution","elements","fromTermAndVariable","toJSON","typeJSON","typeToTypeJSON","json","name","fromJSON","instantiate","instantiateVariable","typeFromJSON","identifierFromVarialbeNode","fromTerm","variableFromTermNode"],"mappings":"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"}
|
package/lib/node/term.js
CHANGED
|
@@ -11,6 +11,15 @@ Object.defineProperty(exports, "default", {
|
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
12
|
const _ruleNames = require("../ruleNames");
|
|
13
13
|
class TermNode extends _occamlanguages.NonTerminalNode {
|
|
14
|
+
getVariableIdentifier() {
|
|
15
|
+
let variableIdentifier = null;
|
|
16
|
+
const singular = this.isSingular();
|
|
17
|
+
if (singular) {
|
|
18
|
+
const variableNode = this.getVariableNode();
|
|
19
|
+
variableIdentifier = variableNode.getVariableIdentifier();
|
|
20
|
+
}
|
|
21
|
+
return variableIdentifier;
|
|
22
|
+
}
|
|
14
23
|
isSingular() {
|
|
15
24
|
let singular = false;
|
|
16
25
|
const singularVariableNode = this.getSingularVariableNode();
|
|
@@ -48,4 +57,4 @@ class TermNode extends _occamlanguages.NonTerminalNode {
|
|
|
48
57
|
}
|
|
49
58
|
}
|
|
50
59
|
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub2RlL3Rlcm0uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IE5vblRlcm1pbmFsTm9kZSB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IHsgQVJHVU1FTlRfUlVMRV9OQU1FLCBWQVJJQUJMRV9SVUxFX05BTUUgfSBmcm9tIFwiLi4vcnVsZU5hbWVzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFRlcm1Ob2RlIGV4dGVuZHMgTm9uVGVybWluYWxOb2RlIHtcbiAgZ2V0VmFyaWFibGVJZGVudGlmaWVyKCkge1xuICAgIGxldCB2YXJpYWJsZUlkZW50aWZpZXIgPSBudWxsO1xuXG4gICAgY29uc3Qgc2luZ3VsYXIgPSB0aGlzLmlzU2luZ3VsYXIoKTtcblxuICAgIGlmIChzaW5ndWxhcikge1xuICAgICAgY29uc3QgdmFyaWFibGVOb2RlID0gdGhpcy5nZXRWYXJpYWJsZU5vZGUoKTtcblxuICAgICAgdmFyaWFibGVJZGVudGlmaWVyID0gdmFyaWFibGVOb2RlLmdldFZhcmlhYmxlSWRlbnRpZmllcigpO1xuICAgIH1cblxuICAgIHJldHVybiB2YXJpYWJsZUlkZW50aWZpZXI7XG4gIH1cblxuICBpc1Npbmd1bGFyKCkge1xuICAgIGxldCBzaW5ndWxhciA9IGZhbHNlO1xuXG4gICAgY29uc3Qgc2luZ3VsYXJWYXJpYWJsZU5vZGUgPSB0aGlzLmdldFNpbmd1bGFyVmFyaWFibGVOb2RlKCk7XG5cbiAgICBpZiAoc2luZ3VsYXJWYXJpYWJsZU5vZGUgIT09IG51bGwpIHtcbiAgICAgIHNpbmd1bGFyID0gdHJ1ZTtcbiAgICB9XG5cbiAgICByZXR1cm4gc2luZ3VsYXI7XG4gIH1cblxuICBnZXRWYXJpYWJsZU5vZGUoKSB7XG4gICAgY29uc3Qgc2luZ3VsYXJWYXJpYWJsZU5vZGUgPSB0aGlzLmdldFNpbmd1bGFyVmFyaWFibGVOb2RlKCksXG4gICAgICAgICAgdmFyaWFibGVOb2RlID0gc2luZ3VsYXJWYXJpYWJsZU5vZGU7ICAvL1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlTm9kZTtcbiAgfVxuXG4gIGdldFNpbmd1bGFyVGVybU5vZGUoKSB7XG4gICAgbGV0IHNpbmd1bGFyVGVybU5vZGUgPSBudWxsO1xuXG4gICAgY29uc3Qgc2luZ3VsYXJBcmd1bWVudE5vZGUgPSB0aGlzLmdldFNpbmd1bGFyQXJndW1lbnROb2RlKCk7XG5cbiAgICBpZiAoc2luZ3VsYXJBcmd1bWVudE5vZGUgIT09IG51bGwpIHtcbiAgICAgIHNpbmd1bGFyVGVybU5vZGUgPSBzaW5ndWxhckFyZ3VtZW50Tm9kZS5nZXRTaW5ndWxhclRlcm1Ob2RlKCk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHNpbmd1bGFyVGVybU5vZGU7XG4gIH1cblxuICBnZXRWYXJpYWJsZU5vZGVzKCkge1xuICAgIGNvbnN0IHJ1bGVOYW1lID0gVkFSSUFCTEVfUlVMRV9OQU1FLFxuICAgICAgICAgIHZhcmlhYmxlTm9kZXMgPSB0aGlzLmdldE5vZGVzQnlSdWxlTmFtZShydWxlTmFtZSk7XG5cbiAgICByZXR1cm4gdmFyaWFibGVOb2RlcztcbiAgfVxuXG4gIGdldFNpbmd1bGFyQXJndW1lbnROb2RlKCkge1xuICAgIGNvbnN0IHJ1bGVOYW1lID0gQVJHVU1FTlRfUlVMRV9OQU1FLFxuICAgICAgICAgIHNpbmd1bGFyQXJndW1lbnROb2RlID0gdGhpcy5nZXRTaW5ndWxhck5vZGVCeVJ1bGVOYW1lKHJ1bGVOYW1lKTtcblxuICAgIHJldHVybiBzaW5ndWxhckFyZ3VtZW50Tm9kZTtcbiAgfVxuXG4gIGdldFNpbmd1bGFyVmFyaWFibGVOb2RlKCkge1xuICAgIGNvbnN0IHJ1bGVOYW1lID0gVkFSSUFCTEVfUlVMRV9OQU1FLFxuICAgICAgICAgIHNpbmd1bGFyVmFyaWFibGVOb2RlID0gdGhpcy5nZXRTaW5ndWxhck5vZGVCeVJ1bGVOYW1lKHJ1bGVOYW1lKTtcblxuICAgIHJldHVybiBzaW5ndWxhclZhcmlhYmxlTm9kZTtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tUnVsZU5hbWVDaGlsZE5vZGVzT3BhY2l0eUFuZFByZWNlZGVuY2UocnVsZU5hbWUsIGNoaWxkTm9kZXMsIG9wYWNpdHksIHByZWNlZGVuY2UpIHsgcmV0dXJuIE5vblRlcm1pbmFsTm9kZS5mcm9tUnVsZU5hbWVDaGlsZE5vZGVzT3BhY2l0eUFuZFByZWNlZGVuY2UoVGVybU5vZGUsIHJ1bGVOYW1lLCBjaGlsZE5vZGVzLCBvcGFjaXR5LCBwcmVjZWRlbmNlKTsgfVxufVxuIl0sIm5hbWVzIjpbIlRlcm1Ob2RlIiwiTm9uVGVybWluYWxOb2RlIiwiZ2V0VmFyaWFibGVJZGVudGlmaWVyIiwidmFyaWFibGVJZGVudGlmaWVyIiwic2luZ3VsYXIiLCJpc1Npbmd1bGFyIiwidmFyaWFibGVOb2RlIiwiZ2V0VmFyaWFibGVOb2RlIiwic2luZ3VsYXJWYXJpYWJsZU5vZGUiLCJnZXRTaW5ndWxhclZhcmlhYmxlTm9kZSIsImdldFNpbmd1bGFyVGVybU5vZGUiLCJzaW5ndWxhclRlcm1Ob2RlIiwic2luZ3VsYXJBcmd1bWVudE5vZGUiLCJnZXRTaW5ndWxhckFyZ3VtZW50Tm9kZSIsImdldFZhcmlhYmxlTm9kZXMiLCJydWxlTmFtZSIsIlZBUklBQkxFX1JVTEVfTkFNRSIsInZhcmlhYmxlTm9kZXMiLCJnZXROb2Rlc0J5UnVsZU5hbWUiLCJBUkdVTUVOVF9SVUxFX05BTUUiLCJnZXRTaW5ndWxhck5vZGVCeVJ1bGVOYW1lIiwiZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlIiwiY2hpbGROb2RlcyIsIm9wYWNpdHkiLCJwcmVjZWRlbmNlIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXFCQTs7O2dDQUpXOzJCQUV1QjtBQUV4QyxNQUFNQSxpQkFBaUJDLCtCQUFlO0lBQ25EQyx3QkFBd0I7UUFDdEIsSUFBSUMscUJBQXFCO1FBRXpCLE1BQU1DLFdBQVcsSUFBSSxDQUFDQyxVQUFVO1FBRWhDLElBQUlELFVBQVU7WUFDWixNQUFNRSxlQUFlLElBQUksQ0FBQ0MsZUFBZTtZQUV6Q0oscUJBQXFCRyxhQUFhSixxQkFBcUI7UUFDekQ7UUFFQSxPQUFPQztJQUNUO0lBRUFFLGFBQWE7UUFDWCxJQUFJRCxXQUFXO1FBRWYsTUFBTUksdUJBQXVCLElBQUksQ0FBQ0MsdUJBQXVCO1FBRXpELElBQUlELHlCQUF5QixNQUFNO1lBQ2pDSixXQUFXO1FBQ2I7UUFFQSxPQUFPQTtJQUNUO0lBRUFHLGtCQUFrQjtRQUNoQixNQUFNQyx1QkFBdUIsSUFBSSxDQUFDQyx1QkFBdUIsSUFDbkRILGVBQWVFLHNCQUF1QixFQUFFO1FBRTlDLE9BQU9GO0lBQ1Q7SUFFQUksc0JBQXNCO1FBQ3BCLElBQUlDLG1CQUFtQjtRQUV2QixNQUFNQyx1QkFBdUIsSUFBSSxDQUFDQyx1QkFBdUI7UUFFekQsSUFBSUQseUJBQXlCLE1BQU07WUFDakNELG1CQUFtQkMscUJBQXFCRixtQkFBbUI7UUFDN0Q7UUFFQSxPQUFPQztJQUNUO0lBRUFHLG1CQUFtQjtRQUNqQixNQUFNQyxXQUFXQyw2QkFBa0IsRUFDN0JDLGdCQUFnQixJQUFJLENBQUNDLGtCQUFrQixDQUFDSDtRQUU5QyxPQUFPRTtJQUNUO0lBRUFKLDBCQUEwQjtRQUN4QixNQUFNRSxXQUFXSSw2QkFBa0IsRUFDN0JQLHVCQUF1QixJQUFJLENBQUNRLHlCQUF5QixDQUFDTDtRQUU1RCxPQUFPSDtJQUNUO0lBRUFILDBCQUEwQjtRQUN4QixNQUFNTSxXQUFXQyw2QkFBa0IsRUFDN0JSLHVCQUF1QixJQUFJLENBQUNZLHlCQUF5QixDQUFDTDtRQUU1RCxPQUFPUDtJQUNUO0lBRUEsT0FBT2EsMkNBQTJDTixRQUFRLEVBQUVPLFVBQVUsRUFBRUMsT0FBTyxFQUFFQyxVQUFVLEVBQUU7UUFBRSxPQUFPdkIsK0JBQWUsQ0FBQ29CLDBDQUEwQyxDQUFDckIsVUFBVWUsVUFBVU8sWUFBWUMsU0FBU0M7SUFBYTtBQUN6TiJ9
|
|
@@ -72,7 +72,7 @@ function separateGroundedTermsAndDefinedVariables(equivalences, groundedTerms, d
|
|
|
72
72
|
remainingEquivalences = [];
|
|
73
73
|
initiallyGroundedEquivalences = [];
|
|
74
74
|
separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context);
|
|
75
|
-
const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.
|
|
75
|
+
const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.length;
|
|
76
76
|
if (initiallyGroundedEquivalencesLength > 0) {
|
|
77
77
|
groundedEquivalences = initiallyGroundedEquivalences; ///
|
|
78
78
|
let implicitlyGroundedEquivalencesLength = 1;
|
|
@@ -89,7 +89,7 @@ function separateGroundedTermsAndDefinedVariables(equivalences, groundedTerms, d
|
|
|
89
89
|
implicitlyGroundedEquivalences = [];
|
|
90
90
|
separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context);
|
|
91
91
|
push(groundedEquivalences, implicitlyGroundedEquivalences);
|
|
92
|
-
implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.
|
|
92
|
+
implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length; ///
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
}
|
|
@@ -143,4 +143,4 @@ function groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquiva
|
|
|
143
143
|
});
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/equivalences.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nimport elements from \"../elements\";\n\nimport { variablesFromTerm } from \"../utilities/equivalence\";\n\nconst { push, separate } = arrayUtilities;\n\nexport function mergeEquivalences(equivalencesA, equivalencesB, context) {\n  equivalencesA = [  ///\n    ...equivalencesA\n  ];\n\n  equivalencesB.forEach((equivalenceB) => {\n    equivalencesA = mergeEquivalence(equivalencesA, equivalenceB, context);\n  });\n\n  return equivalencesA;\n}\n\nexport function findEquivalenceByTerm(equivalences, term) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceComparesToTerm = equivalence.compareTerm(term);\n\n    if (equivalenceComparesToTerm) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function equivalencesFromEquality(equality, context) {\n  const { Equivalence } = elements,\n        eaulivalence = Equivalence.fromEquality(equality, context),\n        equivalences = [\n          eaulivalence\n        ];\n\n  return equivalences;\n}\n\nexport function findEquivalenceByTermNodes(equivalences, termNodes) {\n  const equivalence = equivalences.find((equivalence) => {\n    const termNodeMatches = equivalence.matchTermNodes(termNodes);\n\n    if (termNodeMatches) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function separateGroundedTermsAndDefinedVariables(equivalences, groundedTerms, definedVariables, context) {\n  let groundedEquivalences,\n      remainingEquivalences,\n      initiallyGroundedEquivalences,\n      implicitlyGroundedEquivalences;\n\n  remainingEquivalences = [];\n\n  initiallyGroundedEquivalences = [];\n\n  separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context);\n\n  const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.getLength();\n\n  if (initiallyGroundedEquivalencesLength > 0) {\n    groundedEquivalences = initiallyGroundedEquivalences; ///\n\n    let implicitlyGroundedEquivalencesLength = 1;\n\n    while (implicitlyGroundedEquivalencesLength > 0) {\n      let definedVariablesLength = 0,\n            previousDefinedVariablesLength = -1;\n\n      while (definedVariablesLength > previousDefinedVariablesLength) {\n        previousDefinedVariablesLength = definedVariablesLength;  ///\n\n        groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context);\n\n        definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context);\n\n        definedVariablesLength = definedVariables.length;\n      }\n\n      equivalences = remainingEquivalences; ///\n\n      remainingEquivalences = [];\n\n      implicitlyGroundedEquivalences = [];\n\n      separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context);\n\n      push(groundedEquivalences, implicitlyGroundedEquivalences);\n\n      implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.getLength();  ///\n    }\n  }\n}\n\nfunction mergeEquivalence(equivalencesA, equivalenceB, context) {\n  const mergedEquivalences = [];\n\n  equivalencesA.forEach((equivalenceA) => {\n    const equivalenceBDisjointFromEquivalenceA = equivalenceB.isDisjointFrom(equivalenceA);\n\n    if (equivalenceBDisjointFromEquivalenceA) {\n      const mergedEquivalence = equivalenceB;  ///\n\n      mergedEquivalences.push(mergedEquivalence);\n    } else {\n      equivalenceB = equivalenceB.mergedWith(equivalenceA, context);\n    }\n  });\n\n  const mergedEquivalence = equivalenceB;  ///\n\n  mergedEquivalences.push(mergedEquivalence);\n\n  equivalencesA = mergedEquivalences;  ///\n\n  return equivalencesA;\n}\n\nfunction definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context) {\n  groundedTerms.forEach((groundedTerm) => {\n    const term = groundedTerm,  ///\n          variables = variablesFromTerm(term, context);\n\n    variables.forEach((variable) => {\n      const definedVariablesIncludesTermVariable = definedVariables.includes(variable);\n\n      if (!definedVariablesIncludesTermVariable) {\n        const definedVariable = variable;  ///\n\n        definedVariables.push(definedVariable);\n      }\n    });\n  });\n}\n\nfunction separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context) {\n  separate(equivalences, remainingEquivalences, initiallyGroundedEquivalences, (equivalence) => {\n    const equivalenceInitiallyGrounded = equivalence.isInitiallyGrounded(context);\n\n    if (!equivalenceInitiallyGrounded) {\n      return true;\n    }\n  });\n}\n\nfunction separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context) {\n  separate(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, (equivalence) => {\n    const equivalenceImplicitlyGrounded = equivalence.isImplicitlyGrounded(definedVariables, context);\n\n    if (!equivalenceImplicitlyGrounded) {\n      return true;\n    }\n  });\n}\n\nfunction groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context) {\n  groundedEquivalences.forEach((groundedEquivalence) => {\n    groundedEquivalence.getGroundedTerms(definedVariables, groundedTerms, context);\n  });\n}\n"],"names":["equivalencesFromEquality","findEquivalenceByTerm","findEquivalenceByTermNodes","mergeEquivalences","separateGroundedTermsAndDefinedVariables","push","separate","arrayUtilities","equivalencesA","equivalencesB","context","forEach","equivalenceB","mergeEquivalence","equivalences","term","equivalence","find","equivalenceComparesToTerm","compareTerm","equality","Equivalence","elements","eaulivalence","fromEquality","termNodes","termNodeMatches","matchTermNodes","groundedTerms","definedVariables","groundedEquivalences","remainingEquivalences","initiallyGroundedEquivalences","implicitlyGroundedEquivalences","separateInitiallyGroundedEquivalences","initiallyGroundedEquivalencesLength","getLength","implicitlyGroundedEquivalencesLength","definedVariablesLength","previousDefinedVariablesLength","groundedTermsFromGroundedEquivalencesAndDefinedVariables","definedVariablesFromGroundedTerms","length","separateImplicitlyGroundedEquivalences","mergedEquivalences","equivalenceA","equivalenceBDisjointFromEquivalenceA","isDisjointFrom","mergedEquivalence","mergedWith","groundedTerm","variables","variablesFromTerm","variable","definedVariablesIncludesTermVariable","includes","definedVariable","equivalenceInitiallyGrounded","isInitiallyGrounded","equivalenceImplicitlyGrounded","isImplicitlyGrounded","groundedEquivalence","getGroundedTerms"],"mappings":"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"}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/equivalences.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nimport elements from \"../elements\";\n\nimport { variablesFromTerm } from \"../utilities/equivalence\";\n\nconst { push, separate } = arrayUtilities;\n\nexport function mergeEquivalences(equivalencesA, equivalencesB, context) {\n  equivalencesA = [  ///\n    ...equivalencesA\n  ];\n\n  equivalencesB.forEach((equivalenceB) => {\n    equivalencesA = mergeEquivalence(equivalencesA, equivalenceB, context);\n  });\n\n  return equivalencesA;\n}\n\nexport function findEquivalenceByTerm(equivalences, term) {\n  const equivalence = equivalences.find((equivalence) => {\n    const equivalenceComparesToTerm = equivalence.compareTerm(term);\n\n    if (equivalenceComparesToTerm) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function equivalencesFromEquality(equality, context) {\n  const { Equivalence } = elements,\n        eaulivalence = Equivalence.fromEquality(equality, context),\n        equivalences = [\n          eaulivalence\n        ];\n\n  return equivalences;\n}\n\nexport function findEquivalenceByTermNodes(equivalences, termNodes) {\n  const equivalence = equivalences.find((equivalence) => {\n    const termNodeMatches = equivalence.matchTermNodes(termNodes);\n\n    if (termNodeMatches) {\n      return true;\n    }\n  }) || null;\n\n  return equivalence;\n}\n\nexport function separateGroundedTermsAndDefinedVariables(equivalences, groundedTerms, definedVariables, context) {\n  let groundedEquivalences,\n      remainingEquivalences,\n      initiallyGroundedEquivalences,\n      implicitlyGroundedEquivalences;\n\n  remainingEquivalences = [];\n\n  initiallyGroundedEquivalences = [];\n\n  separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context);\n\n  const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.length;\n\n  if (initiallyGroundedEquivalencesLength > 0) {\n    groundedEquivalences = initiallyGroundedEquivalences; ///\n\n    let implicitlyGroundedEquivalencesLength = 1;\n\n    while (implicitlyGroundedEquivalencesLength > 0) {\n      let definedVariablesLength = 0,\n            previousDefinedVariablesLength = -1;\n\n      while (definedVariablesLength > previousDefinedVariablesLength) {\n        previousDefinedVariablesLength = definedVariablesLength;  ///\n\n        groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context);\n\n        definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context);\n\n        definedVariablesLength = definedVariables.length;\n      }\n\n      equivalences = remainingEquivalences; ///\n\n      remainingEquivalences = [];\n\n      implicitlyGroundedEquivalences = [];\n\n      separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context);\n\n      push(groundedEquivalences, implicitlyGroundedEquivalences);\n\n      implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length;  ///\n    }\n  }\n}\n\nfunction mergeEquivalence(equivalencesA, equivalenceB, context) {\n  const mergedEquivalences = [];\n\n  equivalencesA.forEach((equivalenceA) => {\n    const equivalenceBDisjointFromEquivalenceA = equivalenceB.isDisjointFrom(equivalenceA);\n\n    if (equivalenceBDisjointFromEquivalenceA) {\n      const mergedEquivalence = equivalenceB;  ///\n\n      mergedEquivalences.push(mergedEquivalence);\n    } else {\n      equivalenceB = equivalenceB.mergedWith(equivalenceA, context);\n    }\n  });\n\n  const mergedEquivalence = equivalenceB;  ///\n\n  mergedEquivalences.push(mergedEquivalence);\n\n  equivalencesA = mergedEquivalences;  ///\n\n  return equivalencesA;\n}\n\nfunction definedVariablesFromGroundedTerms(groundedTerms, definedVariables, context) {\n  groundedTerms.forEach((groundedTerm) => {\n    const term = groundedTerm,  ///\n          variables = variablesFromTerm(term, context);\n\n    variables.forEach((variable) => {\n      const definedVariablesIncludesTermVariable = definedVariables.includes(variable);\n\n      if (!definedVariablesIncludesTermVariable) {\n        const definedVariable = variable;  ///\n\n        definedVariables.push(definedVariable);\n      }\n    });\n  });\n}\n\nfunction separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context) {\n  separate(equivalences, remainingEquivalences, initiallyGroundedEquivalences, (equivalence) => {\n    const equivalenceInitiallyGrounded = equivalence.isInitiallyGrounded(context);\n\n    if (!equivalenceInitiallyGrounded) {\n      return true;\n    }\n  });\n}\n\nfunction separateImplicitlyGroundedEquivalences(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, definedVariables, context) {\n  separate(equivalences, remainingEquivalences, implicitlyGroundedEquivalences, (equivalence) => {\n    const equivalenceImplicitlyGrounded = equivalence.isImplicitlyGrounded(definedVariables, context);\n\n    if (!equivalenceImplicitlyGrounded) {\n      return true;\n    }\n  });\n}\n\nfunction groundedTermsFromGroundedEquivalencesAndDefinedVariables(groundedEquivalences, definedVariables, groundedTerms, context) {\n  groundedEquivalences.forEach((groundedEquivalence) => {\n    groundedEquivalence.getGroundedTerms(definedVariables, groundedTerms, context);\n  });\n}\n"],"names":["equivalencesFromEquality","findEquivalenceByTerm","findEquivalenceByTermNodes","mergeEquivalences","separateGroundedTermsAndDefinedVariables","push","separate","arrayUtilities","equivalencesA","equivalencesB","context","forEach","equivalenceB","mergeEquivalence","equivalences","term","equivalence","find","equivalenceComparesToTerm","compareTerm","equality","Equivalence","elements","eaulivalence","fromEquality","termNodes","termNodeMatches","matchTermNodes","groundedTerms","definedVariables","groundedEquivalences","remainingEquivalences","initiallyGroundedEquivalences","implicitlyGroundedEquivalences","separateInitiallyGroundedEquivalences","initiallyGroundedEquivalencesLength","length","implicitlyGroundedEquivalencesLength","definedVariablesLength","previousDefinedVariablesLength","groundedTermsFromGroundedEquivalencesAndDefinedVariables","definedVariablesFromGroundedTerms","separateImplicitlyGroundedEquivalences","mergedEquivalences","equivalenceA","equivalenceBDisjointFromEquivalenceA","isDisjointFrom","mergedEquivalence","mergedWith","groundedTerm","variables","variablesFromTerm","variable","definedVariablesIncludesTermVariable","includes","definedVariable","equivalenceInitiallyGrounded","isInitiallyGrounded","equivalenceImplicitlyGrounded","isImplicitlyGrounded","groundedEquivalence","getGroundedTerms"],"mappings":"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"}
|
package/package.json
CHANGED
package/src/context/ephemeral.js
CHANGED
|
@@ -509,6 +509,14 @@ export default class EphemeralContext extends Context {
|
|
|
509
509
|
});
|
|
510
510
|
}
|
|
511
511
|
|
|
512
|
+
findVariableByVariableNode(variableNode) {
|
|
513
|
+
const variableIdentifier = variableNode.getVariableIdentifier(),
|
|
514
|
+
declaredVariable = this.findDeclaredVariableByVariableIdentifier(variableIdentifier),
|
|
515
|
+
variable = declaredVariable; ///
|
|
516
|
+
|
|
517
|
+
return variable;
|
|
518
|
+
}
|
|
519
|
+
|
|
512
520
|
findTermByTermNode(termNode) {
|
|
513
521
|
const terms = this.getTerms(),
|
|
514
522
|
term = terms.find((term) => {
|
package/src/context/liminal.js
CHANGED
|
@@ -198,9 +198,9 @@ export default class LiminalContext extends Context {
|
|
|
198
198
|
|
|
199
199
|
findSubstitutionByVariableNode(variableNode) {
|
|
200
200
|
const substitution = this.findSubstitution((substitution) => {
|
|
201
|
-
const
|
|
201
|
+
const variableNodeMatches = substitution.matchVariableNode(variableNode);
|
|
202
202
|
|
|
203
|
-
if (
|
|
203
|
+
if (variableNodeMatches) {
|
|
204
204
|
return true;
|
|
205
205
|
}
|
|
206
206
|
}) || null;
|
package/src/context.js
CHANGED
|
@@ -463,7 +463,7 @@ export default class Context extends ContextBase {
|
|
|
463
463
|
|
|
464
464
|
isJudgementPresentByMetavariableNode(metavariableNode) {
|
|
465
465
|
const context = this.getContext(),
|
|
466
|
-
|
|
466
|
+
judgementPresent = context.isJudgementPresentByMetavariableNode(metavariableNode);
|
|
467
467
|
|
|
468
468
|
return judgementPresent;
|
|
469
469
|
}
|
|
@@ -5,6 +5,7 @@ import Assertion from "../assertion";
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
6
|
import { instantiate } from "../../utilities/context";
|
|
7
7
|
import { instantiateDefinedAssertion } from "../../process/instantiate";
|
|
8
|
+
import { separateGroundedTermsAndDefinedVariables } from "../../utilities/equivalences";
|
|
8
9
|
import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions } from "../../utilities/substitutions";
|
|
9
10
|
import { termFromJDefinedAssertionNode, frameFromJDefinedAssertionNode, negatedFromJDefinedAssertionNode, definedAssertionFromStatementNode } from "../../utilities/element";
|
|
10
11
|
|
|
@@ -101,10 +102,10 @@ export default define(class DefinedAssertion extends Assertion {
|
|
|
101
102
|
context.debug(`The '${termString}' term is not singular.`);
|
|
102
103
|
} else {
|
|
103
104
|
const term = this.term.validate(context, (term) => {
|
|
104
|
-
|
|
105
|
+
const validatesForwards = true;
|
|
105
106
|
|
|
106
|
-
|
|
107
|
-
|
|
107
|
+
return validatesForwards;
|
|
108
|
+
});
|
|
108
109
|
|
|
109
110
|
if (term !== null) {
|
|
110
111
|
this.term = term; ///
|
|
@@ -257,7 +258,7 @@ function validateWhenDerived(term, frame, negated, generalContext, specificConte
|
|
|
257
258
|
validatesWhenDerived = true;
|
|
258
259
|
}
|
|
259
260
|
|
|
260
|
-
if (negated && !
|
|
261
|
+
if (negated && !declaredDariableDefined) {
|
|
261
262
|
validatesWhenDerived = true;
|
|
262
263
|
}
|
|
263
264
|
}
|
|
@@ -265,13 +266,13 @@ function validateWhenDerived(term, frame, negated, generalContext, specificConte
|
|
|
265
266
|
if (frame!== null) {
|
|
266
267
|
const metavariableName = frame.getMetavariableName(),
|
|
267
268
|
declaredMetavariable = context.findDeclaredMetavariableByMetavariableName(metavariableName),
|
|
268
|
-
|
|
269
|
+
declaredMetavariableDefined = isMetavariableDefined(declaredMetavariable, context);
|
|
269
270
|
|
|
270
|
-
if (!negated &&
|
|
271
|
+
if (!negated && declaredMetavariableDefined) {
|
|
271
272
|
validatesWhenDerived = true;
|
|
272
273
|
}
|
|
273
274
|
|
|
274
|
-
if (negated && !
|
|
275
|
+
if (negated && !declaredMetavariableDefined) {
|
|
275
276
|
validatesWhenDerived = true;
|
|
276
277
|
}
|
|
277
278
|
}
|
|
@@ -284,7 +285,7 @@ function isVariableDefined(variable, context) {
|
|
|
284
285
|
groundedTerms = [],
|
|
285
286
|
definedVariables = [];
|
|
286
287
|
|
|
287
|
-
|
|
288
|
+
separateGroundedTermsAndDefinedVariables(equivalences, groundedTerms, definedVariables, context);
|
|
288
289
|
|
|
289
290
|
const variableMatchesDefinedVariable = definedVariables.some((definedVariable) => {
|
|
290
291
|
const definedVariableComparesToVariable = definedVariable.compareVariable(variable);
|
package/src/element/signature.js
CHANGED
|
@@ -169,9 +169,9 @@ export default define(class Signature extends Element {
|
|
|
169
169
|
const array = substitutions.getArray(),
|
|
170
170
|
compares = compare(this.terms, array, (term, substitution) => {
|
|
171
171
|
const substitutionTerm = substitution.getTerm(),
|
|
172
|
-
|
|
172
|
+
substitutionTermComparesToTerm = substitutionTerm.compareTerm(term);
|
|
173
173
|
|
|
174
|
-
if (
|
|
174
|
+
if (substitutionTermComparesToTerm) {
|
|
175
175
|
return true;
|
|
176
176
|
}
|
|
177
177
|
});
|
|
@@ -198,9 +198,9 @@ export default define(class Signature extends Element {
|
|
|
198
198
|
const array = substitutions.getArray(),
|
|
199
199
|
correlates = correlate(this.terms, array, (term, substitution) => {
|
|
200
200
|
const substitutionTerm = substitution.getTerm(),
|
|
201
|
-
|
|
201
|
+
substitutionTermComparesToTerm = substitutionTerm.compareTerm(term);
|
|
202
202
|
|
|
203
|
-
if (
|
|
203
|
+
if (substitutionTermComparesToTerm) {
|
|
204
204
|
return true;
|
|
205
205
|
}
|
|
206
206
|
});
|
|
@@ -49,8 +49,8 @@ export default define(class TermSubstitution extends Substitution {
|
|
|
49
49
|
getVariableNode() { return this.targetTerm.getVariableNode(); }
|
|
50
50
|
|
|
51
51
|
isTrivial() {
|
|
52
|
-
const
|
|
53
|
-
trivial =
|
|
52
|
+
const targetTermComparesToReplacementTerm = this.targetTerm.compareTerm(this.replacementTerm),
|
|
53
|
+
trivial = targetTermComparesToReplacementTerm; ///
|
|
54
54
|
|
|
55
55
|
return trivial;
|
|
56
56
|
}
|
|
@@ -60,8 +60,8 @@ export default define(class TermSubstitution extends Substitution {
|
|
|
60
60
|
compareTerm(term, context) {
|
|
61
61
|
term = stripBracketsFromTerm(term, context); ///
|
|
62
62
|
|
|
63
|
-
const
|
|
64
|
-
comparedToTerm =
|
|
63
|
+
const replacementTermComparesToTerm = this.replacementTerm.compareTerm(term),
|
|
64
|
+
comparedToTerm = replacementTermComparesToTerm; ///
|
|
65
65
|
|
|
66
66
|
return comparedToTerm;
|
|
67
67
|
}
|
|
@@ -100,6 +100,18 @@ export default class Substitution extends Element {
|
|
|
100
100
|
return simple;
|
|
101
101
|
}
|
|
102
102
|
|
|
103
|
+
matchVariableNode(variableNode) {
|
|
104
|
+
const variableNodeMatches = false;
|
|
105
|
+
|
|
106
|
+
return variableNodeMatches;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
matchMetavariableNode(metavariableNode) {
|
|
110
|
+
const metavariableNodeMatches = false;
|
|
111
|
+
|
|
112
|
+
return metavariableNodeMatches;
|
|
113
|
+
}
|
|
114
|
+
|
|
103
115
|
matchSubstitutionNode(substitutionNode) {
|
|
104
116
|
const node = substitutionNode, ///
|
|
105
117
|
nodeMatches = this.matchNode(node),
|
|
@@ -108,6 +120,7 @@ export default class Substitution extends Element {
|
|
|
108
120
|
return substitutionNodeMatches;
|
|
109
121
|
}
|
|
110
122
|
|
|
123
|
+
|
|
111
124
|
findValidSubstitution(context) {
|
|
112
125
|
const substitutionNode = this.getSubstitutionNode(),
|
|
113
126
|
substitution = context.findSubstitutionBySubstitutionNode(substitutionNode),
|
package/src/element/term.js
CHANGED
|
@@ -34,6 +34,13 @@ export default define(class Term extends Element {
|
|
|
34
34
|
return termNode;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
+
getVariableNode() {
|
|
38
|
+
const termNode = this.getTermNode(),
|
|
39
|
+
variableNode = termNode.getVariableNode();
|
|
40
|
+
|
|
41
|
+
return variableNode;
|
|
42
|
+
}
|
|
43
|
+
|
|
37
44
|
getVariableIdentifier() {
|
|
38
45
|
const termNode = this.getTermNode(),
|
|
39
46
|
variableIdentifier = termNode.getVariableIdentifier();
|
|
@@ -93,6 +100,27 @@ export default define(class Term extends Element {
|
|
|
93
100
|
return termNodeMatches;
|
|
94
101
|
}
|
|
95
102
|
|
|
103
|
+
matchVariableNode(variableNode) {
|
|
104
|
+
let varialbeNodeMatches = false;
|
|
105
|
+
|
|
106
|
+
const singular = this.isSingular();
|
|
107
|
+
|
|
108
|
+
if (singular) {
|
|
109
|
+
const variableNodeA = variableNode; ///
|
|
110
|
+
|
|
111
|
+
variableNode = this.getVariableNode();
|
|
112
|
+
|
|
113
|
+
const variableNodeB = variableNode, ///
|
|
114
|
+
variableNodeAMatchesVariableNodeB = variableNodeA.match(variableNodeB);
|
|
115
|
+
|
|
116
|
+
if (variableNodeAMatchesVariableNodeB) {
|
|
117
|
+
varialbeNodeMatches = true; ///
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
return varialbeNodeMatches;
|
|
122
|
+
}
|
|
123
|
+
|
|
96
124
|
compareTerm(term) {
|
|
97
125
|
const termNode = term.getNode(),
|
|
98
126
|
termNodeMatches = this.matchNode(termNode),
|
package/src/element/variable.js
CHANGED
|
@@ -137,7 +137,7 @@ export default define(class Variable extends Element {
|
|
|
137
137
|
|
|
138
138
|
context = generalContext; ///
|
|
139
139
|
|
|
140
|
-
const variableNode = variable.
|
|
140
|
+
const variableNode = variable.getNode();
|
|
141
141
|
|
|
142
142
|
variable = context.findVariableByVariableNode(variableNode);
|
|
143
143
|
|
package/src/node/term.js
CHANGED
|
@@ -5,6 +5,20 @@ import { NonTerminalNode } from "occam-languages";
|
|
|
5
5
|
import { ARGUMENT_RULE_NAME, VARIABLE_RULE_NAME } from "../ruleNames";
|
|
6
6
|
|
|
7
7
|
export default class TermNode extends NonTerminalNode {
|
|
8
|
+
getVariableIdentifier() {
|
|
9
|
+
let variableIdentifier = null;
|
|
10
|
+
|
|
11
|
+
const singular = this.isSingular();
|
|
12
|
+
|
|
13
|
+
if (singular) {
|
|
14
|
+
const variableNode = this.getVariableNode();
|
|
15
|
+
|
|
16
|
+
variableIdentifier = variableNode.getVariableIdentifier();
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
return variableIdentifier;
|
|
20
|
+
}
|
|
21
|
+
|
|
8
22
|
isSingular() {
|
|
9
23
|
let singular = false;
|
|
10
24
|
|
|
@@ -66,7 +66,7 @@ export function separateGroundedTermsAndDefinedVariables(equivalences, groundedT
|
|
|
66
66
|
|
|
67
67
|
separateInitiallyGroundedEquivalences(equivalences, remainingEquivalences, initiallyGroundedEquivalences, context);
|
|
68
68
|
|
|
69
|
-
const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.
|
|
69
|
+
const initiallyGroundedEquivalencesLength = initiallyGroundedEquivalences.length;
|
|
70
70
|
|
|
71
71
|
if (initiallyGroundedEquivalencesLength > 0) {
|
|
72
72
|
groundedEquivalences = initiallyGroundedEquivalences; ///
|
|
@@ -97,7 +97,7 @@ export function separateGroundedTermsAndDefinedVariables(equivalences, groundedT
|
|
|
97
97
|
|
|
98
98
|
push(groundedEquivalences, implicitlyGroundedEquivalences);
|
|
99
99
|
|
|
100
|
-
implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.
|
|
100
|
+
implicitlyGroundedEquivalencesLength = implicitlyGroundedEquivalences.length; ///
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
}
|