breaking: drop support for quads in quoted triples as they are forbidden in the rdf-star spec

Author: jeswr

src/N3Parser.js

@@ -845,21 +845,10 @@ export default class N3Parser {
     return this._readPath;
   }
 
-  // ### `_readRDFStarTailOrGraph` reads the graph of a nested RDF* quad or the end of a nested RDF* triple
-  _readRDFStarTailOrGraph(token) {
-    if (token.type !== '>>') {
-      // An entity means this is a quad (only allowed if not already inside a graph)
-      if (this._supportsQuads && this._graph === null && (this._graph = this._readEntity(token)) !== undefined)
-        return this._readRDFStarTail;
-      return this._error(`Expected >> to follow "${this._object.id}"`, token);
-    }
-    return this._readRDFStarTail(token);
-  }
-
   // ### `_readRDFStarTail` reads the end of a nested RDF* triple
   _readRDFStarTail(token) {
     if (token.type !== '>>')
-      return this._error(`Expected >> but got ${token.type}`, token);
+      return this._error(`Expected >> to follow "${this._object.id}" but got ${token.type}`, token);
     // Read the quad and restore the previous context
     const quad = this._quad(this._subject, this._predicate, this._object,
       this._graph || this.DEFAULTGRAPH);
@@ -897,7 +886,7 @@ export default class N3Parser {
     case 'formula':
       return this._readFormulaTail;
     case '<<':
-      return this._readRDFStarTailOrGraph;
+      return this._readRDFStarTail;
     }
   }
 

test/N3Parser-test.js

@@ -933,6 +933,10 @@ describe('Parser', () => {
       shouldParse('<a> <b> <c> <g>.',
                   ['a', 'b', 'c', 'g']));
 
+    it('should not parse a quad in a quoted triple',
+      shouldNotParse('<< <a> <b> <c> <g> >> <c> <d> .',
+                     'Expected >> to follow "http://example.org/c" but got IRI on line 1.'));
+
     it('should parse a quad with 4 prefixed names',
       shouldParse('@prefix p: <p#>.\np:a p:b p:c p:g.',
                   ['p#a', 'p#b', 'p#c', 'p#g']));
@@ -1124,12 +1128,12 @@ describe('Parser', () => {
 
     it('should not parse nested RDF* statements that are partially closed',
       shouldNotParse('<d> <e> <<<<<a> <b> <c>>> <f> <g>.',
-        'Expected entity but got . on line 1.'
+        'Expected >> to follow "http://example.org/g" but got . on line 1.'
       ));
 
     it('should not parse partially closed nested RDF* statements',
       shouldNotParse('<d> <e> <<<<<a> <b> <c> <f> <g>>>.',
-        'Expected >> but got IRI on line 1.'
+        'Expected >> to follow "http://example.org/c" but got IRI on line 1.'
       ));
 
     it('should not parse nested RDF* statements with too many closing tags',
@@ -1167,13 +1171,9 @@ describe('Parser', () => {
         'Unexpected . on line 1.'
       ));
 
-    it('should parse an RDF* quad',
-      shouldParse('<<<a> <b> <c> <d>>> <a> <b> .',
-        [['a', 'b', 'c', 'd'], 'a', 'b']));
-
     it('should not parse a malformed RDF* quad',
       shouldNotParse('<<<a> <b> <c> <d> <e>>> <a> <b> .',
-        'Expected >> but got IRI on line 1.'));
+        'Expected >> to follow "http://example.org/c" but got IRI on line 1.'));
 
     it('should parse statements with a shared RDF* subject',
       shouldParse('<<<a> <b> <c>>> <b> <c>;\n<d> <c>.',
@@ -1392,7 +1392,7 @@ describe('Parser', () => {
 
     it('should not parse nested quads',
       shouldNotParse(parser, '<<_:a <http://ex.org/b> _:b <http://ex.org/b>>> <http://ex.org/b> "c" .',
-        'Expected >> to follow "_:b0_b" on line 1.'));
+        'Expected >> to follow "_:b0_b" but got IRI on line 1.'));
   });
 
   describe('A Parser instance for the TriG format', () => {
@@ -1452,7 +1452,7 @@ describe('Parser', () => {
 
     it('should not parse nested quads',
       shouldNotParse(parser, '<<_:a <http://ex.org/b> _:b <http://ex.org/b>>> <http://ex.org/b> "c" .',
-        'Expected >> to follow "_:b0_b" on line 1.'));
+        'Expected >> to follow "_:b0_b" but got IRI on line 1.'));
   });
 
   describe('A Parser instance for the N-Triples format', () => {
@@ -1527,7 +1527,7 @@ describe('Parser', () => {
 
     it('should not parse nested quads',
       shouldNotParse(parser, '<<_:a <http://ex.org/b> _:b <http://ex.org/b>>> <http://ex.org/b> "c" .',
-        'Expected >> to follow "_:b0_b" on line 1.'));
+        'Expected >> to follow "_:b0_b" but got IRI on line 1.'));
   });
 
   describe('A Parser instance for the N-Quads format', () => {
@@ -1941,7 +1941,7 @@ describe('Parser', () => {
 
     it('should not parse nested quads',
       shouldNotParse(parser, '<<_:a <http://ex.org/b> _:b <http://ex.org/b>>> <http://ex.org/b> "c" .',
-        'Expected >> to follow "_:.b" on line 1.'));
+        'Expected >> to follow "_:.b" but got IRI on line 1.'));
   });
 
   describe('A Parser instance for the N3 format with the explicitQuantifiers option', () => {