eyeprolog 1.2.32 → 1.2.33

package/package.json

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

package/src/lib/clpz.pl

@@ -7,22 +7,24 @@
     constraints will be added as their propagation semantics become available.
 */
 
+% Current operator names in predicate indicators are parenthesized as bare
+% atoms (for example, (#>)/2); quoting is unnecessary.
 :- module(clpz, [
-    ('#>')/2,
-    ('#<')/2,
-    ('#>=')/2,
-    ('#=<')/2,
-    ('#=')/2,
-    ('#\\=')/2,
-    (#\\)/1,
-    ('#<==>')/2,
-    ('#==>')/2,
-    ('#<==')/2,
-    ('#\\/')/2,
-    (#\\)/2,
-    ('#/\\')/2,
-    ('in')/2,
-    ('ins')/2,
+    (#>)/2,
+    (#<)/2,
+    (#>=)/2,
+    (#=<)/2,
+    (#=)/2,
+    (#\=)/2,
+    (#\)/1,
+    (#<==>)/2,
+    (#==>)/2,
+    (#<==)/2,
+    (#\/)/2,
+    (#\)/2,
+    (#/\)/2,
+    (in)/2,
+    (ins)/2,
     all_different/1,
     all_distinct/1,
     nvalue/2,
@@ -50,33 +52,33 @@
 :- op(760, yfx, #<==>).
 :- op(750, xfy, #==>).
 :- op(750, yfx, #<==).
-:- op(740, yfx, #\\/).
-:- op(730, yfx, #\\).
-:- op(720, yfx, #/\\).
-:- op(710, fy, #\\).
+:- op(740, yfx, #\/).
+:- op(730, yfx, #\).
+:- op(720, yfx, #/\).
+:- op(710, fy, #\).
 :- op(700, xfx, #>).
 :- op(700, xfx, #<).
 :- op(700, xfx, #>=).
 :- op(700, xfx, #=<).
 :- op(700, xfx, #=).
-:- op(700, xfx, #\\=).
+:- op(700, xfx, #\=).
 :- op(700, xfx, in).
 :- op(700, xfx, ins).
 :- op(450, xfx, ..).
 
-'#>'(Left, Right) :- eyeprolog__clpz_post('#>'(Left, Right)).
-'#<'(Left, Right) :- eyeprolog__clpz_post('#<'(Left, Right)).
-'#>='(Left, Right) :- eyeprolog__clpz_post('#>='(Left, Right)).
-'#=<'(Left, Right) :- eyeprolog__clpz_post('#=<'(Left, Right)).
-'#='(Left, Right) :- eyeprolog__clpz_post('#='(Left, Right)).
-'#\\='(Left, Right) :- eyeprolog__clpz_post('#\\='(Left, Right)).
-'#\\'(Constraint) :- eyeprolog__clpz_post('#\\'(Constraint)).
-'#<==>'(Left, Right) :- eyeprolog__clpz_post('#<==>'(Left, Right)).
-'#==>'(Left, Right) :- eyeprolog__clpz_post('#==>'(Left, Right)).
-'#<=='(Left, Right) :- eyeprolog__clpz_post('#<=='(Left, Right)).
-'#\\/'(Left, Right) :- eyeprolog__clpz_post('#\\/'(Left, Right)).
-'#\\'(Left, Right) :- eyeprolog__clpz_post('#\\'(Left, Right)).
-'#/\\'(Left, Right) :- eyeprolog__clpz_post('#/\\'(Left, Right)).
+#>(Left, Right) :- eyeprolog__clpz_post(#>(Left, Right)).
+#<(Left, Right) :- eyeprolog__clpz_post(#<(Left, Right)).
+#>=(Left, Right) :- eyeprolog__clpz_post(#>=(Left, Right)).
+#=<(Left, Right) :- eyeprolog__clpz_post(#=<(Left, Right)).
+#=(Left, Right) :- eyeprolog__clpz_post(#=(Left, Right)).
+#\=(Left, Right) :- eyeprolog__clpz_post(#\=(Left, Right)).
+#\(Constraint) :- eyeprolog__clpz_post(#\(Constraint)).
+#<==>(Left, Right) :- eyeprolog__clpz_post(#<==>(Left, Right)).
+#==>(Left, Right) :- eyeprolog__clpz_post(#==>(Left, Right)).
+#<==(Left, Right) :- eyeprolog__clpz_post(#<==(Left, Right)).
+#\/(Left, Right) :- eyeprolog__clpz_post(#\/(Left, Right)).
+#\(Left, Right) :- eyeprolog__clpz_post(#\(Left, Right)).
+#/\(Left, Right) :- eyeprolog__clpz_post(#/\(Left, Right)).
 
 in(Integer, Domain) :- eyeprolog__clpz_in(Integer, Domain).
 ins(Integers, Domain) :- eyeprolog__clpz_ins(Integers, Domain).

package/test/run-regression.mjs

@@ -40,6 +40,7 @@ import {
 } from '../src/index.js';
 import { parseGoalText, parseNumberTokenText } from '../src/parser.js';
 import { compareTerms } from '../src/term.js';
+import { formatTermForWrite } from '../src/write.js';
 import { selectClauseCandidates } from '../src/program.js';
 import { TestReporter, isMainModule } from './test-style.mjs';
 import { buildConformanceReport, formatConformanceReport } from './run-conformance-report.mjs';
@@ -730,6 +731,36 @@ c4 ?- call((!;1)).
         assertIncludes(caught.message, 'operator atom', 'syntax rejection');
       },
     },
+    {
+      name: 'CLP(Z) operator declarations avoid unnecessary quoted atoms',
+      run: () => {
+        const filename = path.join(packageRoot, 'src', 'lib', 'clpz.pl');
+        const source = fs.readFileSync(filename, 'utf8');
+        for (const name of ['#>', '#<', '#>=', '#=<', '#=', '#\\=', '#<==>', '#==>', '#<==', '#\\/', '#/\\']) {
+          assertIncludes(source, `(${name})/2`, `${name}/2 export is parenthesized`);
+          assertNotIncludes(source, `('${name}')/2`, `${name}/2 export is not quoted`);
+          assertNotIncludes(source, `'${name}'(`, `${name} functional notation is not quoted`);
+        }
+        assertIncludes(source, '(#\\)/1', '#\\/1 export is parenthesized');
+        assertIncludes(source, '(#\\)/2', '#\\/2 export is parenthesized');
+        assertIncludes(source, '(in)/2', 'in/2 export is parenthesized');
+        assertIncludes(source, '(ins)/2', 'ins/2 export is parenthesized');
+        assertNotIncludes(source, "('in')/2", 'in/2 export is not quoted');
+        assertNotIncludes(source, "('ins')/2", 'ins/2 export is not quoted');
+
+        const canonicalOptions = { quoted: true, ignoreOps: true, compact: true, operators: [] };
+        assertEqual(
+          formatTermForWrite(compound('#>', [atom('a'), atom('b')]), new Env(), canonicalOptions),
+          '#>(a,b)',
+          'canonical #> functor has no quotes',
+        );
+        assertEqual(
+          formatTermForWrite(compound('#\\=', [atom('a'), atom('b')]), new Env(), canonicalOptions),
+          '#\\=(a,b)',
+          'canonical #\\= functor has no quotes',
+        );
+      },
+    },
     {
       name: 'layout distinguishes prefix notation from functional notation',
       run: () => {