eyeling 1.11.14 → 1.11.15

package/eyeling.js

@@ -1251,13 +1251,13 @@ function materializeRdfLists(triples, forwardRules, backwardRules) {
   }
 
   function rewriteTerm(t) {
+    // rdf:nil is the empty list ()
+    if (t instanceof Iri && t.value === RDF_NIL) return new ListTerm([]);
     // Replace list nodes (Blank/Iri) by their constructed ListTerm when possible
     const k = nodeKey(t);
     if (k) {
       const built = buildListForKey(k);
       if (built) return built;
-      // Also rewrite rdf:nil even if not otherwise referenced
-      if (t instanceof Iri && t.value === RDF_NIL) return new ListTerm([]);
       return t;
     }
     if (t instanceof ListTerm) {
@@ -4405,6 +4405,11 @@ const {
   collectBlankLabelsInTriples,
 } = require('./prelude');
 
+// In N3/Turtle, rdf:nil is the canonical IRI for the empty RDF list.
+// Eyeling represents list literals with ListTerm; ensure rdf:nil unifies with ().
+const RDF_NIL_IRI = RDF_NS + 'nil';
+const __EMPTY_LIST = new ListTerm([]);
+
 const { lex, N3SyntaxError } = require('./lexer');
 const { Parser } = require('./parser');
 const { liftBlankRuleVars } = require('./rules');
@@ -4718,6 +4723,10 @@ function termsEqual(a, b) {
   if (a === b) return true;
   if (!a || !b) return false;
   if (a.__tid && b.__tid && a.__tid === b.__tid) return true;
+
+  // rdf:nil is equivalent to the empty list ()
+  if (a instanceof Iri && a.value === RDF_NIL_IRI && b instanceof ListTerm && b.elems.length === 0) return true;
+  if (b instanceof Iri && b.value === RDF_NIL_IRI && a instanceof ListTerm && a.elems.length === 0) return true;
   if (a.constructor !== b.constructor) return false;
 
   if (a instanceof Iri) return a.value === b.value;
@@ -4777,6 +4786,10 @@ function termsEqualNoIntDecimal(a, b) {
   if (a === b) return true;
   if (!a || !b) return false;
   if (a.__tid && b.__tid && a.__tid === b.__tid) return true;
+
+  // rdf:nil is equivalent to the empty list ()
+  if (a instanceof Iri && a.value === RDF_NIL_IRI && b instanceof ListTerm && b.elems.length === 0) return true;
+  if (b instanceof Iri && b.value === RDF_NIL_IRI && a instanceof ListTerm && a.elems.length === 0) return true;
   if (a.constructor !== b.constructor) return false;
 
   if (a instanceof Iri) return a.value === b.value;
@@ -5427,6 +5440,11 @@ function unifyTermWithOptions(a, b, subst, opts) {
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
 
+  // Normalize rdf:nil IRI to the empty list term, so it unifies with () and
+  // list builtins treat it consistently.
+  if (a instanceof Iri && a.value === RDF_NIL_IRI) a = __EMPTY_LIST;
+  if (b instanceof Iri && b.value === RDF_NIL_IRI) b = __EMPTY_LIST;
+
   // Variable binding
   if (a instanceof Var) {
     const v = a.name;

package/lib/builtins.js

@@ -1239,13 +1239,13 @@ function materializeRdfLists(triples, forwardRules, backwardRules) {
   }
 
   function rewriteTerm(t) {
+    // rdf:nil is the empty list ()
+    if (t instanceof Iri && t.value === RDF_NIL) return new ListTerm([]);
     // Replace list nodes (Blank/Iri) by their constructed ListTerm when possible
     const k = nodeKey(t);
     if (k) {
       const built = buildListForKey(k);
       if (built) return built;
-      // Also rewrite rdf:nil even if not otherwise referenced
-      if (t instanceof Iri && t.value === RDF_NIL) return new ListTerm([]);
       return t;
     }
     if (t instanceof ListTerm) {

package/lib/engine.js

@@ -27,6 +27,11 @@ const {
   collectBlankLabelsInTriples,
 } = require('./prelude');
 
+// In N3/Turtle, rdf:nil is the canonical IRI for the empty RDF list.
+// Eyeling represents list literals with ListTerm; ensure rdf:nil unifies with ().
+const RDF_NIL_IRI = RDF_NS + 'nil';
+const __EMPTY_LIST = new ListTerm([]);
+
 const { lex, N3SyntaxError } = require('./lexer');
 const { Parser } = require('./parser');
 const { liftBlankRuleVars } = require('./rules');
@@ -340,6 +345,10 @@ function termsEqual(a, b) {
   if (a === b) return true;
   if (!a || !b) return false;
   if (a.__tid && b.__tid && a.__tid === b.__tid) return true;
+
+  // rdf:nil is equivalent to the empty list ()
+  if (a instanceof Iri && a.value === RDF_NIL_IRI && b instanceof ListTerm && b.elems.length === 0) return true;
+  if (b instanceof Iri && b.value === RDF_NIL_IRI && a instanceof ListTerm && a.elems.length === 0) return true;
   if (a.constructor !== b.constructor) return false;
 
   if (a instanceof Iri) return a.value === b.value;
@@ -399,6 +408,10 @@ function termsEqualNoIntDecimal(a, b) {
   if (a === b) return true;
   if (!a || !b) return false;
   if (a.__tid && b.__tid && a.__tid === b.__tid) return true;
+
+  // rdf:nil is equivalent to the empty list ()
+  if (a instanceof Iri && a.value === RDF_NIL_IRI && b instanceof ListTerm && b.elems.length === 0) return true;
+  if (b instanceof Iri && b.value === RDF_NIL_IRI && a instanceof ListTerm && a.elems.length === 0) return true;
   if (a.constructor !== b.constructor) return false;
 
   if (a instanceof Iri) return a.value === b.value;
@@ -1049,6 +1062,11 @@ function unifyTermWithOptions(a, b, subst, opts) {
   a = applySubstTerm(a, subst);
   b = applySubstTerm(b, subst);
 
+  // Normalize rdf:nil IRI to the empty list term, so it unifies with () and
+  // list builtins treat it consistently.
+  if (a instanceof Iri && a.value === RDF_NIL_IRI) a = __EMPTY_LIST;
+  if (b instanceof Iri && b.value === RDF_NIL_IRI) b = __EMPTY_LIST;
+
   // Variable binding
   if (a instanceof Var) {
     const v = a.name;

package/package.json

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

package/test/api.test.js

@@ -749,6 +749,27 @@ ${U('a')} <-${U('p')} ${U('b')}.`,
     expect: [new RegExp(`${EX}s>\\s+<${EX}second>\\s+<${EX}b>\\s*\\.`)],
   },
 
+  {
+    name: '49b rdf:nil matches empty list in rdf:rest (issue #7)',
+    opt: { proofComments: false },
+    input: `@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+
+${U('o1')} ${U('path')} (${U('c')} ${U('d')}).
+
+{ ?o ${U('path')} ?path. } => { ?path rdf:type ${U('P')}. }.
+{ ?p1 rdf:type ${U('P')}. ?p1 rdf:rest ?p2. } => { ?p2 rdf:type ${U('P')}. }.
+
+# query1 uses ()
+{ ?p rdf:type ${U('P')}. ?p rdf:rest (). } => { ${U('result')} ${U('query1')} (?p). }.
+# query2 uses rdf:nil
+{ ?p rdf:type ${U('P')}. ?p rdf:rest rdf:nil. } => { ${U('result')} ${U('query2')} (?p). }.
+`,
+    expect: [
+      new RegExp(`${EX}result>\\s+<${EX}query1>\\s+\\(\\(\\s*<${EX}d>\\s*\\)\\)\\s*\\.`),
+      new RegExp(`${EX}result>\\s+<${EX}query2>\\s+\\(\\(\\s*<${EX}d>\\s*\\)\\)\\s*\\.`),
+    ],
+  },
+
   {
     name: '50 rdf collection materialization: rdf:first/rdf:rest triples become list terms',
     opt: { proofComments: false },