eyeling 1.19.3 → 1.19.4

package/eyeling.js

@@ -2576,6 +2576,24 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
 
   // math:absoluteValue
   if (pv === MATH_NS + 'absoluteValue') {
+    const ai = parseIntLiteral(g.s);
+    if (ai !== null) {
+      const outVal = ai < 0n ? -ai : ai;
+      const lit = makeNumericOutputLiteral(outVal, XSD_INTEGER_DT);
+
+      if (g.o instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.o.name] = lit;
+        return [s2];
+      }
+      if (g.o instanceof Blank) return [{ ...subst }];
+
+      const oi = parseIntLiteral(g.o);
+      if (oi !== null && oi === outVal) return [{ ...subst }];
+      if (numEqualTerm(g.o, Number(outVal))) return [{ ...subst }];
+      return [];
+    }
+
     const a = parseNum(g.s);
     if (a === null) return [];
 
@@ -2648,6 +2666,38 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
 
   // math:negation (inverse is itself)
   if (pv === MATH_NS + 'negation') {
+    const si = parseIntLiteral(g.s);
+    if (si !== null) {
+      const outVal = -si;
+      const lit = makeNumericOutputLiteral(outVal, XSD_INTEGER_DT);
+      if (g.o instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.o.name] = lit;
+        return [s2];
+      }
+      if (g.o instanceof Blank) return [{ ...subst }];
+      const oi = parseIntLiteral(g.o);
+      if (oi !== null && oi === outVal) return [{ ...subst }];
+      if (numEqualTerm(g.o, Number(outVal))) return [{ ...subst }];
+      return [];
+    }
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      const inVal = -oi;
+      const lit = makeNumericOutputLiteral(inVal, XSD_INTEGER_DT);
+      if (g.s instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.s.name] = lit;
+        return [s2];
+      }
+      if (g.s instanceof Blank) return [{ ...subst }];
+      const si2 = parseIntLiteral(g.s);
+      if (si2 !== null && si2 === inVal) return [{ ...subst }];
+      if (numEqualTerm(g.s, Number(inVal))) return [{ ...subst }];
+      return [];
+    }
+
     const neg = (x) => -x;
     return evalUnaryMathRel(g, subst, neg, neg);
   }
@@ -2706,6 +2756,25 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
   // Schema: $s+ math:rounded $o-
   // Note: spec says $o is xsd:integer, but we also accept any numeric $o that equals the rounded value.
   if (pv === MATH_NS + 'rounded') {
+    const ai = parseIntLiteral(g.s);
+    if (ai !== null) {
+      const lit = makeNumericOutputLiteral(ai, XSD_INTEGER_DT);
+
+      if (g.o instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.o.name] = lit;
+        return [s2];
+      }
+      if (g.o instanceof Blank) return [{ ...subst }];
+
+      const oi = parseIntLiteral(g.o);
+      if (oi !== null && oi === ai) return [{ ...subst }];
+      if (numEqualTerm(g.o, Number(ai))) return [{ ...subst }];
+
+      const s2 = unifyTerm(g.o, lit, subst);
+      return s2 !== null ? [s2] : [];
+    }
+
     const a = parseNum(g.s);
     if (a === null) return [];
     if (Number.isNaN(a)) return [];

package/lib/builtins.js

@@ -2096,6 +2096,24 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
 
   // math:absoluteValue
   if (pv === MATH_NS + 'absoluteValue') {
+    const ai = parseIntLiteral(g.s);
+    if (ai !== null) {
+      const outVal = ai < 0n ? -ai : ai;
+      const lit = makeNumericOutputLiteral(outVal, XSD_INTEGER_DT);
+
+      if (g.o instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.o.name] = lit;
+        return [s2];
+      }
+      if (g.o instanceof Blank) return [{ ...subst }];
+
+      const oi = parseIntLiteral(g.o);
+      if (oi !== null && oi === outVal) return [{ ...subst }];
+      if (numEqualTerm(g.o, Number(outVal))) return [{ ...subst }];
+      return [];
+    }
+
     const a = parseNum(g.s);
     if (a === null) return [];
 
@@ -2168,6 +2186,38 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
 
   // math:negation (inverse is itself)
   if (pv === MATH_NS + 'negation') {
+    const si = parseIntLiteral(g.s);
+    if (si !== null) {
+      const outVal = -si;
+      const lit = makeNumericOutputLiteral(outVal, XSD_INTEGER_DT);
+      if (g.o instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.o.name] = lit;
+        return [s2];
+      }
+      if (g.o instanceof Blank) return [{ ...subst }];
+      const oi = parseIntLiteral(g.o);
+      if (oi !== null && oi === outVal) return [{ ...subst }];
+      if (numEqualTerm(g.o, Number(outVal))) return [{ ...subst }];
+      return [];
+    }
+
+    const oi = parseIntLiteral(g.o);
+    if (oi !== null) {
+      const inVal = -oi;
+      const lit = makeNumericOutputLiteral(inVal, XSD_INTEGER_DT);
+      if (g.s instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.s.name] = lit;
+        return [s2];
+      }
+      if (g.s instanceof Blank) return [{ ...subst }];
+      const si2 = parseIntLiteral(g.s);
+      if (si2 !== null && si2 === inVal) return [{ ...subst }];
+      if (numEqualTerm(g.s, Number(inVal))) return [{ ...subst }];
+      return [];
+    }
+
     const neg = (x) => -x;
     return evalUnaryMathRel(g, subst, neg, neg);
   }
@@ -2226,6 +2276,25 @@ function evalBuiltin(goal, subst, facts, backRules, depth, varGen, maxResults) {
   // Schema: $s+ math:rounded $o-
   // Note: spec says $o is xsd:integer, but we also accept any numeric $o that equals the rounded value.
   if (pv === MATH_NS + 'rounded') {
+    const ai = parseIntLiteral(g.s);
+    if (ai !== null) {
+      const lit = makeNumericOutputLiteral(ai, XSD_INTEGER_DT);
+
+      if (g.o instanceof Var) {
+        const s2 = { ...subst };
+        s2[g.o.name] = lit;
+        return [s2];
+      }
+      if (g.o instanceof Blank) return [{ ...subst }];
+
+      const oi = parseIntLiteral(g.o);
+      if (oi !== null && oi === ai) return [{ ...subst }];
+      if (numEqualTerm(g.o, Number(ai))) return [{ ...subst }];
+
+      const s2 = unifyTerm(g.o, lit, subst);
+      return s2 !== null ? [s2] : [];
+    }
+
     const a = parseNum(g.s);
     if (a === null) return [];
     if (Number.isNaN(a)) return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [

package/test/api.test.js

@@ -1498,6 +1498,33 @@ _:x :hates { _:foo :making :mess }.
     ],
   },
 
+  {
+    name: '59c regression: integer-safe math absoluteValue, negation, and rounded preserve large integers',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/> .
+@prefix math: <http://www.w3.org/2000/10/swap/math#> .
+@base <http://example.org/> .
+
+{ 9999999999999999 math:absoluteValue ?X. ?X math:notEqualTo 9999999999999999. } => { :result :has :fail-abs. }.
+{ 9999999999999999 math:negation ?X. ?X math:negation ?Y. ?Y math:notEqualTo 9999999999999999. } => { :result :has :fail-neg. }.
+{ 9999999999999999 math:rounded ?X. ?X math:notEqualTo 9999999999999999. } => { :result :has :fail-round. }.
+
+{ } => {
+  :test :contains :fail-abs, :fail-neg, :fail-round.
+}.
+`,
+    expect: [
+      /:(?:test)\s+:(?:contains)\s+:(?:fail-abs)\s*\./,
+      /:(?:test)\s+:(?:contains)\s+:(?:fail-neg)\s*\./,
+      /:(?:test)\s+:(?:contains)\s+:(?:fail-round)\s*\./,
+    ],
+    notExpect: [
+      /:(?:result)\s+:(?:has)\s+:(?:fail-abs)\s*\./,
+      /:(?:result)\s+:(?:has)\s+:(?:fail-neg)\s*\./,
+      /:(?:result)\s+:(?:has)\s+:(?:fail-round)\s*\./,
+    ],
+  },
+
   {
     name: '60 regression: log:includes must match quoted triples with variable predicates',
     opt: { proofComments: false },

package/test/fixtures/builtins/bad-return.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  'http://example.org/test#bad-return': () => ({ nope: true }),
-};