eyeprolog 1.5.44 → 1.5.45

package/package.json

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

package/src/iso.js

@@ -2688,7 +2688,7 @@ function validateControlCallable(term, culprit, env) {
       // eagerly and reports the whole control term as the culprit.
       if (argument.type === VAR) continue;
       if (argument.type !== ATOM && argument.type !== COMPOUND) {
-        throw new PrologError('type_error(callable)', culprit);
+        throw new PrologError('type_error(callable)', copyResolved(culprit, env));
       }
       pending.push(argument);
     }

package/test/run-iso-strict.mjs

@@ -72,6 +72,29 @@ export function runIsoStrict(reporter = new TestReporter()) {
       'type_error(float)', 'negative integer exponent correction');
   });
 
+  reporter.test('round-trips ISO floats through number_chars/2 and quoted write_term/2', () => {
+  for (const literal of ['1.0000000000000001', '0.10000000000000002']) {
+    const converted = run('', {
+      isoStrict: true,
+      goal: `N=${literal}, number_chars(N,Chars), number_chars(M,Chars), M == N`,
+    });
+    equal(converted.stats.completed_goal_lists, 1, `number_chars/2 float round-trip ${literal}`);
+
+    let written = '';
+    run('', {
+      isoStrict: true,
+      goal: `write_term(${literal},[quoted(true)])`,
+      ioOptions: { write: (text) => { written += text; } },
+    });
+    const reread = run('', {
+      isoStrict: true,
+      goal: `read_term(X,[]), X == ${literal}`,
+      ioOptions: { input: `${written}.` },
+    });
+    equal(reread.stats.completed_goal_lists, 1, `quoted write_term/2 float round-trip ${literal}`);
+  }
+});
+
   reporter.test('keeps Corrigendum 2 core predicates and excludes Part 3 phrase', () => {
     const registry = createStrictIsoRegistry();
     equal(Boolean(registry.get('subsumes_term', 2)), true, 'subsumes_term/2');
@@ -1250,6 +1273,16 @@ export function runIsoStrict(reporter = new TestReporter()) {
       'if-then-else commits after a successful condition');
     equal(capture(() => run('', { isoStrict: true, goal: 'call((write(a),3))' })).formal,
       'type_error(callable)', 'nested non-callable control term is rejected');
+    let issue93Output = '';
+    const issue93Error = capture(() => run('', {
+      isoStrict: true,
+      goal: 'X=3,Y=(write(X),X),call(Y)',
+      ioOptions: { write: (chunk) => { issue93Output += chunk; } },
+    }));
+    equal(issue93Error.formal, 'type_error(callable)', 'issue #93 raises the ISO callability error');
+    equal(issue93Error.message, 'error(type_error(callable), (write(3), 3))',
+      'issue #93 reports the fully instantiated control-term culprit');
+    equal(issue93Output, '', 'issue #93 validates the complete body before executing write/1');
     equal(run('', {
       isoStrict: true,
       goal: 'catch(X,error(instantiation_error,_),true)',

package/test/run-regression.mjs

@@ -1618,6 +1618,20 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'call/1 reports the instantiated complete control-term culprit (issue #93)',
+      run: () => {
+        const result = runCli([], {
+          input: 'X = 3, Y = (write(X), X), call(Y).\nhalt.\n',
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout,
+          '?-    error(type_error(callable, (write(3), 3)), eyeprolog).\n' +
+          '?- ',
+          'fully instantiated call/1 culprit');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'number_chars and number_codes keep exponent floats syntactically readable (issue #50)',
       run: () => {