occam-furtle 3.0.452 → 3.0.453

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/procedure.js +2 -2
  2. package/lib/element/returnBlock.js +4 -4
  3. package/package.json +2 -2
  4. package/src/element/procedure.js +1 -1
  5. package/src/element/returnBlock.js +3 -3
package/lib/element/procedure.js CHANGED
@@ -75,7 +75,7 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
75
75
  this.parameters.compareValues(values, context);
76
76
  this.guaranteeReturnBlock();
77
77
  const variables = (0, _parameters.variablesFromValuesAndParameters)(values, this.parameters, context);
78
- this.returnBlock.evaluate(variables, context, (value)=>{
78
+ return this.returnBlock.evaluate(variables, context, back, (value)=>{
79
79
  const valueType = value.getType(), typeEqualToValueType = this.type.isEqualTo(valueType);
80
80
  if (!typeEqualToValueType) {
81
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);
@@ -116,4 +116,4 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
116
116
  }
117
117
  });
118
118
 
119
- //# 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, back, forward) {\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);\n  }\n\n  call = breakable(function (values, context, back, forward) {\n    const procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function...`);\n\n    this.parameters.compareValues(values, context);\n\n    this.guaranteeReturnBlock();\n\n    const variables = variablesFromValuesAndParameters(values, this.parameters, context);\n\n    this.returnBlock.evaluate(variables, context, (value) => {\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        throw exception;\n      }\n\n      context.debug(`...called the '${procedureString}' function.`);\n\n      return forward(value);\n    });\n  });\n\n  callNominally(nominalValues, back, forward) {\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, back, (value) => {\n      context.debug(`...called the '${procedureString}' function nominally.`);\n\n      return forward(value);\n    });\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","back","forward","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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"}
119
+ //# 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, back, forward) {\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);\n  }\n\n  call = breakable(function (values, context, back, forward) {\n    const procedureString = this.getString();  ///\n\n    context.trace(`Calling the '${procedureString}' function...`);\n\n    this.parameters.compareValues(values, context);\n\n    this.guaranteeReturnBlock();\n\n    const variables = variablesFromValuesAndParameters(values, this.parameters, context);\n\n    return this.returnBlock.evaluate(variables, context, back, (value) => {\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        throw exception;\n      }\n\n      context.debug(`...called the '${procedureString}' function.`);\n\n      return forward(value);\n    });\n  });\n\n  callNominally(nominalValues, back, forward) {\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, back, (value) => {\n      context.debug(`...called the '${procedureString}' function nominally.`);\n\n      return forward(value);\n    });\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","back","forward","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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"}
package/lib/element/returnBlock.js CHANGED
@@ -41,8 +41,8 @@ const _default = (0, _elements.define)(class ReturnBlock extends _occamlanguages
41
41
  const message = `The return block is nonsensical.`, exception = _exception.default.fromMessage(message);
42
42
  throw exception;
43
43
  }
44
- (0, _context.confine)((context)=>{
45
- this.evaluateStatements(context, ()=>{
44
+ return (0, _context.confine)((context)=>{
45
+ return this.evaluateStatements(context, back, ()=>{
46
46
  const value = this.returnStatement.evaluate(context), valueString = value.getString();
47
47
  context.debug(`...evaluated the '${returnBlockString}' return block as '${valueString}'.`);
48
48
  return forward(value);
@@ -54,7 +54,7 @@ const _default = (0, _elements.define)(class ReturnBlock extends _occamlanguages
54
54
  context.trace(`Evaluating the '${returnBlockString}' return block's statements...`);
55
55
  return forEach(this.statements, (statement, back, forward)=>{
56
56
  return statement.evaluate(context, back, forward);
57
- }, ()=>{
57
+ }, back, ()=>{
58
58
  context.debug(`...evaluated the '${returnBlockString}' return block's statements.`);
59
59
  return forward();
60
60
  });
@@ -62,4 +62,4 @@ const _default = (0, _elements.define)(class ReturnBlock extends _occamlanguages
62
62
  static name = "ReturnBlock";
63
63
  });
64
64
 
65
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3JldHVybkJsb2NrLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcbmltcG9ydCB7IGNvbmZpbmUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcblxuY29uc3QgeyBmb3JFYWNoIH0gPSBjb250aW51YXRpb25VdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBSZXR1cm5CbG9jayBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHN0YXRlbWVudHMsIG5vbnNlbnNpY2FsLCByZXR1cm5TdGF0ZW1lbnQpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy5zdGF0ZW1lbnRzID0gc3RhdGVtZW50cztcbiAgICB0aGlzLm5vbnNlbnNpY2FsID0gbm9uc2Vuc2ljYWw7XG4gICAgdGhpcy5yZXR1cm5TdGF0ZW1lbnQgPSByZXR1cm5TdGF0ZW1lbnQ7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnRzKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudHM7XG4gIH1cblxuICBpc05vbnNlbnNpY2FsKCkge1xuICAgIHJldHVybiB0aGlzLm5vbnNlbnNpY2FsO1xuICB9XG5cbiAgZ2V0UmV0dXJuU3RhdGVtZW50KCkge1xuICAgIHJldHVybiB0aGlzLnJldHVyblN0YXRlbWVudDtcbiAgfVxuXG4gIGV2YWx1YXRlKHZhcmlhYmxlcywgY29udGV4dCwgYmFjaywgZm9yd2FyZCkge1xuICAgIGNvbnN0IHJldHVybkJsb2NrU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtyZXR1cm5CbG9ja1N0cmluZ30nIHJldHVybiBibG9jay4uLmApO1xuXG4gICAgaWYgKHRoaXMubm9uc2Vuc2ljYWwpIHtcbiAgICAgIGNvbnN0IG1lc3NhZ2UgPSBgVGhlIHJldHVybiBibG9jayBpcyBub25zZW5zaWNhbC5gLFxuICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICB0aHJvdyBleGNlcHRpb247XG4gICAgfVxuXG4gICAgY29uZmluZSgoY29udGV4dCkgPT4ge1xuICAgICAgdGhpcy5ldmFsdWF0ZVN0YXRlbWVudHMoY29udGV4dCwgKCkgPT4ge1xuICAgICAgICBjb25zdCB2YWx1ZSA9IHRoaXMucmV0dXJuU3RhdGVtZW50LmV2YWx1YXRlKGNvbnRleHQpLFxuICAgICAgICAgICAgICB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpO1xuXG4gICAgICAgIGNvbnRleHQuZGVidWcoYC4uLmV2YWx1YXRlZCB0aGUgJyR7cmV0dXJuQmxvY2tTdHJpbmd9JyByZXR1cm4gYmxvY2sgYXMgJyR7dmFsdWVTdHJpbmd9Jy5gKTtcblxuICAgICAgICByZXR1cm4gZm9yd2FyZCh2YWx1ZSk7XG4gICAgICB9KTtcbiAgICB9LCB2YXJpYWJsZXMsIGNvbnRleHQpO1xuICB9XG5cbiAgZXZhbHVhdGVTdGF0ZW1lbnRzKGNvbnRleHQsIGJhY2ssIGZvcndhcmQpIHtcbiAgICBjb25zdCByZXR1cm5CbG9ja1N0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7IC8vL1xuXG4gICAgY29udGV4dC50cmFjZShgRXZhbHVhdGluZyB0aGUgJyR7cmV0dXJuQmxvY2tTdHJpbmd9JyByZXR1cm4gYmxvY2sncyBzdGF0ZW1lbnRzLi4uYCk7XG5cbiAgICByZXR1cm4gZm9yRWFjaCh0aGlzLnN0YXRlbWVudHMsIChzdGF0ZW1lbnQsIGJhY2ssIGZvcndhcmQpID0+IHtcbiAgICAgIHJldHVybiBzdGF0ZW1lbnQuZXZhbHVhdGUoY29udGV4dCwgYmFjaywgZm9yd2FyZCk7XG4gICAgfSwgKCkgPT4ge1xuICAgICAgY29udGV4dC5kZWJ1ZyhgLi4uZXZhbHVhdGVkIHRoZSAnJHtyZXR1cm5CbG9ja1N0cmluZ30nIHJldHVybiBibG9jaydzIHN0YXRlbWVudHMuYCk7XG5cbiAgICAgIHJldHVybiBmb3J3YXJkKCk7XG4gICAgfSk7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiUmV0dXJuQmxvY2tcIjtcbn0pO1xuIl0sIm5hbWVzIjpbImZvckVhY2giLCJjb250aW51YXRpb25VdGlsaXRpZXMiLCJkZWZpbmUiLCJSZXR1cm5CbG9jayIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJzdGF0ZW1lbnRzIiwibm9uc2Vuc2ljYWwiLCJyZXR1cm5TdGF0ZW1lbnQiLCJnZXRTdGF0ZW1lbnRzIiwiaXNOb25zZW5zaWNhbCIsImdldFJldHVyblN0YXRlbWVudCIsImV2YWx1YXRlIiwidmFyaWFibGVzIiwiYmFjayIsImZvcndhcmQiLCJyZXR1cm5CbG9ja1N0cmluZyIsImdldFN0cmluZyIsInRyYWNlIiwibWVzc2FnZSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwiY29uZmluZSIsImV2YWx1YXRlU3RhdGVtZW50cyIsInZhbHVlIiwidmFsdWVTdHJpbmciLCJkZWJ1ZyIsInN0YXRlbWVudCIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBQTs7O2dDQVQrQztrRUFFekI7MEJBRUM7eUJBQ0M7Ozs7OztBQUV4QixNQUFNLEVBQUVBLE9BQU8sRUFBRSxHQUFHQyxxQ0FBcUI7TUFFekMsV0FBZUMsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQyxvQkFBb0JDLHVCQUFPO0lBQ3JELFlBQVlDLE9BQU8sRUFBRUMsTUFBTSxFQUFFQyxJQUFJLEVBQUVDLFVBQVUsRUFBRUMsVUFBVSxFQUFFQyxXQUFXLEVBQUVDLGVBQWUsQ0FBRTtRQUN2RixLQUFLLENBQUNOLFNBQVNDLFFBQVFDLE1BQU1DO1FBRTdCLElBQUksQ0FBQ0MsVUFBVSxHQUFHQTtRQUNsQixJQUFJLENBQUNDLFdBQVcsR0FBR0E7UUFDbkIsSUFBSSxDQUFDQyxlQUFlLEdBQUdBO0lBQ3pCO0lBRUFDLGdCQUFnQjtRQUNkLE9BQU8sSUFBSSxDQUFDSCxVQUFVO0lBQ3hCO0lBRUFJLGdCQUFnQjtRQUNkLE9BQU8sSUFBSSxDQUFDSCxXQUFXO0lBQ3pCO0lBRUFJLHFCQUFxQjtRQUNuQixPQUFPLElBQUksQ0FBQ0gsZUFBZTtJQUM3QjtJQUVBSSxTQUFTQyxTQUFTLEVBQUVYLE9BQU8sRUFBRVksSUFBSSxFQUFFQyxPQUFPLEVBQUU7UUFDMUMsTUFBTUMsb0JBQW9CLElBQUksQ0FBQ0MsU0FBUyxJQUFJLEdBQUc7UUFFL0NmLFFBQVFnQixLQUFLLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRUYsa0JBQWtCLGlCQUFpQixDQUFDO1FBRXJFLElBQUksSUFBSSxDQUFDVCxXQUFXLEVBQUU7WUFDcEIsTUFBTVksVUFBVSxDQUFDLGdDQUFnQyxDQUFDLEVBQzVDQyxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNIO1lBRXhDLE1BQU1DO1FBQ1I7UUFFQUcsSUFBQUEsZ0JBQU8sRUFBQyxDQUFDckI7WUFDUCxJQUFJLENBQUNzQixrQkFBa0IsQ0FBQ3RCLFNBQVM7Z0JBQy9CLE1BQU11QixRQUFRLElBQUksQ0FBQ2pCLGVBQWUsQ0FBQ0ksUUFBUSxDQUFDVixVQUN0Q3dCLGNBQWNELE1BQU1SLFNBQVM7Z0JBRW5DZixRQUFReUIsS0FBSyxDQUFDLENBQUMsa0JBQWtCLEVBQUVYLGtCQUFrQixtQkFBbUIsRUFBRVUsWUFBWSxFQUFFLENBQUM7Z0JBRXpGLE9BQU9YLFFBQVFVO1lBQ2pCO1FBQ0YsR0FBR1osV0FBV1g7SUFDaEI7SUFFQXNCLG1CQUFtQnRCLE9BQU8sRUFBRVksSUFBSSxFQUFFQyxPQUFPLEVBQUU7UUFDekMsTUFBTUMsb0JBQW9CLElBQUksQ0FBQ0MsU0FBUyxJQUFJLEdBQUc7UUFFL0NmLFFBQVFnQixLQUFLLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRUYsa0JBQWtCLDhCQUE4QixDQUFDO1FBRWxGLE9BQU9uQixRQUFRLElBQUksQ0FBQ1MsVUFBVSxFQUFFLENBQUNzQixXQUFXZCxNQUFNQztZQUNoRCxPQUFPYSxVQUFVaEIsUUFBUSxDQUFDVixTQUFTWSxNQUFNQztRQUMzQyxHQUFHO1lBQ0RiLFFBQVF5QixLQUFLLENBQUMsQ0FBQyxrQkFBa0IsRUFBRVgsa0JBQWtCLDRCQUE0QixDQUFDO1lBRWxGLE9BQU9EO1FBQ1Q7SUFDRjtJQUVBLE9BQU9jLE9BQU8sY0FBYztBQUM5QiJ9
65
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3JldHVybkJsb2NrLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBFbGVtZW50LCBjb250aW51YXRpb25VdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcbmltcG9ydCB7IGNvbmZpbmUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2NvbnRleHRcIjtcblxuY29uc3QgeyBmb3JFYWNoIH0gPSBjb250aW51YXRpb25VdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBSZXR1cm5CbG9jayBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHN0YXRlbWVudHMsIG5vbnNlbnNpY2FsLCByZXR1cm5TdGF0ZW1lbnQpIHtcbiAgICBzdXBlcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQpO1xuXG4gICAgdGhpcy5zdGF0ZW1lbnRzID0gc3RhdGVtZW50cztcbiAgICB0aGlzLm5vbnNlbnNpY2FsID0gbm9uc2Vuc2ljYWw7XG4gICAgdGhpcy5yZXR1cm5TdGF0ZW1lbnQgPSByZXR1cm5TdGF0ZW1lbnQ7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnRzKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudHM7XG4gIH1cblxuICBpc05vbnNlbnNpY2FsKCkge1xuICAgIHJldHVybiB0aGlzLm5vbnNlbnNpY2FsO1xuICB9XG5cbiAgZ2V0UmV0dXJuU3RhdGVtZW50KCkge1xuICAgIHJldHVybiB0aGlzLnJldHVyblN0YXRlbWVudDtcbiAgfVxuXG4gIGV2YWx1YXRlKHZhcmlhYmxlcywgY29udGV4dCwgYmFjaywgZm9yd2FyZCkge1xuICAgIGNvbnN0IHJldHVybkJsb2NrU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtyZXR1cm5CbG9ja1N0cmluZ30nIHJldHVybiBibG9jay4uLmApO1xuXG4gICAgaWYgKHRoaXMubm9uc2Vuc2ljYWwpIHtcbiAgICAgIGNvbnN0IG1lc3NhZ2UgPSBgVGhlIHJldHVybiBibG9jayBpcyBub25zZW5zaWNhbC5gLFxuICAgICAgICAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uLmZyb21NZXNzYWdlKG1lc3NhZ2UpO1xuXG4gICAgICB0aHJvdyBleGNlcHRpb247XG4gICAgfVxuXG4gICAgcmV0dXJuIGNvbmZpbmUoKGNvbnRleHQpID0+IHtcbiAgICAgIHJldHVybiB0aGlzLmV2YWx1YXRlU3RhdGVtZW50cyhjb250ZXh0LCBiYWNrLCAoKSA9PiB7XG4gICAgICAgIGNvbnN0IHZhbHVlID0gdGhpcy5yZXR1cm5TdGF0ZW1lbnQuZXZhbHVhdGUoY29udGV4dCksXG4gICAgICAgICAgICAgIHZhbHVlU3RyaW5nID0gdmFsdWUuZ2V0U3RyaW5nKCk7XG5cbiAgICAgICAgY29udGV4dC5kZWJ1ZyhgLi4uZXZhbHVhdGVkIHRoZSAnJHtyZXR1cm5CbG9ja1N0cmluZ30nIHJldHVybiBibG9jayBhcyAnJHt2YWx1ZVN0cmluZ30nLmApO1xuXG4gICAgICAgIHJldHVybiBmb3J3YXJkKHZhbHVlKTtcbiAgICAgIH0pO1xuICAgIH0sIHZhcmlhYmxlcywgY29udGV4dCk7XG4gIH1cblxuICBldmFsdWF0ZVN0YXRlbWVudHMoY29udGV4dCwgYmFjaywgZm9yd2FyZCkge1xuICAgIGNvbnN0IHJldHVybkJsb2NrU3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtyZXR1cm5CbG9ja1N0cmluZ30nIHJldHVybiBibG9jaydzIHN0YXRlbWVudHMuLi5gKTtcblxuICAgIHJldHVybiBmb3JFYWNoKHRoaXMuc3RhdGVtZW50cywgKHN0YXRlbWVudCwgYmFjaywgZm9yd2FyZCkgPT4ge1xuICAgICAgcmV0dXJuIHN0YXRlbWVudC5ldmFsdWF0ZShjb250ZXh0LCBiYWNrLCBmb3J3YXJkKTtcbiAgICB9LCBiYWNrLCAoKSA9PiB7XG4gICAgICBjb250ZXh0LmRlYnVnKGAuLi5ldmFsdWF0ZWQgdGhlICcke3JldHVybkJsb2NrU3RyaW5nfScgcmV0dXJuIGJsb2NrJ3Mgc3RhdGVtZW50cy5gKTtcblxuICAgICAgcmV0dXJuIGZvcndhcmQoKTtcbiAgICB9KTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJSZXR1cm5CbG9ja1wiO1xufSk7XG4iXSwibmFtZXMiOlsiZm9yRWFjaCIsImNvbnRpbnVhdGlvblV0aWxpdGllcyIsImRlZmluZSIsIlJldHVybkJsb2NrIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsInN0YXRlbWVudHMiLCJub25zZW5zaWNhbCIsInJldHVyblN0YXRlbWVudCIsImdldFN0YXRlbWVudHMiLCJpc05vbnNlbnNpY2FsIiwiZ2V0UmV0dXJuU3RhdGVtZW50IiwiZXZhbHVhdGUiLCJ2YXJpYWJsZXMiLCJiYWNrIiwiZm9yd2FyZCIsInJldHVybkJsb2NrU3RyaW5nIiwiZ2V0U3RyaW5nIiwidHJhY2UiLCJtZXNzYWdlIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJjb25maW5lIiwiZXZhbHVhdGVTdGF0ZW1lbnRzIiwidmFsdWUiLCJ2YWx1ZVN0cmluZyIsImRlYnVnIiwic3RhdGVtZW50IiwibmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBV0E7OztlQUFBOzs7Z0NBVCtDO2tFQUV6QjswQkFFQzt5QkFDQzs7Ozs7O0FBRXhCLE1BQU0sRUFBRUEsT0FBTyxFQUFFLEdBQUdDLHFDQUFxQjtNQUV6QyxXQUFlQyxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLG9CQUFvQkMsdUJBQU87SUFDckQsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxFQUFFQyxVQUFVLEVBQUVDLFdBQVcsRUFBRUMsZUFBZSxDQUFFO1FBQ3ZGLEtBQUssQ0FBQ04sU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxVQUFVLEdBQUdBO1FBQ2xCLElBQUksQ0FBQ0MsV0FBVyxHQUFHQTtRQUNuQixJQUFJLENBQUNDLGVBQWUsR0FBR0E7SUFDekI7SUFFQUMsZ0JBQWdCO1FBQ2QsT0FBTyxJQUFJLENBQUNILFVBQVU7SUFDeEI7SUFFQUksZ0JBQWdCO1FBQ2QsT0FBTyxJQUFJLENBQUNILFdBQVc7SUFDekI7SUFFQUkscUJBQXFCO1FBQ25CLE9BQU8sSUFBSSxDQUFDSCxlQUFlO0lBQzdCO0lBRUFJLFNBQVNDLFNBQVMsRUFBRVgsT0FBTyxFQUFFWSxJQUFJLEVBQUVDLE9BQU8sRUFBRTtRQUMxQyxNQUFNQyxvQkFBb0IsSUFBSSxDQUFDQyxTQUFTLElBQUksR0FBRztRQUUvQ2YsUUFBUWdCLEtBQUssQ0FBQyxDQUFDLGdCQUFnQixFQUFFRixrQkFBa0IsaUJBQWlCLENBQUM7UUFFckUsSUFBSSxJQUFJLENBQUNULFdBQVcsRUFBRTtZQUNwQixNQUFNWSxVQUFVLENBQUMsZ0NBQWdDLENBQUMsRUFDNUNDLFlBQVlDLGtCQUFTLENBQUNDLFdBQVcsQ0FBQ0g7WUFFeEMsTUFBTUM7UUFDUjtRQUVBLE9BQU9HLElBQUFBLGdCQUFPLEVBQUMsQ0FBQ3JCO1lBQ2QsT0FBTyxJQUFJLENBQUNzQixrQkFBa0IsQ0FBQ3RCLFNBQVNZLE1BQU07Z0JBQzVDLE1BQU1XLFFBQVEsSUFBSSxDQUFDakIsZUFBZSxDQUFDSSxRQUFRLENBQUNWLFVBQ3RDd0IsY0FBY0QsTUFBTVIsU0FBUztnQkFFbkNmLFFBQVF5QixLQUFLLENBQUMsQ0FBQyxrQkFBa0IsRUFBRVgsa0JBQWtCLG1CQUFtQixFQUFFVSxZQUFZLEVBQUUsQ0FBQztnQkFFekYsT0FBT1gsUUFBUVU7WUFDakI7UUFDRixHQUFHWixXQUFXWDtJQUNoQjtJQUVBc0IsbUJBQW1CdEIsT0FBTyxFQUFFWSxJQUFJLEVBQUVDLE9BQU8sRUFBRTtRQUN6QyxNQUFNQyxvQkFBb0IsSUFBSSxDQUFDQyxTQUFTLElBQUksR0FBRztRQUUvQ2YsUUFBUWdCLEtBQUssQ0FBQyxDQUFDLGdCQUFnQixFQUFFRixrQkFBa0IsOEJBQThCLENBQUM7UUFFbEYsT0FBT25CLFFBQVEsSUFBSSxDQUFDUyxVQUFVLEVBQUUsQ0FBQ3NCLFdBQVdkLE1BQU1DO1lBQ2hELE9BQU9hLFVBQVVoQixRQUFRLENBQUNWLFNBQVNZLE1BQU1DO1FBQzNDLEdBQUdELE1BQU07WUFDUFosUUFBUXlCLEtBQUssQ0FBQyxDQUFDLGtCQUFrQixFQUFFWCxrQkFBa0IsNEJBQTRCLENBQUM7WUFFbEYsT0FBT0Q7UUFDVDtJQUNGO0lBRUEsT0FBT2MsT0FBTyxjQUFjO0FBQzlCIn0=
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-furtle",
3
3
  "author": "James Smith",
4
- "version": "3.0.452",
4
+ "version": "3.0.453",
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.10",
15
+ "occam-languages": "^3.0.12",
16
16
  "occam-lexers": "^23.2.8",
17
17
  "occam-parsers": "^23.2.11",
18
18
  "occam-query": "^4.1.206"
package/src/element/procedure.js CHANGED
@@ -89,7 +89,7 @@ export default define(class Procedure extends Element {
89
89
 
90
90
  const variables = variablesFromValuesAndParameters(values, this.parameters, context);
91
91
 
92
- this.returnBlock.evaluate(variables, context, (value) => {
92
+ return this.returnBlock.evaluate(variables, context, back, (value) => {
93
93
  const valueType = value.getType(),
94
94
  typeEqualToValueType = this.type.isEqualTo(valueType);
95
95
 
package/src/element/returnBlock.js CHANGED
@@ -42,8 +42,8 @@ export default define(class ReturnBlock extends Element {
42
42
  throw exception;
43
43
  }
44
44
 
45
- confine((context) => {
46
- this.evaluateStatements(context, () => {
45
+ return confine((context) => {
46
+ return this.evaluateStatements(context, back, () => {
47
47
  const value = this.returnStatement.evaluate(context),
48
48
  valueString = value.getString();
49
49
 
@@ -61,7 +61,7 @@ export default define(class ReturnBlock extends Element {
61
61
 
62
62
  return forEach(this.statements, (statement, back, forward) => {
63
63
  return statement.evaluate(context, back, forward);
64
- }, () => {
64
+ }, back, () => {
65
65
  context.debug(`...evaluated the '${returnBlockString}' return block's statements.`);
66
66
 
67
67
  return forward();