Merge pull request #123 from jindrichmynarz/nquads-allow-comments

Nquads allow comments, fixes

Author: davidlehn

js/jsonld.js

@@ -6831,7 +6831,7 @@ function _parseNQuads(input) {
   var datatype = '(?:\\^\\^' + iri + ')';
   var language = '(?:@([a-z]+(?:-[a-z0-9]+)*))';
   var literal = '(?:' + plain + '(?:' + datatype + '|' + language + ')?)';
-  var comment = '(?:#[^$]*)?';
+  var comment = '(?:#.*)?';
   var ws = '[ \\t]+';
   var wso = '[ \\t]*';
   var eoln = /(?:\r\n)|(?:\n)|(?:\r)/g;

tests/fromRdf-0001-in.nq

@@ -0,0 +1,6 @@
+<http://example.com/Subj1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Type> .
+# $5 comment
+<http://example.com/Subj1> <http://example.com/prop1> <http://example.com/Obj1> .
+<http://example.com/Subj1> <http://example.com/prop2> "Plain" . # Another comment
+<http://example.com/Subj1> <http://example.com/prop2> "2012-05-12"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://example.com/Subj1> <http://example.com/prop2> "English"@en .

tests/fromRdf-0001-out.jsonld

@@ -0,0 +1,12 @@
+[
+  {
+    "@id": "http://example.com/Subj1",
+    "@type": ["http://example.com/Type"],
+    "http://example.com/prop1": [{"@id": "http://example.com/Obj1"}],
+    "http://example.com/prop2": [
+      {"@value": "Plain"},
+      {"@value": "2012-05-12", "@type": "http://www.w3.org/2001/XMLSchema#date"},
+      {"@value": "English", "@language": "en"}
+    ]
+  }
+]

tests/manifest.jsonld

@@ -41,5 +41,12 @@
     "name": "follow redirect",
     "input": "remote-0006-in.jsonld",
     "expect": "remote-0006-out.jsonld"
+  }, {
+    "@id": "#t0007",
+    "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
+    "name": "allow comments in N-Quads",
+    "purpose": "RDF serialized in N-Quads may contain comments",
+    "input": "fromRdf-0001-in.nq",
+    "expect": "fromRdf-0001-out.jsonld"
   }]
 }