occam-verify-cli 1.0.581 → 1.0.582
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/element/parameter.js
CHANGED
|
@@ -172,9 +172,9 @@ var _default = (0, _elements.define)((_Parameter = /*#__PURE__*/ function(Elemen
|
|
|
172
172
|
}
|
|
173
173
|
},
|
|
174
174
|
{
|
|
175
|
-
key: "
|
|
176
|
-
value: function
|
|
177
|
-
var
|
|
175
|
+
key: "findPrimitive",
|
|
176
|
+
value: function findPrimitive(substitutions) {
|
|
177
|
+
var primitive = null;
|
|
178
178
|
var parameter = this, substitution = substitutions.find(function(substitution) {
|
|
179
179
|
var substitutionComparesToParamter = substitution.compareParameter(parameter);
|
|
180
180
|
if (substitutionComparesToParamter) {
|
|
@@ -182,9 +182,9 @@ var _default = (0, _elements.define)((_Parameter = /*#__PURE__*/ function(Elemen
|
|
|
182
182
|
}
|
|
183
183
|
}) || null;
|
|
184
184
|
if (substitution !== null) {
|
|
185
|
-
|
|
185
|
+
primitive = substitution.getPrimitive();
|
|
186
186
|
}
|
|
187
|
-
return
|
|
187
|
+
return primitive;
|
|
188
188
|
}
|
|
189
189
|
},
|
|
190
190
|
{
|
|
@@ -208,4 +208,4 @@ var _default = (0, _elements.define)((_Parameter = /*#__PURE__*/ function(Elemen
|
|
|
208
208
|
return Parameter;
|
|
209
209
|
}(_wrap_native_super(_occamlanguages.Element)), _define_property(_Parameter, "name", "Parameter"), _Parameter));
|
|
210
210
|
|
|
211
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
211
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3BhcmFtZXRlci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBQYXJhbWV0ZXIgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBuYW1lLCBpZGVudGlmaWVyKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBpZGVudGlmaWVyKTtcblxuICAgIHRoaXMubmFtZSA9IG5hbWU7XG4gICAgdGhpcy5pZGVudGlmaWVyID0gaWRlbnRpZmllcjtcbiAgfVxuICBcbiAgZ2V0TmFtZSgpIHtcbiAgICByZXR1cm4gdGhpcy5uYW1lO1xuICB9XG5cbiAgZ2V0SWRlbnRpZmllcigpIHtcbiAgICByZXR1cm4gdGhpcy5pZGVudGlmaWVyO1xuICB9XG5cbiAgZmluZFByaW1pdGl2ZShzdWJzdGl0dXRpb25zKSB7XG4gICAgbGV0IHByaW1pdGl2ZSA9IG51bGw7XG5cbiAgICBjb25zdCBwYXJhbWV0ZXIgPSB0aGlzLCAvLy9cbiAgICAgICAgICBzdWJzdGl0dXRpb24gPSBzdWJzdGl0dXRpb25zLmZpbmQoKHN1YnN0aXR1dGlvbikgPT4ge1xuICAgICAgICAgICAgY29uc3Qgc3Vic3RpdHV0aW9uQ29tcGFyZXNUb1BhcmFtdGVyID0gc3Vic3RpdHV0aW9uLmNvbXBhcmVQYXJhbWV0ZXIocGFyYW1ldGVyKTtcblxuICAgICAgICAgICAgaWYgKHN1YnN0aXR1dGlvbkNvbXBhcmVzVG9QYXJhbXRlcikge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KSB8fCBudWxsO1xuXG4gICAgaWYgKHN1YnN0aXR1dGlvbiAhPT0gbnVsbCkge1xuICAgICAgcHJpbWl0aXZlID0gc3Vic3RpdHV0aW9uLmdldFByaW1pdGl2ZSgpO1xuICAgIH1cblxuICAgIHJldHVybiBwcmltaXRpdmU7XG4gIH1cblxuICB0b0pTT04oKSB7XG4gICAgY29uc3QgbmFtZSA9IHRoaXMubmFtZSxcbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAgbmFtZVxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJQYXJhbWV0ZXJcIjtcblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkge1xuICAgIGNvbnN0IHsgbmFtZSwgaWRlbnRpZmllciB9ID0ganNvbixcbiAgICAgICAgICBzdHJpbmcgPSBudWxsLFxuICAgICAgICAgIG5vZGUgPSBudWxsLFxuICAgICAgICAgIHBhcmFtZXRlciA9IG5ldyBQYXJhbWV0ZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBuYW1lLCBpZGVudGlmaWVyKTtcblxuICAgIHJldHVybiBwYXJhbWV0ZXI7XG4gIH1cbn0pO1xuIl0sIm5hbWVzIjpbImRlZmluZSIsIlBhcmFtZXRlciIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwibmFtZSIsImlkZW50aWZpZXIiLCJnZXROYW1lIiwiZ2V0SWRlbnRpZmllciIsImZpbmRQcmltaXRpdmUiLCJzdWJzdGl0dXRpb25zIiwicHJpbWl0aXZlIiwicGFyYW1ldGVyIiwic3Vic3RpdHV0aW9uIiwiZmluZCIsInN1YnN0aXR1dGlvbkNvbXBhcmVzVG9QYXJhbXRlciIsImNvbXBhcmVQYXJhbWV0ZXIiLCJnZXRQcmltaXRpdmUiLCJ0b0pTT04iLCJqc29uIiwiZnJvbUpTT04iLCJFbGVtZW50Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQUE7Ozs4QkFKd0I7d0JBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0lBRXZCLFdBQWVBLElBQUFBLGdCQUFNLDhCQUFDOzthQUFNQyxVQUNkQyxPQUFPLEVBQUVDLE1BQU0sRUFBRUMsSUFBSSxFQUFFQyxJQUFJLEVBQUVDLFVBQVU7Z0NBRHpCTDs7Z0JBRXhCLGtCQUZ3QkE7WUFFbEJDO1lBQVNDO1lBQVFDO1lBQU1FOztRQUU3QixNQUFLRCxJQUFJLEdBQUdBO1FBQ1osTUFBS0MsVUFBVSxHQUFHQTs7Ozs7WUFHcEJDLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0YsSUFBSTtZQUNsQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0YsVUFBVTtZQUN4Qjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxjQUFjQyxhQUFhO2dCQUN6QixJQUFJQyxZQUFZO2dCQUVoQixJQUFNQyxZQUFZLElBQUksRUFDaEJDLGVBQWVILGNBQWNJLElBQUksQ0FBQyxTQUFDRDtvQkFDakMsSUFBTUUsaUNBQWlDRixhQUFhRyxnQkFBZ0IsQ0FBQ0o7b0JBRXJFLElBQUlHLGdDQUFnQzt3QkFDbEMsT0FBTztvQkFDVDtnQkFDRixNQUFNO2dCQUVaLElBQUlGLGlCQUFpQixNQUFNO29CQUN6QkYsWUFBWUUsYUFBYUksWUFBWTtnQkFDdkM7Z0JBRUEsT0FBT047WUFDVDs7O1lBRUFPLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxJQUFNYixPQUFPLElBQUksQ0FBQ0EsSUFBSSxFQUNoQmMsT0FBTztvQkFDTGQsTUFBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT2M7WUFDVDs7OztZQUlPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVqQixPQUFPO2dCQUMzQixJQUFRRyxPQUFxQmMsS0FBckJkLE1BQU1DLGFBQWVhLEtBQWZiLFlBQ1JILFNBQVMsTUFDVEMsT0FBTyxNQUNQUSxZQUFZLElBQUlYLFVBQVVDLFNBQVNDLFFBQVFDLE1BQU1DLE1BQU1DO2dCQUU3RCxPQUFPTTtZQUNUOzs7O3FCQXJENENTLHVCQUFPLElBNENuRCw2QkFBT2hCLFFBQU8ifQ==
|
|
@@ -180,13 +180,13 @@ var _default = (0, _elements.define)((_ProcedureCall = /*#__PURE__*/ function(El
|
|
|
180
180
|
}
|
|
181
181
|
},
|
|
182
182
|
{
|
|
183
|
-
key: "
|
|
184
|
-
value: function
|
|
185
|
-
var substitutions = context.getSubstitutions(),
|
|
186
|
-
var
|
|
187
|
-
return
|
|
183
|
+
key: "findPrimitives",
|
|
184
|
+
value: function findPrimitives(context) {
|
|
185
|
+
var substitutions = context.getSubstitutions(), primitives = this.parameters.map(function(parameter) {
|
|
186
|
+
var primitive = parameter.findPrimitive(substitutions);
|
|
187
|
+
return primitive;
|
|
188
188
|
});
|
|
189
|
-
return
|
|
189
|
+
return primitives;
|
|
190
190
|
}
|
|
191
191
|
},
|
|
192
192
|
{
|
|
@@ -218,9 +218,9 @@ var _default = (0, _elements.define)((_ProcedureCall = /*#__PURE__*/ function(El
|
|
|
218
218
|
var unifiesIndependently = false;
|
|
219
219
|
var procedureCallString = this.getString(); ///
|
|
220
220
|
context.trace("Unifying the '".concat(procedureCallString, "' procedure call independently..."));
|
|
221
|
-
var name = this.getName(),
|
|
221
|
+
var name = this.getName(), primitives = this.findPrimitives(context), terms = termsFromPrimitives(primitives), procedure = context.findProcedureByName(name);
|
|
222
222
|
try {
|
|
223
|
-
var
|
|
223
|
+
var term = procedure.call(terms, context), boolean = term.isBoolean();
|
|
224
224
|
unifiesIndependently = boolean; ///
|
|
225
225
|
} catch (exception) {
|
|
226
226
|
var message = exception.getMessage();
|
|
@@ -254,4 +254,4 @@ var _default = (0, _elements.define)((_ProcedureCall = /*#__PURE__*/ function(El
|
|
|
254
254
|
return ProcedureCall;
|
|
255
255
|
}(_wrap_native_super(_occamlanguages.Element)), _define_property(_ProcedureCall, "name", "ProcedureCall"), _ProcedureCall));
|
|
256
256
|
|
|
257
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
257
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedureCall.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\nimport { termsUtilities } from \"occam-furtle\";\n\nimport { define } from \"../elements\";\nimport { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from \"../utilities/json\";\n\nconst { termsFromPrimitives } = termsUtilities;\n\nexport default define(class ProcedureCall extends Element {\n  constructor(context, string, node, parameters, procedureReference) {\n    super(context, string, node);\n\n    this.parameters = parameters;\n    this.procedureReference = procedureReference;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getProcedureReference() {\n    return this.procedureReference;\n  }\n\n  getName() { return this.procedureReference.getName(); }\n\n  findPrimitives(context) {\n    const substitutions = context.getSubstitutions(),\n          primitives = this.parameters.map((parameter) => {\n            const primitive = parameter.findPrimitive(substitutions);\n\n            return primitive;\n          });\n\n    return primitives;\n  }\n\n  validate(context) {\n    let validates = false;\n\n    const procedureCallString = this.getString(); ///\n\n    context.trace(`Validating the '${procedureCallString}' procedure call...`);\n\n    const name = this.getName(),\n          procedure = context.findProcedureByName(name);\n\n    if (procedure !== null) {\n      const procedureBoolean = procedure.isBoolean();\n\n      if (procedureBoolean) {\n        validates = true;\n      } else {\n        context.trace(`The '${procedureCallString}' procedure is not boolean.`);\n      }\n    } else {\n      context.trace(`The '${procedureCallString}' procedure is not present.`);\n    }\n\n    if (validates) {\n      context.debug(`...validated the '${procedureCallString}' procedure call.`);\n    }\n\n    return validates;\n  }\n\n  unifyIndependently(context) {\n    let unifiesIndependently = false;\n\n    const procedureCallString = this.getString(); ///\n\n    context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);\n\n    const name = this.getName(),\n          primitives = this.findPrimitives(context),\n          terms = termsFromPrimitives(primitives),\n          procedure = context.findProcedureByName(name);\n\n    try {\n      const term = procedure.call(terms, context),\n            boolean = term.isBoolean();\n\n      unifiesIndependently = boolean; ///\n    } catch (exception) {\n      const message = exception.getMessage();\n\n      context.info(message);\n    }\n\n    if (unifiesIndependently) {\n      context.debug(`...unified the '${procedureCallString}' procedure call independently.`);\n    }\n\n    return unifiesIndependently;\n  }\n\n  toJSON() {\n    const parametersJSON = parametersToParametersJSON(this.parameters),\n          procedureReference = procedureReferenceToProcedureReferenceJSON(this.procedureReference),\n          parameters = parametersJSON,  ///\n          json = {\n            procedureReference,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"ProcedureCall\";\n\n  static fromJSON(json, context) {\n    const node = null,\n          parameters = parametersFromJSON(json, context),\n          procedureReference = procedureReferenceFromJSON(json, context),\n          string = stringFromProcedureReferenceAndParameters(procedureReference, parameters),\n          procedureCall = new ProcedureCall(context, string, node, parameters, procedureReference);\n\n    return procedureCall;\n  }\n});\n"],"names":["termsFromPrimitives","termsUtilities","define","ProcedureCall","context","string","node","parameters","procedureReference","getParameters","getProcedureReference","getName","findPrimitives","substitutions","getSubstitutions","primitives","map","parameter","primitive","findPrimitive","validate","validates","procedureCallString","getString","trace","name","procedure","findProcedureByName","procedureBoolean","isBoolean","debug","unifyIndependently","unifiesIndependently","terms","term","call","boolean","exception","message","getMessage","info","toJSON","parametersJSON","parametersToParametersJSON","procedureReferenceToProcedureReferenceJSON","json","fromJSON","parametersFromJSON","procedureReferenceFromJSON","stringFromProcedureReferenceAndParameters","procedureCall","Element"],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
var _occamlanguages = require("occam-languages");
|
|
12
|
+
var _occamfurtle = require("occam-furtle");
|
|
12
13
|
function _assert_this_initialized(self) {
|
|
13
14
|
if (self === void 0) {
|
|
14
15
|
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
|
|
@@ -128,6 +129,7 @@ function _is_native_reflect_construct() {
|
|
|
128
129
|
return !!result;
|
|
129
130
|
})();
|
|
130
131
|
}
|
|
132
|
+
var primitiveFromNode = _occamfurtle.primitiveUtilities.primitiveFromNode;
|
|
131
133
|
var Substitution = /*#__PURE__*/ function(Element) {
|
|
132
134
|
_inherits(Substitution, Element);
|
|
133
135
|
function Substitution(context, string, node) {
|
|
@@ -146,6 +148,13 @@ var Substitution = /*#__PURE__*/ function(Element) {
|
|
|
146
148
|
return substitution;
|
|
147
149
|
}
|
|
148
150
|
},
|
|
151
|
+
{
|
|
152
|
+
key: "getPrimitive",
|
|
153
|
+
value: function getPrimitive() {
|
|
154
|
+
var context = this.getContext(), replacementNode = this.getReplacementNode(), node = replacementNode, primitive = primitiveFromNode(node, context);
|
|
155
|
+
return primitive;
|
|
156
|
+
}
|
|
157
|
+
},
|
|
149
158
|
{
|
|
150
159
|
key: "isSimple",
|
|
151
160
|
value: function isSimple() {
|
|
@@ -234,4 +243,4 @@ var Substitution = /*#__PURE__*/ function(Element) {
|
|
|
234
243
|
return Substitution;
|
|
235
244
|
}(_wrap_native_super(_occamlanguages.Element));
|
|
236
245
|
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
246
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3N1YnN0aXR1dGlvbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcbmltcG9ydCB7IHByaW1pdGl2ZVV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1mdXJ0bGVcIjtcblxuY29uc3QgeyBwcmltaXRpdmVGcm9tTm9kZSB9ID1wcmltaXRpdmVVdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFN1YnN0aXR1dGlvbiBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUpO1xuICB9XG5cbiAgZ2V0U3Vic3RpdHV0aW9uKCkge1xuICAgIGNvbnN0IHN1YnN0aXR1dGlvbiA9IG51bGw7XG5cbiAgICByZXR1cm4gc3Vic3RpdHV0aW9uO1xuICB9XG5cbiAgZ2V0UHJpbWl0aXZlKCkge1xuICAgIGNvbnN0IGNvbnRleHQgPSB0aGlzLmdldENvbnRleHQoKSxcbiAgICAgICAgICByZXBsYWNlbWVudE5vZGUgPSB0aGlzLmdldFJlcGxhY2VtZW50Tm9kZSgpLFxuICAgICAgICAgIG5vZGUgPSByZXBsYWNlbWVudE5vZGUsIC8vL1xuICAgICAgICAgIHByaW1pdGl2ZSA9IHByaW1pdGl2ZUZyb21Ob2RlKG5vZGUsIGNvbnRleHQpO1xuXG4gICAgcmV0dXJuIHByaW1pdGl2ZTtcbiAgfVxuXG4gIGlzU2ltcGxlKCkge1xuICAgIGNvbnN0IHNpbXBsZSA9IHRydWU7XG5cbiAgICByZXR1cm4gc2ltcGxlO1xuICB9XG5cbiAgaXNDb21wbGV4KCkge1xuICAgIGNvbnN0IHNpbXBsZSA9IHRoaXMuaXNTaW1wbGUoKSxcbiAgICAgICAgICBjb21wbGV4ID0gIXNpbXBsZTtcblxuICAgIHJldHVybiBjb21wbGV4O1xuICB9XG5cbiAgaXNUcml2aWFsKCkge1xuICAgIGNvbnN0IHRyaXZpYWwgPSBmYWxzZTtcblxuICAgIHJldHVybiB0cml2aWFsO1xuICB9XG5cbiAgaXNGcmFtZUVxdWFsVG9GcmFtZShmcmFtZSkge1xuICAgIGNvbnN0IGZyYW1lRXF1YWxUb0ZyYW1lID0gZmFsc2U7XG5cbiAgICByZXR1cm4gZnJhbWVFcXVhbFRvRnJhbWU7XG4gIH1cblxuICBpc1JlZmVyZW5jZUVxdWFsVG9SZWZlcmVuY2UocmVmZXJlbmNlKSB7XG4gICAgY29uc3QgcmVmZXJlbmNlRXF1YWxUb1JlZmVyZW5jZSA9IGZhbHNlO1xuXG4gICAgcmV0dXJuIHJlZmVyZW5jZUVxdWFsVG9SZWZlcmVuY2U7XG4gIH1cblxuICBpc01ldGF2YXJpYWJsZUVxdWFsVG9NZXRhdmFyaWFibGUobWV0YXZhcmlhYmxlKSB7XG4gICAgY29uc3QgbWV0YXZhcmlhYmxlRXF1YWxUb01ldGF2YXJpYWJsZSA9IGZhbHNlO1xuXG4gICAgcmV0dXJuIG1ldGF2YXJpYWJsZUVxdWFsVG9NZXRhdmFyaWFibGU7XG4gIH1cblxuICBpc0VxdWFsVG8oc3Vic3RpdHV0aW9uKSB7XG4gICAgY29uc3Qgc3Vic3RpdHV0aW9uQSA9IHRoaXMsIC8vL1xuICAgICAgICAgIHN1YnN0aXR1dGlvbkIgPSBzdWJzdGl0dXRpb24sIC8vL1xuICAgICAgICAgIHN1YnN0aXR1dGlvbkFOb2RlID0gc3Vic3RpdHV0aW9uQS5nZXROb2RlKCksXG4gICAgICAgICAgc3Vic3RpdHV0aW9uQk5vZGUgPSBzdWJzdGl0dXRpb25CLmdldE5vZGUoKSxcbiAgICAgICAgICBzdWJzdGl0dXRpb25BTm9kZU1hdGNoZXNTdWJzdGl0dXRpb25CTm9kZSA9IHN1YnN0aXR1dGlvbkFOb2RlLm1hdGNoKHN1YnN0aXR1dGlvbkJOb2RlKSxcbiAgICAgICAgICBlcXVhbFRvID0gc3Vic3RpdHV0aW9uQU5vZGVNYXRjaGVzU3Vic3RpdHV0aW9uQk5vZGU7IC8vL1xuXG4gICAgcmV0dXJuIGVxdWFsVG87XG4gIH1cblxuICBjb21wYXJlVGVybSh0ZXJtLCBjb250ZXh0KSB7XG4gICAgY29uc3QgY29tcGFyZXNUb1Rlcm0gPSBmYWxzZTtcblxuICAgIHJldHVybiBjb21wYXJlc1RvVGVybTtcbiAgfVxuXG4gIGNvbXBhcmVTdGF0ZW1lbnQoc3RhdGVtZW50KSB7XG4gICAgY29uc3QgY29tcGFyZXNUb1N0YXRlbWVudCA9IGZhbHNlO1xuXG4gICAgcmV0dXJuIGNvbXBhcmVzVG9TdGF0ZW1lbnQ7XG4gIH1cblxuICBjb21wYXJlUGFyYW1ldGVyKHBhcmFtZXRlcikge1xuICAgIGNvbnN0IGNvbXBhcmVzVG9QYXJhbWV0ZXIgPSBmYWxzZTtcblxuICAgIHJldHVybiBjb21wYXJlc1RvUGFyYW1ldGVyO1xuICB9XG5cbiAgY29tcGFyZVN1YnN0aXR1dGlvbihzdWJzdGl0dXRpb24pIHtcbiAgICBjb25zdCBjb21wYXJlc1RvU3Vic3RpdHV0aW9uID0gZmFsc2U7XG5cbiAgICByZXR1cm4gY29tcGFyZXNUb1N1YnN0aXR1dGlvbjtcbiAgfVxuXG4gIHJlc29sdmUoc3Vic3RpdHV0aW9ucywgY29udGV4dCkge1xuICAgIGNvbnN0IHJlc29sdmVkID0gdHJ1ZTtcblxuICAgIHJldHVybiByZXNvbHZlZDtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIlN1YnN0aXR1dGlvbiIsInByaW1pdGl2ZUZyb21Ob2RlIiwicHJpbWl0aXZlVXRpbGl0aWVzIiwiY29udGV4dCIsInN0cmluZyIsIm5vZGUiLCJnZXRTdWJzdGl0dXRpb24iLCJzdWJzdGl0dXRpb24iLCJnZXRQcmltaXRpdmUiLCJnZXRDb250ZXh0IiwicmVwbGFjZW1lbnROb2RlIiwiZ2V0UmVwbGFjZW1lbnROb2RlIiwicHJpbWl0aXZlIiwiaXNTaW1wbGUiLCJzaW1wbGUiLCJpc0NvbXBsZXgiLCJjb21wbGV4IiwiaXNUcml2aWFsIiwidHJpdmlhbCIsImlzRnJhbWVFcXVhbFRvRnJhbWUiLCJmcmFtZSIsImZyYW1lRXF1YWxUb0ZyYW1lIiwiaXNSZWZlcmVuY2VFcXVhbFRvUmVmZXJlbmNlIiwicmVmZXJlbmNlIiwicmVmZXJlbmNlRXF1YWxUb1JlZmVyZW5jZSIsImlzTWV0YXZhcmlhYmxlRXF1YWxUb01ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZUVxdWFsVG9NZXRhdmFyaWFibGUiLCJpc0VxdWFsVG8iLCJzdWJzdGl0dXRpb25BIiwic3Vic3RpdHV0aW9uQiIsInN1YnN0aXR1dGlvbkFOb2RlIiwiZ2V0Tm9kZSIsInN1YnN0aXR1dGlvbkJOb2RlIiwic3Vic3RpdHV0aW9uQU5vZGVNYXRjaGVzU3Vic3RpdHV0aW9uQk5vZGUiLCJtYXRjaCIsImVxdWFsVG8iLCJjb21wYXJlVGVybSIsInRlcm0iLCJjb21wYXJlc1RvVGVybSIsImNvbXBhcmVTdGF0ZW1lbnQiLCJzdGF0ZW1lbnQiLCJjb21wYXJlc1RvU3RhdGVtZW50IiwiY29tcGFyZVBhcmFtZXRlciIsInBhcmFtZXRlciIsImNvbXBhcmVzVG9QYXJhbWV0ZXIiLCJjb21wYXJlU3Vic3RpdHV0aW9uIiwiY29tcGFyZXNUb1N1YnN0aXR1dGlvbiIsInJlc29sdmUiLCJzdWJzdGl0dXRpb25zIiwicmVzb2x2ZWQiLCJFbGVtZW50Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU9xQkE7Ozs4QkFMRzsyQkFDVzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRW5DLElBQU0sQUFBRUMsb0JBQXFCQywrQkFBa0IsQ0FBdkNEO0FBRU8sSUFBQSxBQUFNRCw2QkFBTjtjQUFNQTthQUFBQSxhQUNQRyxPQUFPLEVBQUVDLE1BQU0sRUFBRUMsSUFBSTtnQ0FEZEw7UUFFakIsT0FBQSxrQkFGaUJBO1lBRVhHO1lBQVNDO1lBQVFDOzs7a0JBRk5MOztZQUtuQk0sS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLGVBQWU7Z0JBRXJCLE9BQU9BO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUwsVUFBVSxJQUFJLENBQUNNLFVBQVUsSUFDekJDLGtCQUFrQixJQUFJLENBQUNDLGtCQUFrQixJQUN6Q04sT0FBT0ssaUJBQ1BFLFlBQVlYLGtCQUFrQkksTUFBTUY7Z0JBRTFDLE9BQU9TO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUMsU0FBUztnQkFFZixPQUFPQTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1ELFNBQVMsSUFBSSxDQUFDRCxRQUFRLElBQ3RCRyxVQUFVLENBQUNGO2dCQUVqQixPQUFPRTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLFVBQVU7Z0JBRWhCLE9BQU9BO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsb0JBQW9CQyxLQUFLO2dCQUN2QixJQUFNQyxvQkFBb0I7Z0JBRTFCLE9BQU9BO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsNEJBQTRCQyxTQUFTO2dCQUNuQyxJQUFNQyw0QkFBNEI7Z0JBRWxDLE9BQU9BO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsa0NBQWtDQyxZQUFZO2dCQUM1QyxJQUFNQyxrQ0FBa0M7Z0JBRXhDLE9BQU9BO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVXJCLFlBQVk7Z0JBQ3BCLElBQU1zQixnQkFBZ0IsSUFBSSxFQUNwQkMsZ0JBQWdCdkIsY0FDaEJ3QixvQkFBb0JGLGNBQWNHLE9BQU8sSUFDekNDLG9CQUFvQkgsY0FBY0UsT0FBTyxJQUN6Q0UsNENBQTRDSCxrQkFBa0JJLEtBQUssQ0FBQ0Ysb0JBQ3BFRyxVQUFVRiwyQ0FBMkMsR0FBRztnQkFFOUQsT0FBT0U7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxZQUFZQyxJQUFJLEVBQUVuQyxPQUFPO2dCQUN2QixJQUFNb0MsaUJBQWlCO2dCQUV2QixPQUFPQTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLGlCQUFpQkMsU0FBUztnQkFDeEIsSUFBTUMsc0JBQXNCO2dCQUU1QixPQUFPQTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLGlCQUFpQkMsU0FBUztnQkFDeEIsSUFBTUMsc0JBQXNCO2dCQUU1QixPQUFPQTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLG9CQUFvQnZDLFlBQVk7Z0JBQzlCLElBQU13Qyx5QkFBeUI7Z0JBRS9CLE9BQU9BO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsUUFBUUMsYUFBYSxFQUFFOUMsT0FBTztnQkFDNUIsSUFBTStDLFdBQVc7Z0JBRWpCLE9BQU9BO1lBQ1Q7OztXQWhHbUJsRDtxQkFBcUJtRCx1QkFBTyJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.582",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"argumentative": "^2.0.36",
|
|
14
14
|
"necessary": "^17.0.9",
|
|
15
15
|
"occam-file-system": "^6.0.505",
|
|
16
|
-
"occam-furtle": "^3.0.
|
|
16
|
+
"occam-furtle": "^3.0.94",
|
|
17
17
|
"occam-grammars": "^1.3.510",
|
|
18
18
|
"occam-languages": "^0.0.67",
|
|
19
19
|
"occam-lexers": "^23.1.34",
|
package/src/element/parameter.js
CHANGED
|
@@ -20,8 +20,8 @@ export default define(class Parameter extends Element {
|
|
|
20
20
|
return this.identifier;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
let
|
|
23
|
+
findPrimitive(substitutions) {
|
|
24
|
+
let primitive = null;
|
|
25
25
|
|
|
26
26
|
const parameter = this, ///
|
|
27
27
|
substitution = substitutions.find((substitution) => {
|
|
@@ -33,10 +33,10 @@ export default define(class Parameter extends Element {
|
|
|
33
33
|
}) || null;
|
|
34
34
|
|
|
35
35
|
if (substitution !== null) {
|
|
36
|
-
|
|
36
|
+
primitive = substitution.getPrimitive();
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
return
|
|
39
|
+
return primitive;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
toJSON() {
|
|
@@ -26,16 +26,15 @@ export default define(class ProcedureCall extends Element {
|
|
|
26
26
|
|
|
27
27
|
getName() { return this.procedureReference.getName(); }
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
findPrimitives(context) {
|
|
30
30
|
const substitutions = context.getSubstitutions(),
|
|
31
|
-
|
|
32
|
-
const
|
|
33
|
-
node = replacementNode; ///
|
|
31
|
+
primitives = this.parameters.map((parameter) => {
|
|
32
|
+
const primitive = parameter.findPrimitive(substitutions);
|
|
34
33
|
|
|
35
|
-
return
|
|
34
|
+
return primitive;
|
|
36
35
|
});
|
|
37
36
|
|
|
38
|
-
return
|
|
37
|
+
return primitives;
|
|
39
38
|
}
|
|
40
39
|
|
|
41
40
|
validate(context) {
|
|
@@ -75,13 +74,13 @@ export default define(class ProcedureCall extends Element {
|
|
|
75
74
|
context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);
|
|
76
75
|
|
|
77
76
|
const name = this.getName(),
|
|
78
|
-
|
|
79
|
-
terms = termsFromPrimitives(
|
|
77
|
+
primitives = this.findPrimitives(context),
|
|
78
|
+
terms = termsFromPrimitives(primitives),
|
|
80
79
|
procedure = context.findProcedureByName(name);
|
|
81
80
|
|
|
82
81
|
try {
|
|
83
|
-
const
|
|
84
|
-
boolean =
|
|
82
|
+
const term = procedure.call(terms, context),
|
|
83
|
+
boolean = term.isBoolean();
|
|
85
84
|
|
|
86
85
|
unifiesIndependently = boolean; ///
|
|
87
86
|
} catch (exception) {
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { Element } from "occam-languages";
|
|
4
|
+
import { primitiveUtilities } from "occam-furtle";
|
|
5
|
+
|
|
6
|
+
const { primitiveFromNode } =primitiveUtilities;
|
|
4
7
|
|
|
5
8
|
export default class Substitution extends Element {
|
|
6
9
|
constructor(context, string, node) {
|
|
@@ -13,6 +16,15 @@ export default class Substitution extends Element {
|
|
|
13
16
|
return substitution;
|
|
14
17
|
}
|
|
15
18
|
|
|
19
|
+
getPrimitive() {
|
|
20
|
+
const context = this.getContext(),
|
|
21
|
+
replacementNode = this.getReplacementNode(),
|
|
22
|
+
node = replacementNode, ///
|
|
23
|
+
primitive = primitiveFromNode(node, context);
|
|
24
|
+
|
|
25
|
+
return primitive;
|
|
26
|
+
}
|
|
27
|
+
|
|
16
28
|
isSimple() {
|
|
17
29
|
const simple = true;
|
|
18
30
|
|