occam-furtle 3.0.237 → 3.0.239

package/lib/utilities/term.js

@@ -15,11 +15,11 @@ _export(exports, {
     get termFromBoolean () {
         return termFromBoolean;
     },
-    get termFromNode () {
-        return termFromNode;
+    get termFromNominalValue () {
+        return termFromNominalValue;
     },
-    get termFromNodes () {
-        return termFromNodes;
+    get termFromNominalValues () {
+        return termFromNominalValues;
     },
     get termFromPrimitive () {
         return termFromPrimitive;
@@ -35,17 +35,8 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-function termFromNode(node, context) {
-    const { Term } = _elements.default, variable = null, primitive = (0, _primitive.primitiveFromNode)(node, context), string = primitive.getString(), breakPoint = null;
-    node = null;
-    context = null;
-    const term = new Term(context, string, node, breakPoint, variable, primitive);
-    return term;
-}
-function termFromNodes(nodes, context) {
-    const { Term } = _elements.default, variable = null, primitive = (0, _primitive.primitiveFromNodes)(nodes, context), string = primitive.getString(), node = null, breakPoint = null;
-    context = null;
-    const term = new Term(context, string, node, breakPoint, variable, primitive);
+function termFromPrimitive(primitive) {
+    const { Term } = _elements.default, context = null, string = primitive.getString(), node = null, breakPoint = null, variable = null, term = new Term(context, string, node, breakPoint, variable, primitive);
     return term;
 }
 function termFromBoolean(boolean, context) {
@@ -54,22 +45,26 @@ function termFromBoolean(boolean, context) {
     const term = new Term(context, string, node, breakPoint, variable, primitive);
     return term;
 }
+function termFromNominalValue(nominalValue) {
+    const { Term } = _elements.default, variable = null, primitive = (0, _primitive.primitiveFromNominalValue)(nominalValue), string = primitive.getString(), breakPoint = null, node = null, context = null, term = new Term(context, string, node, breakPoint, variable, primitive);
+    return term;
+}
+function termFromNominalValues(nominalValues) {
+    const { Term } = _elements.default, variable = null, primitive = (0, _primitive.primitiveFromNominalValues)(nominalValues), string = primitive.getString(), node = null, breakPoint = null, context = null, term = new Term(context, string, node, breakPoint, variable, primitive);
+    return term;
+}
 function termFromStringLiteral(stringLiteral, context) {
     const { Term } = _elements.default, variable = null, primitive = (0, _primitive.primitiveFromStringLiteral)(stringLiteral, context), string = primitive.getString(), node = null, breakPoint = null;
     context = null;
     const term = new Term(context, string, node, breakPoint, variable, primitive);
     return term;
 }
-function termFromPrimitive(primitive) {
-    const { Term } = _elements.default, context = null, string = primitive.getString(), node = null, breakPoint = null, variable = null, term = new Term(context, string, node, breakPoint, variable, primitive);
-    return term;
-}
 const _default = {
-    termFromNode,
-    termFromNodes,
     termFromBoolean,
+    termFromNominalValue,
+    termFromNominalValues,
     termFromStringLiteral,
     termFromPrimitive
 };
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdGVybS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IGVsZW1lbnRzIGZyb20gXCIuLi9lbGVtZW50c1wiO1xuXG5pbXBvcnQgeyBwcmltaXRpdmVGcm9tTm9kZSwgcHJpbWl0aXZlRnJvbU5vZGVzLCBwcmltaXRpdmVGcm9tQm9vbGVhbiwgcHJpbWl0aXZlRnJvbVN0cmluZ0xpdGVyYWwgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3ByaW1pdGl2ZVwiO1xuXG5leHBvcnQgZnVuY3Rpb24gdGVybUZyb21Ob2RlKG5vZGUsIGNvbnRleHQpIHtcbiAgY29uc3QgeyBUZXJtIH0gPSBlbGVtZW50cyxcbiAgICAgICAgdmFyaWFibGUgPSBudWxsLFxuICAgICAgICBwcmltaXRpdmUgPSBwcmltaXRpdmVGcm9tTm9kZShub2RlLCBjb250ZXh0KSxcbiAgICAgICAgc3RyaW5nID0gcHJpbWl0aXZlLmdldFN0cmluZygpLFxuICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICBub2RlID0gbnVsbDtcblxuICBjb250ZXh0ID0gbnVsbDtcblxuICBjb25zdCB0ZXJtID0gbmV3IFRlcm0oY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB2YXJpYWJsZSwgcHJpbWl0aXZlKTtcblxuICByZXR1cm4gdGVybTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1Gcm9tTm9kZXMobm9kZXMsIGNvbnRleHQpIHtcbiAgY29uc3QgeyBUZXJtIH0gPSBlbGVtZW50cyxcbiAgICAgICAgdmFyaWFibGUgPSBudWxsLFxuICAgICAgICBwcmltaXRpdmUgPSBwcmltaXRpdmVGcm9tTm9kZXMobm9kZXMsIGNvbnRleHQpLFxuICAgICAgICBzdHJpbmcgPSBwcmltaXRpdmUuZ2V0U3RyaW5nKCksXG4gICAgICAgIG5vZGUgPSBudWxsLFxuICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICBjb250ZXh0ID0gbnVsbDtcblxuICBjb25zdCB0ZXJtID0gbmV3IFRlcm0oY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB2YXJpYWJsZSwgcHJpbWl0aXZlKTtcblxuICByZXR1cm4gdGVybTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1Gcm9tQm9vbGVhbihib29sZWFuLCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgVGVybSB9ID0gZWxlbWVudHMsXG4gICAgICAgIHZhcmlhYmxlID0gbnVsbCxcbiAgICAgICAgcHJpbWl0aXZlID0gcHJpbWl0aXZlRnJvbUJvb2xlYW4oYm9vbGVhbiwgY29udGV4dCksXG4gICAgICAgIHN0cmluZyA9IHByaW1pdGl2ZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgbm9kZSA9IG51bGwsXG4gICAgICAgIGJyZWFrUG9pbnQgPSBudWxsO1xuXG4gIGNvbnRleHQgPSBudWxsO1xuXG4gIGNvbnN0IHRlcm0gPSBuZXcgVGVybShjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHZhcmlhYmxlLCBwcmltaXRpdmUpO1xuXG4gIHJldHVybiB0ZXJtO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdGVybUZyb21TdHJpbmdMaXRlcmFsKHN0cmluZ0xpdGVyYWwsIGNvbnRleHQpIHtcbiAgY29uc3QgeyBUZXJtIH0gPSBlbGVtZW50cyxcbiAgICAgICAgdmFyaWFibGUgPSBudWxsLFxuICAgICAgICBwcmltaXRpdmUgPSBwcmltaXRpdmVGcm9tU3RyaW5nTGl0ZXJhbChzdHJpbmdMaXRlcmFsLCBjb250ZXh0KSxcbiAgICAgICAgc3RyaW5nID0gcHJpbWl0aXZlLmdldFN0cmluZygpLFxuICAgICAgICBub2RlID0gbnVsbCxcbiAgICAgICAgYnJlYWtQb2ludCA9IG51bGw7XG5cbiAgY29udGV4dCA9IG51bGw7XG5cbiAgY29uc3QgdGVybSA9IG5ldyBUZXJtKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgdmFyaWFibGUsIHByaW1pdGl2ZSk7XG5cbiAgcmV0dXJuIHRlcm07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0ZXJtRnJvbVByaW1pdGl2ZShwcmltaXRpdmUpIHtcbiAgY29uc3QgeyBUZXJtIH0gPSBlbGVtZW50cyxcbiAgICAgICAgY29udGV4dCA9IG51bGwsXG4gICAgICAgIHN0cmluZyA9IHByaW1pdGl2ZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgbm9kZSA9IG51bGwsXG4gICAgICAgIGJyZWFrUG9pbnQgPSBudWxsLFxuICAgICAgICB2YXJpYWJsZSA9IG51bGwsXG4gICAgICAgIHRlcm0gPSBuZXcgVGVybShjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHZhcmlhYmxlLCBwcmltaXRpdmUpO1xuXG4gIHJldHVybiB0ZXJtO1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIHRlcm1Gcm9tTm9kZSxcbiAgdGVybUZyb21Ob2RlcyxcbiAgdGVybUZyb21Cb29sZWFuLFxuICB0ZXJtRnJvbVN0cmluZ0xpdGVyYWwsXG4gIHRlcm1Gcm9tUHJpbWl0aXZlXG59O1xuIl0sIm5hbWVzIjpbInRlcm1Gcm9tQm9vbGVhbiIsInRlcm1Gcm9tTm9kZSIsInRlcm1Gcm9tTm9kZXMiLCJ0ZXJtRnJvbVByaW1pdGl2ZSIsInRlcm1Gcm9tU3RyaW5nTGl0ZXJhbCIsIm5vZGUiLCJjb250ZXh0IiwiVGVybSIsImVsZW1lbnRzIiwidmFyaWFibGUiLCJwcmltaXRpdmUiLCJwcmltaXRpdmVGcm9tTm9kZSIsInN0cmluZyIsImdldFN0cmluZyIsImJyZWFrUG9pbnQiLCJ0ZXJtIiwibm9kZXMiLCJwcmltaXRpdmVGcm9tTm9kZXMiLCJib29sZWFuIiwicHJpbWl0aXZlRnJvbUJvb2xlYW4iLCJzdHJpbmdMaXRlcmFsIiwicHJpbWl0aXZlRnJvbVN0cmluZ0xpdGVyYWwiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQStFQTtlQUFBOztRQTFDZ0JBO2VBQUFBOztRQS9CQUM7ZUFBQUE7O1FBZ0JBQztlQUFBQTs7UUE2Q0FDO2VBQUFBOztRQWZBQztlQUFBQTs7O2lFQWxESzsyQkFFbUY7Ozs7OztBQUVqRyxTQUFTSCxhQUFhSSxJQUFJLEVBQUVDLE9BQU87SUFDeEMsTUFBTSxFQUFFQyxJQUFJLEVBQUUsR0FBR0MsaUJBQVEsRUFDbkJDLFdBQVcsTUFDWEMsWUFBWUMsSUFBQUEsNEJBQWlCLEVBQUNOLE1BQU1DLFVBQ3BDTSxTQUFTRixVQUFVRyxTQUFTLElBQzVCQyxhQUFhO0lBRW5CVCxPQUFPO0lBRVBDLFVBQVU7SUFFVixNQUFNUyxPQUFPLElBQUlSLEtBQUtELFNBQVNNLFFBQVFQLE1BQU1TLFlBQVlMLFVBQVVDO0lBRW5FLE9BQU9LO0FBQ1Q7QUFFTyxTQUFTYixjQUFjYyxLQUFLLEVBQUVWLE9BQU87SUFDMUMsTUFBTSxFQUFFQyxJQUFJLEVBQUUsR0FBR0MsaUJBQVEsRUFDbkJDLFdBQVcsTUFDWEMsWUFBWU8sSUFBQUEsNkJBQWtCLEVBQUNELE9BQU9WLFVBQ3RDTSxTQUFTRixVQUFVRyxTQUFTLElBQzVCUixPQUFPLE1BQ1BTLGFBQWE7SUFFbkJSLFVBQVU7SUFFVixNQUFNUyxPQUFPLElBQUlSLEtBQUtELFNBQVNNLFFBQVFQLE1BQU1TLFlBQVlMLFVBQVVDO0lBRW5FLE9BQU9LO0FBQ1Q7QUFFTyxTQUFTZixnQkFBZ0JrQixPQUFPLEVBQUVaLE9BQU87SUFDOUMsTUFBTSxFQUFFQyxJQUFJLEVBQUUsR0FBR0MsaUJBQVEsRUFDbkJDLFdBQVcsTUFDWEMsWUFBWVMsSUFBQUEsK0JBQW9CLEVBQUNELFNBQVNaLFVBQzFDTSxTQUFTRixVQUFVRyxTQUFTLElBQzVCUixPQUFPLE1BQ1BTLGFBQWE7SUFFbkJSLFVBQVU7SUFFVixNQUFNUyxPQUFPLElBQUlSLEtBQUtELFNBQVNNLFFBQVFQLE1BQU1TLFlBQVlMLFVBQVVDO0lBRW5FLE9BQU9LO0FBQ1Q7QUFFTyxTQUFTWCxzQkFBc0JnQixhQUFhLEVBQUVkLE9BQU87SUFDMUQsTUFBTSxFQUFFQyxJQUFJLEVBQUUsR0FBR0MsaUJBQVEsRUFDbkJDLFdBQVcsTUFDWEMsWUFBWVcsSUFBQUEscUNBQTBCLEVBQUNELGVBQWVkLFVBQ3RETSxTQUFTRixVQUFVRyxTQUFTLElBQzVCUixPQUFPLE1BQ1BTLGFBQWE7SUFFbkJSLFVBQVU7SUFFVixNQUFNUyxPQUFPLElBQUlSLEtBQUtELFNBQVNNLFFBQVFQLE1BQU1TLFlBQVlMLFVBQVVDO0lBRW5FLE9BQU9LO0FBQ1Q7QUFFTyxTQUFTWixrQkFBa0JPLFNBQVM7SUFDekMsTUFBTSxFQUFFSCxJQUFJLEVBQUUsR0FBR0MsaUJBQVEsRUFDbkJGLFVBQVUsTUFDVk0sU0FBU0YsVUFBVUcsU0FBUyxJQUM1QlIsT0FBTyxNQUNQUyxhQUFhLE1BQ2JMLFdBQVcsTUFDWE0sT0FBTyxJQUFJUixLQUFLRCxTQUFTTSxRQUFRUCxNQUFNUyxZQUFZTCxVQUFVQztJQUVuRSxPQUFPSztBQUNUO01BRUEsV0FBZTtJQUNiZDtJQUNBQztJQUNBRjtJQUNBSTtJQUNBRDtBQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdGVybS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IGVsZW1lbnRzIGZyb20gXCIuLi9lbGVtZW50c1wiO1xuXG5pbXBvcnQgeyBwcmltaXRpdmVGcm9tQm9vbGVhbiwgcHJpbWl0aXZlRnJvbU5vbWluYWxWYWx1ZSwgcHJpbWl0aXZlRnJvbU5vbWluYWxWYWx1ZXMsIHByaW1pdGl2ZUZyb21TdHJpbmdMaXRlcmFsIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9wcmltaXRpdmVcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1Gcm9tUHJpbWl0aXZlKHByaW1pdGl2ZSkge1xuICBjb25zdCB7IFRlcm0gfSA9IGVsZW1lbnRzLFxuICAgICAgICBjb250ZXh0ID0gbnVsbCxcbiAgICAgICAgc3RyaW5nID0gcHJpbWl0aXZlLmdldFN0cmluZygpLFxuICAgICAgICBub2RlID0gbnVsbCxcbiAgICAgICAgYnJlYWtQb2ludCA9IG51bGwsXG4gICAgICAgIHZhcmlhYmxlID0gbnVsbCxcbiAgICAgICAgdGVybSA9IG5ldyBUZXJtKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgdmFyaWFibGUsIHByaW1pdGl2ZSk7XG5cbiAgcmV0dXJuIHRlcm07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0ZXJtRnJvbUJvb2xlYW4oYm9vbGVhbiwgY29udGV4dCkge1xuICBjb25zdCB7IFRlcm0gfSA9IGVsZW1lbnRzLFxuICAgICAgICB2YXJpYWJsZSA9IG51bGwsXG4gICAgICAgIHByaW1pdGl2ZSA9IHByaW1pdGl2ZUZyb21Cb29sZWFuKGJvb2xlYW4sIGNvbnRleHQpLFxuICAgICAgICBzdHJpbmcgPSBwcmltaXRpdmUuZ2V0U3RyaW5nKCksXG4gICAgICAgIG5vZGUgPSBudWxsLFxuICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICBjb250ZXh0ID0gbnVsbDtcblxuICBjb25zdCB0ZXJtID0gbmV3IFRlcm0oY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB2YXJpYWJsZSwgcHJpbWl0aXZlKTtcblxuICByZXR1cm4gdGVybTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1Gcm9tTm9taW5hbFZhbHVlKG5vbWluYWxWYWx1ZSkge1xuICBjb25zdCB7IFRlcm0gfSA9IGVsZW1lbnRzLFxuICAgICAgICB2YXJpYWJsZSA9IG51bGwsXG4gICAgICAgIHByaW1pdGl2ZSA9IHByaW1pdGl2ZUZyb21Ob21pbmFsVmFsdWUobm9taW5hbFZhbHVlKSxcbiAgICAgICAgc3RyaW5nID0gcHJpbWl0aXZlLmdldFN0cmluZygpLFxuICAgICAgICBicmVha1BvaW50ID0gbnVsbCxcbiAgICAgICAgbm9kZSA9IG51bGwsXG4gICAgICAgIGNvbnRleHQgPSBudWxsLFxuICAgICAgICB0ZXJtID0gbmV3IFRlcm0oY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB2YXJpYWJsZSwgcHJpbWl0aXZlKTtcblxuICByZXR1cm4gdGVybTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1Gcm9tTm9taW5hbFZhbHVlcyhub21pbmFsVmFsdWVzKSB7XG4gIGNvbnN0IHsgVGVybSB9ID0gZWxlbWVudHMsXG4gICAgICAgIHZhcmlhYmxlID0gbnVsbCxcbiAgICAgICAgcHJpbWl0aXZlID0gcHJpbWl0aXZlRnJvbU5vbWluYWxWYWx1ZXMobm9taW5hbFZhbHVlcyksXG4gICAgICAgIHN0cmluZyA9IHByaW1pdGl2ZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgbm9kZSA9IG51bGwsXG4gICAgICAgIGJyZWFrUG9pbnQgPSBudWxsLFxuICAgICAgICBjb250ZXh0ID0gbnVsbCxcbiAgICAgICAgdGVybSA9IG5ldyBUZXJtKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgdmFyaWFibGUsIHByaW1pdGl2ZSk7XG5cbiAgcmV0dXJuIHRlcm07XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0ZXJtRnJvbVN0cmluZ0xpdGVyYWwoc3RyaW5nTGl0ZXJhbCwgY29udGV4dCkge1xuICBjb25zdCB7IFRlcm0gfSA9IGVsZW1lbnRzLFxuICAgICAgICB2YXJpYWJsZSA9IG51bGwsXG4gICAgICAgIHByaW1pdGl2ZSA9IHByaW1pdGl2ZUZyb21TdHJpbmdMaXRlcmFsKHN0cmluZ0xpdGVyYWwsIGNvbnRleHQpLFxuICAgICAgICBzdHJpbmcgPSBwcmltaXRpdmUuZ2V0U3RyaW5nKCksXG4gICAgICAgIG5vZGUgPSBudWxsLFxuICAgICAgICBicmVha1BvaW50ID0gbnVsbDtcblxuICBjb250ZXh0ID0gbnVsbDtcblxuICBjb25zdCB0ZXJtID0gbmV3IFRlcm0oY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCB2YXJpYWJsZSwgcHJpbWl0aXZlKTtcblxuICByZXR1cm4gdGVybTtcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuICB0ZXJtRnJvbUJvb2xlYW4sXG4gIHRlcm1Gcm9tTm9taW5hbFZhbHVlLFxuICB0ZXJtRnJvbU5vbWluYWxWYWx1ZXMsXG4gIHRlcm1Gcm9tU3RyaW5nTGl0ZXJhbCxcbiAgdGVybUZyb21QcmltaXRpdmVcbn07XG4iXSwibmFtZXMiOlsidGVybUZyb21Cb29sZWFuIiwidGVybUZyb21Ob21pbmFsVmFsdWUiLCJ0ZXJtRnJvbU5vbWluYWxWYWx1ZXMiLCJ0ZXJtRnJvbVByaW1pdGl2ZSIsInRlcm1Gcm9tU3RyaW5nTGl0ZXJhbCIsInByaW1pdGl2ZSIsIlRlcm0iLCJlbGVtZW50cyIsImNvbnRleHQiLCJzdHJpbmciLCJnZXRTdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsInZhcmlhYmxlIiwidGVybSIsImJvb2xlYW4iLCJwcmltaXRpdmVGcm9tQm9vbGVhbiIsIm5vbWluYWxWYWx1ZSIsInByaW1pdGl2ZUZyb21Ob21pbmFsVmFsdWUiLCJub21pbmFsVmFsdWVzIiwicHJpbWl0aXZlRnJvbU5vbWluYWxWYWx1ZXMiLCJzdHJpbmdMaXRlcmFsIiwicHJpbWl0aXZlRnJvbVN0cmluZ0xpdGVyYWwiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQTBFQTtlQUFBOztRQXhEZ0JBO2VBQUFBOztRQWVBQztlQUFBQTs7UUFhQUM7ZUFBQUE7O1FBeENBQztlQUFBQTs7UUFxREFDO2VBQUFBOzs7aUVBekRLOzJCQUVtRzs7Ozs7O0FBRWpILFNBQVNELGtCQUFrQkUsU0FBUztJQUN6QyxNQUFNLEVBQUVDLElBQUksRUFBRSxHQUFHQyxpQkFBUSxFQUNuQkMsVUFBVSxNQUNWQyxTQUFTSixVQUFVSyxTQUFTLElBQzVCQyxPQUFPLE1BQ1BDLGFBQWEsTUFDYkMsV0FBVyxNQUNYQyxPQUFPLElBQUlSLEtBQUtFLFNBQVNDLFFBQVFFLE1BQU1DLFlBQVlDLFVBQVVSO0lBRW5FLE9BQU9TO0FBQ1Q7QUFFTyxTQUFTZCxnQkFBZ0JlLE9BQU8sRUFBRVAsT0FBTztJQUM5QyxNQUFNLEVBQUVGLElBQUksRUFBRSxHQUFHQyxpQkFBUSxFQUNuQk0sV0FBVyxNQUNYUixZQUFZVyxJQUFBQSwrQkFBb0IsRUFBQ0QsU0FBU1AsVUFDMUNDLFNBQVNKLFVBQVVLLFNBQVMsSUFDNUJDLE9BQU8sTUFDUEMsYUFBYTtJQUVuQkosVUFBVTtJQUVWLE1BQU1NLE9BQU8sSUFBSVIsS0FBS0UsU0FBU0MsUUFBUUUsTUFBTUMsWUFBWUMsVUFBVVI7SUFFbkUsT0FBT1M7QUFDVDtBQUVPLFNBQVNiLHFCQUFxQmdCLFlBQVk7SUFDL0MsTUFBTSxFQUFFWCxJQUFJLEVBQUUsR0FBR0MsaUJBQVEsRUFDbkJNLFdBQVcsTUFDWFIsWUFBWWEsSUFBQUEsb0NBQXlCLEVBQUNELGVBQ3RDUixTQUFTSixVQUFVSyxTQUFTLElBQzVCRSxhQUFhLE1BQ2JELE9BQU8sTUFDUEgsVUFBVSxNQUNWTSxPQUFPLElBQUlSLEtBQUtFLFNBQVNDLFFBQVFFLE1BQU1DLFlBQVlDLFVBQVVSO0lBRW5FLE9BQU9TO0FBQ1Q7QUFFTyxTQUFTWixzQkFBc0JpQixhQUFhO0lBQ2pELE1BQU0sRUFBRWIsSUFBSSxFQUFFLEdBQUdDLGlCQUFRLEVBQ25CTSxXQUFXLE1BQ1hSLFlBQVllLElBQUFBLHFDQUEwQixFQUFDRCxnQkFDdkNWLFNBQVNKLFVBQVVLLFNBQVMsSUFDNUJDLE9BQU8sTUFDUEMsYUFBYSxNQUNiSixVQUFVLE1BQ1ZNLE9BQU8sSUFBSVIsS0FBS0UsU0FBU0MsUUFBUUUsTUFBTUMsWUFBWUMsVUFBVVI7SUFFbkUsT0FBT1M7QUFDVDtBQUVPLFNBQVNWLHNCQUFzQmlCLGFBQWEsRUFBRWIsT0FBTztJQUMxRCxNQUFNLEVBQUVGLElBQUksRUFBRSxHQUFHQyxpQkFBUSxFQUNuQk0sV0FBVyxNQUNYUixZQUFZaUIsSUFBQUEscUNBQTBCLEVBQUNELGVBQWViLFVBQ3REQyxTQUFTSixVQUFVSyxTQUFTLElBQzVCQyxPQUFPLE1BQ1BDLGFBQWE7SUFFbkJKLFVBQVU7SUFFVixNQUFNTSxPQUFPLElBQUlSLEtBQUtFLFNBQVNDLFFBQVFFLE1BQU1DLFlBQVlDLFVBQVVSO0lBRW5FLE9BQU9TO0FBQ1Q7TUFFQSxXQUFlO0lBQ2JkO0lBQ0FDO0lBQ0FDO0lBQ0FFO0lBQ0FEO0FBQ0YifQ==

package/lib/utilities/terms.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "termsFromNodes", {
+Object.defineProperty(exports, "termsFromNominalValues", {
     enumerable: true,
     get: function() {
-        return termsFromNodes;
+        return termsFromNominalValues;
     }
 });
 const _elements = /*#__PURE__*/ _interop_require_default(require("../elements"));
@@ -16,18 +16,16 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-function termsFromNodes(nodes, context) {
-    const { Terms } = _elements.default, termsArray = termsArrayFromNodes(nodes, context), termsString = (0, _string.termsStringFromTermsArray)(termsArray), string = termsString, array = termsArray, node = null, breakPoint = null;
-    context = null;
-    const terms = new Terms(context, string, node, breakPoint, array);
+function termsFromNominalValues(nominalValues) {
+    const { Terms } = _elements.default, termsArray = termsArrayFromNominalValues(nominalValues), termsString = (0, _string.termsStringFromTermsArray)(termsArray), string = termsString, array = termsArray, node = null, breakPoint = null, context = null, terms = new Terms(context, string, node, breakPoint, array);
     return terms;
 }
-function termsArrayFromNodes(nodes, context) {
-    const termsArray = nodes.map((node)=>{
-        const term = (0, _term.termFromNode)(node, context);
+function termsArrayFromNominalValues(nominalValues) {
+    const termsArray = nominalValues.map((nominalValue)=>{
+        const term = (0, _term.termFromNominalValue)(nominalValue);
         return term;
     });
     return termsArray;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdGVybXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBlbGVtZW50cyBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuaW1wb3J0IHsgdGVybUZyb21Ob2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy90ZXJtXCI7XG5pbXBvcnQgeyB0ZXJtc1N0cmluZ0Zyb21UZXJtc0FycmF5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1zRnJvbU5vZGVzKG5vZGVzLCBjb250ZXh0KSB7XG4gIGNvbnN0IHsgVGVybXMgfSA9IGVsZW1lbnRzLFxuICAgICAgICB0ZXJtc0FycmF5ID0gdGVybXNBcnJheUZyb21Ob2Rlcyhub2RlcywgY29udGV4dCksXG4gICAgICAgIHRlcm1zU3RyaW5nID0gdGVybXNTdHJpbmdGcm9tVGVybXNBcnJheSh0ZXJtc0FycmF5KSxcbiAgICAgICAgc3RyaW5nID0gdGVybXNTdHJpbmcsIC8vL1xuICAgICAgICBhcnJheSA9IHRlcm1zQXJyYXksICAvLy9cbiAgICAgICAgbm9kZSA9IG51bGwsXG4gICAgICAgIGJyZWFrUG9pbnQgPSBudWxsO1xuXG4gIGNvbnRleHQgPSBudWxsO1xuXG4gIGNvbnN0IHRlcm1zID0gbmV3IFRlcm1zKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgYXJyYXkpO1xuXG4gIHJldHVybiB0ZXJtcztcbn1cblxuZnVuY3Rpb24gdGVybXNBcnJheUZyb21Ob2Rlcyhub2RlcywgY29udGV4dCkge1xuICBjb25zdCB0ZXJtc0FycmF5ID0gbm9kZXMubWFwKChub2RlKSA9PiB7XG4gICAgY29uc3QgdGVybSA9IHRlcm1Gcm9tTm9kZShub2RlLCBjb250ZXh0KTtcblxuICAgIHJldHVybiB0ZXJtO1xuICB9KTtcblxuICByZXR1cm4gdGVybXNBcnJheTtcbn1cbiJdLCJuYW1lcyI6WyJ0ZXJtc0Zyb21Ob2RlcyIsIm5vZGVzIiwiY29udGV4dCIsIlRlcm1zIiwiZWxlbWVudHMiLCJ0ZXJtc0FycmF5IiwidGVybXNBcnJheUZyb21Ob2RlcyIsInRlcm1zU3RyaW5nIiwidGVybXNTdHJpbmdGcm9tVGVybXNBcnJheSIsInN0cmluZyIsImFycmF5Iiwibm9kZSIsImJyZWFrUG9pbnQiLCJ0ZXJtcyIsIm1hcCIsInRlcm0iLCJ0ZXJtRnJvbU5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9nQkE7OztlQUFBQTs7O2lFQUxLO3NCQUVRO3dCQUNhOzs7Ozs7QUFFbkMsU0FBU0EsZUFBZUMsS0FBSyxFQUFFQyxPQUFPO0lBQzNDLE1BQU0sRUFBRUMsS0FBSyxFQUFFLEdBQUdDLGlCQUFRLEVBQ3BCQyxhQUFhQyxvQkFBb0JMLE9BQU9DLFVBQ3hDSyxjQUFjQyxJQUFBQSxpQ0FBeUIsRUFBQ0gsYUFDeENJLFNBQVNGLGFBQ1RHLFFBQVFMLFlBQ1JNLE9BQU8sTUFDUEMsYUFBYTtJQUVuQlYsVUFBVTtJQUVWLE1BQU1XLFFBQVEsSUFBSVYsTUFBTUQsU0FBU08sUUFBUUUsTUFBTUMsWUFBWUY7SUFFM0QsT0FBT0c7QUFDVDtBQUVBLFNBQVNQLG9CQUFvQkwsS0FBSyxFQUFFQyxPQUFPO0lBQ3pDLE1BQU1HLGFBQWFKLE1BQU1hLEdBQUcsQ0FBQyxDQUFDSDtRQUM1QixNQUFNSSxPQUFPQyxJQUFBQSxrQkFBWSxFQUFDTCxNQUFNVDtRQUVoQyxPQUFPYTtJQUNUO0lBRUEsT0FBT1Y7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdGVybXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBlbGVtZW50cyBmcm9tIFwiLi4vZWxlbWVudHNcIjtcblxuaW1wb3J0IHsgdGVybUZyb21Ob21pbmFsVmFsdWUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3Rlcm1cIjtcbmltcG9ydCB7IHRlcm1zU3RyaW5nRnJvbVRlcm1zQXJyYXkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5leHBvcnQgZnVuY3Rpb24gdGVybXNGcm9tTm9taW5hbFZhbHVlcyhub21pbmFsVmFsdWVzKSB7XG4gIGNvbnN0IHsgVGVybXMgfSA9IGVsZW1lbnRzLFxuICAgICAgICB0ZXJtc0FycmF5ID0gdGVybXNBcnJheUZyb21Ob21pbmFsVmFsdWVzKG5vbWluYWxWYWx1ZXMpLFxuICAgICAgICB0ZXJtc1N0cmluZyA9IHRlcm1zU3RyaW5nRnJvbVRlcm1zQXJyYXkodGVybXNBcnJheSksXG4gICAgICAgIHN0cmluZyA9IHRlcm1zU3RyaW5nLCAvLy9cbiAgICAgICAgYXJyYXkgPSB0ZXJtc0FycmF5LCAgLy8vXG4gICAgICAgIG5vZGUgPSBudWxsLFxuICAgICAgICBicmVha1BvaW50ID0gbnVsbCxcbiAgICAgICAgY29udGV4dCA9IG51bGwsXG4gICAgICAgIHRlcm1zID0gbmV3IFRlcm1zKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCwgYXJyYXkpO1xuXG4gIHJldHVybiB0ZXJtcztcbn1cblxuZnVuY3Rpb24gdGVybXNBcnJheUZyb21Ob21pbmFsVmFsdWVzKG5vbWluYWxWYWx1ZXMpIHtcbiAgY29uc3QgdGVybXNBcnJheSA9IG5vbWluYWxWYWx1ZXMubWFwKChub21pbmFsVmFsdWUpID0+IHtcbiAgICBjb25zdCB0ZXJtID0gdGVybUZyb21Ob21pbmFsVmFsdWUobm9taW5hbFZhbHVlKTtcblxuICAgIHJldHVybiB0ZXJtO1xuICB9KTtcblxuICByZXR1cm4gdGVybXNBcnJheTtcbn1cbiJdLCJuYW1lcyI6WyJ0ZXJtc0Zyb21Ob21pbmFsVmFsdWVzIiwibm9taW5hbFZhbHVlcyIsIlRlcm1zIiwiZWxlbWVudHMiLCJ0ZXJtc0FycmF5IiwidGVybXNBcnJheUZyb21Ob21pbmFsVmFsdWVzIiwidGVybXNTdHJpbmciLCJ0ZXJtc1N0cmluZ0Zyb21UZXJtc0FycmF5Iiwic3RyaW5nIiwiYXJyYXkiLCJub2RlIiwiYnJlYWtQb2ludCIsImNvbnRleHQiLCJ0ZXJtcyIsIm1hcCIsIm5vbWluYWxWYWx1ZSIsInRlcm0iLCJ0ZXJtRnJvbU5vbWluYWxWYWx1ZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBT2dCQTs7O2VBQUFBOzs7aUVBTEs7c0JBRWdCO3dCQUNLOzs7Ozs7QUFFbkMsU0FBU0EsdUJBQXVCQyxhQUFhO0lBQ2xELE1BQU0sRUFBRUMsS0FBSyxFQUFFLEdBQUdDLGlCQUFRLEVBQ3BCQyxhQUFhQyw0QkFBNEJKLGdCQUN6Q0ssY0FBY0MsSUFBQUEsaUNBQXlCLEVBQUNILGFBQ3hDSSxTQUFTRixhQUNURyxRQUFRTCxZQUNSTSxPQUFPLE1BQ1BDLGFBQWEsTUFDYkMsVUFBVSxNQUNWQyxRQUFRLElBQUlYLE1BQU1VLFNBQVNKLFFBQVFFLE1BQU1DLFlBQVlGO0lBRTNELE9BQU9JO0FBQ1Q7QUFFQSxTQUFTUiw0QkFBNEJKLGFBQWE7SUFDaEQsTUFBTUcsYUFBYUgsY0FBY2EsR0FBRyxDQUFDLENBQUNDO1FBQ3BDLE1BQU1DLE9BQU9DLElBQUFBLDBCQUFvQixFQUFDRjtRQUVsQyxPQUFPQztJQUNUO0lBRUEsT0FBT1o7QUFDVCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-furtle",
   "author": "James Smith",
-  "version": "3.0.237",
+  "version": "3.0.239",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-furtle",
   "description": "Occam's Furtle language.",
@@ -28,7 +28,7 @@
     "juxtapose": "^4.0.138",
     "lively-cli": "^3.0.3",
     "occam-model": "^1.0.516",
-    "occam-nominal": "^1.0.144",
+    "occam-nominal": "^1.0.152",
     "occam-query": "^4.1.168",
     "occam-server": "^7.0.17",
     "watchful-cli": "^1.7.91"

package/src/element/assignment/array.js

@@ -6,8 +6,9 @@ import elements from "../../elements";
 import Exception from "../../exception";
 
 import { define } from "../../elements";
-import { termFromNode } from "../../utilities/term";
-import { NODE_TYPE, NODES_TYPE } from "../../types";
+import { termFromNominalValue } from "../../utilities/term";
+import { primtiveStringFromNominalValues } from "../../utilities/string";
+import { NOMINAL_VALUE_TYPE, NOMINAL_VALUES_TYPE } from "../../types";
 
 export default define(class ArrayAssigment extends Element {
   constructor(context, string, node, breakPoint, variable, parameters) {
@@ -33,23 +34,23 @@ export default define(class ArrayAssigment extends Element {
     const term = this.variable.evaluate(context),
           termType = term.getType();
 
-    if (termType !== NODES_TYPE) {
+    if (termType !== NOMINAL_VALUES_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODES_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUES_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
     }
 
     const primitiveValue = term.getPrimitiveValue(),
-          nodes = primitiveValue, ///
-          nodesLength = nodes.length,
-          parametersLength = this.parameters.getLength();
+          nominalValues = primitiveValue, ///
+          parametersLength = this.parameters.getLength(),
+          nominalValuesLength = nominalValues.length;
 
-    if (parametersLength > nodesLength) {
+    if (parametersLength > nominalValuesLength) {
       const parametersString = this.parameters.getString(),
-            nodesString = context.nodesAsString(nodex),
-            message = `The length of the '${parametersString}' parameters is greater than the length of the '${nodesString}' nodes.`,
+            primitiveString = primtiveStringFromNominalValues(nominalValues),
+            message = `The length of the '${parametersString}' parameters is greater than the length of the '${primitiveString}' nodes.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
@@ -57,8 +58,8 @@ export default define(class ArrayAssigment extends Element {
 
     this.parameters.forEachParameter((parameter, index) => {
       if (parameter !== null) {
-        const node = nodes[index],
-              term = termFromNode(node, context);
+        const nominalValue = nominalValues[index],
+              term = termFromNominalValue(nominalValue);
 
         this.evaluateParameter(parameter, term, context);
       }
@@ -75,8 +76,8 @@ export default define(class ArrayAssigment extends Element {
 
     const parameterType = parameter.getType();
 
-    if (parameterType !== NODE_TYPE) {
-      const message = `The type of the '${parameterString}' parameter should be '${NODE_TYPE}'.`,
+    if (parameterType !== NOMINAL_VALUE_TYPE) {
+      const message = `The type of the '${parameterString}' parameter should be '${NOMINAL_VALUE_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;

package/src/element/assignment/object.js

@@ -8,8 +8,9 @@ import nodeProperties from "../../nodeProperties";
 
 import { define } from "../../elements";
 import { stringLiteralFromString } from "../../utilities/stringLiteral";
-import { NODE_TYPE, NODES_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "../../types";
-import { termFromNodes, termFromBoolean, termFromStringLiteral } from "../../utilities/term";
+import { termFromNodesAndNominalValue } from "../../utilities/nominal";
+import { termFromBoolean, termFromStringLiteral } from "../../utilities/term";
+import { STRING_TYPE, BOOLEAN_TYPE, NOMINAL_VALUE_TYPE, NOMINAL_VALUES_TYPE } from "../../types";
 import { CONTENT_PARAMETER_NAME, TERMINAL_PARAMETER_NAME, CHILD_NODES_PARAMETER_NAME } from "../../parameterNames";
 
 export default define(class ObjectAssigment extends Element {
@@ -36,9 +37,9 @@ export default define(class ObjectAssigment extends Element {
     const term = this.variable.evaluate(context),
           termType = term.getType();
 
-    if (termType !== NODE_TYPE) {
+    if (termType !== NOMINAL_VALUE_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODE_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUE_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
@@ -104,7 +105,8 @@ export default define(class ObjectAssigment extends Element {
     }
 
     const primitiveValue = term.getPrimitiveValue(),
-          node = primitiveValue,  ///
+          nominalValue = primitiveValue,  ///
+          node = nominalValue.getNode(),
           nodeTerminalNode = node.isTerminalNode();
 
     if (!nodeTerminalNode) {
@@ -144,7 +146,8 @@ export default define(class ObjectAssigment extends Element {
     }
 
     const primitiveValue = term.getPrimitiveValue(),
-          node = primitiveValue,  ///
+          nominalValue = primitiveValue,  ///
+          node = nominalValue.getNode(),
           nodeTerminalNode = node.isTerminalNode(),
           terminal = nodeTerminalNode;  ///
 
@@ -165,16 +168,17 @@ export default define(class ObjectAssigment extends Element {
 
     context.trace(`Evaluating the child nodes '${namedParameterString}' named parameter...`);
 
-    if (type !== NODES_TYPE) {
+    if (type !== NOMINAL_VALUES_TYPE) {
       const namedParameterString = namedParameter.getString(),
-            message = `The '${namedParameterString}' named parameter's type should be '${NODES_TYPE}'.`,
+            message = `The '${namedParameterString}' named parameter's type should be '${NOMINAL_VALUES_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
     }
 
     const primitiveValue = term.getPrimitiveValue(),
-          node = primitiveValue,  ///
+          nominalValue = primitiveValue,  ///
+          node = nominalValue.getNode(),
           nodeNonTerminalNode = node.isNonTerminalNode();
 
     if (!nodeNonTerminalNode) {
@@ -189,7 +193,7 @@ export default define(class ObjectAssigment extends Element {
           childNodes = nonTerminalNode.getChildNodes(),
           nodes = childNodes;  ///
 
-    term = termFromNodes(nodes, context);
+    term = termFromNodesAndNominalValue(nodes, nominalValue);
 
     const termSttring = term.getString();
 

package/src/element/every.js

@@ -6,8 +6,8 @@ import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
 import { termFromNode, termFromBoolean } from "../utilities/term";
+import { BOOLEAN_TYPE, NOMINAL_VALUES_TYPE } from "../types";
 
 const { asyncEvery } = asynchronousUtilities;
 
@@ -41,9 +41,9 @@ export default define(class Every extends Element {
 
     const termType = term.getType();
 
-    if (termType !== NODES_TYPE) {
+    if (termType !== NOMINAL_VALUES_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODES_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUES_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;

package/src/element/nodeQuery.js

@@ -6,8 +6,8 @@ import { arrayUtilities } from "necessary";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { NODE_TYPE } from "../types";
-import { termFromNode } from "../utilities/term";
+import { NOMINAL_VALUE_TYPE } from "../types";
+import { termFromNodeAndNominalValue } from "../utilities/nominal";
 
 const { first } = arrayUtilities;
 
@@ -45,9 +45,9 @@ export default define(class NodeQuery extends Element {
 
     const termType = term.getType();
 
-    if (termType !== NODE_TYPE) {
+    if (termType !== NOMINAL_VALUE_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODE_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUE_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
@@ -55,9 +55,10 @@ export default define(class NodeQuery extends Element {
 
     let node;
 
-    const primitiveValue = term.getPrimitiveValue();
+    const primitiveValue = term.getPrimitiveValue(),
+          nominalValue = primitiveValue;  ///
 
-    node = primitiveValue;  ///
+    node = nominalValue.getNode();
 
     if (node === null) {
       const termString = term.getString(),
@@ -77,11 +78,12 @@ export default define(class NodeQuery extends Element {
       throw exception;
     }
 
+
     const firstNode = first(nodes);
 
-    node = firstNode; ///
+    node = firstNode ///
 
-    term = termFromNode(node, context);
+    term = termFromNodeAndNominalValue(node, nominalValue);
 
     const termString = term.getString();
 

package/src/element/nodesQuery.js

@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { NODE_TYPE } from "../types";
-import { termFromNodes } from "../utilities/term";
+import { NOMINAL_VALUE_TYPE } from "../types";
+import { termFromNodesAndNominalValue } from "../utilities/nominal";
 
 export default define(class NodesQuery extends Element {
   constructor(context, string, node, breakPoint, variable, query) {
@@ -42,9 +42,9 @@ export default define(class NodesQuery extends Element {
 
     const termType = term.getType();
 
-    if (termType !== NODE_TYPE) {
+    if (termType !== NOMINAL_VALUE_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODE_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUE_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
@@ -52,9 +52,10 @@ export default define(class NodesQuery extends Element {
 
     let node;
 
-    const primitiveValue = term.getPrimitiveValue();
+    const primitiveValue = term.getPrimitiveValue(),
+          nominalValue = primitiveValue;  ///
 
-    node = primitiveValue;  ///
+    node = nominalValue.getNode();
 
     if (node === null) {
       const termString = term.getString(),
@@ -66,7 +67,7 @@ export default define(class NodesQuery extends Element {
 
     const nodes = this.query.execute(node);
 
-    term = termFromNodes(nodes, context);
+    term = termFromNodesAndNominalValue(nodes, nominalValue);
 
     const termString = term.getString();
 

package/src/element/primitive.js

@@ -4,10 +4,9 @@ import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
 
 import elements from "../elements";
-import nullNode from "../nullNode";
 
 import { define } from "../elements";
-import { NODE_TYPE, NODES_TYPE, STRING_TYPE, NUMBER_TYPE, BOOLEAN_TYPE  } from "../types";
+import { STRING_TYPE, NUMBER_TYPE, BOOLEAN_TYPE, NOMINAL_VALUE_TYPE, NOMINAL_VALUES_TYPE } from "../types";
 
 const { match } = arrayUtilities;
 
@@ -44,30 +43,6 @@ export default define(class Primitive extends Element {
       const value = primitive.getValue();
 
       switch (type) {
-        case NODE_TYPE: {
-          const nodeA = this.value, ///
-                nodeB = value,  ///
-                nodeMatches = matchNode(nodeA, nodeB);
-
-          if (nodeMatches) {
-            equalTo = true;
-          }
-
-          break;
-        }
-
-        case NODES_TYPE: {
-          const nodesA = this.value, ///
-                nodesB = value,  ///
-                nodesMatch = matchNodes(nodesA, nodesB);
-
-          if (nodesMatch) {
-            equalTo = true;
-          }
-
-          break;
-        }
-
         case STRING_TYPE: {
           const stringLiteralA = this.value, ///
                 stringLiteralB = value;  ///
@@ -100,41 +75,42 @@ export default define(class Primitive extends Element {
 
           break;
         }
-      }
-    }
 
-    return equalTo;
-  }
+        case NOMINAL_VALUE_TYPE: {
+          const nominalValueA = this.value, ///
+                nomimalValueB = value,  ///
+                matches = nominalValueA.match(nomimalValueB);
 
-  static name = "Primitive";
-});
+          if (matches) {
+            equalTo = true;
+          }
 
-function matchNode(nodeA, nodeB) {
-  let nodeMatches;
+          break;
+        }
 
-  if ((nodeA === nullNode) || (nodeB === nullNode)) {
-    nodeMatches = (nodeA === nodeB);
-  } else if (nodeA === nullNode) {
-    nodeMatches = false;
-  } else if (nodeB === nullNode) {
-    nodeMatches = false;
-  } else {
-    const nodeAMatchesNodeB = nodeA.match(nodeB);
+        case NOMINAL_VALUES_TYPE: {
+          const nominalValuesA = this.value, ///
+                nominalValuesB = value,  ///
+                matches = match(nominalValuesA, nominalValuesB, (nominalValueA, nomimalValueB) => {
+                  const matches = nominalValueA.match(nomimalValueB);
 
-    nodeMatches = nodeAMatchesNodeB;  ///
-  }
+                  if (matches) {
+                    return true;
+                  }
+                });
 
-  return nodeMatches;
-}
+          if (matches) {
+            equalTo = true;
+          }
 
-function matchNodes(nodesA, nodesB) {
-  const nodesMatch = match(nodesA, nodesB, (nodeA, nodeB) => {
-    const nodeMatches = matchNode(nodeA, nodeB);
+          break;
+        }
 
-    if (nodeMatches) {
-      return true;
+      }
     }
-  });
 
-  return nodesMatch;
-}
+    return equalTo;
+  }
+
+  static name = "Primitive";
+});

package/src/element/procedure.js

@@ -7,7 +7,7 @@ import Exception from "../exception";
 
 import { define } from "../elements";
 import { BOOLEAN_TYPE } from "../types";
-import { termsFromNodes } from "../utilities/terms";
+import { termsFromNominalValues } from "../utilities/terms";
 
 export default define(class Procedure extends Element {
   constructor(context, string, node, breakPoint, type, label, parameters, returnBlock) {
@@ -74,14 +74,16 @@ export default define(class Procedure extends Element {
     return term;
   }
 
-  async callNominally(nodes, context) {
+  async callNominally(nominalValues) {
+    const context = this.getContext();
+
     await this.break(context);
 
     const procedureString = this.getString();  ///
 
     context.trace(`Calling the '${procedureString}' procedure nominally...`);
 
-    const terms = termsFromNodes(nodes, context),
+    const terms = termsFromNominalValues(nominalValues),
           term = await this.call(terms, context);
 
     context.debug(`...called the '${procedureString}' procedure nominally.`);

package/src/element/reduce.js

@@ -6,8 +6,8 @@ import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { NODES_TYPE } from "../types";
 import { termFromNode } from "../utilities/term";
+import { NOMINAL_VALUES_TYPE } from "../types";
 
 const { asyncReduce } = asynchronousUtilities;
 
@@ -45,9 +45,9 @@ export default define(class Reduce extends Element {
 
     const termType = term.getType();
 
-    if (termType !== NODES_TYPE) {
+    if (termType !== NOMINAL_VALUES_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODES_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUES_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;

package/src/element/some.js

@@ -6,8 +6,8 @@ import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
-import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
-import { termFromNode, termFromBoolean } from "../utilities/term";
+import { BOOLEAN_TYPE, NOMINAL_VALUES_TYPE } from "../types";
+import { termFromBoolean, termFromNominalValue } from "../utilities/term";
 
 const { asyncSome } = asynchronousUtilities;
 
@@ -40,20 +40,20 @@ export default define(class Some extends Element {
 
     const termType = term.getType();
 
-    if (termType !== NODES_TYPE) {
+    if (termType !== NOMINAL_VALUES_TYPE) {
       const termString = term.getString(),
-            message = `The '${termString}' term's '${termType}' type should be '${NODES_TYPE}'.`,
+            message = `The '${termString}' term's '${termType}' type should be '${NOMINAL_VALUES_TYPE}'.`,
             exception = Exception.fromMessage(message);
 
       throw exception;
     }
 
     const primitiveValue = term.getPrimitiveValue(),
-          nodes = primitiveValue, ///
-          boolean = await asyncSome(nodes, async (node) => {
+          nominalValues = primitiveValue, ///
+          boolean = await asyncSome(nominalValues, async (nominalValue) => {
             let term;
 
-            term = termFromNode(node, context);
+            term = termFromNominalValue(nominalValue);
 
             const { Terms } = elements,
                   terms = Terms.fromTerm(term, context);