eyeprolog 1.3.70 → 1.3.71

package/package.json

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

package/src/write.js

@@ -86,7 +86,12 @@ function isWordOperatorToken(token) {
 
 function compactPrefixOperator(token, argument) {
   if (isWordOperatorToken(token)) return `${token} ${argument}`;
-  return `${token}${compactBoundaryNeedsSpace(token, argument) ? ' ' : ''}${argument}`;
+  // Without layout, `op(...)` is functional notation rather than prefix-operator
+  // notation. ISO 7.10.5 h requires operator-form output and layout whenever
+  // ambiguity could otherwise arise, so a parenthesized prefix argument must
+  // never be glued directly to the operator token.
+  const needsLayout = argument.startsWith('(') || compactBoundaryNeedsSpace(token, argument);
+  return `${token}${needsLayout ? ' ' : ''}${argument}`;
 }
 
 function compactPostfixOperator(argument, token) {
@@ -188,28 +193,6 @@ function chooseOperator(term, table) {
   return null;
 }
 
-function startsWithUnsignedNumber(term, env, table, options) {
-  const resolved = deref(term, env);
-  if (resolved.type === NUMBER) return !resolved.name.startsWith('-');
-  if (resolved.type !== COMPOUND || isCons(resolved)) return false;
-  if (options.numbervars && resolved.name === '$VAR' && resolved.arity === 1) {
-    const index = deref(resolved.args[0], env);
-    if (index.type === NUMBER && /^\d+$/.test(index.name) &&
-        writeNumberedVariable(Number(index.name)) != null) {
-      return false;
-    }
-  }
-  const definition = chooseOperator(resolved, table);
-  if (definition == null) return false;
-  if (definition.specifier === 'xf' || definition.specifier === 'yf') {
-    return startsWithUnsignedNumber(resolved.args[0], env, table, options);
-  }
-  if (definition.specifier === 'xfx' || definition.specifier === 'xfy' || definition.specifier === 'yfx') {
-    return startsWithUnsignedNumber(resolved.args[0], env, table, options);
-  }
-  return false;
-}
-
 function printableReadVariableNames(term, env, explicit) {
   const names = new Map(explicit);
   const used = new Set(names.values());
@@ -353,13 +336,30 @@ function format(term, env, options, table, maxPriority = 1200, context = 'term')
       let text;
       if (specifier === 'fx' || specifier === 'fy') {
         const argumentPriority = specifier === 'fx' ? priority - 1 : priority;
-        // A separated `- 1` is still read as the negative number -1.  When
-        // the source term is the unary -/1 compound, parenthesize a positive
-        // numeric-leading argument so writeq/write_term remain read-back safe
-        // (WG17 #135, #183, #215, #216, and #248).
-        if (resolved.name === '-' && startsWithUnsignedNumber(resolved.args[0], env, table, options)) {
+        // Corrigendum 3 adds mandatory parentheses for prefix - when its
+        // argument is a non-negative number or is written in infix/postfix
+        // operator form (ISO 7.10.5 h 2(iii-iv)).
+        const child = deref(resolved.args[0], env);
+        const childNumbervar = options.numbervars && child.type === COMPOUND &&
+          child.name === '$VAR' && child.arity === 1 && (() => {
+            const index = deref(child.args[0], env);
+            return index.type === NUMBER && /^\d+$/.test(index.name) &&
+              writeNumberedVariable(Number(index.name)) != null;
+          })();
+        const childUsesSpecialNotation = isCons(child) ||
+          (child.type === COMPOUND && child.name === '{}' && child.arity === 1) || childNumbervar;
+        const childDefinition = childUsesSpecialNotation ? null : chooseOperator(child, table);
+        const negativeNeedsParentheses = resolved.name === '-' && (
+          (child.type === NUMBER && !child.name.startsWith('-')) ||
+          ['xf', 'yf', 'xfx', 'xfy', 'yfx'].includes(childDefinition?.specifier)
+        );
+        if (negativeNeedsParentheses) {
+          // ISO 7.10.5 h 2(iii-iv): prefix - requires parentheses around a
+          // non-negative number and around an argument written in infix or
+          // postfix operator form. Keep layout before `(` so the result is
+          // operator notation, not functional notation such as `-(...)`.
           const argument = format(resolved.args[0], env, options, table, 1200);
-          text = options.minimalOperatorSpacing ? `${token}(${argument})` : `${token} (${argument})`;
+          text = `${token} (${argument})`;
         } else {
           const argument = format(resolved.args[0], env, options, table, argumentPriority);
           text = options.minimalOperatorSpacing ? compactPrefixOperator(token, argument) : `${token} ${argument}`;

package/test/conformance/WG17-SYNTAX-STATUS.md

@@ -11,10 +11,14 @@ upstream assertion.
 
 ## Current standing
 
+The percentage below is **traceability coverage**, not a conformance pass rate.
+A represented case still has to pass the executable upstream assertion in
+`test/run-wg17.mjs`.
+
 | Measure | Count |
 | --- | ---: |
 | Active upstream cases | 366 |
-| Executable EyeProlog dispositions | 366 (100.0%) |
+| Upstream cases represented in the executable matrix | 366 (100.0%) |
 | Not yet traced one-by-one | 0 |
 | Deleted upstream identifiers | #20, #273 |
 

package/test/conformance/wg17-syntax-cases.json

@@ -522,7 +522,7 @@
       "query": "writeq([:-,-]).",
       "input": "writeq([:-,-]).",
       "readCount": 1,
-      "expected": "[:-,-] ³",
+      "expected": "[:-,-]",
       "outcome": {
         "type": "success",
         "stages": [
@@ -586,7 +586,7 @@
       "query": "writeq([.,.(.,.,.)]).",
       "input": "writeq([.,.(.,.,.)]).",
       "readCount": 1,
-      "expected": "['.','.'('.','.','.')] ³",
+      "expected": "['.','.'('.','.','.')]",
       "outcome": {
         "type": "success",
         "stages": [
@@ -602,7 +602,7 @@
       "query": "writeq((a :- b,c)).",
       "input": "writeq((a :- b,c)).",
       "readCount": 1,
-      "expected": "a:-b,c³",
+      "expected": "a:-b,c",
       "outcome": {
         "type": "success",
         "stages": [
@@ -618,7 +618,7 @@
       "query": "write_canonical([a]).",
       "input": "write_canonical([a]).",
       "readCount": 1,
-      "expected": "'.'(a,[])³",
+      "expected": "'.'(a,[])",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1052,7 +1052,7 @@
       "query": "(- (1)) = -(1).",
       "input": "(- (1)) = -(1).",
       "readCount": 1,
-      "expected": "succeeds°",
+      "expected": "succeeds",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1068,7 +1068,7 @@
       "query": "(- -1) = -(-1).",
       "input": "(- -1) = -(-1).",
       "readCount": 1,
-      "expected": "succeeds°",
+      "expected": "succeeds",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1084,7 +1084,7 @@
       "query": "(- 1^2) = ^(-1,2).",
       "input": "(- 1^2) = ^(-1,2).",
       "readCount": 1,
-      "expected": "succeeds°",
+      "expected": "succeeds",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1303,12 +1303,12 @@
       "query": "writeq(-(1)).",
       "input": "writeq(-(1)).",
       "readCount": 1,
-      "expected": "- (1)³",
+      "expected": "- (1)",
       "outcome": {
         "type": "success",
         "stages": [
           {
-            "output": "-(1)",
+            "output": "- (1)",
             "variables": "[]"
           }
         ]
@@ -1335,12 +1335,12 @@
       "query": "writeq(-(1^2)).",
       "input": "writeq(-(1^2)).",
       "readCount": 1,
-      "expected": "- (1^2)³",
+      "expected": "- (1^2)",
       "outcome": {
         "type": "success",
         "stages": [
           {
-            "output": "-(1^2)",
+            "output": "- (1^2)",
             "variables": "[]"
           }
         ]
@@ -1351,12 +1351,12 @@
       "query": "writeq(-(a^2)).",
       "input": "writeq(-(a^2)).",
       "readCount": 1,
-      "expected": "- (a^2)³",
+      "expected": "- (a^2)",
       "outcome": {
         "type": "success",
         "stages": [
           {
-            "output": "-a^2",
+            "output": "- (a^2)",
             "variables": "[]"
           }
         ]
@@ -1367,12 +1367,12 @@
       "query": "writeq(-((a,b))).",
       "input": "writeq(-((a,b))).",
       "readCount": 1,
-      "expected": "- (a,b)³",
+      "expected": "- (a,b)",
       "outcome": {
         "type": "success",
         "stages": [
           {
-            "output": "-(a,b)",
+            "output": "- (a,b)",
             "variables": "[]"
           }
         ]
@@ -1388,7 +1388,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "-(1*2)",
+            "output": "- (1*2)",
             "variables": "[]"
           }
         ]
@@ -1420,7 +1420,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "-(-)",
+            "output": "- (-)",
             "variables": "[]"
           }
         ]
@@ -1431,7 +1431,7 @@
       "query": "writeq(-[-]).",
       "input": "writeq(-[-]).",
       "readCount": 1,
-      "expected": "-[-] ³",
+      "expected": "-[-]",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1479,7 +1479,7 @@
       "query": "writeq(-{a}).",
       "input": "writeq(-{a}).",
       "readCount": 1,
-      "expected": "-{a}³",
+      "expected": "-{a}",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1532,7 +1532,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "- -(1)",
+            "output": "- - (1)",
             "variables": "[]"
           }
         ]
@@ -1543,7 +1543,7 @@
       "query": "op(100,yfx,~).\nwriteq(-(1~2~3)).",
       "input": "op(100,yfx,~).\nwriteq(-(1~2~3)).",
       "readCount": 2,
-      "expected": "- (1~2~3)³",
+      "expected": "- (1~2~3)",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1552,7 +1552,7 @@
             "variables": "[]"
           },
           {
-            "output": "-(1~2~3)",
+            "output": "- (1~2~3)",
             "variables": "[]"
           }
         ]
@@ -1563,7 +1563,7 @@
       "query": " /**/ writeq(- (1~2)).",
       "input": "(catch((op(100,yfx,~)), _, true) -> true ; true).\n  writeq(- (1~2)).",
       "readCount": 2,
-      "expected": "- (1~2)³",
+      "expected": "- (1~2)",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1572,7 +1572,7 @@
             "variables": "[]"
           },
           {
-            "output": "-(1~2)",
+            "output": "- (1~2)",
             "variables": "[]"
           }
         ]
@@ -1619,7 +1619,7 @@
       "query": "op(9,xf,'$VAR'), writeq(- '$VAR'(0)).",
       "input": "op(9,xf,'$VAR'), writeq(- '$VAR'(0)).",
       "readCount": 1,
-      "expected": "-A ³",
+      "expected": "-A",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1695,7 +1695,7 @@
       "query": "compound(+1).",
       "input": "compound(+1).",
       "readCount": 1,
-      "expected": "succeeds ²",
+      "expected": "succeeds",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1711,7 +1711,7 @@
       "query": "compound(+ 1).",
       "input": "compound(+ 1).",
       "readCount": 1,
-      "expected": "succeeds ²",
+      "expected": "succeeds",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1727,7 +1727,7 @@
       "query": "writeq(+1^2).",
       "input": "writeq(+1^2).",
       "readCount": 1,
-      "expected": "+1^2 ²",
+      "expected": "+1^2",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1754,7 +1754,7 @@
       "query": "writeq([+{a},+[]]).",
       "input": "writeq([+{a},+[]]).",
       "readCount": 1,
-      "expected": "[+{a},+[]] ² ³",
+      "expected": "[+{a},+[]]",
       "outcome": {
         "type": "success",
         "stages": [
@@ -1819,7 +1819,7 @@
       "query": "op(999,xfy,'|').",
       "input": "op(999,xfy,'|').",
       "readCount": 1,
-      "expected": "p._e.(c., o.,'|') ²",
+      "expected": "p._e.(c., o.,'|')",
       "outcome": {
         "type": "error",
         "formal": "permission_error(create, operator)"
@@ -1952,7 +1952,7 @@
       "query": "current_op(200,fy,+).",
       "input": "current_op(200,fy,+).",
       "readCount": 1,
-      "expected": "succeeds ²",
+      "expected": "succeeds",
       "outcome": {
         "type": "success",
         "stages": [
@@ -2984,7 +2984,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "-(a*b)",
+            "output": "- (a*b)",
             "variables": "[]"
           }
         ]
@@ -3000,7 +3000,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "\\(a*b)",
+            "output": "\\ (a*b)",
             "variables": "[]"
           }
         ]
@@ -3173,7 +3173,7 @@
       "query": "writeq('$VAR'(0)).",
       "input": "writeq('$VAR'(0)).",
       "readCount": 1,
-      "expected": "A ³",
+      "expected": "A",
       "outcome": {
         "type": "success",
         "stages": [
@@ -3738,7 +3738,7 @@
       "query": " /**/ writeq(\"a\").",
       "input": "(catch((set_prolog_flag(\n double_quotes,chars)), _, true) -> true ; true).\n  writeq(\"a\").",
       "readCount": 2,
-      "expected": "[a] ³",
+      "expected": "[a]",
       "outcome": {
         "type": "success",
         "stages": [
@@ -3885,7 +3885,7 @@
       "query": " /**/ writeq((a-->b,c|d)).",
       "input": "(catch((op(1105,xfy,'|')), _, true) -> true ; true).\n  writeq((a-->b,c|d)).",
       "readCount": 2,
-      "expected": "a-->b,c|d² ³",
+      "expected": "a-->b,c|d",
       "outcome": {
         "type": "success",
         "stages": [
@@ -3956,7 +3956,7 @@
       "query": " /**/ writeq([(a|b)]).",
       "input": "(catch((op(1105,xfy,'|')), _, true) -> true ; true).\n  writeq([(a|b)]).",
       "readCount": 2,
-      "expected": "[(a|b)] ³",
+      "expected": "[(a|b)]",
       "outcome": {
         "type": "success",
         "stages": [
@@ -4210,7 +4210,7 @@
       "query": "op(400,fx,f).\nwriteq(f/*.*/(1,2)).",
       "input": "op(400,fx,f).\nwriteq(f/*.*/(1,2)).",
       "readCount": 2,
-      "expected": "f (1,2)³",
+      "expected": "f (1,2)",
       "outcome": {
         "type": "success",
         "stages": [
@@ -4660,7 +4660,7 @@
       "query": "op(500, xfy, {}).",
       "input": "op(500, xfy, {}).",
       "readCount": 1,
-      "expected": "p._e.(c.,o.,{}) ²",
+      "expected": "p._e.(c.,o.,{})",
       "outcome": {
         "type": "error",
         "formal": "permission_error(create, operator)"
@@ -4958,7 +4958,7 @@
             "variables": "[]"
           },
           {
-            "output": "~(a=b)",
+            "output": "~ (a=b)",
             "variables": "[]"
           }
         ]
@@ -4974,7 +4974,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "\\(a=b)",
+            "output": "\\ (a=b)",
             "variables": "[]"
           }
         ]
@@ -4990,7 +4990,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "+(a=b)",
+            "output": "+ (a=b)",
             "variables": "[]"
           }
         ]
@@ -5076,7 +5076,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "+(1*2)^3",
+            "output": "+ (1*2)^3",
             "variables": "[]"
           }
         ]
@@ -5092,7 +5092,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "-((1*2)^3)",
+            "output": "- ((1*2)^3)",
             "variables": "[]"
           }
         ]

package/test/run-regression.mjs

@@ -314,6 +314,19 @@ probe :- empty_assoc(A), copy_term_nat(A, _), bb_b_put(current, ok), bb_get(curr
           goal: "catch((VN=[[]],write_term(T,[variable_names(VN)])),error(E,_),writeq(E))",
         });
         assertEqual(list.stdout, 'domain_error(write_option,variable_names([[]]))', 'list culprit');
+
+        assertEqual(run('', { isoStrict: true, goal: 'writeq(-(1^2))' }).stdout.split('writeq(')[0],
+          '- (1^2)', 'writeq negative power layout');
+        assertEqual(run('', { isoStrict: true, goal: 'writeq(-(a^2))' }).stdout.split('writeq(')[0],
+          '- (a^2)', 'writeq symbolic negative power layout');
+        assertEqual(run('', {
+          isoStrict: true,
+          goal: "write_term(-X^2,[variable_names(['X'=X])])",
+        }).stdout, '- (X^2)', 'write_term variable_names negative power layout');
+        assertEqual(run('', {
+          isoStrict: true,
+          goal: "X=1,write_term(-X^2,[variable_names(['X'=X])])",
+        }).stdout.split('1 = 1')[0], '- (1^2)', 'write_term bound variable negative power layout');
       },
     },
     {
@@ -3703,6 +3716,16 @@ function documentationSyncCases() {
         assertEqual(parsed[0].query, 'set_prolog_flag( double_quotes,chars).', 'normalized query');
       },
     },
+    {
+      name: 'WG17 upgrader removes presentation footnote markers from Codex text',
+      run: () => {
+        const rows = Array.from({ length: 120 }, (_, index) =>
+          `<tr><td>${index + 1}<td>writeq(-(1^2)).<td>- (1^2)&sup3;`).join('\n');
+        const html = `<table><tr><th>#<th>Query<th>Codex${rows}</table>`;
+        const parsed = parseWg17SyntaxTable(html);
+        assertEqual(parsed[0].expected, '- (1^2)', 'normalized Codex expectation');
+      },
+    },
     {
       name: 'WG17 upstream expectations independently validate reviewed outcomes',
       run: () => {
@@ -3719,6 +3742,22 @@ function documentationSyncCases() {
           true,
           'observable output',
         );
+        const negativePower = { id: 183, input: 'writeq(-(1^2)).' };
+        assertEqual(
+          matchesUpstreamExpectation('- (1^2)', { type: 'success', stages: [{ output: '-(1^2)', variables: '[]' }] }, negativePower),
+          false,
+          'mandatory operator/parenthesis layout is not erased',
+        );
+        assertEqual(
+          matchesUpstreamExpectation('- (a^2)', { type: 'success', stages: [{ output: '-a^2', variables: '[]' }] }, negativePower),
+          false,
+          'mandatory negative-power parentheses are not erased',
+        );
+        assertEqual(
+          matchesUpstreamExpectation('- (1^2)', { type: 'success', stages: [{ output: '- (1 ^ 2)', variables: '[]' }] }, negativePower),
+          true,
+          'non-semantic internal operator spacing remains flexible',
+        );
         const repeated = {
           id: 227, input: 'write_canonical(B+B).',
           outcome: { type: 'success', stages: [{ output: '+(_A,_A)', variables: "['B' = B]" }] },

package/test/run-wg17.mjs

@@ -140,6 +140,38 @@ function stripLayoutOutsideQuotes(text) {
   return output.replace(/\.$/, '').replace(/([eE])\+(?=\d)/g, '$1');
 }
 
+function leadingGraphicOperatorParenSignature(text) {
+  const source = presentationText(text);
+  let index = 0;
+  const operators = [];
+  while (index < source.length) {
+    const match = source.slice(index).match(/^[!#$&*+\-./<=>?@^~\\]+/);
+    if (match == null) return null;
+    operators.push(match[0]);
+    index += match[0].length;
+    const layoutStart = index;
+    while (/\s/.test(source[index] ?? '')) index++;
+    if (index === layoutStart) return null;
+    if (source[index] === '(') return operators;
+  }
+  return null;
+}
+
+function preservesLeadingOperatorParenLayout(expected, actual) {
+  const signature = leadingGraphicOperatorParenSignature(expected);
+  if (signature == null) return true;
+  const source = presentationText(actual);
+  let index = 0;
+  for (const operator of signature) {
+    if (!source.startsWith(operator, index)) return false;
+    index += operator.length;
+    const layoutStart = index;
+    while (/\s/.test(source[index] ?? '')) index++;
+    if (index === layoutStart) return false;
+  }
+  return source[index] === '(';
+}
+
 function normalizeExampleVariables(text) {
   const names = new Map();
   let next = 0;
@@ -248,6 +280,10 @@ function textExpectationMatches(expectedText, actual, item, example = false) {
       left = normalizeExampleVariables(left);
       right = normalizeExampleVariables(right);
     }
+    // Some Codex expectations intentionally carry a mandatory lexical
+    // boundary, notably Cor.3 prefix-operator cases such as `- (1^2)`. Do not
+    // erase that boundary before the semantic/layout-tolerant fallbacks below.
+    if (!preservesLeadingOperatorParenLayout(left, right)) continue;
     if (stripLayoutOutsideQuotes(left) === stripLayoutOutsideQuotes(right)) return true;
     if (termEquivalent(left, right, item)) return true;
     if (example) {

package/tools/report-wg17-syntax-coverage.mjs

@@ -99,10 +99,14 @@ upstream assertion.
 
 ## Current standing
 
+The percentage below is **traceability coverage**, not a conformance pass rate.
+A represented case still has to pass the executable upstream assertion in
+\`test/run-wg17.mjs\`.
+
 | Measure | Count |
 | --- | ---: |
 | Active upstream cases | ${activeIds.length} |
-| Executable EyeProlog dispositions | ${coveredIds.length} (${percentage}%) |
+| Upstream cases represented in the executable matrix | ${coveredIds.length} (${percentage}%) |
 | Not yet traced one-by-one | ${untracedIds.length} |
 | Deleted upstream identifiers | ${formatRanges(manifest.upstream.deletedIds)} |
 

package/tools/upgrade-wg17.mjs

@@ -16,6 +16,7 @@ const namedEntities = new Map([
   ['amp', '&'], ['lt', '<'], ['gt', '>'], ['quot', '"'], ['apos', "'"],
   ['nbsp', '\u00a0'], ['ndash', '–'], ['mdash', '—'], ['minus', '−'],
   ['hellip', '…'], ['middot', '·'], ['times', '×'], ['laquo', '«'], ['raquo', '»'],
+  ['sup2', '²'], ['sup3', '³'], ['deg', '°'],
 ]);
 
 export function decodeHtmlEntities(text) {
@@ -96,7 +97,7 @@ export function parseWg17SyntaxTable(html) {
     // They are not part of the Prolog source being specified, so normalize
     // them to ordinary spaces before snapshotting/comparing rows.
     const query = htmlCellText(cells[1]).replace(/\u00a0/g, ' ');
-    const expected = htmlCellText(cells[2]).replace(/\u00a0/g, ' ').replace(/[ \t\n]+/g, ' ').trim();
+    const expected = htmlCellText(cells[2]).replace(/\u00a0/g, ' ').replace(/[²³°]/g, '').replace(/[ \t\n]+/g, ' ').trim();
     if (query.length === 0 || expected.length === 0) continue;
     cases.push({ id, query, expected });
     seen.add(id);