occam-furtle 3.0.482 → 3.0.484

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/element/anonymousProcedure.js +4 -2
  2. package/lib/element/procedure.js +4 -3
  3. package/package.json +2 -2
  4. package/src/element/anonymousProcedure.js +9 -4
  5. package/src/element/procedure.js +9 -5
package/lib/element/anonymousProcedure.js CHANGED
@@ -17,6 +17,7 @@ function _interop_require_default(obj) {
17
17
  default: obj
18
18
  };
19
19
  }
20
+ const { cut } = _occamlanguages.continuationUtilities;
20
21
  const _default = (0, _elements.define)(class AnonymousProcedure extends _occamlanguages.Element {
21
22
  constructor(context, string, node, breakPoint, type, parameters, returnBlock){
22
23
  super(context, string, node, breakPoint);
@@ -34,6 +35,7 @@ const _default = (0, _elements.define)(class AnonymousProcedure extends _occamla
34
35
  return this.returnBlock;
35
36
  }
36
37
  call(values, context, forward, back) {
38
+ forward = cut(forward, back); ///
37
39
  const anonymousProcedureString = this.getString(); ///
38
40
  context.trace(`Calling the '${anonymousProcedureString}' anonymous function...`);
39
41
  return this.parameters.compareValues(values, context, (back)=>{
@@ -41,7 +43,7 @@ const _default = (0, _elements.define)(class AnonymousProcedure extends _occamla
41
43
  return this.returnBlock.evaluate(variables, context, (value, back)=>{
42
44
  const valueType = value.getType(), typeEqualToValueType = this.type.isEqualTo(valueType);
43
45
  if (!typeEqualToValueType) {
44
- const valueString = value.getString(), typeString = this.type.getString(), message = `The '${valueString}' value's '${valueType}' type is not equal to the '${anonymousProcedureString}' anonymous function's '${typeString}' type.`, exception = _exception.default.fromMessage(message);
46
+ const typeString = this.type.getString(), valueString = value.getString(), valueTypeString = valueType.getString(), message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${anonymousProcedureString}' anonymous function's '${typeString}' type.`, exception = _exception.default.fromMessage(message);
45
47
  return back(exception);
46
48
  }
47
49
  context.debug(`...called the '${anonymousProcedureString}' anonymous function.`);
@@ -52,4 +54,4 @@ const _default = (0, _elements.define)(class AnonymousProcedure extends _occamla
52
54
  static name = "AnonymousProcedure";
53
55
  });
54
56
 
55
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2Fub255bW91c1Byb2NlZHVyZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgdmFyaWFibGVzRnJvbVZhbHVlc0FuZFBhcmFtZXRlcnMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3BhcmFtZXRlcnNcIjtcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIEFub255bW91c1Byb2NlZHVyZSBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHR5cGUsIHBhcmFtZXRlcnMsIHJldHVybkJsb2NrKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gICAgdGhpcy5wYXJhbWV0ZXJzID0gcGFyYW1ldGVycztcbiAgICB0aGlzLnJldHVybkJsb2NrID0gcmV0dXJuQmxvY2s7XG4gIH1cblxuICBnZXRUeXBlKCkge1xuICAgIHJldHVybiB0aGlzLnR5cGU7XG4gIH1cblxuICBnZXRQYXJhbWV0ZXJzKCkge1xuICAgIHJldHVybiB0aGlzLnBhcmFtZXRlcnM7XG4gIH1cblxuICBnZXRSZXR1cm5CbG9jaygpIHtcbiAgICByZXR1cm4gdGhpcy5yZXR1cm5CbG9jaztcbiAgfVxuXG4gIGNhbGwodmFsdWVzLCBjb250ZXh0LCBmb3J3YXJkLCBiYWNrKSB7XG4gICAgY29uc3QgYW5vbnltb3VzUHJvY2VkdXJlU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBDYWxsaW5nIHRoZSAnJHthbm9ueW1vdXNQcm9jZWR1cmVTdHJpbmd9JyBhbm9ueW1vdXMgZnVuY3Rpb24uLi5gKTtcblxuICAgIHJldHVybiB0aGlzLnBhcmFtZXRlcnMuY29tcGFyZVZhbHVlcyh2YWx1ZXMsIGNvbnRleHQsIChiYWNrKSA9PiB7XG4gICAgICBjb25zdCB2YXJpYWJsZXMgPSB2YXJpYWJsZXNGcm9tVmFsdWVzQW5kUGFyYW1ldGVycyh2YWx1ZXMsIHRoaXMucGFyYW1ldGVycywgY29udGV4dCk7XG5cbiAgICAgIHJldHVybiB0aGlzLnJldHVybkJsb2NrLmV2YWx1YXRlKHZhcmlhYmxlcywgY29udGV4dCwgKHZhbHVlLCBiYWNrKSA9PiB7XG4gICAgICAgIGNvbnN0IHZhbHVlVHlwZSA9IHZhbHVlLmdldFR5cGUoKSxcbiAgICAgICAgICAgICAgdHlwZUVxdWFsVG9WYWx1ZVR5cGUgPSB0aGlzLnR5cGUuaXNFcXVhbFRvKHZhbHVlVHlwZSk7XG5cbiAgICAgICAgaWYgKCF0eXBlRXF1YWxUb1ZhbHVlVHlwZSkge1xuICAgICAgICAgIGNvbnN0IHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgICAgICAgdHlwZVN0cmluZyA9IHRoaXMudHlwZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICAgICAgICBtZXNzYWdlID0gYFRoZSAnJHt2YWx1ZVN0cmluZ30nIHZhbHVlJ3MgJyR7dmFsdWVUeXBlfScgdHlwZSBpcyBub3QgZXF1YWwgdG8gdGhlICcke2Fub255bW91c1Byb2NlZHVyZVN0cmluZ30nIGFub255bW91cyBmdW5jdGlvbidzICcke3R5cGVTdHJpbmd9JyB0eXBlLmAsXG4gICAgICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICAgICAgcmV0dXJuIGJhY2soZXhjZXB0aW9uKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnRleHQuZGVidWcoYC4uLmNhbGxlZCB0aGUgJyR7YW5vbnltb3VzUHJvY2VkdXJlU3RyaW5nfScgYW5vbnltb3VzIGZ1bmN0aW9uLmApO1xuXG4gICAgICAgIHJldHVybiBmb3J3YXJkKHZhbHVlLCBiYWNrKTtcbiAgICAgIH0sIGJhY2spO1xuICAgIH0sIGJhY2spO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIkFub255bW91c1Byb2NlZHVyZVwiO1xufSk7XG4iXSwibmFtZXMiOlsiZGVmaW5lIiwiQW5vbnltb3VzUHJvY2VkdXJlIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsInR5cGUiLCJwYXJhbWV0ZXJzIiwicmV0dXJuQmxvY2siLCJnZXRUeXBlIiwiZ2V0UGFyYW1ldGVycyIsImdldFJldHVybkJsb2NrIiwiY2FsbCIsInZhbHVlcyIsImZvcndhcmQiLCJiYWNrIiwiYW5vbnltb3VzUHJvY2VkdXJlU3RyaW5nIiwiZ2V0U3RyaW5nIiwidHJhY2UiLCJjb21wYXJlVmFsdWVzIiwidmFyaWFibGVzIiwidmFyaWFibGVzRnJvbVZhbHVlc0FuZFBhcmFtZXRlcnMiLCJldmFsdWF0ZSIsInZhbHVlIiwidmFsdWVUeXBlIiwidHlwZUVxdWFsVG9WYWx1ZVR5cGUiLCJpc0VxdWFsVG8iLCJ2YWx1ZVN0cmluZyIsInR5cGVTdHJpbmciLCJtZXNzYWdlIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJkZWJ1ZyIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBQTs7O2dDQVB3QjtrRUFFRjswQkFFQzs0QkFDMEI7Ozs7OztNQUVqRCxXQUFlQSxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLDJCQUEyQkMsdUJBQU87SUFDNUQsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsV0FBVyxDQUFFO1FBQzVFLEtBQUssQ0FBQ04sU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxVQUFVLEdBQUdBO1FBQ2xCLElBQUksQ0FBQ0MsV0FBVyxHQUFHQTtJQUNyQjtJQUVBQyxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUNILElBQUk7SUFDbEI7SUFFQUksZ0JBQWdCO1FBQ2QsT0FBTyxJQUFJLENBQUNILFVBQVU7SUFDeEI7SUFFQUksaUJBQWlCO1FBQ2YsT0FBTyxJQUFJLENBQUNILFdBQVc7SUFDekI7SUFFQUksS0FBS0MsTUFBTSxFQUFFWCxPQUFPLEVBQUVZLE9BQU8sRUFBRUMsSUFBSSxFQUFFO1FBQ25DLE1BQU1DLDJCQUEyQixJQUFJLENBQUNDLFNBQVMsSUFBSSxHQUFHO1FBRXREZixRQUFRZ0IsS0FBSyxDQUFDLENBQUMsYUFBYSxFQUFFRix5QkFBeUIsdUJBQXVCLENBQUM7UUFFL0UsT0FBTyxJQUFJLENBQUNULFVBQVUsQ0FBQ1ksYUFBYSxDQUFDTixRQUFRWCxTQUFTLENBQUNhO1lBQ3JELE1BQU1LLFlBQVlDLElBQUFBLDRDQUFnQyxFQUFDUixRQUFRLElBQUksQ0FBQ04sVUFBVSxFQUFFTDtZQUU1RSxPQUFPLElBQUksQ0FBQ00sV0FBVyxDQUFDYyxRQUFRLENBQUNGLFdBQVdsQixTQUFTLENBQUNxQixPQUFPUjtnQkFDM0QsTUFBTVMsWUFBWUQsTUFBTWQsT0FBTyxJQUN6QmdCLHVCQUF1QixJQUFJLENBQUNuQixJQUFJLENBQUNvQixTQUFTLENBQUNGO2dCQUVqRCxJQUFJLENBQUNDLHNCQUFzQjtvQkFDekIsTUFBTUUsY0FBY0osTUFBTU4sU0FBUyxJQUM3QlcsYUFBYSxJQUFJLENBQUN0QixJQUFJLENBQUNXLFNBQVMsSUFDaENZLFVBQVUsQ0FBQyxLQUFLLEVBQUVGLFlBQVksV0FBVyxFQUFFSCxVQUFVLDRCQUE0QixFQUFFUix5QkFBeUIsd0JBQXdCLEVBQUVZLFdBQVcsT0FBTyxDQUFDLEVBQ3pKRSxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNIO29CQUV4QyxPQUFPZCxLQUFLZTtnQkFDZDtnQkFFQTVCLFFBQVErQixLQUFLLENBQUMsQ0FBQyxlQUFlLEVBQUVqQix5QkFBeUIscUJBQXFCLENBQUM7Z0JBRS9FLE9BQU9GLFFBQVFTLE9BQU9SO1lBQ3hCLEdBQUdBO1FBQ0wsR0FBR0E7SUFDTDtJQUVBLE9BQU9tQixPQUFPLHFCQUFxQjtBQUNyQyJ9
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L2Fub255bW91c1Byb2NlZHVyZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCwgY29udGludWF0aW9uVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuXG5pbXBvcnQgRXhjZXB0aW9uIGZyb20gXCIuLi9leGNlcHRpb25cIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyB2YXJpYWJsZXNGcm9tVmFsdWVzQW5kUGFyYW1ldGVycyB9IGZyb20gXCIuLi91dGlsaXRpZXMvcGFyYW1ldGVyc1wiO1xuXG5jb25zdCB7IGN1dCB9ID0gY29udGludWF0aW9uVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgQW5vbnltb3VzUHJvY2VkdXJlIGV4dGVuZHMgRWxlbWVudCB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgdHlwZSwgcGFyYW1ldGVycywgcmV0dXJuQmxvY2spIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy50eXBlID0gdHlwZTtcbiAgICB0aGlzLnBhcmFtZXRlcnMgPSBwYXJhbWV0ZXJzO1xuICAgIHRoaXMucmV0dXJuQmxvY2sgPSByZXR1cm5CbG9jaztcbiAgfVxuXG4gIGdldFR5cGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudHlwZTtcbiAgfVxuXG4gIGdldFBhcmFtZXRlcnMoKSB7XG4gICAgcmV0dXJuIHRoaXMucGFyYW1ldGVycztcbiAgfVxuXG4gIGdldFJldHVybkJsb2NrKCkge1xuICAgIHJldHVybiB0aGlzLnJldHVybkJsb2NrO1xuICB9XG5cbiAgY2FsbCh2YWx1ZXMsIGNvbnRleHQsIGZvcndhcmQsIGJhY2spIHtcbiAgICBmb3J3YXJkID0gY3V0KGZvcndhcmQsIGJhY2spOyAvLy9cblxuICAgIGNvbnN0IGFub255bW91c1Byb2NlZHVyZVN0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7IC8vL1xuXG4gICAgY29udGV4dC50cmFjZShgQ2FsbGluZyB0aGUgJyR7YW5vbnltb3VzUHJvY2VkdXJlU3RyaW5nfScgYW5vbnltb3VzIGZ1bmN0aW9uLi4uYCk7XG5cbiAgICByZXR1cm4gdGhpcy5wYXJhbWV0ZXJzLmNvbXBhcmVWYWx1ZXModmFsdWVzLCBjb250ZXh0LCAoYmFjaykgPT4ge1xuICAgICAgY29uc3QgdmFyaWFibGVzID0gdmFyaWFibGVzRnJvbVZhbHVlc0FuZFBhcmFtZXRlcnModmFsdWVzLCB0aGlzLnBhcmFtZXRlcnMsIGNvbnRleHQpO1xuXG4gICAgICByZXR1cm4gdGhpcy5yZXR1cm5CbG9jay5ldmFsdWF0ZSh2YXJpYWJsZXMsIGNvbnRleHQsICh2YWx1ZSwgYmFjaykgPT4ge1xuICAgICAgICBjb25zdCB2YWx1ZVR5cGUgPSB2YWx1ZS5nZXRUeXBlKCksXG4gICAgICAgICAgICAgIHR5cGVFcXVhbFRvVmFsdWVUeXBlID0gdGhpcy50eXBlLmlzRXF1YWxUbyh2YWx1ZVR5cGUpO1xuXG4gICAgICAgIGlmICghdHlwZUVxdWFsVG9WYWx1ZVR5cGUpIHtcbiAgICAgICAgICBjb25zdCB0eXBlU3RyaW5nID0gdGhpcy50eXBlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgICAgIHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgICAgICAgdmFsdWVUeXBlU3RyaW5nID0gdmFsdWVUeXBlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgICAgIG1lc3NhZ2UgPSBgVGhlICcke3ZhbHVlU3RyaW5nfScgdmFsdWUncyAnJHt2YWx1ZVR5cGVTdHJpbmd9JyB0eXBlIGlzIG5vdCBlcXVhbCB0byB0aGUgJyR7YW5vbnltb3VzUHJvY2VkdXJlU3RyaW5nfScgYW5vbnltb3VzIGZ1bmN0aW9uJ3MgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCxcbiAgICAgICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgICAgICByZXR1cm4gYmFjayhleGNlcHRpb24pO1xuICAgICAgICB9XG5cbiAgICAgICAgY29udGV4dC5kZWJ1ZyhgLi4uY2FsbGVkIHRoZSAnJHthbm9ueW1vdXNQcm9jZWR1cmVTdHJpbmd9JyBhbm9ueW1vdXMgZnVuY3Rpb24uYCk7XG5cbiAgICAgICAgcmV0dXJuIGZvcndhcmQodmFsdWUsIGJhY2spO1xuICAgICAgfSwgYmFjayk7XG4gICAgfSwgYmFjayk7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiQW5vbnltb3VzUHJvY2VkdXJlXCI7XG59KTtcbiJdLCJuYW1lcyI6WyJjdXQiLCJjb250aW51YXRpb25VdGlsaXRpZXMiLCJkZWZpbmUiLCJBbm9ueW1vdXNQcm9jZWR1cmUiLCJFbGVtZW50IiwiY29udGV4dCIsInN0cmluZyIsIm5vZGUiLCJicmVha1BvaW50IiwidHlwZSIsInBhcmFtZXRlcnMiLCJyZXR1cm5CbG9jayIsImdldFR5cGUiLCJnZXRQYXJhbWV0ZXJzIiwiZ2V0UmV0dXJuQmxvY2siLCJjYWxsIiwidmFsdWVzIiwiZm9yd2FyZCIsImJhY2siLCJhbm9ueW1vdXNQcm9jZWR1cmVTdHJpbmciLCJnZXRTdHJpbmciLCJ0cmFjZSIsImNvbXBhcmVWYWx1ZXMiLCJ2YXJpYWJsZXMiLCJ2YXJpYWJsZXNGcm9tVmFsdWVzQW5kUGFyYW1ldGVycyIsImV2YWx1YXRlIiwidmFsdWUiLCJ2YWx1ZVR5cGUiLCJ0eXBlRXF1YWxUb1ZhbHVlVHlwZSIsImlzRXF1YWxUbyIsInR5cGVTdHJpbmciLCJ2YWx1ZVN0cmluZyIsInZhbHVlVHlwZVN0cmluZyIsIm1lc3NhZ2UiLCJleGNlcHRpb24iLCJFeGNlcHRpb24iLCJmcm9tTWVzc2FnZSIsImRlYnVnIiwibmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBV0E7OztlQUFBOzs7Z0NBVCtDO2tFQUV6QjswQkFFQzs0QkFDMEI7Ozs7OztBQUVqRCxNQUFNLEVBQUVBLEdBQUcsRUFBRSxHQUFHQyxxQ0FBcUI7TUFFckMsV0FBZUMsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQywyQkFBMkJDLHVCQUFPO0lBQzVELFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsSUFBSSxFQUFFQyxVQUFVLEVBQUVDLFdBQVcsQ0FBRTtRQUM1RSxLQUFLLENBQUNOLFNBQVNDLFFBQVFDLE1BQU1DO1FBRTdCLElBQUksQ0FBQ0MsSUFBSSxHQUFHQTtRQUNaLElBQUksQ0FBQ0MsVUFBVSxHQUFHQTtRQUNsQixJQUFJLENBQUNDLFdBQVcsR0FBR0E7SUFDckI7SUFFQUMsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDSCxJQUFJO0lBQ2xCO0lBRUFJLGdCQUFnQjtRQUNkLE9BQU8sSUFBSSxDQUFDSCxVQUFVO0lBQ3hCO0lBRUFJLGlCQUFpQjtRQUNmLE9BQU8sSUFBSSxDQUFDSCxXQUFXO0lBQ3pCO0lBRUFJLEtBQUtDLE1BQU0sRUFBRVgsT0FBTyxFQUFFWSxPQUFPLEVBQUVDLElBQUksRUFBRTtRQUNuQ0QsVUFBVWpCLElBQUlpQixTQUFTQyxPQUFPLEdBQUc7UUFFakMsTUFBTUMsMkJBQTJCLElBQUksQ0FBQ0MsU0FBUyxJQUFJLEdBQUc7UUFFdERmLFFBQVFnQixLQUFLLENBQUMsQ0FBQyxhQUFhLEVBQUVGLHlCQUF5Qix1QkFBdUIsQ0FBQztRQUUvRSxPQUFPLElBQUksQ0FBQ1QsVUFBVSxDQUFDWSxhQUFhLENBQUNOLFFBQVFYLFNBQVMsQ0FBQ2E7WUFDckQsTUFBTUssWUFBWUMsSUFBQUEsNENBQWdDLEVBQUNSLFFBQVEsSUFBSSxDQUFDTixVQUFVLEVBQUVMO1lBRTVFLE9BQU8sSUFBSSxDQUFDTSxXQUFXLENBQUNjLFFBQVEsQ0FBQ0YsV0FBV2xCLFNBQVMsQ0FBQ3FCLE9BQU9SO2dCQUMzRCxNQUFNUyxZQUFZRCxNQUFNZCxPQUFPLElBQ3pCZ0IsdUJBQXVCLElBQUksQ0FBQ25CLElBQUksQ0FBQ29CLFNBQVMsQ0FBQ0Y7Z0JBRWpELElBQUksQ0FBQ0Msc0JBQXNCO29CQUN6QixNQUFNRSxhQUFhLElBQUksQ0FBQ3JCLElBQUksQ0FBQ1csU0FBUyxJQUNoQ1csY0FBY0wsTUFBTU4sU0FBUyxJQUM3Qlksa0JBQWtCTCxVQUFVUCxTQUFTLElBQ3JDYSxVQUFVLENBQUMsS0FBSyxFQUFFRixZQUFZLFdBQVcsRUFBRUMsZ0JBQWdCLDRCQUE0QixFQUFFYix5QkFBeUIsd0JBQXdCLEVBQUVXLFdBQVcsT0FBTyxDQUFDLEVBQy9KSSxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNIO29CQUV4QyxPQUFPZixLQUFLZ0I7Z0JBQ2Q7Z0JBRUE3QixRQUFRZ0MsS0FBSyxDQUFDLENBQUMsZUFBZSxFQUFFbEIseUJBQXlCLHFCQUFxQixDQUFDO2dCQUUvRSxPQUFPRixRQUFRUyxPQUFPUjtZQUN4QixHQUFHQTtRQUNMLEdBQUdBO0lBQ0w7SUFFQSxPQUFPb0IsT0FBTyxxQkFBcUI7QUFDckMifQ==
package/lib/element/procedure.js CHANGED
@@ -20,7 +20,7 @@ function _interop_require_default(obj) {
20
20
  default: obj
21
21
  };
22
22
  }
23
- const { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = _occamlanguages.breakPointUtilities;
23
+ const { cut } = _occamlanguages.continuationUtilities, { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = _occamlanguages.breakPointUtilities;
24
24
  const _default = (0, _elements.define)(class Procedure extends _occamlanguages.Element {
25
25
  constructor(context, string, node, breakPoint, type, label, parameters, returnBlock){
26
26
  super(context, string, node, breakPoint);
@@ -70,6 +70,7 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
70
70
  return forward(context, back);
71
71
  }
72
72
  call = breakable(function(values, context, forward, back) {
73
+ forward = cut(forward, back);
73
74
  const procedureString = this.getString(); ///
74
75
  context.trace(`Calling the '${procedureString}' function...`);
75
76
  return this.parameters.compareValues(values, context, (back)=>{
@@ -78,7 +79,7 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
78
79
  return this.returnBlock.evaluate(variables, context, (value, back)=>{
79
80
  const valueType = value.getType(), typeEqualToValueType = this.type.isEqualTo(valueType);
80
81
  if (!typeEqualToValueType) {
81
- const valueString = value.getString(), typeString = this.type.getString(), message = `The '${valueString}' value's '${typeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`, exception = _exception.default.fromMessage(message);
82
+ const typeString = this.type.getString(), valueString = value.getString(), valueTypeString = valueType.getString(), message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`, exception = _exception.default.fromMessage(message);
82
83
  return back(exception);
83
84
  }
84
85
  context.debug(`...called the '${procedureString}' function.`);
@@ -117,4 +118,4 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
117
118
  }
118
119
  });
119
120
 
120
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedure.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, breakPointUtilities } from \"occam-languages\";\n\nimport Exception from \"../exception\";\n\nimport { define } from \"../elements\";\nimport { valuesFromNominalValues } from \"../utilities/values\";\nimport { returnBlockFromProcedureNode } from \"../utilities/element\";\nimport { variablesFromValuesAndParameters } from \"../utilities/parameters\";\nimport { typeFromJSON, labelFromJSON, parametersFromJSON, typeToTypeJSON, labelToLabelJSON, parametersToParametersJSON } from \"../utilities/json\";\n\nconst { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = breakPointUtilities;\n\nexport default define(class Procedure extends Element {\n  constructor(context, string, node, breakPoint, type, label, parameters, returnBlock) {\n    super(context, string, node, breakPoint);\n\n    this.type = type;\n    this.label = label;\n    this.parameters = parameters;\n    this.returnBlock = returnBlock;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getLabel() {\n    return this.label;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getReturnBlock() {\n    return this.returnBlock;\n  }\n\n  getName() { return this.label.getName(); }\n\n  isBoolean() {\n    const type = this.getType(),\n          booleanType = type.isBooleanType(),\n          boolean = booleanType;  ///\n\n    return boolean;\n  }\n\n  getReturnStatement() { return this.returnBlock.getReturnStatement(); }\n\n  compareProcedureName(procedureName) { return this.label.compareProcedureName(procedureName); }\n\n  guaranteeReturnBlock() {\n    if (this.returnBlock != null) {\n      return;\n    }\n\n    const node = this.getNode(),\n          context = this.getContext(),\n          procedureNode = node;\n\n    this.returnBlock = returnBlockFromProcedureNode(procedureNode, context);\n  }\n\n  verify(context, forward, back) {\n    const procedureString = this.getString();\n\n    context.trace(`Verifying the '${procedureString}' function...`)\n\n    const procedure = this; ///\n\n    context.addProcedure(procedure);\n\n    context.debug(`...verified the '${procedureString}' function.`)\n\n    return forward(context, back);\n  }\n\n  call = breakable(function (values, context, forward, back) {\n    const procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function...`);\n\n    return this.parameters.compareValues(values, context, (back) => {\n      this.guaranteeReturnBlock();\n\n      const variables = variablesFromValuesAndParameters(values, this.parameters, context);\n\n      return this.returnBlock.evaluate(variables, context, (value, back) => {\n        const valueType = value.getType(),\n              typeEqualToValueType = this.type.isEqualTo(valueType);\n\n        if (!typeEqualToValueType) {\n          const valueString = value.getString(),\n                typeString = this.type.getString(),\n                message = `The '${valueString}' value's '${typeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`,\n                exception = Exception.fromMessage(message);\n\n          return back(exception);\n        }\n\n        context.debug(`...called the '${procedureString}' function.`);\n\n        return forward(value, back);\n      }, back);\n    }, back);\n  });\n\n  callNominally(nominalValues, forward, back) {\n    const context = this.getContext(),\n          procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function nominally...`);\n\n    const values = valuesFromNominalValues(nominalValues, context);\n\n    return this.call(values, context, (value, back) => {\n      context.debug(`...called the '${procedureString}' function nominally.`);\n\n      return forward(value, back);\n    }, back);\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          labelJSON = labelToLabelJSON(this.label),\n          parametersJSON = parametersToParametersJSON(this.parameters),\n          string = this.getString();\n\n    let breakPoint;\n\n    breakPoint = this.getBreakPoint();\n\n    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);\n\n    breakPoint = breakPointJSON;  ///\n\n    const type = typeJSON,  ///\n          label = labelJSON,  ///\n          parameters = parametersJSON,  ///\n          json = {\n            string,\n            breakPoint,\n            type,\n            label,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"Procedure\";\n\n  static fromJSON(json, context) {\n    const { string } = json,\n          breakPoint = breakPointFromJSON(json),\n          type = typeFromJSON(json, context),\n          label = labelFromJSON(json, context),\n          parameters = parametersFromJSON(json, context),\n          procedureNode = context.findProcedureNode(label),\n          returnBlock = null, ///\n          node = procedureNode, ///\n          procedure = new Procedure(context, string, node, breakPoint, type, label, parameters, returnBlock);\n\n    return procedure;\n  }\n});\n"],"names":["breakable","breakPointFromJSON","breakPointToBreakPointJSON","breakPointUtilities","define","Procedure","Element","context","string","node","breakPoint","type","label","parameters","returnBlock","getType","getLabel","getParameters","getReturnBlock","getName","isBoolean","booleanType","isBooleanType","boolean","getReturnStatement","compareProcedureName","procedureName","guaranteeReturnBlock","getNode","getContext","procedureNode","returnBlockFromProcedureNode","verify","forward","back","procedureString","getString","trace","procedure","addProcedure","debug","call","values","compareValues","variables","variablesFromValuesAndParameters","evaluate","value","valueType","typeEqualToValueType","isEqualTo","valueString","typeString","message","exception","Exception","fromMessage","callNominally","nominalValues","valuesFromNominalValues","toJSON","typeJSON","typeToTypeJSON","labelJSON","labelToLabelJSON","parametersJSON","parametersToParametersJSON","getBreakPoint","breakPointJSON","json","name","fromJSON","typeFromJSON","labelFromJSON","parametersFromJSON","findProcedureNode"],"mappings":"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"}
121
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedure.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, breakPointUtilities, continuationUtilities } from \"occam-languages\";\n\nimport Exception from \"../exception\";\n\nimport { define } from \"../elements\";\nimport { valuesFromNominalValues } from \"../utilities/values\";\nimport { returnBlockFromProcedureNode } from \"../utilities/element\";\nimport { variablesFromValuesAndParameters } from \"../utilities/parameters\";\nimport { typeFromJSON, labelFromJSON, parametersFromJSON, typeToTypeJSON, labelToLabelJSON, parametersToParametersJSON } from \"../utilities/json\";\n\nconst { cut } = continuationUtilities,\n      { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = breakPointUtilities;\n\nexport default define(class Procedure extends Element {\n  constructor(context, string, node, breakPoint, type, label, parameters, returnBlock) {\n    super(context, string, node, breakPoint);\n\n    this.type = type;\n    this.label = label;\n    this.parameters = parameters;\n    this.returnBlock = returnBlock;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getLabel() {\n    return this.label;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getReturnBlock() {\n    return this.returnBlock;\n  }\n\n  getName() { return this.label.getName(); }\n\n  isBoolean() {\n    const type = this.getType(),\n          booleanType = type.isBooleanType(),\n          boolean = booleanType;  ///\n\n    return boolean;\n  }\n\n  getReturnStatement() { return this.returnBlock.getReturnStatement(); }\n\n  compareProcedureName(procedureName) { return this.label.compareProcedureName(procedureName); }\n\n  guaranteeReturnBlock() {\n    if (this.returnBlock != null) {\n      return;\n    }\n\n    const node = this.getNode(),\n          context = this.getContext(),\n          procedureNode = node;\n\n    this.returnBlock = returnBlockFromProcedureNode(procedureNode, context);\n  }\n\n  verify(context, forward, back) {\n    const procedureString = this.getString();\n\n    context.trace(`Verifying the '${procedureString}' function...`)\n\n    const procedure = this; ///\n\n    context.addProcedure(procedure);\n\n    context.debug(`...verified the '${procedureString}' function.`)\n\n    return forward(context, back);\n  }\n\n  call = breakable(function (values, context, forward, back) {\n    forward = cut(forward, back);\n\n    const procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function...`);\n\n    return this.parameters.compareValues(values, context, (back) => {\n      this.guaranteeReturnBlock();\n\n      const variables = variablesFromValuesAndParameters(values, this.parameters, context);\n\n      return this.returnBlock.evaluate(variables, context, (value, back) => {\n        const valueType = value.getType(),\n              typeEqualToValueType = this.type.isEqualTo(valueType);\n\n        if (!typeEqualToValueType) {\n          const typeString = this.type.getString(),\n                valueString = value.getString(),\n                valueTypeString = valueType.getString(),\n                message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`,\n                exception = Exception.fromMessage(message);\n\n          return back(exception);\n        }\n\n        context.debug(`...called the '${procedureString}' function.`);\n\n        return forward(value, back);\n      }, back);\n    }, back);\n  });\n\n  callNominally(nominalValues, forward, back) {\n    const context = this.getContext(),\n          procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function nominally...`);\n\n    const values = valuesFromNominalValues(nominalValues, context);\n\n    return this.call(values, context, (value, back) => {\n      context.debug(`...called the '${procedureString}' function nominally.`);\n\n      return forward(value, back);\n    }, back);\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          labelJSON = labelToLabelJSON(this.label),\n          parametersJSON = parametersToParametersJSON(this.parameters),\n          string = this.getString();\n\n    let breakPoint;\n\n    breakPoint = this.getBreakPoint();\n\n    const breakPointJSON = breakPointToBreakPointJSON(breakPoint);\n\n    breakPoint = breakPointJSON;  ///\n\n    const type = typeJSON,  ///\n          label = labelJSON,  ///\n          parameters = parametersJSON,  ///\n          json = {\n            string,\n            breakPoint,\n            type,\n            label,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"Procedure\";\n\n  static fromJSON(json, context) {\n    const { string } = json,\n          breakPoint = breakPointFromJSON(json),\n          type = typeFromJSON(json, context),\n          label = labelFromJSON(json, context),\n          parameters = parametersFromJSON(json, context),\n          procedureNode = context.findProcedureNode(label),\n          returnBlock = null, ///\n          node = procedureNode, ///\n          procedure = new Procedure(context, string, node, breakPoint, type, label, parameters, returnBlock);\n\n    return procedure;\n  }\n});\n"],"names":["cut","continuationUtilities","breakable","breakPointFromJSON","breakPointToBreakPointJSON","breakPointUtilities","define","Procedure","Element","context","string","node","breakPoint","type","label","parameters","returnBlock","getType","getLabel","getParameters","getReturnBlock","getName","isBoolean","booleanType","isBooleanType","boolean","getReturnStatement","compareProcedureName","procedureName","guaranteeReturnBlock","getNode","getContext","procedureNode","returnBlockFromProcedureNode","verify","forward","back","procedureString","getString","trace","procedure","addProcedure","debug","call","values","compareValues","variables","variablesFromValuesAndParameters","evaluate","value","valueType","typeEqualToValueType","isEqualTo","typeString","valueString","valueTypeString","message","exception","Exception","fromMessage","callNominally","nominalValues","valuesFromNominalValues","toJSON","typeJSON","typeToTypeJSON","labelJSON","labelToLabelJSON","parametersJSON","parametersToParametersJSON","getBreakPoint","breakPointJSON","json","name","fromJSON","typeFromJSON","labelFromJSON","parametersFromJSON","findProcedureNode"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-furtle",
3
3
  "author": "James Smith",
4
- "version": "3.0.482",
4
+ "version": "3.0.484",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-furtle",
7
7
  "description": "Occam's Furtle language.",
@@ -12,7 +12,7 @@
12
12
  "dependencies": {
13
13
  "necessary": "^17.6.3",
14
14
  "occam-grammars": "^1.3.663",
15
- "occam-languages": "^3.0.42",
15
+ "occam-languages": "^3.0.44",
16
16
  "occam-lexers": "^23.2.8",
17
17
  "occam-parsers": "^23.2.11",
18
18
  "occam-query": "^4.1.206"
package/src/element/anonymousProcedure.js CHANGED
@@ -1,12 +1,14 @@
1
1
  "use strict";
2
2
 
3
- import { Element } from "occam-languages";
3
+ import { Element, continuationUtilities } from "occam-languages";
4
4
 
5
5
  import Exception from "../exception";
6
6
 
7
7
  import { define } from "../elements";
8
8
  import { variablesFromValuesAndParameters } from "../utilities/parameters";
9
9
 
10
+ const { cut } = continuationUtilities;
11
+
10
12
  export default define(class AnonymousProcedure extends Element {
11
13
  constructor(context, string, node, breakPoint, type, parameters, returnBlock) {
12
14
  super(context, string, node, breakPoint);
@@ -29,6 +31,8 @@ export default define(class AnonymousProcedure extends Element {
29
31
  }
30
32
 
31
33
  call(values, context, forward, back) {
34
+ forward = cut(forward, back); ///
35
+
32
36
  const anonymousProcedureString = this.getString(); ///
33
37
 
34
38
  context.trace(`Calling the '${anonymousProcedureString}' anonymous function...`);
@@ -41,9 +45,10 @@ export default define(class AnonymousProcedure extends Element {
41
45
  typeEqualToValueType = this.type.isEqualTo(valueType);
42
46
 
43
47
  if (!typeEqualToValueType) {
44
- const valueString = value.getString(),
45
- typeString = this.type.getString(),
46
- message = `The '${valueString}' value's '${valueType}' type is not equal to the '${anonymousProcedureString}' anonymous function's '${typeString}' type.`,
48
+ const typeString = this.type.getString(),
49
+ valueString = value.getString(),
50
+ valueTypeString = valueType.getString(),
51
+ message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${anonymousProcedureString}' anonymous function's '${typeString}' type.`,
47
52
  exception = Exception.fromMessage(message);
48
53
 
49
54
  return back(exception);
package/src/element/procedure.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import { Element, breakPointUtilities } from "occam-languages";
3
+ import { Element, breakPointUtilities, continuationUtilities } from "occam-languages";
4
4
 
5
5
  import Exception from "../exception";
6
6
 
@@ -10,7 +10,8 @@ import { returnBlockFromProcedureNode } from "../utilities/element";
10
10
  import { variablesFromValuesAndParameters } from "../utilities/parameters";
11
11
  import { typeFromJSON, labelFromJSON, parametersFromJSON, typeToTypeJSON, labelToLabelJSON, parametersToParametersJSON } from "../utilities/json";
12
12
 
13
- const { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = breakPointUtilities;
13
+ const { cut } = continuationUtilities,
14
+ { breakable, breakPointFromJSON, breakPointToBreakPointJSON } = breakPointUtilities;
14
15
 
15
16
  export default define(class Procedure extends Element {
16
17
  constructor(context, string, node, breakPoint, type, label, parameters, returnBlock) {
@@ -79,6 +80,8 @@ export default define(class Procedure extends Element {
79
80
  }
80
81
 
81
82
  call = breakable(function (values, context, forward, back) {
83
+ forward = cut(forward, back);
84
+
82
85
  const procedureString = this.getString(); ///
83
86
 
84
87
  context.trace(`Calling the '${procedureString}' function...`);
@@ -93,9 +96,10 @@ export default define(class Procedure extends Element {
93
96
  typeEqualToValueType = this.type.isEqualTo(valueType);
94
97
 
95
98
  if (!typeEqualToValueType) {
96
- const valueString = value.getString(),
97
- typeString = this.type.getString(),
98
- message = `The '${valueString}' value's '${typeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`,
99
+ const typeString = this.type.getString(),
100
+ valueString = value.getString(),
101
+ valueTypeString = valueType.getString(),
102
+ message = `The '${valueString}' value's '${valueTypeString}' type is not equal to the '${procedureString}' function's '${typeString}' type.`,
99
103
  exception = Exception.fromMessage(message);
100
104
 
101
105
  return back(exception);