occam-furtle 3.0.227 → 3.0.229

package/lib/context/block.js

@@ -26,7 +26,7 @@ class BlockContext extends _occamlanguages.Context {
         const variables = [];
         push(variables, this.variables);
         if (nested) {
-            const context = this.getContext(), contextVariables = context.getVariables();
+            const context = this.getContext(), contextVariables = context.getVariables(nested);
             push(variables, contextVariables);
         }
         return variables;
@@ -68,4 +68,4 @@ class BlockContext extends _occamlanguages.Context {
     }
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250ZXh0L2Jsb2NrLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBDb250ZXh0IH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5jb25zdCB7IHB1c2ggfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBCbG9ja0NvbnRleHQgZXh0ZW5kcyBDb250ZXh0IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgdmFyaWFibGVzKSB7XG4gICAgc3VwZXIoY29udGV4dCk7XG5cbiAgICB0aGlzLnZhcmlhYmxlcyA9IHZhcmlhYmxlcztcbiAgfVxuXG4gIGdldFZhcmlhYmxlcyhuZXN0ZWQgPSB0cnVlKSB7XG4gICAgY29uc3QgdmFyaWFibGVzID0gW107XG5cbiAgICBwdXNoKHZhcmlhYmxlcywgdGhpcy52YXJpYWJsZXMpO1xuXG4gICAgaWYgKG5lc3RlZCkge1xuICAgICAgY29uc3QgY29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpLFxuICAgICAgICAgICAgY29udGV4dFZhcmlhYmxlcyA9IGNvbnRleHQuZ2V0VmFyaWFibGVzKCk7XG5cbiAgICAgIHB1c2godmFyaWFibGVzLCBjb250ZXh0VmFyaWFibGVzKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmFyaWFibGVzO1xuICB9XG5cbiAgYWRkVmFyaWFibGUodmFyaWFibGUpIHtcbiAgICBjb25zdCBuZXN0ZWQgPSBmYWxzZSxcbiAgICAgICAgICB2YXJpYWJsZU5hbWUgPSB2YXJpYWJsZS5nZXROYW1lKCksXG4gICAgICAgICAgdmFyaWFibGVTdHJpbmcgPSB2YXJpYWJsZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICB2YXJpYWJsZVByZXNlbnQgPSB0aGlzLmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lLCBuZXN0ZWQpO1xuXG4gICAgaWYgKHZhcmlhYmxlUHJlc2VudCkge1xuICAgICAgY29uc3QgbWVzc2FnZSA9IGBUaGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSBpcyBhbHJlYWR5IHByZXNlbnQuJ2AsXG4gICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgIHRocm93IGV4Y2VwdGlvbjtcbiAgICB9XG5cbiAgICBjb25zdCBjb250ZXh0ID0gdGhpczsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBBZGRlZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSB0byB0aGUgY29udGV4dC5gKTtcblxuICAgIHRoaXMudmFyaWFibGVzLnB1c2godmFyaWFibGUpO1xuICB9XG5cbiAgZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKSB7XG4gICAgY29uc3QgY29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpLFxuICAgICAgICAgIHByb2NlZHVyZSA9IGNvbnRleHQuZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKTtcblxuICAgIHJldHVybiBwcm9jZWR1cmU7XG4gIH1cblxuICBpc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSkge1xuICAgIGNvbnN0IGNvbnRleHQgPSB0aGlzLmdldENvbnRleHQoKSxcbiAgICAgICAgICBwcm9jZWR1cmVQcmVzZW50ID0gY29udGV4dC5pc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSk7XG5cbiAgICByZXR1cm4gcHJvY2VkdXJlUHJlc2VudDtcbiAgfVxuXG4gIGZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOYW1lKHZhcmlhYmxlTmFtZSwgbmVzdGVkID0gdHJ1ZSkge1xuICAgIGNvbnN0IHZhcmlhYmxlcyA9IHRoaXMuZ2V0VmFyaWFibGVzKG5lc3RlZCksXG4gICAgICAgICAgdmFyaWFibGUgPSB2YXJpYWJsZXMuZmluZCgodmFyaWFibGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZhcmlhYmxlQ29tcGFyZXNUb1ZhcmlhYmxlTmFtZSA9IHZhcmlhYmxlLmNvbXBhcmVWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lKTtcblxuICAgICAgICAgICAgaWYgKHZhcmlhYmxlQ29tcGFyZXNUb1ZhcmlhYmxlTmFtZSkge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KSB8fCBudWxsO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlO1xuICB9XG5cbiAgaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSh2YXJpYWJsZU5hbWUsIG5lc3RlZCA9IHRydWUpIHtcbiAgICBjb25zdCB2YXJpYWJsZSA9IHRoaXMuZmluZFZhcmlhYmxlQnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lLCBuZXN0ZWQpLFxuICAgICAgICAgIHZhcmlhYmxlUHJlc2VudCA9ICh2YXJpYWJsZSAhPT0gbnVsbCk7XG5cbiAgICByZXR1cm4gdmFyaWFibGVQcmVzZW50O1xuICB9XG5cbiAgc3RhdGljIGZyb21WYXJpYWJsZXModmFyaWFibGVzLCBjb250ZXh0KSB7XG4gICAgY29uc3QgYmxvY2tDb250ZXh0ID0gQ29udGV4dC5mcm9tTm90aGluZyhCbG9ja0NvbnRleHQsIHZhcmlhYmxlcywgY29udGV4dClcblxuICAgIHJldHVybiBibG9ja0NvbnRleHQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJCbG9ja0NvbnRleHQiLCJwdXNoIiwiYXJyYXlVdGlsaXRpZXMiLCJDb250ZXh0IiwiY29udGV4dCIsInZhcmlhYmxlcyIsImdldFZhcmlhYmxlcyIsIm5lc3RlZCIsImdldENvbnRleHQiLCJjb250ZXh0VmFyaWFibGVzIiwiYWRkVmFyaWFibGUiLCJ2YXJpYWJsZSIsInZhcmlhYmxlTmFtZSIsImdldE5hbWUiLCJ2YXJpYWJsZVN0cmluZyIsImdldFN0cmluZyIsInZhcmlhYmxlUHJlc2VudCIsImlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUiLCJtZXNzYWdlIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJ0cmFjZSIsImZpbmRQcm9jZWR1cmVCeVByb2NlZHVyZU5hbWUiLCJwcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlIiwiaXNQcm9jZWR1cmVQcmVzZW50QnlQcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlUHJlc2VudCIsImZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOYW1lIiwiZmluZCIsInZhcmlhYmxlQ29tcGFyZXNUb1ZhcmlhYmxlTmFtZSIsImNvbXBhcmVWYXJpYWJsZU5hbWUiLCJmcm9tVmFyaWFibGVzIiwiYmxvY2tDb250ZXh0IiwiZnJvbU5vdGhpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBcUJBOzs7Z0NBUEc7MkJBQ087a0VBRVQ7Ozs7OztBQUV0QixNQUFNLEVBQUVDLElBQUksRUFBRSxHQUFHQyx5QkFBYztBQUVoQixNQUFNRixxQkFBcUJHLHVCQUFPO0lBQy9DLFlBQVlDLE9BQU8sRUFBRUMsU0FBUyxDQUFFO1FBQzlCLEtBQUssQ0FBQ0Q7UUFFTixJQUFJLENBQUNDLFNBQVMsR0FBR0E7SUFDbkI7SUFFQUMsYUFBYUMsU0FBUyxJQUFJLEVBQUU7UUFDMUIsTUFBTUYsWUFBWSxFQUFFO1FBRXBCSixLQUFLSSxXQUFXLElBQUksQ0FBQ0EsU0FBUztRQUU5QixJQUFJRSxRQUFRO1lBQ1YsTUFBTUgsVUFBVSxJQUFJLENBQUNJLFVBQVUsSUFDekJDLG1CQUFtQkwsUUFBUUUsWUFBWTtZQUU3Q0wsS0FBS0ksV0FBV0k7UUFDbEI7UUFFQSxPQUFPSjtJQUNUO0lBRUFLLFlBQVlDLFFBQVEsRUFBRTtRQUNwQixNQUFNSixTQUFTLE9BQ1RLLGVBQWVELFNBQVNFLE9BQU8sSUFDL0JDLGlCQUFpQkgsU0FBU0ksU0FBUyxJQUNuQ0Msa0JBQWtCLElBQUksQ0FBQ0MsK0JBQStCLENBQUNMLGNBQWNMO1FBRTNFLElBQUlTLGlCQUFpQjtZQUNuQixNQUFNRSxVQUFVLENBQUMsS0FBSyxFQUFFSixlQUFlLCtCQUErQixDQUFDLEVBQ2pFSyxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNIO1lBRXhDLE1BQU1DO1FBQ1I7UUFFQSxNQUFNZixVQUFVLElBQUksRUFBRSxHQUFHO1FBRXpCQSxRQUFRa0IsS0FBSyxDQUFDLENBQUMsV0FBVyxFQUFFUixlQUFlLDBCQUEwQixDQUFDO1FBRXRFLElBQUksQ0FBQ1QsU0FBUyxDQUFDSixJQUFJLENBQUNVO0lBQ3RCO0lBRUFZLDZCQUE2QkMsYUFBYSxFQUFFO1FBQzFDLE1BQU1wQixVQUFVLElBQUksQ0FBQ0ksVUFBVSxJQUN6QmlCLFlBQVlyQixRQUFRbUIsNEJBQTRCLENBQUNDO1FBRXZELE9BQU9DO0lBQ1Q7SUFFQUMsa0NBQWtDRixhQUFhLEVBQUU7UUFDL0MsTUFBTXBCLFVBQVUsSUFBSSxDQUFDSSxVQUFVLElBQ3pCbUIsbUJBQW1CdkIsUUFBUXNCLGlDQUFpQyxDQUFDRjtRQUVuRSxPQUFPRztJQUNUO0lBRUFDLDJCQUEyQmhCLFlBQVksRUFBRUwsU0FBUyxJQUFJLEVBQUU7UUFDdEQsTUFBTUYsWUFBWSxJQUFJLENBQUNDLFlBQVksQ0FBQ0MsU0FDOUJJLFdBQVdOLFVBQVV3QixJQUFJLENBQUMsQ0FBQ2xCO1lBQ3pCLE1BQU1tQixpQ0FBaUNuQixTQUFTb0IsbUJBQW1CLENBQUNuQjtZQUVwRSxJQUFJa0IsZ0NBQWdDO2dCQUNsQyxPQUFPO1lBQ1Q7UUFDRixNQUFNO1FBRVosT0FBT25CO0lBQ1Q7SUFFQU0sZ0NBQWdDTCxZQUFZLEVBQUVMLFNBQVMsSUFBSSxFQUFFO1FBQzNELE1BQU1JLFdBQVcsSUFBSSxDQUFDaUIsMEJBQTBCLENBQUNoQixjQUFjTCxTQUN6RFMsa0JBQW1CTCxhQUFhO1FBRXRDLE9BQU9LO0lBQ1Q7SUFFQSxPQUFPZ0IsY0FBYzNCLFNBQVMsRUFBRUQsT0FBTyxFQUFFO1FBQ3ZDLE1BQU02QixlQUFlOUIsdUJBQU8sQ0FBQytCLFdBQVcsQ0FBQ2xDLGNBQWNLLFdBQVdEO1FBRWxFLE9BQU82QjtJQUNUO0FBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250ZXh0L2Jsb2NrLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBDb250ZXh0IH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5jb25zdCB7IHB1c2ggfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBCbG9ja0NvbnRleHQgZXh0ZW5kcyBDb250ZXh0IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgdmFyaWFibGVzKSB7XG4gICAgc3VwZXIoY29udGV4dCk7XG5cbiAgICB0aGlzLnZhcmlhYmxlcyA9IHZhcmlhYmxlcztcbiAgfVxuXG4gIGdldFZhcmlhYmxlcyhuZXN0ZWQgPSB0cnVlKSB7XG4gICAgY29uc3QgdmFyaWFibGVzID0gW107XG5cbiAgICBwdXNoKHZhcmlhYmxlcywgdGhpcy52YXJpYWJsZXMpO1xuXG4gICAgaWYgKG5lc3RlZCkge1xuICAgICAgY29uc3QgY29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpLFxuICAgICAgICAgICAgY29udGV4dFZhcmlhYmxlcyA9IGNvbnRleHQuZ2V0VmFyaWFibGVzKG5lc3RlZCk7XG5cbiAgICAgIHB1c2godmFyaWFibGVzLCBjb250ZXh0VmFyaWFibGVzKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmFyaWFibGVzO1xuICB9XG5cbiAgYWRkVmFyaWFibGUodmFyaWFibGUpIHtcbiAgICBjb25zdCBuZXN0ZWQgPSBmYWxzZSxcbiAgICAgICAgICB2YXJpYWJsZU5hbWUgPSB2YXJpYWJsZS5nZXROYW1lKCksXG4gICAgICAgICAgdmFyaWFibGVTdHJpbmcgPSB2YXJpYWJsZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICB2YXJpYWJsZVByZXNlbnQgPSB0aGlzLmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lLCBuZXN0ZWQpO1xuXG4gICAgaWYgKHZhcmlhYmxlUHJlc2VudCkge1xuICAgICAgY29uc3QgbWVzc2FnZSA9IGBUaGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSBpcyBhbHJlYWR5IHByZXNlbnQuJ2AsXG4gICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgIHRocm93IGV4Y2VwdGlvbjtcbiAgICB9XG5cbiAgICBjb25zdCBjb250ZXh0ID0gdGhpczsgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBBZGRlZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSB0byB0aGUgY29udGV4dC5gKTtcblxuICAgIHRoaXMudmFyaWFibGVzLnB1c2godmFyaWFibGUpO1xuICB9XG5cbiAgZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKSB7XG4gICAgY29uc3QgY29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpLFxuICAgICAgICAgIHByb2NlZHVyZSA9IGNvbnRleHQuZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKTtcblxuICAgIHJldHVybiBwcm9jZWR1cmU7XG4gIH1cblxuICBpc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSkge1xuICAgIGNvbnN0IGNvbnRleHQgPSB0aGlzLmdldENvbnRleHQoKSxcbiAgICAgICAgICBwcm9jZWR1cmVQcmVzZW50ID0gY29udGV4dC5pc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSk7XG5cbiAgICByZXR1cm4gcHJvY2VkdXJlUHJlc2VudDtcbiAgfVxuXG4gIGZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOYW1lKHZhcmlhYmxlTmFtZSwgbmVzdGVkID0gdHJ1ZSkge1xuICAgIGNvbnN0IHZhcmlhYmxlcyA9IHRoaXMuZ2V0VmFyaWFibGVzKG5lc3RlZCksXG4gICAgICAgICAgdmFyaWFibGUgPSB2YXJpYWJsZXMuZmluZCgodmFyaWFibGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZhcmlhYmxlQ29tcGFyZXNUb1ZhcmlhYmxlTmFtZSA9IHZhcmlhYmxlLmNvbXBhcmVWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lKTtcblxuICAgICAgICAgICAgaWYgKHZhcmlhYmxlQ29tcGFyZXNUb1ZhcmlhYmxlTmFtZSkge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KSB8fCBudWxsO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlO1xuICB9XG5cbiAgaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSh2YXJpYWJsZU5hbWUsIG5lc3RlZCA9IHRydWUpIHtcbiAgICBjb25zdCB2YXJpYWJsZSA9IHRoaXMuZmluZFZhcmlhYmxlQnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lLCBuZXN0ZWQpLFxuICAgICAgICAgIHZhcmlhYmxlUHJlc2VudCA9ICh2YXJpYWJsZSAhPT0gbnVsbCk7XG5cbiAgICByZXR1cm4gdmFyaWFibGVQcmVzZW50O1xuICB9XG5cbiAgc3RhdGljIGZyb21WYXJpYWJsZXModmFyaWFibGVzLCBjb250ZXh0KSB7XG4gICAgY29uc3QgYmxvY2tDb250ZXh0ID0gQ29udGV4dC5mcm9tTm90aGluZyhCbG9ja0NvbnRleHQsIHZhcmlhYmxlcywgY29udGV4dClcblxuICAgIHJldHVybiBibG9ja0NvbnRleHQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJCbG9ja0NvbnRleHQiLCJwdXNoIiwiYXJyYXlVdGlsaXRpZXMiLCJDb250ZXh0IiwiY29udGV4dCIsInZhcmlhYmxlcyIsImdldFZhcmlhYmxlcyIsIm5lc3RlZCIsImdldENvbnRleHQiLCJjb250ZXh0VmFyaWFibGVzIiwiYWRkVmFyaWFibGUiLCJ2YXJpYWJsZSIsInZhcmlhYmxlTmFtZSIsImdldE5hbWUiLCJ2YXJpYWJsZVN0cmluZyIsImdldFN0cmluZyIsInZhcmlhYmxlUHJlc2VudCIsImlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUiLCJtZXNzYWdlIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJ0cmFjZSIsImZpbmRQcm9jZWR1cmVCeVByb2NlZHVyZU5hbWUiLCJwcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlIiwiaXNQcm9jZWR1cmVQcmVzZW50QnlQcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlUHJlc2VudCIsImZpbmRWYXJpYWJsZUJ5VmFyaWFibGVOYW1lIiwiZmluZCIsInZhcmlhYmxlQ29tcGFyZXNUb1ZhcmlhYmxlTmFtZSIsImNvbXBhcmVWYXJpYWJsZU5hbWUiLCJmcm9tVmFyaWFibGVzIiwiYmxvY2tDb250ZXh0IiwiZnJvbU5vdGhpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBcUJBOzs7Z0NBUEc7MkJBQ087a0VBRVQ7Ozs7OztBQUV0QixNQUFNLEVBQUVDLElBQUksRUFBRSxHQUFHQyx5QkFBYztBQUVoQixNQUFNRixxQkFBcUJHLHVCQUFPO0lBQy9DLFlBQVlDLE9BQU8sRUFBRUMsU0FBUyxDQUFFO1FBQzlCLEtBQUssQ0FBQ0Q7UUFFTixJQUFJLENBQUNDLFNBQVMsR0FBR0E7SUFDbkI7SUFFQUMsYUFBYUMsU0FBUyxJQUFJLEVBQUU7UUFDMUIsTUFBTUYsWUFBWSxFQUFFO1FBRXBCSixLQUFLSSxXQUFXLElBQUksQ0FBQ0EsU0FBUztRQUU5QixJQUFJRSxRQUFRO1lBQ1YsTUFBTUgsVUFBVSxJQUFJLENBQUNJLFVBQVUsSUFDekJDLG1CQUFtQkwsUUFBUUUsWUFBWSxDQUFDQztZQUU5Q04sS0FBS0ksV0FBV0k7UUFDbEI7UUFFQSxPQUFPSjtJQUNUO0lBRUFLLFlBQVlDLFFBQVEsRUFBRTtRQUNwQixNQUFNSixTQUFTLE9BQ1RLLGVBQWVELFNBQVNFLE9BQU8sSUFDL0JDLGlCQUFpQkgsU0FBU0ksU0FBUyxJQUNuQ0Msa0JBQWtCLElBQUksQ0FBQ0MsK0JBQStCLENBQUNMLGNBQWNMO1FBRTNFLElBQUlTLGlCQUFpQjtZQUNuQixNQUFNRSxVQUFVLENBQUMsS0FBSyxFQUFFSixlQUFlLCtCQUErQixDQUFDLEVBQ2pFSyxZQUFZQyxrQkFBUyxDQUFDQyxXQUFXLENBQUNIO1lBRXhDLE1BQU1DO1FBQ1I7UUFFQSxNQUFNZixVQUFVLElBQUksRUFBRSxHQUFHO1FBRXpCQSxRQUFRa0IsS0FBSyxDQUFDLENBQUMsV0FBVyxFQUFFUixlQUFlLDBCQUEwQixDQUFDO1FBRXRFLElBQUksQ0FBQ1QsU0FBUyxDQUFDSixJQUFJLENBQUNVO0lBQ3RCO0lBRUFZLDZCQUE2QkMsYUFBYSxFQUFFO1FBQzFDLE1BQU1wQixVQUFVLElBQUksQ0FBQ0ksVUFBVSxJQUN6QmlCLFlBQVlyQixRQUFRbUIsNEJBQTRCLENBQUNDO1FBRXZELE9BQU9DO0lBQ1Q7SUFFQUMsa0NBQWtDRixhQUFhLEVBQUU7UUFDL0MsTUFBTXBCLFVBQVUsSUFBSSxDQUFDSSxVQUFVLElBQ3pCbUIsbUJBQW1CdkIsUUFBUXNCLGlDQUFpQyxDQUFDRjtRQUVuRSxPQUFPRztJQUNUO0lBRUFDLDJCQUEyQmhCLFlBQVksRUFBRUwsU0FBUyxJQUFJLEVBQUU7UUFDdEQsTUFBTUYsWUFBWSxJQUFJLENBQUNDLFlBQVksQ0FBQ0MsU0FDOUJJLFdBQVdOLFVBQVV3QixJQUFJLENBQUMsQ0FBQ2xCO1lBQ3pCLE1BQU1tQixpQ0FBaUNuQixTQUFTb0IsbUJBQW1CLENBQUNuQjtZQUVwRSxJQUFJa0IsZ0NBQWdDO2dCQUNsQyxPQUFPO1lBQ1Q7UUFDRixNQUFNO1FBRVosT0FBT25CO0lBQ1Q7SUFFQU0sZ0NBQWdDTCxZQUFZLEVBQUVMLFNBQVMsSUFBSSxFQUFFO1FBQzNELE1BQU1JLFdBQVcsSUFBSSxDQUFDaUIsMEJBQTBCLENBQUNoQixjQUFjTCxTQUN6RFMsa0JBQW1CTCxhQUFhO1FBRXRDLE9BQU9LO0lBQ1Q7SUFFQSxPQUFPZ0IsY0FBYzNCLFNBQVMsRUFBRUQsT0FBTyxFQUFFO1FBQ3ZDLE1BQU02QixlQUFlOUIsdUJBQU8sQ0FBQytCLFdBQVcsQ0FBQ2xDLGNBQWNLLFdBQVdEO1FBRWxFLE9BQU82QjtJQUNUO0FBQ0YifQ==

package/lib/context/file/furtle.js

@@ -24,10 +24,6 @@ class FurtleFileContext extends _occamlanguages.FileContext {
     getParser() {
         return this.parser;
     }
-    getProcedures(includeRelease = true) {
-        const procedures = includeRelease ? this.context.getProcedures() : this.procedures;
-        return procedures;
-    }
     getLabels(includeRelease = true) {
         const labels = [];
         return labels;
@@ -52,10 +48,6 @@ class FurtleFileContext extends _occamlanguages.FileContext {
         const theorems = [];
         return theorems;
     }
-    getVariables(includeRelease = true) {
-        const variables = [];
-        return variables;
-    }
     getMetaLemmas(includeRelease = true) {
         const metaLemmas = [];
         return metaLemmas;
@@ -84,6 +76,14 @@ class FurtleFileContext extends _occamlanguages.FileContext {
         const metavariables = [];
         return metavariables;
     }
+    getProcedures(includeRelease = true) {
+        const procedures = includeRelease ? this.context.getProcedures() : this.procedures;
+        return procedures;
+    }
+    getVariables(nested = true) {
+        const variables = [];
+        return variables;
+    }
     addProcedure(procedure) {
         const procedureString = procedure.getString();
         this.procedures.push(procedure);
@@ -136,4 +136,4 @@ class FurtleFileContext extends _occamlanguages.FileContext {
     }
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/context/file/furtle.js"],"sourcesContent":["\"use strict\";\n\nimport { FileContext } from \"occam-languages\";\n\nimport { verifyFile } from \"../../process/verify\";\nimport { furtleLexer, furtleParser } from \"../../utilities/furtle\";\n\nexport default class FurtleFileContext extends FileContext {\n  constructor(context, fileContent, filePath, tokens, node, json, lexer, parser, procedures) {\n    super(context, fileContent, filePath, tokens, node, json);\n\n    this.lexer = lexer;\n    this.parser = parser;\n    this.procedures = procedures;\n  }\n\n  getLexer() {\n    return this.lexer;\n  }\n\n  getParser() {\n    return this.parser;\n  }\n\n  getProcedures(includeRelease = true) {\n    const procedures = includeRelease ?\n                         this.context.getProcedures() :\n                           this.procedures;\n\n    return procedures;\n  }\n\n  getLabels(includeRelease = true) {\n    const labels = [];\n\n    return labels;\n  }\n\n  getTypes(includeRelease = true) {\n    const types = [];\n\n    return types;\n  }\n\n  getRules(includeRelease = true) {\n    const rules = []\n\n    return rules;\n  }\n\n  getAxioms(includeRelease = true) {\n    const axioms = [];\n\n    return axioms;\n  }\n\n  getLemmas(includeRelease = true) {\n    const lemmas = [];\n\n    return lemmas;\n  }\n\n  getTheorems(includeRelease = true) {\n    const theorems = [];\n\n    return theorems;\n  }\n\n  getVariables(includeRelease = true) {\n    const variables = [];\n\n    return variables;\n  }\n\n  getMetaLemmas(includeRelease = true) {\n    const metaLemmas = [];\n\n    return metaLemmas;\n  }\n\n  getConjectures(includeRelease = true) {\n    const conjectures = [];\n\n    return conjectures;\n  }\n\n  getCombinators(includeRelease = true) {\n    const combinators = [];\n\n    return combinators;\n  }\n\n  getTypePrefixes(includeRelease = true) {\n    const typePrefixes = [];\n\n    return typePrefixes;\n  }\n\n  getConstructors(includeRelease = true) {\n    const constructors = [];\n\n    return constructors;\n  }\n\n  getMetatheorems(includeRelease = true) {\n    const metatheorems = [];\n\n    return metatheorems;\n  }\n\n  getMetavariables(includeRelease = true) {\n    const metavariables = [];\n\n    return metavariables;\n  }\n\n  addProcedure(procedure) {\n    const procedureString = procedure.getString();\n\n    this.procedures.push(procedure);\n\n    const filePath = this.getFilePath();\n\n    this.debug(`Added the '${procedureString}' procedure to the '${filePath}' file context.`);\n  }\n\n  findProcedureByProcedureName(procedureName) {\n    const procedures = this.getProcedures(),\n          procedure = procedures.find((procedure) => {\n            const procedureComparesToProcedureName = procedure.compareProcedureName(procedureName);\n\n            if (procedureComparesToProcedureName) {\n              return true;\n            }\n          }) || null;\n\n    return procedure;\n  }\n\n  isProcedurePresentByProcedureName(procedureName) {\n    const procedure = this.findProcedureByProcedureName(procedureName),\n          procedurePresent = (procedure !== null);\n\n    return procedurePresent;\n  }\n\n  clear() {\n    this.procedures = [];\n  }\n\n  complete() {\n    ///\n  }\n\n  initialise(json) {\n    super.initialise();\n\n    this.procedures = [];\n\n    const node = this.getNode(),\n          context = this, ///\n          fileNode = node;  ///\n\n    verifyFile(fileNode, context);\n  }\n\n  async verifyFile() {\n    const node = this.getNode(),\n          context = this, ///\n          fileNode = node,  ///\n          fileVerifies = verifyFile(fileNode, context);\n\n    return fileVerifies;\n  }\n\n  toJSON() {\n    const filePath = this.getFilePath(),\n          fileContent = this.getFileContent(),\n          json = {\n            filePath,\n            fileContent\n          };\n\n    return json;\n  }\n\n  static fromFile(file, context) {\n    const lexer = furtleLexer,  ///\n          parser = furtleParser,  ///\n          procedures = [],\n          furtleFileContext = FileContext.fromFile(FurtleFileContext, file, lexer, parser, procedures, context);\n\n    return furtleFileContext;\n  }\n\n  static fromJSON(json, context) {\n    const lexer = furtleLexer,  ///\n          parser = furtleParser,  ///\n          procedures = null,\n          furtleFileContext = FileContext.fromJSON(FurtleFileContext, json, lexer, parser, procedures, context);\n\n    return furtleFileContext;\n  }\n}\n"],"names":["FurtleFileContext","FileContext","context","fileContent","filePath","tokens","node","json","lexer","parser","procedures","getLexer","getParser","getProcedures","includeRelease","getLabels","labels","getTypes","types","getRules","rules","getAxioms","axioms","getLemmas","lemmas","getTheorems","theorems","getVariables","variables","getMetaLemmas","metaLemmas","getConjectures","conjectures","getCombinators","combinators","getTypePrefixes","typePrefixes","getConstructors","constructors","getMetatheorems","metatheorems","getMetavariables","metavariables","addProcedure","procedure","procedureString","getString","push","getFilePath","debug","findProcedureByProcedureName","procedureName","find","procedureComparesToProcedureName","compareProcedureName","isProcedurePresentByProcedureName","procedurePresent","clear","complete","initialise","getNode","fileNode","verifyFile","fileVerifies","toJSON","getFileContent","fromFile","file","furtleLexer","furtleParser","furtleFileContext","fromJSON"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/context/file/furtle.js"],"sourcesContent":["\"use strict\";\n\nimport { FileContext } from \"occam-languages\";\n\nimport { verifyFile } from \"../../process/verify\";\nimport { furtleLexer, furtleParser } from \"../../utilities/furtle\";\n\nexport default class FurtleFileContext extends FileContext {\n  constructor(context, fileContent, filePath, tokens, node, json, lexer, parser, procedures) {\n    super(context, fileContent, filePath, tokens, node, json);\n\n    this.lexer = lexer;\n    this.parser = parser;\n    this.procedures = procedures;\n  }\n\n  getLexer() {\n    return this.lexer;\n  }\n\n  getParser() {\n    return this.parser;\n  }\n\n  getLabels(includeRelease = true) {\n    const labels = [];\n\n    return labels;\n  }\n\n  getTypes(includeRelease = true) {\n    const types = [];\n\n    return types;\n  }\n\n  getRules(includeRelease = true) {\n    const rules = []\n\n    return rules;\n  }\n\n  getAxioms(includeRelease = true) {\n    const axioms = [];\n\n    return axioms;\n  }\n\n  getLemmas(includeRelease = true) {\n    const lemmas = [];\n\n    return lemmas;\n  }\n\n  getTheorems(includeRelease = true) {\n    const theorems = [];\n\n    return theorems;\n  }\n\n  getMetaLemmas(includeRelease = true) {\n    const metaLemmas = [];\n\n    return metaLemmas;\n  }\n\n  getConjectures(includeRelease = true) {\n    const conjectures = [];\n\n    return conjectures;\n  }\n\n  getCombinators(includeRelease = true) {\n    const combinators = [];\n\n    return combinators;\n  }\n\n  getTypePrefixes(includeRelease = true) {\n    const typePrefixes = [];\n\n    return typePrefixes;\n  }\n\n  getConstructors(includeRelease = true) {\n    const constructors = [];\n\n    return constructors;\n  }\n\n  getMetatheorems(includeRelease = true) {\n    const metatheorems = [];\n\n    return metatheorems;\n  }\n\n  getMetavariables(includeRelease = true) {\n    const metavariables = [];\n\n    return metavariables;\n  }\n\n  getProcedures(includeRelease = true) {\n    const procedures = includeRelease ?\n                         this.context.getProcedures() :\n                           this.procedures;\n\n    return procedures;\n  }\n\n  getVariables(nested = true) {\n    const variables = [];\n\n    return variables;\n  }\n\n  addProcedure(procedure) {\n    const procedureString = procedure.getString();\n\n    this.procedures.push(procedure);\n\n    const filePath = this.getFilePath();\n\n    this.debug(`Added the '${procedureString}' procedure to the '${filePath}' file context.`);\n  }\n\n  findProcedureByProcedureName(procedureName) {\n    const procedures = this.getProcedures(),\n          procedure = procedures.find((procedure) => {\n            const procedureComparesToProcedureName = procedure.compareProcedureName(procedureName);\n\n            if (procedureComparesToProcedureName) {\n              return true;\n            }\n          }) || null;\n\n    return procedure;\n  }\n\n  isProcedurePresentByProcedureName(procedureName) {\n    const procedure = this.findProcedureByProcedureName(procedureName),\n          procedurePresent = (procedure !== null);\n\n    return procedurePresent;\n  }\n\n  clear() {\n    this.procedures = [];\n  }\n\n  complete() {\n    ///\n  }\n\n  initialise(json) {\n    super.initialise();\n\n    this.procedures = [];\n\n    const node = this.getNode(),\n          context = this, ///\n          fileNode = node;  ///\n\n    verifyFile(fileNode, context);\n  }\n\n  async verifyFile() {\n    const node = this.getNode(),\n          context = this, ///\n          fileNode = node,  ///\n          fileVerifies = verifyFile(fileNode, context);\n\n    return fileVerifies;\n  }\n\n  toJSON() {\n    const filePath = this.getFilePath(),\n          fileContent = this.getFileContent(),\n          json = {\n            filePath,\n            fileContent\n          };\n\n    return json;\n  }\n\n  static fromFile(file, context) {\n    const lexer = furtleLexer,  ///\n          parser = furtleParser,  ///\n          procedures = [],\n          furtleFileContext = FileContext.fromFile(FurtleFileContext, file, lexer, parser, procedures, context);\n\n    return furtleFileContext;\n  }\n\n  static fromJSON(json, context) {\n    const lexer = furtleLexer,  ///\n          parser = furtleParser,  ///\n          procedures = null,\n          furtleFileContext = FileContext.fromJSON(FurtleFileContext, json, lexer, parser, procedures, context);\n\n    return furtleFileContext;\n  }\n}\n"],"names":["FurtleFileContext","FileContext","context","fileContent","filePath","tokens","node","json","lexer","parser","procedures","getLexer","getParser","getLabels","includeRelease","labels","getTypes","types","getRules","rules","getAxioms","axioms","getLemmas","lemmas","getTheorems","theorems","getMetaLemmas","metaLemmas","getConjectures","conjectures","getCombinators","combinators","getTypePrefixes","typePrefixes","getConstructors","constructors","getMetatheorems","metatheorems","getMetavariables","metavariables","getProcedures","getVariables","nested","variables","addProcedure","procedure","procedureString","getString","push","getFilePath","debug","findProcedureByProcedureName","procedureName","find","procedureComparesToProcedureName","compareProcedureName","isProcedurePresentByProcedureName","procedurePresent","clear","complete","initialise","getNode","fileNode","verifyFile","fileVerifies","toJSON","getFileContent","fromFile","file","furtleLexer","furtleParser","furtleFileContext","fromJSON"],"mappings":"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"}

package/lib/element/procedureCall.js

@@ -40,12 +40,11 @@ const _default = (0, _elements.define)(class ProcedureCall extends _occamlanguag
             const message = `The '${procedureCallString} procedure is not present.'`, exception = _exception.default.fromMessage(message);
             throw exception;
         }
-        const procedure = context.findProcedureByProcedureName(procedureName), terms = this.terms.evaluate(context), term = await procedure.call(terms, context);
-        const termString = term.getString();
+        const procedure = context.findProcedureByProcedureName(procedureName), terms = this.terms.evaluate(context), term = await procedure.call(terms, context), termString = term.getString();
         context.debug(`...evaluated the '${procedureCallString}' procedure call as '${termString}'.`);
         return term;
     }
     static name = "ProcedureCall";
 });
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3Byb2NlZHVyZUNhbGwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIFByb2NlZHVyZUNhbGwgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCByZWZlcmVuY2UsIHRlcm1zKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMucmVmZXJlbmNlID0gcmVmZXJlbmNlO1xuICAgIHRoaXMudGVybXMgPSB0ZXJtcztcbiAgfVxuXG4gIGdldFJlZmVyZW5jZSgpIHtcbiAgICByZXR1cm4gdGhpcy5yZWZlcmVuY2U7XG4gIH1cblxuICBnZXRUZXJtcygpIHtcbiAgICByZXR1cm4gdGhpcy50ZXJtcztcbiAgfVxuXG4gIGdldFByb2NlZHVyZU5hbWUoKSB7IHJldHVybiB0aGlzLnJlZmVyZW5jZS5nZXRQcm9jZWR1cmVOYW1lKCk7IH1cblxuICBhc3luYyBldmFsdWF0ZShjb250ZXh0KSB7XG4gICAgYXdhaXQgdGhpcy5icmVhayhjb250ZXh0KTtcblxuICAgIGNvbnN0IHByb2NlZHVyZUNhbGxTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpOyAgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtwcm9jZWR1cmVDYWxsU3RyaW5nfScgcHJvY2VkdXJlIGNhbGwuLi5gKTtcblxuICAgIGNvbnN0IHByb2NlZHVyZU5hbWUgPSB0aGlzLmdldFByb2NlZHVyZU5hbWUoKSxcbiAgICAgICAgICBwcm9jZWR1cmVQcmVzZW50ID0gY29udGV4dC5pc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSk7XG5cbiAgICBpZiAoIXByb2NlZHVyZVByZXNlbnQpIHtcbiAgICAgIGNvbnN0IG1lc3NhZ2UgPSBgVGhlICcke3Byb2NlZHVyZUNhbGxTdHJpbmd9IHByb2NlZHVyZSBpcyBub3QgcHJlc2VudC4nYCxcbiAgICAgICAgICAgIGV4Y2VwdGlvbiA9IEV4Y2VwdGlvbi5mcm9tTWVzc2FnZShtZXNzYWdlKTtcblxuICAgICAgdGhyb3cgZXhjZXB0aW9uO1xuICAgIH1cblxuICAgIGNvbnN0IHByb2NlZHVyZSA9IGNvbnRleHQuZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKSxcbiAgICAgICAgICB0ZXJtcyA9IHRoaXMudGVybXMuZXZhbHVhdGUoY29udGV4dCksXG4gICAgICAgICAgdGVybSA9IGF3YWl0IHByb2NlZHVyZS5jYWxsKHRlcm1zLCBjb250ZXh0KTtcblxuICAgIGNvbnN0IHRlcm1TdHJpbmcgPSB0ZXJtLmdldFN0cmluZygpO1xuXG4gICAgY29udGV4dC5kZWJ1ZyhgLi4uZXZhbHVhdGVkIHRoZSAnJHtwcm9jZWR1cmVDYWxsU3RyaW5nfScgcHJvY2VkdXJlIGNhbGwgYXMgJyR7dGVybVN0cmluZ30nLmApO1xuXG4gICAgcmV0dXJuIHRlcm07XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiUHJvY2VkdXJlQ2FsbFwiO1xufSk7XG4iXSwibmFtZXMiOlsiZGVmaW5lIiwiUHJvY2VkdXJlQ2FsbCIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJyZWZlcmVuY2UiLCJ0ZXJtcyIsImdldFJlZmVyZW5jZSIsImdldFRlcm1zIiwiZ2V0UHJvY2VkdXJlTmFtZSIsImV2YWx1YXRlIiwiYnJlYWsiLCJwcm9jZWR1cmVDYWxsU3RyaW5nIiwiZ2V0U3RyaW5nIiwidHJhY2UiLCJwcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlUHJlc2VudCIsImlzUHJvY2VkdXJlUHJlc2VudEJ5UHJvY2VkdXJlTmFtZSIsIm1lc3NhZ2UiLCJleGNlcHRpb24iLCJFeGNlcHRpb24iLCJmcm9tTWVzc2FnZSIsInByb2NlZHVyZSIsImZpbmRQcm9jZWR1cmVCeVByb2NlZHVyZU5hbWUiLCJ0ZXJtIiwiY2FsbCIsInRlcm1TdHJpbmciLCJkZWJ1ZyIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFBOzs7ZUFBQTs7O2dDQU53QjtrRUFFRjswQkFFQzs7Ozs7O01BRXZCLFdBQWVBLElBQUFBLGdCQUFNLEVBQUMsTUFBTUMsc0JBQXNCQyx1QkFBTztJQUN2RCxZQUFZQyxPQUFPLEVBQUVDLE1BQU0sRUFBRUMsSUFBSSxFQUFFQyxVQUFVLEVBQUVDLFNBQVMsRUFBRUMsS0FBSyxDQUFFO1FBQy9ELEtBQUssQ0FBQ0wsU0FBU0MsUUFBUUMsTUFBTUM7UUFFN0IsSUFBSSxDQUFDQyxTQUFTLEdBQUdBO1FBQ2pCLElBQUksQ0FBQ0MsS0FBSyxHQUFHQTtJQUNmO0lBRUFDLGVBQWU7UUFDYixPQUFPLElBQUksQ0FBQ0YsU0FBUztJQUN2QjtJQUVBRyxXQUFXO1FBQ1QsT0FBTyxJQUFJLENBQUNGLEtBQUs7SUFDbkI7SUFFQUcsbUJBQW1CO1FBQUUsT0FBTyxJQUFJLENBQUNKLFNBQVMsQ0FBQ0ksZ0JBQWdCO0lBQUk7SUFFL0QsTUFBTUMsU0FBU1QsT0FBTyxFQUFFO1FBQ3RCLE1BQU0sSUFBSSxDQUFDVSxLQUFLLENBQUNWO1FBRWpCLE1BQU1XLHNCQUFzQixJQUFJLENBQUNDLFNBQVMsSUFBSyxHQUFHO1FBRWxEWixRQUFRYSxLQUFLLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRUYsb0JBQW9CLG1CQUFtQixDQUFDO1FBRXpFLE1BQU1HLGdCQUFnQixJQUFJLENBQUNOLGdCQUFnQixJQUNyQ08sbUJBQW1CZixRQUFRZ0IsaUNBQWlDLENBQUNGO1FBRW5FLElBQUksQ0FBQ0Msa0JBQWtCO1lBQ3JCLE1BQU1FLFVBQVUsQ0FBQyxLQUFLLEVBQUVOLG9CQUFvQiwyQkFBMkIsQ0FBQyxFQUNsRU8sWUFBWUMsa0JBQVMsQ0FBQ0MsV0FBVyxDQUFDSDtZQUV4QyxNQUFNQztRQUNSO1FBRUEsTUFBTUcsWUFBWXJCLFFBQVFzQiw0QkFBNEIsQ0FBQ1IsZ0JBQ2pEVCxRQUFRLElBQUksQ0FBQ0EsS0FBSyxDQUFDSSxRQUFRLENBQUNULFVBQzVCdUIsT0FBTyxNQUFNRixVQUFVRyxJQUFJLENBQUNuQixPQUFPTDtRQUV6QyxNQUFNeUIsYUFBYUYsS0FBS1gsU0FBUztRQUVqQ1osUUFBUTBCLEtBQUssQ0FBQyxDQUFDLGtCQUFrQixFQUFFZixvQkFBb0IscUJBQXFCLEVBQUVjLFdBQVcsRUFBRSxDQUFDO1FBRTVGLE9BQU9GO0lBQ1Q7SUFFQSxPQUFPSSxPQUFPLGdCQUFnQjtBQUNoQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3Byb2NlZHVyZUNhbGwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IEVsZW1lbnQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBFeGNlcHRpb24gZnJvbSBcIi4uL2V4Y2VwdGlvblwiO1xuXG5pbXBvcnQgeyBkZWZpbmUgfSBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIFByb2NlZHVyZUNhbGwgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCByZWZlcmVuY2UsIHRlcm1zKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMucmVmZXJlbmNlID0gcmVmZXJlbmNlO1xuICAgIHRoaXMudGVybXMgPSB0ZXJtcztcbiAgfVxuXG4gIGdldFJlZmVyZW5jZSgpIHtcbiAgICByZXR1cm4gdGhpcy5yZWZlcmVuY2U7XG4gIH1cblxuICBnZXRUZXJtcygpIHtcbiAgICByZXR1cm4gdGhpcy50ZXJtcztcbiAgfVxuXG4gIGdldFByb2NlZHVyZU5hbWUoKSB7IHJldHVybiB0aGlzLnJlZmVyZW5jZS5nZXRQcm9jZWR1cmVOYW1lKCk7IH1cblxuICBhc3luYyBldmFsdWF0ZShjb250ZXh0KSB7XG4gICAgYXdhaXQgdGhpcy5icmVhayhjb250ZXh0KTtcblxuICAgIGNvbnN0IHByb2NlZHVyZUNhbGxTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpOyAgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBFdmFsdWF0aW5nIHRoZSAnJHtwcm9jZWR1cmVDYWxsU3RyaW5nfScgcHJvY2VkdXJlIGNhbGwuLi5gKTtcblxuICAgIGNvbnN0IHByb2NlZHVyZU5hbWUgPSB0aGlzLmdldFByb2NlZHVyZU5hbWUoKSxcbiAgICAgICAgICBwcm9jZWR1cmVQcmVzZW50ID0gY29udGV4dC5pc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSk7XG5cbiAgICBpZiAoIXByb2NlZHVyZVByZXNlbnQpIHtcbiAgICAgIGNvbnN0IG1lc3NhZ2UgPSBgVGhlICcke3Byb2NlZHVyZUNhbGxTdHJpbmd9IHByb2NlZHVyZSBpcyBub3QgcHJlc2VudC4nYCxcbiAgICAgICAgICAgIGV4Y2VwdGlvbiA9IEV4Y2VwdGlvbi5mcm9tTWVzc2FnZShtZXNzYWdlKTtcblxuICAgICAgdGhyb3cgZXhjZXB0aW9uO1xuICAgIH1cblxuICAgIGNvbnN0IHByb2NlZHVyZSA9IGNvbnRleHQuZmluZFByb2NlZHVyZUJ5UHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKSxcbiAgICAgICAgICB0ZXJtcyA9IHRoaXMudGVybXMuZXZhbHVhdGUoY29udGV4dCksXG4gICAgICAgICAgdGVybSA9IGF3YWl0IHByb2NlZHVyZS5jYWxsKHRlcm1zLCBjb250ZXh0KSxcbiAgICAgICAgICB0ZXJtU3RyaW5nID0gdGVybS5nZXRTdHJpbmcoKTtcblxuICAgIGNvbnRleHQuZGVidWcoYC4uLmV2YWx1YXRlZCB0aGUgJyR7cHJvY2VkdXJlQ2FsbFN0cmluZ30nIHByb2NlZHVyZSBjYWxsIGFzICcke3Rlcm1TdHJpbmd9Jy5gKTtcblxuICAgIHJldHVybiB0ZXJtO1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIlByb2NlZHVyZUNhbGxcIjtcbn0pO1xuIl0sIm5hbWVzIjpbImRlZmluZSIsIlByb2NlZHVyZUNhbGwiLCJFbGVtZW50IiwiY29udGV4dCIsInN0cmluZyIsIm5vZGUiLCJicmVha1BvaW50IiwicmVmZXJlbmNlIiwidGVybXMiLCJnZXRSZWZlcmVuY2UiLCJnZXRUZXJtcyIsImdldFByb2NlZHVyZU5hbWUiLCJldmFsdWF0ZSIsImJyZWFrIiwicHJvY2VkdXJlQ2FsbFN0cmluZyIsImdldFN0cmluZyIsInRyYWNlIiwicHJvY2VkdXJlTmFtZSIsInByb2NlZHVyZVByZXNlbnQiLCJpc1Byb2NlZHVyZVByZXNlbnRCeVByb2NlZHVyZU5hbWUiLCJtZXNzYWdlIiwiZXhjZXB0aW9uIiwiRXhjZXB0aW9uIiwiZnJvbU1lc3NhZ2UiLCJwcm9jZWR1cmUiLCJmaW5kUHJvY2VkdXJlQnlQcm9jZWR1cmVOYW1lIiwidGVybSIsImNhbGwiLCJ0ZXJtU3RyaW5nIiwiZGVidWciLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFRQTs7O2VBQUE7OztnQ0FOd0I7a0VBRUY7MEJBRUM7Ozs7OztNQUV2QixXQUFlQSxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLHNCQUFzQkMsdUJBQU87SUFDdkQsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxFQUFFQyxTQUFTLEVBQUVDLEtBQUssQ0FBRTtRQUMvRCxLQUFLLENBQUNMLFNBQVNDLFFBQVFDLE1BQU1DO1FBRTdCLElBQUksQ0FBQ0MsU0FBUyxHQUFHQTtRQUNqQixJQUFJLENBQUNDLEtBQUssR0FBR0E7SUFDZjtJQUVBQyxlQUFlO1FBQ2IsT0FBTyxJQUFJLENBQUNGLFNBQVM7SUFDdkI7SUFFQUcsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDRixLQUFLO0lBQ25CO0lBRUFHLG1CQUFtQjtRQUFFLE9BQU8sSUFBSSxDQUFDSixTQUFTLENBQUNJLGdCQUFnQjtJQUFJO0lBRS9ELE1BQU1DLFNBQVNULE9BQU8sRUFBRTtRQUN0QixNQUFNLElBQUksQ0FBQ1UsS0FBSyxDQUFDVjtRQUVqQixNQUFNVyxzQkFBc0IsSUFBSSxDQUFDQyxTQUFTLElBQUssR0FBRztRQUVsRFosUUFBUWEsS0FBSyxDQUFDLENBQUMsZ0JBQWdCLEVBQUVGLG9CQUFvQixtQkFBbUIsQ0FBQztRQUV6RSxNQUFNRyxnQkFBZ0IsSUFBSSxDQUFDTixnQkFBZ0IsSUFDckNPLG1CQUFtQmYsUUFBUWdCLGlDQUFpQyxDQUFDRjtRQUVuRSxJQUFJLENBQUNDLGtCQUFrQjtZQUNyQixNQUFNRSxVQUFVLENBQUMsS0FBSyxFQUFFTixvQkFBb0IsMkJBQTJCLENBQUMsRUFDbEVPLFlBQVlDLGtCQUFTLENBQUNDLFdBQVcsQ0FBQ0g7WUFFeEMsTUFBTUM7UUFDUjtRQUVBLE1BQU1HLFlBQVlyQixRQUFRc0IsNEJBQTRCLENBQUNSLGdCQUNqRFQsUUFBUSxJQUFJLENBQUNBLEtBQUssQ0FBQ0ksUUFBUSxDQUFDVCxVQUM1QnVCLE9BQU8sTUFBTUYsVUFBVUcsSUFBSSxDQUFDbkIsT0FBT0wsVUFDbkN5QixhQUFhRixLQUFLWCxTQUFTO1FBRWpDWixRQUFRMEIsS0FBSyxDQUFDLENBQUMsa0JBQWtCLEVBQUVmLG9CQUFvQixxQkFBcUIsRUFBRWMsV0FBVyxFQUFFLENBQUM7UUFFNUYsT0FBT0Y7SUFDVDtJQUVBLE9BQU9JLE9BQU8sZ0JBQWdCO0FBQ2hDIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-furtle",
   "author": "James Smith",
-  "version": "3.0.227",
+  "version": "3.0.229",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-furtle",
   "description": "Occam's Furtle language.",
@@ -13,7 +13,8 @@
     "necessary": "^17.2.10",
     "occam-grammar-utilities": "^8.0.425",
     "occam-grammars": "^1.3.538",
-    "occam-languages": "^0.0.231",
+    "occam-languages": "^0.0.235",
+    "occam-lexers": "^23.1.58",
     "occam-parsers": "^23.1.64"
   },
   "devDependencies": {
@@ -26,9 +27,9 @@
     "express": "^4.17.1",
     "juxtapose": "^4.0.138",
     "lively-cli": "^3.0.3",
-    "occam-custom-grammars": "^6.0.46",
     "occam-model": "^1.0.513",
     "occam-query": "^4.1.168",
+    "occam-server": "^7.0.14",
     "watchful-cli": "^1.7.91"
   },
   "scripts": {

package/src/context/block.js

@@ -21,7 +21,7 @@ export default class BlockContext extends Context {
 
     if (nested) {
       const context = this.getContext(),
-            contextVariables = context.getVariables();
+            contextVariables = context.getVariables(nested);
 
       push(variables, contextVariables);
     }

package/src/context/file/furtle.js

@@ -22,14 +22,6 @@ export default class FurtleFileContext extends FileContext {
     return this.parser;
   }
 
-  getProcedures(includeRelease = true) {
-    const procedures = includeRelease ?
-                         this.context.getProcedures() :
-                           this.procedures;
-
-    return procedures;
-  }
-
   getLabels(includeRelease = true) {
     const labels = [];
 
@@ -66,12 +58,6 @@ export default class FurtleFileContext extends FileContext {
     return theorems;
   }
 
-  getVariables(includeRelease = true) {
-    const variables = [];
-
-    return variables;
-  }
-
   getMetaLemmas(includeRelease = true) {
     const metaLemmas = [];
 
@@ -114,6 +100,20 @@ export default class FurtleFileContext extends FileContext {
     return metavariables;
   }
 
+  getProcedures(includeRelease = true) {
+    const procedures = includeRelease ?
+                         this.context.getProcedures() :
+                           this.procedures;
+
+    return procedures;
+  }
+
+  getVariables(nested = true) {
+    const variables = [];
+
+    return variables;
+  }
+
   addProcedure(procedure) {
     const procedureString = procedure.getString();
 

package/src/element/procedureCall.js

@@ -43,9 +43,8 @@ export default define(class ProcedureCall extends Element {
 
     const procedure = context.findProcedureByProcedureName(procedureName),
           terms = this.terms.evaluate(context),
-          term = await procedure.call(terms, context);
-
-    const termString = term.getString();
+          term = await procedure.call(terms, context),
+          termString = term.getString();
 
     context.debug(`...evaluated the '${procedureCallString}' procedure call as '${termString}'.`);