eyeprolog 1.3.90 → 1.3.91

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.90",
+  "version": "1.3.91",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/src/iso.js

@@ -224,12 +224,40 @@ function difConstraint(left, right) {
       })) return true;
       return identical(left, right, probe);
     },
-    residualGoal() {
-      return compound('dif', [left, right]);
+    residualGoal(env) {
+      const [projectedLeft, projectedRight] = projectDifSubterms(left, right, env);
+      return compound('dif', [projectedLeft, projectedRight]);
     },
   });
 }
 
+function projectDifSubterms(left, right, env) {
+  left = deref(left, env);
+  right = deref(right, env);
+  while (left.type === COMPOUND && right.type === COMPOUND &&
+      left.name === right.name && left.arity === right.arity) {
+    let projectedIndex = -1;
+    for (let index = 0; index < left.arity; index++) {
+      if (identical(left.args[index], right.args[index], env)) continue;
+      const probe = env.clone();
+      if (unify(left.args[index], right.args[index], probe, {
+        skipVariableConstraints: true,
+        skipAttributeHooks: true,
+      }) && identical(left, right, probe)) {
+        projectedIndex = index;
+        break;
+      }
+    }
+    // If no single aligned subterm equality entails equality of the complete
+    // compounds, their disequality is a genuine disjunction. Keep it whole
+    // instead of inventing auxiliary terms or separate stronger constraints.
+    if (projectedIndex === -1) return [left, right];
+    left = deref(left.args[projectedIndex], env);
+    right = deref(right.args[projectedIndex], env);
+  }
+  return [left, right];
+}
+
 function* difBuiltin({ goal, env }) {
   const left = goal.args[0];
   const right = goal.args[1];

package/test/run-regression.mjs

@@ -340,8 +340,8 @@ function regressionCases() {
         });
         assertEqual(residuals.status, 0, 'dif/2 residual display status');
         assertEqual(residuals.stdout,
-          '?-    C = z, D = z, dif(A-z, B-z).\n' +
-          '?-    A = [[]], B = [], dif([[]], [C]).\n' +
+          '?-    C = z, D = z, dif(A, B).\n' +
+          '?-    A = [[]], B = [], dif([], C).\n' +
           '?-    X = Y.\n' +
           '?- ',
           'dif/2 residual constraints are retained and discharged');
@@ -374,6 +374,12 @@ function regressionCases() {
             'dif(X-Y,Z-Z),dif(X,Y).\n' +
             'dif(X,a),dif(X,b).\n' +
             'dif(X,a),dif(Y,a),X=Y.\n' +
+            'dif(-X,-Y).\n' +
+            'dif(X,Y),X+Y= -XA+ -YA.\n' +
+            'dif(f(X,a),f(Y,a)).\n' +
+            'dif(f(X,X),f(Y,Y)).\n' +
+            'dif(f(X,Y),f(Y,X)).\n' +
+            'dif(f(X,A),f(Y,B)).\n' +
             'halt.\n',
         });
         assertEqual(residuals.status, 0, 'dif/2 normalization display status');
@@ -383,8 +389,14 @@ function regressionCases() {
           '?-    dif(X, Y).\n' +
           '?-    dif(X, a), dif(X, b).\n' +
           '?-    X = Y, dif(Y, a).\n' +
+          '?-    dif(X, Y).\n' +
+          '?-    X = -XA, Y = -YA, dif(XA, YA).\n' +
+          '?-    dif(X, Y).\n' +
+          '?-    dif(X, Y).\n' +
+          '?-    dif(X, Y).\n' +
+          '?-    dif(f(X, A), f(Y, B)).\n' +
           '?- ',
-          'dif/2 residuals are minimal independent of insertion order');
+          'dif/2 residuals are minimal without auxiliary terms');
         assertEqual(residuals.stderr, '', 'dif/2 normalization display stderr');
 
         const pendingDifCount = (text) => {