eyeling 1.25.2 → 1.25.4

package/lib/parser.js

@@ -642,15 +642,21 @@ class Parser {
 
     while (true) {
       const { verb, invert } = this.parseStatementVerb();
-      const objects = this.parseObjectList();
 
-      // If VERB or OBJECTS contained paths, their helper triples must come
-      // before the triples that consume the path results (Easter depends on this).
-      this.flushPendingTriples(out);
+      while (true) {
+        const o = this.parseTerm();
+        const postTriples = this.pendingTriplesAfter;
+        this.pendingTriplesAfter = [];
+
+        // If VERB or OBJECT contained paths, their helper triples must come
+        // before the triple that consumes the path result (Easter depends on this).
+        this.flushPendingTriples(out);
 
-      for (const { term: o, postTriples } of objects) {
         out.push(new Triple(invert ? o : subject, verb, invert ? subject : o));
-        if (postTriples && postTriples.length) out.push(...postTriples);
+        if (postTriples.length) out.push(...postTriples);
+
+        if (this.peek().typ !== 'Comma') break;
+        this.next();
       }
 
       if (this.peek().typ === 'Semicolon') {
@@ -664,27 +670,6 @@ class Parser {
     return out;
   }
 
-  parseObjectList() {
-    // Capture any trailing property-list triples produced while parsing each
-    // object term so we can emit them *after* the triple that references the
-    // term. (See pendingTriplesAfter in the constructor.)
-
-    const objs = [];
-    const readObj = () => {
-      const o = this.parseTerm();
-      const post = this.pendingTriplesAfter;
-      this.pendingTriplesAfter = [];
-      objs.push({ term: o, postTriples: post });
-    };
-
-    readObj();
-    while (this.peek().typ === 'Comma') {
-      this.next();
-      readObj();
-    }
-    return objs;
-  }
-
   makeRule(left, right, isForward) {
     let premiseTerm, conclTerm;
 

package/package.json

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

package/test/api.test.js

@@ -1769,6 +1769,46 @@ ex:w a ex:Woman .
     expect: [/:(?:test)\s+:(?:is)\s+true\s*\./],
   },
 
+  {
+    name: '58b regression: fully variable top-level fact can trigger indexed ground forward rule',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/#>.
+
+?S :p ?O.
+
+{ :s :p :o } => { :test :is true }.
+`,
+    expect: [/:(?:test)\s+:(?:is)\s+true\s*\./],
+  },
+
+  {
+    name: '58c regression: variable-predicate fact can trigger indexed IRI-predicate rule',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/#>.
+
+?S ?P :o.
+
+{ :s :p :o } => { :test :is true }.
+`,
+    expect: [/:(?:test)\s+:(?:is)\s+true\s*\./],
+  },
+
+  {
+    name: '58d regression: numeric literal equivalence must not be pruned by object indexes',
+    opt: { proofComments: false },
+    input: `@prefix : <http://example.org/#>.
+
+:a :v 1.0.
+:b :v 2.0.
+
+{
+  ?x :v 1.00.
+} => { :test :from ?x }.
+`,
+    expect: [/:(?:test)\s+:(?:from)\s+:(?:a)\s*\./],
+    reject: [/:(?:test)\s+:(?:from)\s+:(?:b)\s*\./],
+  },
+
   {
     name: '59 regression: quoted-formula alpha-equivalence must not rename blanks introduced by outer substitution',
     opt: { proofComments: false },