rdflib 2.2.21 → 2.2.22-0de51c50

package/esm/n3parser.js

@@ -1,7 +1,6 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _typeof from "@babel/runtime/helpers/typeof";
-
 /**
 *
 *  UTF-8 data encode / decode
@@ -10,21 +9,18 @@ import _typeof from "@babel/runtime/helpers/typeof";
 **/
 import * as Uri from './uri';
 import { ArrayIndexOf } from './utils';
-
+import { convertFirstRestNil } from './lists';
 function hexify(str) {
   // also used in parser
   return encodeURI(str);
 }
-
 var Utf8 = {
   // public method for url encoding
   encode: function encode(string) {
     string = string.replace(/\r\n/g, "\n");
     var utftext = "";
-
     for (var n = 0; n < string.length; n++) {
       var c = string.charCodeAt(n);
-
       if (c < 128) {
         utftext += String.fromCharCode(c);
       } else if (c > 127 && c < 2048) {
@@ -36,17 +32,14 @@ var Utf8 = {
         utftext += String.fromCharCode(c & 63 | 128);
       }
     }
-
     return utftext;
   },
   // public method for url decoding
   decode: function decode(utftext) {
     var string = "";
     var i = 0;
-
     while (i < utftext.length) {
       var c = utftext.charCodeAt(i);
-
       if (c < 128) {
         string += String.fromCharCode(c);
         i++;
@@ -58,7 +51,6 @@ var Utf8 = {
         i += 3;
       }
     }
-
     return string;
   }
 }; // Things we need to define to make converted pythn code work in js
@@ -66,25 +58,23 @@ var Utf8 = {
 
 var RDFSink_forSomeSym = "http://www.w3.org/2000/10/swap/log#forSome";
 var RDFSink_forAllSym = "http://www.w3.org/2000/10/swap/log#forAll";
-var Logic_NS = "http://www.w3.org/2000/10/swap/log#"; //  pyjs seems to reference runtime library which I didn't find
+var Logic_NS = "http://www.w3.org/2000/10/swap/log#";
+
+//  pyjs seems to reference runtime library which I didn't find
 
 var pyjslib_Tuple = function pyjslib_Tuple(theList) {
   return theList;
 };
-
 var pyjslib_List = function pyjslib_List(theList) {
   return theList;
 };
-
 var pyjslib_Dict = function pyjslib_Dict(listOfPairs) {
   if (listOfPairs.length > 0) throw "missing.js: oops nnonempty dict not imp";
   return [];
 };
-
 var pyjslib_len = function pyjslib_len(s) {
   return s.length;
 };
-
 var pyjslib_slice = function pyjslib_slice(str, i, j) {
   if (typeof str.slice == 'undefined') throw '@@ mising.js: No .slice function for ' + str + ' of type ' + _typeof(str);
   if (typeof j == 'undefined' || j == null) return str.slice(i);
@@ -92,64 +82,53 @@ var pyjslib_slice = function pyjslib_slice(str, i, j) {
 };
 
 var StopIteration = Error('dummy error stop iteration');
-
 var pyjslib_Iterator = function pyjslib_Iterator(theList) {
   this.last = 0;
   this.li = theList;
-
   this.next = function () {
     if (this.last == this.li.length) throw StopIteration;
     return this.li[this.last++];
   };
-
   return this;
 };
-
 var ord = function ord(str) {
   return str.charCodeAt(0);
 };
-
 var string_find = function string_find(str, s) {
   return str.indexOf(s);
 };
-
 var assertFudge = function assertFudge(condition, desc) {
   if (condition) return;
   if (desc) throw "python Assertion failed: " + desc;
   throw "(python) Assertion failed.";
 };
-
 var stringFromCharCode = function stringFromCharCode(uesc) {
   return String.fromCharCode(uesc);
 };
-
 String.prototype.encode = function (encoding) {
   if (encoding != 'utf-8') throw "UTF8_converter: can only do utf-8";
   return Utf8.encode(this);
 };
-
 String.prototype.decode = function (encoding) {
-  if (encoding != 'utf-8') throw "UTF8_converter: can only do utf-8"; //return Utf8.decode(this);
-
+  if (encoding != 'utf-8') throw "UTF8_converter: can only do utf-8";
+  //return Utf8.decode(this);
   return this;
 };
-
 var uripath_join = function uripath_join(base, given) {
   return Uri.join(given, base); // sad but true
 };
 
 var becauseSubexpression = null; // No reason needed
-
 var diag_tracking = 0;
 var diag_chatty_flag = 0;
+var diag_progress = function diag_progress(str) {/*$rdf.log.debug(str);*/};
 
-var diag_progress = function diag_progress(str) {
-  /*$rdf.log.debug(str);*/
-}; // why_BecauseOfData = function(doc, reason) { return doc };
-
+// why_BecauseOfData = function(doc, reason) { return doc };
 
 var RDF_type_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
+var RDF_nil_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";
 var DAML_sameAs_URI = "http://www.w3.org/2002/07/owl#sameAs";
+
 /*
 function SyntaxError(details) {
     return new __SyntaxError(details);
@@ -159,6 +138,7 @@ function SyntaxError(details) {
 function __SyntaxError(details) {
   this.details = details;
 }
+
 /*
 
 $Id: n3parser.js 14561 2008-02-23 06:37:26Z kennyluck $
@@ -189,7 +169,6 @@ the module, including tests and test harness.
 
 */
 
-
 var ADDED_HASH = "#";
 var LOG_implies_URI = "http://www.w3.org/2000/10/swap/log#implies";
 var INTEGER_DATATYPE = "http://www.w3.org/2001/XMLSchema#integer";
@@ -200,9 +179,7 @@ var DATETIME_DATATYPE = "http://www.w3.org/2001/XMLSchema#dateTime";
 var BOOLEAN_DATATYPE = "http://www.w3.org/2001/XMLSchema#boolean";
 var option_noregen = 0;
 var _notQNameChars = "\t\r\n !\"#$%&'()*.,+/;<=>?@[\\]^`{|}~";
-
 var _notNameChars = _notQNameChars + ":";
-
 var _rdfns = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 var N3CommentCharacter = "#";
 var eol = new RegExp("^[ \\t]*(#[^\\n]*)?\\r?\\n", 'g');
@@ -214,16 +191,13 @@ var datetime_syntax = new RegExp('^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9](T[
 var digitstring = new RegExp("^[0-9]+", 'g');
 var interesting = new RegExp("[\\\\\\r\\n\\\"]", 'g');
 var langcode = new RegExp("^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*", 'g');
-
 function createSinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
   return new SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why);
 }
-
 export default createSinkParser;
 export var SinkParser = /*#__PURE__*/function () {
   function SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
     _classCallCheck(this, SinkParser);
-
     if (typeof openFormula == 'undefined') openFormula = null;
     if (typeof thisDoc == 'undefined') thisDoc = "";
     if (typeof baseURI == 'undefined') baseURI = null;
@@ -237,22 +211,19 @@ export var SinkParser = /*#__PURE__*/function () {
 
     this._bindings = new pyjslib_Dict([]);
     this._flags = flags;
-
     if (thisDoc != "") {
       assertFudge(thisDoc.indexOf(":") >= 0, "Document URI not absolute: " + thisDoc);
       this._bindings[""] = thisDoc + "#";
     }
-
     this._store = store;
-
     if (genPrefix) {
       store.setGenPrefix(genPrefix);
     }
-
     this._thisDoc = thisDoc;
     this.source = store.sym(thisDoc);
     this.lines = 0;
     this.statementCount = 0;
+    this.hasNil = false;
     this.startOfLine = 0;
     this.previousLine = 0;
     this._genPrefix = genPrefix;
@@ -263,11 +234,9 @@ export var SinkParser = /*#__PURE__*/function () {
     this._parentVariables = new pyjslib_Dict([]);
     this._reason = why;
     this._reason2 = null;
-
     if (diag_tracking) {
       this._reason2 = why_BecauseOfData(store.sym(thisDoc), this._reason);
     }
-
     if (baseURI) {
       this._baseURI = baseURI;
     } else {
@@ -277,9 +246,7 @@ export var SinkParser = /*#__PURE__*/function () {
         this._baseURI = null;
       }
     }
-
     assertFudge(!this._baseURI || this._baseURI.indexOf(":") >= 0);
-
     if (!this._genPrefix) {
       if (this._thisDoc) {
         this._genPrefix = this._thisDoc + "#_g";
@@ -287,7 +254,6 @@ export var SinkParser = /*#__PURE__*/function () {
         this._genPrefix = RDFSink_uniqueURI();
       }
     }
-
     if (openFormula == null) {
       if (this._thisDoc) {
         this._formula = store.formula(thisDoc + "#_formula");
@@ -297,11 +263,9 @@ export var SinkParser = /*#__PURE__*/function () {
     } else {
       this._formula = openFormula;
     }
-
     this._context = this._formula;
     this._parentContext = null;
   }
-
   _createClass(SinkParser, [{
     key: "here",
     value: function here(i) {
@@ -322,6 +286,7 @@ export var SinkParser = /*#__PURE__*/function () {
     value: function loadBuf(buf) {
       /*
       Parses a buffer and returns its top level formula*/
+
       this.startDoc();
       this.feed(buf);
       return this.endDoc();
@@ -336,18 +301,15 @@ export var SinkParser = /*#__PURE__*/function () {
       remainder after any statements have been parsed.
       So if there is more data to feed to the
       parser, it should be straightforward to recover.*/
+
       var str = octets.decode("utf-8");
       var i = 0;
-
       while (i >= 0) {
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           return;
         }
-
         var i = this.directiveOrStatement(str, j);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "expected directive or statement");
         }
@@ -357,23 +319,17 @@ export var SinkParser = /*#__PURE__*/function () {
     key: "directiveOrStatement",
     value: function directiveOrStatement(str, h) {
       var i = this.skipSpace(str, h);
-
       if (i < 0) {
         return i;
       }
-
       var j = this.directive(str, i);
-
       if (j >= 0) {
         return this.checkDot(str, j);
       }
-
       var j = this.statement(str, i);
-
       if (j >= 0) {
         return this.checkDot(str, j);
       }
-
       return j;
     }
   }, {
@@ -383,7 +339,6 @@ export var SinkParser = /*#__PURE__*/function () {
       Check for keyword.  Space must have been stripped on entry and
       we must not be at end of file.*/
       var whitespace = "\t\n\v\f\r ";
-
       if (str.slice(i, i + 1) == "@") {
         var i = i + 1;
       } else {
@@ -391,9 +346,7 @@ export var SinkParser = /*#__PURE__*/function () {
           return -1;
         }
       }
-
       var k = i + pyjslib_len(_tok);
-
       if (str.slice(i, k) == _tok && _notQNameChars.indexOf(str.charAt(k)) >= 0) {
         return k;
       } else {
@@ -404,51 +357,36 @@ export var SinkParser = /*#__PURE__*/function () {
     key: "directive",
     value: function directive(str, i) {
       var j = this.skipSpace(str, i);
-
       if (j < 0) {
         return j;
       }
-
       var res = new pyjslib_List([]);
       var j = this.tok("bind", str, i);
-
       if (j > 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "keyword bind is obsolete: use @prefix");
       }
-
       var j = this.tok("keywords", str, i);
-
       if (j > 0) {
         var i = this.commaSeparatedList(str, j, res, false);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "'@keywords' needs comma separated list of words");
         }
-
         this.setKeywords(pyjslib_slice(res, null, null));
-
         if (diag_chatty_flag > 80) {
           diag_progress("Keywords ", this.keywords);
         }
-
         return i;
       }
-
       var j = this.tok("forAll", str, i);
-
       if (j > 0) {
         var i = this.commaSeparatedList(str, j, res, true);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "Bad variable list after @forAll");
         }
-
         var __x = new pyjslib_Iterator(res);
-
         try {
           while (true) {
             var x = __x.next();
-
             if (ArrayIndexOf(this._variables, x) < 0 || ArrayIndexOf(this._parentVariables, x) >= 0) {
               this._variables[x] = this._context.newUniversal(x);
             }
@@ -458,25 +396,18 @@ export var SinkParser = /*#__PURE__*/function () {
             throw e;
           }
         }
-
         return i;
       }
-
       var j = this.tok("forSome", str, i);
-
       if (j > 0) {
         var i = this.commaSeparatedList(str, j, res, this.uri_ref2);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "Bad variable list after @forSome");
         }
-
         var __x = new pyjslib_Iterator(res);
-
         try {
           while (true) {
             var x = __x.next();
-
             this._context.declareExistential(x);
           }
         } catch (e) {
@@ -484,63 +415,47 @@ export var SinkParser = /*#__PURE__*/function () {
             throw e;
           }
         }
-
         return i;
       }
-
       var j = this.tok("prefix", str, i);
-
       if (j >= 0) {
         var t = new pyjslib_List([]);
         var i = this.qname(str, j, t);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "expected qname after @prefix");
         }
-
         var j = this.uri_ref2(str, i, t);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "expected <uriref> after @prefix _qname_");
         }
-
         var ns = t[1].uri;
-
         if (this._baseURI) {
           var ns = uripath_join(this._baseURI, ns);
         } else {
           assertFudge(ns.indexOf(":") >= 0, "With no base URI, cannot handle relative URI for NS");
         }
-
         assertFudge(ns.indexOf(":") >= 0);
         this._bindings[t[0][0]] = ns;
         this.bind(t[0][0], hexify(ns));
         return j;
       }
-
       var j = this.tok("base", str, i);
-
       if (j >= 0) {
         var t = new pyjslib_List([]);
         var i = this.uri_ref2(str, j, t);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "expected <uri> after @base ");
         }
-
         var ns = t[0].uri;
-
         if (this._baseURI) {
           var ns = uripath_join(this._baseURI, ns);
         } else {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "With no previous base URI, cannot use relative URI in @base  <" + ns + ">");
         }
-
         assertFudge(ns.indexOf(":") >= 0);
         this._baseURI = ns;
         return i;
       }
-
       return -1;
     }
   }, {
@@ -555,6 +470,7 @@ export var SinkParser = /*#__PURE__*/function () {
     value: function setKeywords(k) {
       /*
       Takes a list of strings*/
+
       if (k == null) {
         this.keywordsSet = 0;
       } else {
@@ -567,15 +483,20 @@ export var SinkParser = /*#__PURE__*/function () {
     value: function startDoc() {}
   }, {
     key: "endDoc",
-    value: function endDoc() {
-      /*
-      Signal end of document and stop parsing. returns formula*/
+    value: /* Signal end of document and stop parsing. returns formula */
+    function endDoc() {
+      if (this.hasNil && this._store.rdfFactory.supports["COLLECTIONS"]) {
+        convertFirstRestNil(this._store, this.source);
+      }
       return this._formula;
     }
   }, {
     key: "makeStatement",
     value: function makeStatement(quad) {
       quad[0].add(quad[2], quad[1], quad[3], this.source);
+      if (quad[2].uri && quad[2].uri === RDF_nil_URI || quad[3].uri && quad[3].uri === RDF_nil_URI) {
+        this.hasNil = true;
+      }
       this.statementCount += 1;
     }
   }, {
@@ -583,17 +504,13 @@ export var SinkParser = /*#__PURE__*/function () {
     value: function statement(str, i) {
       var r = new pyjslib_List([]);
       var i = this.object(str, i, r);
-
       if (i < 0) {
         return i;
       }
-
       var j = this.property_list(str, i, r[0]);
-
       if (j < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "expected propertylist");
       }
-
       return j;
     }
   }, {
@@ -613,91 +530,69 @@ export var SinkParser = /*#__PURE__*/function () {
       >- prop ->
       <- prop -<
       _operator_*/
-      var j = this.skipSpace(str, i);
 
+      var j = this.skipSpace(str, i);
       if (j < 0) {
         return j;
       }
-
       var r = new pyjslib_List([]);
       var j = this.tok("has", str, i);
-
       if (j >= 0) {
         var i = this.prop(str, j, r);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "expected property after 'has'");
         }
-
         res.push(new pyjslib_Tuple(["->", r[0]]));
         return i;
       }
-
       var j = this.tok("is", str, i);
-
       if (j >= 0) {
         var i = this.prop(str, j, r);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "expected <property> after 'is'");
         }
-
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "End of file found, expected property after 'is'");
           return j;
         }
-
         var i = j;
         var j = this.tok("of", str, i);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "expected 'of' after 'is' <prop>");
         }
-
         res.push(new pyjslib_Tuple(["<-", r[0]]));
         return j;
       }
-
       var j = this.tok("a", str, i);
-
       if (j >= 0) {
         res.push(new pyjslib_Tuple(["->", this._store.sym(RDF_type_URI)]));
         return j;
       }
-
       if (str.slice(i, i + 2) == "<=") {
         res.push(new pyjslib_Tuple(["<-", this._store.sym(Logic_NS + "implies")]));
         return i + 2;
       }
-
       if (str.slice(i, i + 1) == "=") {
         if (str.slice(i + 1, i + 2) == ">") {
           res.push(new pyjslib_Tuple(["->", this._store.sym(Logic_NS + "implies")]));
           return i + 2;
         }
-
         res.push(new pyjslib_Tuple(["->", this._store.sym(DAML_sameAs_URI)]));
         return i + 1;
       }
-
       if (str.slice(i, i + 2) == ":=") {
         res.push(new pyjslib_Tuple(["->", Logic_NS + "becomes"]));
         return i + 2;
       }
-
       var j = this.prop(str, i, r);
-
       if (j >= 0) {
         res.push(new pyjslib_Tuple(["->", r[0]]));
         return j;
       }
-
       if (str.slice(i, i + 2) == ">-" || str.slice(i, i + 2) == "<-") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, ">- ... -> syntax is obsolete.");
       }
-
       return -1;
     }
   }, {
@@ -721,42 +616,33 @@ export var SinkParser = /*#__PURE__*/function () {
       /*
       Parse the path production.
       */
-      var j = this.nodeOrLiteral(str, i, res);
 
+      var j = this.nodeOrLiteral(str, i, res);
       if (j < 0) {
         return j;
       }
-
       while ("!^.".indexOf(str.slice(j, j + 1)) >= 0) {
         var ch = str.slice(j, j + 1);
-
         if (ch == ".") {
           var ahead = str.slice(j + 1, j + 2);
-
           if (!ahead || _notNameChars.indexOf(ahead) >= 0 && ":?<[{(".indexOf(ahead) < 0) {
             break;
           }
         }
-
         var subj = res.pop();
         var obj = this.blankNode(this.here(j));
         var j = this.node(str, j + 1, res);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "EOF found in middle of path syntax");
         }
-
         var pred = res.pop();
-
         if (ch == "^") {
           this.makeStatement(new pyjslib_Tuple([this._context, pred, obj, subj]));
         } else {
           this.makeStatement(new pyjslib_Tuple([this._context, pred, subj, obj]));
         }
-
         res.push(obj);
       }
-
       return j;
     }
   }, {
@@ -764,15 +650,13 @@ export var SinkParser = /*#__PURE__*/function () {
     value: function anonymousNode(ln) {
       /*
       Remember or generate a term for one of these _: anonymous nodes*/
-      var term = this._anonymousNodes[ln];
 
+      var term = this._anonymousNodes[ln];
       if (term) {
         return term;
       }
-
-      var term = this._store.bnode(ln); // var term = this._store.bnode(this._context, this._reason2); eh?
-
-
+      var term = this._store.bnode(ln);
+      // var term = this._store.bnode(this._context, this._reason2); eh?
       this._anonymousNodes[ln] = term;
       return term;
     }
@@ -788,37 +672,28 @@ export var SinkParser = /*#__PURE__*/function () {
 
       var subj = subjectAlready;
       var j = this.skipSpace(str, i);
-
       if (j < 0) {
         return j;
       }
-
       var i = j;
       var ch = str.slice(i, i + 1);
-
       if (ch == "[") {
         var bnodeID = this.here(i);
         var j = this.skipSpace(str, i + 1);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF after '['");
         }
-
         if (str.slice(j, j + 1) == "=") {
           var i = j + 1;
           var objs = new pyjslib_List([]);
           var j = this.objectList(str, i, objs);
-
           if (j >= 0) {
             var subj = objs[0];
-
             if (pyjslib_len(objs) > 1) {
               var __obj = new pyjslib_Iterator(objs);
-
               try {
                 while (true) {
                   var obj = __obj.next();
-
                   this.makeStatement(new pyjslib_Tuple([this._context, this._store.sym(DAML_sameAs_URI), subj, obj]));
                 }
               } catch (e) {
@@ -827,13 +702,10 @@ export var SinkParser = /*#__PURE__*/function () {
                 }
               }
             }
-
             var j = this.skipSpace(str, j);
-
             if (j < 0) {
               throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when objectList expected after [ = ");
             }
-
             if (str.slice(j, j + 1) == ";") {
               var j = j + 1;
             }
@@ -841,52 +713,39 @@ export var SinkParser = /*#__PURE__*/function () {
             throw BadSyntax(this._thisDoc, this.lines, str, i, "objectList expected after [= ");
           }
         }
-
         if (subj == null) {
           var subj = this.blankNode(bnodeID);
         }
-
         var i = this.property_list(str, j, subj);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "property_list expected");
         }
-
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when ']' expected after [ <propertyList>");
         }
-
         if (str.slice(j, j + 1) != "]") {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
         }
-
         res.push(subj);
         return j + 1;
       }
-
       if (ch == "{") {
         var ch2 = str.slice(i + 1, i + 2);
-
         if (ch2 == "$") {
           i += 1;
           var j = i + 1;
           var mylist = new pyjslib_List([]);
           var first_run = true;
-
           while (1) {
             var i = this.skipSpace(str, j);
-
             if (i < 0) {
               throw BadSyntax(this._thisDoc, this.lines, str, i, "needed '$}', found end.");
             }
-
             if (str.slice(i, i + 2) == "$}") {
               var j = i + 2;
               break;
             }
-
             if (!first_run) {
               if (str.slice(i, i + 1) == ",") {
                 i += 1;
@@ -896,17 +755,13 @@ export var SinkParser = /*#__PURE__*/function () {
             } else {
               var first_run = false;
             }
-
             var item = new pyjslib_List([]);
             var j = this.item(str, i, item);
-
             if (j < 0) {
               throw BadSyntax(this._thisDoc, this.lines, str, i, "expected item in set or '$}'");
             }
-
             mylist.push(item[0]);
           }
-
           res.push(this._store.newSet(mylist, this._context));
           return j;
         } else {
@@ -920,32 +775,24 @@ export var SinkParser = /*#__PURE__*/function () {
           this._variables = this._variables.slice();
           var reason2 = this._reason2;
           this._reason2 = becauseSubexpression;
-
           if (subj == null) {
             var subj = this._store.formula();
           }
-
           this._context = subj;
-
           while (1) {
             var i = this.skipSpace(str, j);
-
             if (i < 0) {
               throw BadSyntax(this._thisDoc, this.lines, str, i, "needed '}', found end.");
             }
-
             if (str.slice(i, i + 1) == "}") {
               var j = i + 1;
               break;
             }
-
             var j = this.directiveOrStatement(str, i);
-
             if (j < 0) {
               throw BadSyntax(this._thisDoc, this.lines, str, i, "expected statement or '}'");
             }
           }
-
           this._anonymousNodes = parentAnonymousNodes;
           this._variables = this._parentVariables;
           this._parentVariables = grandParentVariables;
@@ -956,75 +803,56 @@ export var SinkParser = /*#__PURE__*/function () {
           return j;
         }
       }
-
       if (ch == "(") {
         var thing_type = this._store.list;
         var ch2 = str.slice(i + 1, i + 2);
-
         if (ch2 == "$") {
           var thing_type = this._store.newSet;
           i += 1;
         }
-
         var j = i + 1;
         var mylist = new pyjslib_List([]);
-
         while (1) {
           var i = this.skipSpace(str, j);
-
           if (i < 0) {
             throw BadSyntax(this._thisDoc, this.lines, str, i, "needed ')', found end.");
           }
-
           if (str.slice(i, i + 1) == ")") {
             var j = i + 1;
             break;
           }
-
           var item = new pyjslib_List([]);
           var j = this.item(str, i, item);
-
           if (j < 0) {
             throw BadSyntax(this._thisDoc, this.lines, str, i, "expected item in list or ')'");
           }
-
           mylist.push(item[0]);
         }
-
         res.push(thing_type(mylist, this._context));
         return j;
       }
-
       var j = this.tok("this", str, i);
-
       if (j >= 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "Keyword 'this' was ancient N3. Now use @forSome and @forAll keywords.");
         res.push(this._context);
         return j;
       }
-
       var j = this.tok("true", str, i);
-
       if (j >= 0) {
         res.push(true);
         return j;
       }
-
       var j = this.tok("false", str, i);
-
       if (j >= 0) {
         res.push(false);
         return j;
       }
-
       if (subj == null) {
         var j = this.uri_ref2(str, i, res);
-
         if (j >= 0) {
           return j;
         }
       }
-
       return -1;
     }
   }, {
@@ -1034,52 +862,41 @@ export var SinkParser = /*#__PURE__*/function () {
       Parse property list
       Leaves the terminating punctuation in the buffer
       */
+
       while (1) {
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF found when expected verb in property list");
           return j;
         }
-
         if (str.slice(j, j + 2) == ":-") {
           var i = j + 2;
           var res = new pyjslib_List([]);
           var j = this.node(str, i, res, subj);
-
           if (j < 0) {
             throw BadSyntax(this._thisDoc, this.lines, str, i, "bad {} or () or [] node after :- ");
           }
-
           var i = j;
           continue;
         }
-
         var i = j;
         var v = new pyjslib_List([]);
         var j = this.verb(str, i, v);
-
         if (j <= 0) {
           return i;
         }
-
         var objs = new pyjslib_List([]);
         var i = this.objectList(str, j, objs);
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "objectList expected");
         }
-
         var __obj = new pyjslib_Iterator(objs);
-
         try {
           while (true) {
             var obj = __obj.next();
-
             var pairFudge = v[0];
             var dir = pairFudge[0];
             var sym = pairFudge[1];
-
             if (dir == "->") {
               this.makeStatement(new pyjslib_Tuple([this._context, sym, subj, obj]));
             } else {
@@ -1091,18 +908,14 @@ export var SinkParser = /*#__PURE__*/function () {
             throw e;
           }
         }
-
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "EOF found in list of objects");
           return j;
         }
-
         if (str.slice(i, i + 1) != ";") {
           return i;
         }
-
         var i = i + 1;
       }
     }
@@ -1115,50 +928,40 @@ export var SinkParser = /*#__PURE__*/function () {
        Used to use a final value of the function to be called, e.g. this.bareWord
       but passing the function didn't work fo js converion pyjs
       */
-      var i = this.skipSpace(str, j);
 
+      var i = this.skipSpace(str, j);
       if (i < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF found expecting comma sep list");
         return i;
       }
-
       if (str.charAt(i) == ".") {
         return j;
       }
-
       if (ofUris) {
         var i = this.uri_ref2(str, i, res);
       } else {
         var i = this.bareWord(str, i, res);
       }
-
       if (i < 0) {
         return -1;
       }
-
       while (1) {
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           return j;
         }
-
         var ch = str.slice(j, j + 1);
-
         if (ch != ",") {
           if (ch != ".") {
             return -1;
           }
-
           return j;
         }
-
         if (ofUris) {
           var i = this.uri_ref2(str, j + 1, res);
         } else {
           var i = this.bareWord(str, j + 1, res);
         }
-
         if (i < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "bad list content");
           return i;
@@ -1169,25 +972,19 @@ export var SinkParser = /*#__PURE__*/function () {
     key: "objectList",
     value: function objectList(str, i, res) {
       var i = this.object(str, i, res);
-
       if (i < 0) {
         return -1;
       }
-
       while (1) {
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, j, "EOF found after object");
           return j;
         }
-
         if (str.slice(j, j + 1) != ",") {
           return j;
         }
-
         var i = this.object(str, j + 1, res);
-
         if (i < 0) {
           return i;
         }
@@ -1197,23 +994,18 @@ export var SinkParser = /*#__PURE__*/function () {
     key: "checkDot",
     value: function checkDot(str, i) {
       var j = this.skipSpace(str, i);
-
       if (j < 0) {
         return j;
       }
-
       if (str.slice(j, j + 1) == ".") {
         return j + 1;
       }
-
       if (str.slice(j, j + 1) == "}") {
         return j;
       }
-
       if (str.slice(j, j + 1) == "]") {
         return j;
       }
-
       throw BadSyntax(this._thisDoc, this.lines, str, j, "expected '.' or '}' or ']' at end of statement");
       return i;
     }
@@ -1226,102 +1018,80 @@ export var SinkParser = /*#__PURE__*/function () {
       NS and local name is now used though I prefer inserting a '#'
       to make the namesapces look more like what XML folks expect.
       */
+
       var qn = new pyjslib_List([]);
       var j = this.qname(str, i, qn);
-
       if (j >= 0) {
         var pairFudge = qn[0];
         var pfx = pairFudge[0];
         var ln = pairFudge[1];
-
         if (pfx == null) {
           assertFudge(0, "not used?");
           var ns = this._baseURI + ADDED_HASH;
         } else {
           var ns = this._bindings[pfx];
-
           if (!ns) {
             if (pfx == "_") {
               res.push(this.anonymousNode(ln));
               return j;
             }
-
             throw BadSyntax(this._thisDoc, this.lines, str, i, "Prefix " + pfx + " not bound.");
           }
         }
-
         var symb = this._store.sym(ns + ln);
-
         if (ArrayIndexOf(this._variables, symb) >= 0) {
           res.push(this._variables[symb]);
         } else {
           res.push(symb);
         }
-
         return j;
       }
-
       var i = this.skipSpace(str, i);
-
       if (i < 0) {
         return -1;
       }
-
       if (str.charAt(i) == "?") {
         var v = new pyjslib_List([]);
         var j = this.variable(str, i, v);
-
         if (j > 0) {
           res.push(v[0]);
           return j;
         }
-
         return -1;
       } else if (str.charAt(i) == "<") {
         var i = i + 1;
         var st = i;
-
         while (i < pyjslib_len(str)) {
           if (str.charAt(i) == ">") {
             var uref = str.slice(st, i);
-
             if (this._baseURI) {
               var uref = uripath_join(this._baseURI, uref);
             } else {
               assertFudge(uref.indexOf(":") >= 0, "With no base URI, cannot deal with relative URIs");
             }
-
             if (str.slice(i - 1, i) == "#" && !(pyjslib_slice(uref, -1, null) == "#")) {
               var uref = uref + "#";
             }
-
             var symb = this._store.sym(uref);
-
             if (ArrayIndexOf(this._variables, symb) >= 0) {
               res.push(this._variables[symb]);
             } else {
               res.push(symb);
             }
-
             return i + 1;
           }
-
           var i = i + 1;
         }
-
         throw BadSyntax(this._thisDoc, this.lines, str, j, "unterminated URI reference");
       } else if (this.keywordsSet) {
         var v = new pyjslib_List([]);
         var j = this.bareWord(str, i, v);
-
         if (j < 0) {
           return -1;
         }
-
         if (ArrayIndexOf(this.keywords, v[0]) >= 0) {
           throw BadSyntax(this._thisDoc, this.lines, str, i, "Keyword \"" + v[0] + "\" not allowed here.");
         }
-
         res.push(this._store.sym(this._bindings[""] + v[0]));
         return j;
       } else {
@@ -1334,12 +1104,12 @@ export var SinkParser = /*#__PURE__*/function () {
       /*
       Skip white space, newlines and comments.
       return -1 if EOF, else position of first non-ws character*/
-      var whitespace = " \n\r\t\f\x0B\xA0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u200B\u2028\u2029\u3000";
 
+      var whitespace = " \n\r\t\f\x0B\xA0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u200B\u2028\u2029\u3000";
       for (var j = i ? i : 0; j < str.length; j++) {
-        var ch = str.charAt(j); // console.log("    skipspace j= "+j + " i= " + i + " n= " + str.length);
+        var ch = str.charAt(j);
+        // console.log("    skipspace j= "+j + " i= " + i + " n= " + str.length);
         // console.log(" skipspace ch <" + ch + ">");
-
         if (whitespace.indexOf(ch) < 0) {
           //not ws
           // console.log(" skipspace 2 ch <" + ch + ">");
@@ -1355,7 +1125,6 @@ export var SinkParser = /*#__PURE__*/function () {
                 break;
               }
             }
-
             ;
           } else {
             // Not hash - something interesting
@@ -1370,8 +1139,6 @@ export var SinkParser = /*#__PURE__*/function () {
           }
         }
       } // next j
-
-
       return -1; // EOF
     }
   }, {
@@ -1380,32 +1147,26 @@ export var SinkParser = /*#__PURE__*/function () {
       /*
       ?abc -> variable(:abc)
       */
-      var j = this.skipSpace(str, i);
 
+      var j = this.skipSpace(str, i);
       if (j < 0) {
         return -1;
       }
-
       if (str.slice(j, j + 1) != "?") {
         return -1;
       }
-
       var j = j + 1;
       var i = j;
-
       if ("0123456789-".indexOf(str.charAt(j)) >= 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "Varible name can't start with '" + str.charAt(j) + "s'");
         return -1;
       }
-
       while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
         var i = i + 1;
       }
-
       if (this._parentContext == null) {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "Can't use ?xxx syntax for variable in outermost level: " + str.slice(j - 1, i));
       }
-
       res.push(this._store.variable(str.slice(j, i)));
       return i;
     }
@@ -1415,28 +1176,22 @@ export var SinkParser = /*#__PURE__*/function () {
       /*
       abc -> :abc
       */
-      var j = this.skipSpace(str, i);
 
+      var j = this.skipSpace(str, i);
       if (j < 0) {
         return -1;
       }
-
       var ch = str.charAt(j);
-
       if ("0123456789-".indexOf(ch) >= 0) {
         return -1;
       }
-
       if (_notNameChars.indexOf(ch) >= 0) {
         return -1;
       }
-
       var i = j;
-
       while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
         var i = i + 1;
       }
-
       res.push(str.slice(j, i));
       return i;
     }
@@ -1448,25 +1203,20 @@ export var SinkParser = /*#__PURE__*/function () {
       If not in keywords and keywordsSet: def -> ('', 'def')
       :def -> ('', 'def')
       */
-      var i = this.skipSpace(str, i);
 
+      var i = this.skipSpace(str, i);
       if (i < 0) {
         return -1;
       }
-
       var c = str.charAt(i);
-
       if ("0123456789-+".indexOf(c) >= 0) {
         return -1;
       }
-
       if (_notNameChars.indexOf(c) < 0) {
         var ln = c;
         var i = i + 1;
-
         while (i < pyjslib_len(str)) {
           var c = str.charAt(i);
-
           if (_notNameChars.indexOf(c) < 0) {
             var ln = ln + c;
             var i = i + 1;
@@ -1477,15 +1227,12 @@ export var SinkParser = /*#__PURE__*/function () {
       } else {
         var ln = "";
       }
-
       if (i < pyjslib_len(str) && str.charAt(i) == ":") {
         var pfx = ln;
         var i = i + 1;
         var ln = "";
-
         while (i < pyjslib_len(str)) {
           var c = str.charAt(i);
-
           if (_notNameChars.indexOf(c) < 0) {
             var ln = ln + c;
             var i = i + 1;
@@ -1493,7 +1240,6 @@ export var SinkParser = /*#__PURE__*/function () {
             break;
           }
         }
-
         res.push(new pyjslib_Tuple([pfx, ln]));
         return i;
       } else {
@@ -1501,7 +1247,6 @@ export var SinkParser = /*#__PURE__*/function () {
           res.push(new pyjslib_Tuple(["", ln]));
           return i;
         }
-
         return -1;
       }
     }
@@ -1509,28 +1254,23 @@ export var SinkParser = /*#__PURE__*/function () {
     key: "object",
     value: function object(str, i, res) {
       var j = this.subject(str, i, res);
-
       if (j >= 0) {
         return j;
       } else {
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           return -1;
         } else {
           var i = j;
         }
-
         var delim = null;
         var ch = str.charAt(i);
-
         if (ch == "\"" || ch == "'") {
           if (str.slice(i, i + 3 == ch + ch)) {
             delim = ch + ch + ch;
           } else {
             delim = ch;
           }
-
           var i = i + pyjslib_len(delim);
           var pairFudge = this.strconst(str, i, delim);
           var j = pairFudge[0];
@@ -1547,29 +1287,23 @@ export var SinkParser = /*#__PURE__*/function () {
     key: "nodeOrLiteral",
     value: function nodeOrLiteral(str, i, res) {
       var j = this.node(str, i, res);
-
       if (j >= 0) {
         return j;
       } else {
         var j = this.skipSpace(str, i);
-
         if (j < 0) {
           return -1;
         } else {
           var i = j;
         }
-
         var ch = str.charAt(i);
-
         if ("-+0987654321".indexOf(ch) >= 0) {
           datetime_syntax.lastIndex = 0;
           var m = datetime_syntax.exec(str.slice(i));
-
           if (m != null) {
             // j =  ( i + datetime_syntax.lastIndex ) ;
             var val = m[0];
             j = i + val.length;
-
             if (val.indexOf("T") >= 0) {
               res.push(this._store.literal(val, this._store.sym(DATETIME_DATATYPE)));
             } else {
@@ -1578,14 +1312,11 @@ export var SinkParser = /*#__PURE__*/function () {
           } else {
             number_syntax.lastIndex = 0;
             var m = number_syntax.exec(str.slice(i));
-
             if (m == null) {
               throw BadSyntax(this._thisDoc, this.lines, str, i, "Bad number or date syntax");
             }
-
             j = i + number_syntax.lastIndex;
             var val = str.slice(i, j);
-
             if (val.indexOf("e") >= 0) {
               res.push(this._store.literal(parseFloat(val), this._store.sym(FLOAT_DATATYPE)));
             } else if (str.slice(i, j).indexOf(".") >= 0) {
@@ -1594,7 +1325,6 @@ export var SinkParser = /*#__PURE__*/function () {
               res.push(this._store.literal(parseInt(val), this._store.sym(INTEGER_DATATYPE)));
             }
           }
-
           ;
           return j; // Where we have got up to
         }
@@ -1605,33 +1335,27 @@ export var SinkParser = /*#__PURE__*/function () {
           } else {
             var delim = "\"";
           }
-
           var i = i + pyjslib_len(delim);
           var dt = null;
           var pairFudge = this.strconst(str, i, delim);
           var j = pairFudge[0];
           var s = pairFudge[1];
           var lang = null;
-
           if (str.slice(j, j + 1) == "@") {
             langcode.lastIndex = 0;
             var m = langcode.exec(str.slice(j + 1));
-
             if (m == null) {
               throw BadSyntax(this._thisDoc, startline, str, i, "Bad language code syntax on string literal, after @");
             }
-
             var i = langcode.lastIndex + j + 1;
             var lang = str.slice(j + 1, i);
             var j = i;
           }
-
           if (str.slice(j, j + 2) == "^^") {
             var res2 = new pyjslib_List([]);
             var j = this.uri_ref2(str, j + 2, res2);
             var dt = res2[0];
           }
-
           res.push(this._store.literal(s, lang || dt));
           return j;
         } else {
@@ -1646,34 +1370,28 @@ export var SinkParser = /*#__PURE__*/function () {
       parse an N3 string constant delimited by delim.
       return index, val
       */
+
       var j = i;
       var ustr = "";
       var startline = this.lines;
-
       while (j < pyjslib_len(str)) {
         var i = j + pyjslib_len(delim);
-
         if (str.slice(j, i) == delim) {
           return new pyjslib_Tuple([i, ustr]);
         }
-
         if (str.charAt(j) == "\"") {
           var ustr = ustr + "\"";
           var j = j + 1;
           continue;
         }
-
         interesting.lastIndex = 0;
         var m = interesting.exec(str.slice(j));
-
         if (!m) {
           throw BadSyntax(this._thisDoc, startline, str, j, "Closing quote missing in string at ^ in " + str.slice(j - 20, j) + "^" + str.slice(j, j + 20));
         }
-
         var i = j + interesting.lastIndex - 1;
         var ustr = ustr + str.slice(j, i);
         var ch = str.charAt(i);
-
         if (ch == "\"") {
           var j = i;
           continue;
@@ -1684,7 +1402,6 @@ export var SinkParser = /*#__PURE__*/function () {
           if (delim == "\"") {
             throw BadSyntax(this._thisDoc, startline, str, i, "newline found in string literal");
           }
-
           this.lines = this.lines + 1;
           var ustr = ustr + ch;
           var j = i + 1;
@@ -1693,13 +1410,10 @@ export var SinkParser = /*#__PURE__*/function () {
         } else if (ch == "\\") {
           var j = i + 1;
           var ch = str.slice(j, j + 1);
-
           if (!ch) {
             throw BadSyntax(this._thisDoc, startline, str, i, "unterminated string literal (2)");
           }
-
           var k = string_find("abfrtvn\\\"", ch);
-
           if (k >= 0) {
             var uch = "\a\b\f\r\t\v\n\\\"".charAt(k);
             var ustr = ustr + uch;
@@ -1719,7 +1433,6 @@ export var SinkParser = /*#__PURE__*/function () {
           }
         }
       }
-
       throw BadSyntax(this._thisDoc, this.lines, str, i, "unterminated string literal");
     }
   }, {
@@ -1728,26 +1441,20 @@ export var SinkParser = /*#__PURE__*/function () {
       var j = i;
       var count = 0;
       var value = 0;
-
       while (count < 4) {
         var chFudge = str.slice(j, j + 1);
         var ch = chFudge.toLowerCase();
         var j = j + 1;
-
         if (ch == "") {
           throw BadSyntax(this._thisDoc, startline, str, i, "unterminated string literal(3)");
         }
-
         var k = string_find("0123456789abcdef", ch);
-
         if (k < 0) {
           throw BadSyntax(this._thisDoc, startline, str, i, "bad string literal hex escape");
         }
-
         var value = value * 16 + k;
         var count = count + 1;
       }
-
       var uch = String.fromCharCode(value);
       return new pyjslib_Tuple([j, uch]);
     }
@@ -1757,38 +1464,29 @@ export var SinkParser = /*#__PURE__*/function () {
       var j = i;
       var count = 0;
       var value = "\\U";
-
       while (count < 8) {
         var chFudge = str.slice(j, j + 1);
         var ch = chFudge.toLowerCase();
         var j = j + 1;
-
         if (ch == "") {
           throw BadSyntax(this._thisDoc, startline, str, i, "unterminated string literal(3)");
         }
-
         var k = string_find("0123456789abcdef", ch);
-
         if (k < 0) {
           throw BadSyntax(this._thisDoc, startline, str, i, "bad string literal hex escape");
         }
-
         var value = value + ch;
         var count = count + 1;
       }
-
       var uch = stringFromCharCode("0x" + pyjslib_slice(value, 2, 10) - 0);
       return new pyjslib_Tuple([j, uch]);
     }
   }]);
-
   return SinkParser;
 }();
-
 function OLD_BadSyntax(uri, lines, str, i, why) {
   return new __OLD_BadSyntax(uri, lines, str, i, why);
 }
-
 function __OLD_BadSyntax(uri, lines, str, i, why) {
   this._str = str.encode("utf-8");
   this._str = str;
@@ -1797,28 +1495,23 @@ function __OLD_BadSyntax(uri, lines, str, i, why) {
   this.lines = lines;
   this._uri = uri;
 }
-
 __OLD_BadSyntax.prototype.toString = function () {
   var str = this._str;
   var i = this._i;
   var st = 0;
-
   if (i > 60) {
     var pre = "...";
     var st = i - 60;
   } else {
     var pre = "";
   }
-
   if (pyjslib_len(str) - i > 60) {
     var post = "...";
   } else {
     var post = "";
   }
-
   return "Line %i of <%s>: Bad syntax (%s) at ^ in:\n\"%s%s^%s%s\"" % new pyjslib_Tuple([this.lines + 1, this._uri, this._why, pre, str.slice(st, i), str.slice(i, i + 60), post]);
 };
-
 function BadSyntax(uri, lines, str, i, why) {
   var lineNo = lines + 1;
   var msg = "Line " + lineNo + " of <" + uri + ">: Bad syntax: " + why + "\nat: \"" + str.slice(i, i + 30) + "\"";
@@ -1828,16 +1521,12 @@ function BadSyntax(uri, lines, str, i, why) {
   e.syntaxProblem = why;
   return e;
 }
-
 function stripCR(str) {
   var res = "";
-
   var __ch = new pyjslib_Iterator(str);
-
   try {
     while (true) {
       var ch = __ch.next();
-
       if (ch != "\r") {
         var res = res + ch;
       }
@@ -1847,8 +1536,6 @@ function stripCR(str) {
       throw e;
     }
   }
-
   return res;
 }
-
 function dummyWrite(x) {}