rdflib 2.2.21 → 2.2.22-04669b23

package/lib/n3parser.js

@@ -1,48 +1,32 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.SinkParser = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var Uri = _interopRequireWildcard(require("./uri"));
-
 var _utils = require("./utils");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+var _lists = require("./lists");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
 *
 *  UTF-8 data encode / decode
 *  http://www.webtoolkit.info/
 *
 **/
+
 function hexify(str) {
   // also used in parser
   return encodeURI(str);
 }
-
 var Utf8 = {
   // public method for url encoding
-  encode: function encode(string) {
+  encode: function (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) {
@@ -54,17 +38,14 @@ var Utf8 = {
         utftext += String.fromCharCode(c & 63 | 128);
       }
     }
-
     return utftext;
   },
   // public method for url decoding
-  decode: function decode(utftext) {
+  decode: function (utftext) {
     var string = "";
     var i = 0;
-
     while (i < utftext.length) {
       var c = utftext.charCodeAt(i);
-
       if (c < 128) {
         string += String.fromCharCode(c);
         i++;
@@ -76,7 +57,6 @@ var Utf8 = {
         i += 3;
       }
     }
-
     return string;
   }
 }; // Things we need to define to make converted pythn code work in js
@@ -84,90 +64,77 @@ 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#";
 
-var pyjslib_Tuple = function pyjslib_Tuple(theList) {
+//  pyjs seems to reference runtime library which I didn't find
+
+var pyjslib_Tuple = function (theList) {
   return theList;
 };
-
-var pyjslib_List = function pyjslib_List(theList) {
+var pyjslib_List = function (theList) {
   return theList;
 };
-
-var pyjslib_Dict = function pyjslib_Dict(listOfPairs) {
+var pyjslib_Dict = function (listOfPairs) {
   if (listOfPairs.length > 0) throw "missing.js: oops nnonempty dict not imp";
   return [];
 };
-
-var pyjslib_len = function pyjslib_len(s) {
+var pyjslib_len = function (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 ' + (0, _typeof2.default)(str);
+var pyjslib_slice = function (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);
   return str.slice(i, j); // @ exactly the same spec?
 };
 
 var StopIteration = Error('dummy error stop iteration');
-
-var pyjslib_Iterator = function pyjslib_Iterator(theList) {
+var pyjslib_Iterator = function (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) {
+var ord = function (str) {
   return str.charCodeAt(0);
 };
-
-var string_find = function string_find(str, s) {
+var string_find = function (str, s) {
   return str.indexOf(s);
 };
-
-var assertFudge = function assertFudge(condition, desc) {
+var assertFudge = function (condition, desc) {
   if (condition) return;
   if (desc) throw "python Assertion failed: " + desc;
   throw "(python) Assertion failed.";
 };
-
-var stringFromCharCode = function stringFromCharCode(uesc) {
+var stringFromCharCode = function (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) {
+var uripath_join = function (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 (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);
@@ -177,6 +144,7 @@ function SyntaxError(details) {
 function __SyntaxError(details) {
   this.details = details;
 }
+
 /*
 
 $Id: n3parser.js 14561 2008-02-23 06:37:26Z kennyluck $
@@ -207,7 +175,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";
@@ -218,9 +185,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');
@@ -232,17 +197,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);
 }
-
 var _default = createSinkParser;
 exports.default = _default;
-
-var SinkParser = /*#__PURE__*/function () {
-  function SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
-    (0, _classCallCheck2.default)(this, SinkParser);
+class SinkParser {
+  constructor(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
     if (typeof openFormula == 'undefined') openFormula = null;
     if (typeof thisDoc == 'undefined') thisDoc = "";
     if (typeof baseURI == 'undefined') baseURI = null;
@@ -256,22 +217,19 @@ 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;
@@ -282,11 +240,9 @@ 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 {
@@ -296,9 +252,7 @@ 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";
@@ -306,7 +260,6 @@ var SinkParser = /*#__PURE__*/function () {
         this._genPrefix = RDFSink_uniqueURI();
       }
     }
-
     if (openFormula == null) {
       if (this._thisDoc) {
         this._formula = store.formula(thisDoc + "#_formula");
@@ -316,1499 +269,1158 @@ var SinkParser = /*#__PURE__*/function () {
     } else {
       this._formula = openFormula;
     }
-
     this._context = this._formula;
     this._parentContext = null;
   }
+  here(i) {
+    return this._genPrefix + "_L" + this.lines + "C" + (i - this.startOfLine + 1);
+  }
+  formula() {
+    return this._formula;
+  }
+  loadStream(stream) {
+    return this.loadBuf(stream.read());
+  }
+  loadBuf(buf) {
+    /*
+    Parses a buffer and returns its top level formula*/
 
-  (0, _createClass2.default)(SinkParser, [{
-    key: "here",
-    value: function here(i) {
-      return this._genPrefix + "_L" + this.lines + "C" + (i - this.startOfLine + 1);
-    }
-  }, {
-    key: "formula",
-    value: function formula() {
-      return this._formula;
-    }
-  }, {
-    key: "loadStream",
-    value: function loadStream(stream) {
-      return this.loadBuf(stream.read());
-    }
-  }, {
-    key: "loadBuf",
-    value: function loadBuf(buf) {
-      /*
-      Parses a buffer and returns its top level formula*/
-      this.startDoc();
-      this.feed(buf);
-      return this.endDoc();
-    }
-  }, {
-    key: "feed",
-    value: function feed(octets) {
-      /*
-      Feed an octet stream tothe parser
-       if BadSyntax is raised, the string
-      passed in the exception object is the
-      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");
-        }
+    this.startDoc();
+    this.feed(buf);
+    return this.endDoc();
+  }
+  feed(octets) {
+    /*
+    Feed an octet stream tothe parser
+     if BadSyntax is raised, the string
+    passed in the exception object is the
+    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;
       }
-    }
-  }, {
-    key: "directiveOrStatement",
-    value: function directiveOrStatement(str, h) {
-      var i = this.skipSpace(str, h);
-
+      var i = this.directiveOrStatement(str, j);
       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);
+        throw BadSyntax(this._thisDoc, this.lines, str, j, "expected directive or statement");
       }
-
-      return j;
     }
-  }, {
-    key: "tok",
-    value: function tok(_tok, str, i) {
-      /*
-      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 {
-        if ((0, _utils.ArrayIndexOf)(this.keywords, _tok) < 0) {
-          return -1;
-        }
-      }
-
-      var k = i + pyjslib_len(_tok);
-
-      if (str.slice(i, k) == _tok && _notQNameChars.indexOf(str.charAt(k)) >= 0) {
-        return k;
-      } else {
+  }
+  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;
+  }
+  tok(tok, str, i) {
+    /*
+    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 {
+      if ((0, _utils.ArrayIndexOf)(this.keywords, tok) < 0) {
         return -1;
       }
     }
-  }, {
-    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 k = i + pyjslib_len(tok);
+    if (str.slice(i, k) == tok && _notQNameChars.indexOf(str.charAt(k)) >= 0) {
+      return k;
+    } else {
+      return -1;
+    }
+  }
+  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");
       }
-
-      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;
+      this.setKeywords(pyjslib_slice(res, null, null));
+      if (diag_chatty_flag > 80) {
+        diag_progress("Keywords ", this.keywords);
       }
-
-      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 ((0, _utils.ArrayIndexOf)(this._variables, x) < 0 || (0, _utils.ArrayIndexOf)(this._parentVariables, x) >= 0) {
-              this._variables[x] = this._context.newUniversal(x);
-            }
-          }
-        } catch (e) {
-          if (e != StopIteration) {
-            throw e;
+      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 ((0, _utils.ArrayIndexOf)(this._variables, x) < 0 || (0, _utils.ArrayIndexOf)(this._parentVariables, x) >= 0) {
+            this._variables[x] = this._context.newUniversal(x);
           }
         }
-
-        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) {
-          if (e != StopIteration) {
-            throw e;
-          }
+      } catch (e) {
+        if (e != StopIteration) {
+          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;
+      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 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 __x = new pyjslib_Iterator(res);
+      try {
+        while (true) {
+          var x = __x.next();
+          this._context.declareExistential(x);
         }
-
-        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 + ">");
+      } catch (e) {
+        if (e != StopIteration) {
+          throw e;
         }
-
-        assertFudge(ns.indexOf(":") >= 0);
-        this._baseURI = ns;
-        return i;
       }
-
-      return -1;
+      return i;
     }
-  }, {
-    key: "bind",
-    value: function bind(qn, uri) {
-      if (qn == "") {} else {
-        this._store.setPrefixForURI(qn, uri);
+    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");
       }
-    }
-  }, {
-    key: "setKeywords",
-    value: function setKeywords(k) {
-      /*
-      Takes a list of strings*/
-      if (k == null) {
-        this.keywordsSet = 0;
+      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 {
-        this.keywords = k;
-        this.keywordsSet = 1;
-      }
-    }
-  }, {
-    key: "startDoc",
-    value: function startDoc() {}
-  }, {
-    key: "endDoc",
-    value: function endDoc() {
-      /*
-      Signal end of document and stop parsing. returns formula*/
-      return this._formula;
-    }
-  }, {
-    key: "makeStatement",
-    value: function makeStatement(quad) {
-      quad[0].add(quad[2], quad[1], quad[3], this.source);
-      this.statementCount += 1;
-    }
-  }, {
-    key: "statement",
-    value: function statement(str, i) {
-      var r = new pyjslib_List([]);
-      var i = this.object(str, i, r);
-
+        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) {
-        return i;
+        throw BadSyntax(this._thisDoc, this.lines, str, j, "expected <uri> after @base ");
       }
-
-      var j = this.property_list(str, i, r[0]);
-
-      if (j < 0) {
-        throw BadSyntax(this._thisDoc, this.lines, str, i, "expected propertylist");
+      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;
+  }
+  bind(qn, uri) {
+    if (qn == "") {} else {
+      this._store.setPrefixForURI(qn, uri);
+    }
+  }
+  setKeywords(k) {
+    /*
+    Takes a list of strings*/
 
+    if (k == null) {
+      this.keywordsSet = 0;
+    } else {
+      this.keywords = k;
+      this.keywordsSet = 1;
+    }
+  }
+  startDoc() {}
+  /* Signal end of document and stop parsing. returns formula */
+  endDoc() {
+    if (this.hasNil && this._store.rdfFactory.supports["COLLECTIONS"]) {
+      (0, _lists.convertFirstRestNil)(this._store, this.source);
+    }
+    return this._formula;
+  }
+  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;
+  }
+  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;
+  }
+  subject(str, i, res) {
+    return this.item(str, i, res);
+  }
+  verb(str, i, res) {
+    /*
+    has _prop_
+    is _prop_ of
+    a
+    =
+    _prop_
+    >- prop ->
+    <- prop -<
+    _operator_*/
+
+    var j = this.skipSpace(str, i);
+    if (j < 0) {
       return j;
     }
-  }, {
-    key: "subject",
-    value: function subject(str, i, res) {
-      return this.item(str, i, res);
-    }
-  }, {
-    key: "verb",
-    value: function verb(str, i, res) {
-      /*
-      has _prop_
-      is _prop_ of
-      a
-      =
-      _prop_
-      >- prop ->
-      <- prop -<
-      _operator_*/
+    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;
+  }
+  prop(str, i, res) {
+    return this.item(str, i, res);
+  }
+  item(str, i, res) {
+    return this.path(str, i, res);
+  }
+  blankNode(uri) {
+    return this._context.bnode(uri, this._reason2);
+  }
+  path(str, i, res) {
+    /*
+    Parse the path production.
+    */
 
-      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'");
+    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;
         }
-
-        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;
-    }
-  }, {
-    key: "prop",
-    value: function prop(str, i, res) {
-      return this.item(str, i, res);
-    }
-  }, {
-    key: "item",
-    value: function item(str, i, res) {
-      return this.path(str, i, res);
-    }
-  }, {
-    key: "blankNode",
-    value: function blankNode(uri) {
-      return this._context.bnode(uri, this._reason2);
-    }
-  }, {
-    key: "path",
-    value: function path(str, i, res) {
-      /*
-      Parse the path production.
-      */
-      var j = this.nodeOrLiteral(str, i, res);
-
+      var subj = res.pop();
+      var obj = this.blankNode(this.here(j));
+      var j = this.node(str, j + 1, res);
       if (j < 0) {
-        return j;
+        throw BadSyntax(this._thisDoc, this.lines, str, j, "EOF found in middle of path syntax");
       }
-
-      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);
+      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]));
       }
-
-      return j;
+      res.push(obj);
     }
-  }, {
-    key: "anonymousNode",
-    value: function anonymousNode(ln) {
-      /*
-      Remember or generate a term for one of these _: anonymous nodes*/
-      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?
-
+    return j;
+  }
+  anonymousNode(ln) {
+    /*
+    Remember or generate a term for one of these _: anonymous nodes*/
 
-      this._anonymousNodes[ln] = term;
+    var term = this._anonymousNodes[ln];
+    if (term) {
       return term;
     }
-  }, {
-    key: "node",
-    value: function node(str, i, res, subjectAlready) {
-      if (typeof subjectAlready == 'undefined') subjectAlready = null;
-      /*
-      Parse the <node> production.
-      Space is now skipped once at the beginning
-      instead of in multipe calls to self.skipSpace().
-      */
-
-      var subj = subjectAlready;
-      var j = this.skipSpace(str, i);
-
+    var term = this._store.bnode(ln);
+    // var term = this._store.bnode(this._context, this._reason2); eh?
+    this._anonymousNodes[ln] = term;
+    return term;
+  }
+  node(str, i, res, subjectAlready) {
+    if (typeof subjectAlready == 'undefined') subjectAlready = null;
+    /*
+    Parse the <node> production.
+    Space is now skipped once at the beginning
+    instead of in multipe calls to self.skipSpace().
+    */
+
+    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) {
-        return j;
+        throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF after '['");
       }
-
-      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) {
-                if (e != StopIteration) {
-                  throw e;
-                }
+      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]));
               }
-            }
-
-            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;
-            }
-          } else {
-            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;
-              } else {
-                throw BadSyntax(this._thisDoc, this.lines, str, i, "expected: ','");
+            } catch (e) {
+              if (e != StopIteration) {
+                throw e;
               }
-            } 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 {
-          var j = i + 1;
-          var oldParentContext = this._parentContext;
-          this._parentContext = this._context;
-          var parentAnonymousNodes = this._anonymousNodes;
-          var grandParentVariables = this._parentVariables;
-          this._parentVariables = this._variables;
-          this._anonymousNodes = new pyjslib_Dict([]);
-          this._variables = this._variables.slice();
-          var reason2 = this._reason2;
-          this._reason2 = becauseSubexpression;
-
-          if (subj == null) {
-            var subj = this._store.formula();
+          var j = this.skipSpace(str, j);
+          if (j < 0) {
+            throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when objectList expected after [ = ");
           }
-
-          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 '}'");
-            }
+          if (str.slice(j, j + 1) == ";") {
+            var j = j + 1;
           }
-
-          this._anonymousNodes = parentAnonymousNodes;
-          this._variables = this._parentVariables;
-          this._parentVariables = grandParentVariables;
-          this._context = this._parentContext;
-          this._reason2 = reason2;
-          this._parentContext = oldParentContext;
-          res.push(subj.close());
-          return j;
+        } else {
+          throw BadSyntax(this._thisDoc, this.lines, str, i, "objectList expected after [= ");
         }
       }
-
-      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;
-        }
-
+      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.");
+            throw BadSyntax(this._thisDoc, this.lines, str, i, "needed '$}', found end.");
           }
-
-          if (str.slice(i, i + 1) == ")") {
-            var j = i + 1;
+          if (str.slice(i, i + 2) == "$}") {
+            var j = i + 2;
             break;
           }
-
+          if (!first_run) {
+            if (str.slice(i, i + 1) == ",") {
+              i += 1;
+            } else {
+              throw BadSyntax(this._thisDoc, this.lines, str, i, "expected: ','");
+            }
+          } 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 list or ')'");
+            throw BadSyntax(this._thisDoc, this.lines, str, i, "expected item in set 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);
+        res.push(this._store.newSet(mylist, this._context));
         return j;
-      }
-
-      if (subj == null) {
-        var j = this.uri_ref2(str, i, res);
-
-        if (j >= 0) {
-          return j;
-        }
-      }
-
-      return -1;
-    }
-  }, {
-    key: "property_list",
-    value: function property_list(str, i, subj) {
-      /*
-      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;
+      } else {
+        var j = i + 1;
+        var oldParentContext = this._parentContext;
+        this._parentContext = this._context;
+        var parentAnonymousNodes = this._anonymousNodes;
+        var grandParentVariables = this._parentVariables;
+        this._parentVariables = this._variables;
+        this._anonymousNodes = new pyjslib_Dict([]);
+        this._variables = this._variables.slice();
+        var reason2 = this._reason2;
+        this._reason2 = becauseSubexpression;
+        if (subj == null) {
+          var subj = this._store.formula();
         }
-
-        if (str.slice(j, j + 2) == ":-") {
-          var i = j + 2;
-          var res = new pyjslib_List([]);
-          var j = this.node(str, i, res, subj);
-
+        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, "bad {} or () or [] node after :- ");
+            throw BadSyntax(this._thisDoc, this.lines, str, i, "expected statement or '}'");
           }
-
-          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);
-
+        this._anonymousNodes = parentAnonymousNodes;
+        this._variables = this._parentVariables;
+        this._parentVariables = grandParentVariables;
+        this._context = this._parentContext;
+        this._reason2 = reason2;
+        this._parentContext = oldParentContext;
+        res.push(subj.close());
+        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, j, "objectList expected");
+          throw BadSyntax(this._thisDoc, this.lines, str, i, "needed ')', found end.");
         }
-
-        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 {
-              this.makeStatement(new pyjslib_Tuple([this._context, sym, obj, subj]));
-            }
-          }
-        } catch (e) {
-          if (e != StopIteration) {
-            throw e;
-          }
+        if (str.slice(i, i + 1) == ")") {
+          var j = i + 1;
+          break;
         }
-
-        var j = this.skipSpace(str, i);
-
+        var item = new pyjslib_List([]);
+        var j = this.item(str, i, item);
         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;
+          throw BadSyntax(this._thisDoc, this.lines, str, i, "expected item in list or ')'");
         }
-
-        var i = i + 1;
+        mylist.push(item[0]);
       }
+      res.push(thing_type(mylist, this._context));
+      return j;
     }
-  }, {
-    key: "commaSeparatedList",
-    value: function commaSeparatedList(str, j, res, ofUris) {
-      /*
-      return value: -1 bad syntax; >1 new position in str
-      res has things found appended
-       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);
-
-      if (i < 0) {
-        throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF found expecting comma sep list");
-        return i;
-      }
-
-      if (str.charAt(i) == ".") {
+    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;
+  }
+  property_list(str, i, subj) {
+    /*
+    Parse property list
+    Leaves the terminating punctuation in the buffer
+    */
 
-      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) {
+        throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF found when expected verb in property list");
+        return j;
       }
-
-      while (1) {
-        var j = this.skipSpace(str, i);
-
+      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) {
-          return j;
+          throw BadSyntax(this._thisDoc, this.lines, str, i, "bad {} or () or [] node after :- ");
         }
-
-        var ch = str.slice(j, j + 1);
-
-        if (ch != ",") {
-          if (ch != ".") {
-            return -1;
+        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 {
+            this.makeStatement(new pyjslib_Tuple([this._context, sym, obj, subj]));
           }
-
-          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;
+      } catch (e) {
+        if (e != StopIteration) {
+          throw e;
         }
       }
-    }
-  }, {
-    key: "objectList",
-    value: function objectList(str, i, res) {
-      var i = this.object(str, i, res);
-
-      if (i < 0) {
-        return -1;
+      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;
       }
-
-      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;
-        }
+      if (str.slice(i, i + 1) != ";") {
+        return i;
       }
+      var i = i + 1;
+    }
+  }
+  commaSeparatedList(str, j, res, ofUris) {
+    /*
+    return value: -1 bad syntax; >1 new position in str
+    res has things found appended
+     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);
+    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;
     }
-  }, {
-    key: "checkDot",
-    value: function checkDot(str, i) {
+    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;
       }
-
-      if (str.slice(j, j + 1) == ".") {
-        return j + 1;
+      var ch = str.slice(j, j + 1);
+      if (ch != ",") {
+        if (ch != ".") {
+          return -1;
+        }
+        return j;
       }
-
-      if (str.slice(j, j + 1) == "}") {
+      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;
+      }
+    }
+  }
+  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) == "]") {
+      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;
+      var i = this.object(str, j + 1, res);
+      if (i < 0) {
+        return i;
+      }
     }
-  }, {
-    key: "uri_ref2",
-    value: function uri_ref2(str, i, res) {
-      /*
-      Generate uri from n3 representation.
-       Note that the RDF convention of directly concatenating
-      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.");
+  }
+  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;
+  }
+  uri_ref2(str, i, res) {
+    /*
+    Generate uri from n3 representation.
+     Note that the RDF convention of directly concatenating
+    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 ((0, _utils.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;
+      var symb = this._store.sym(ns + ln);
+      if ((0, _utils.ArrayIndexOf)(this._variables, symb) >= 0) {
+        res.push(this._variables[symb]);
+      } else {
+        res.push(symb);
       }
-
-      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 ((0, _utils.ArrayIndexOf)(this._variables, symb) >= 0) {
-              res.push(this._variables[symb]);
-            } else {
-              res.push(symb);
-            }
-
-            return i + 1;
+      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");
           }
-
-          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 ((0, _utils.ArrayIndexOf)(this.keywords, v[0]) >= 0) {
-          throw BadSyntax(this._thisDoc, this.lines, str, i, "Keyword \"" + v[0] + "\" not allowed here.");
+          if (str.slice(i - 1, i) == "#" && !(pyjslib_slice(uref, -1, null) == "#")) {
+            var uref = uref + "#";
+          }
+          var symb = this._store.sym(uref);
+          if ((0, _utils.ArrayIndexOf)(this._variables, symb) >= 0) {
+            res.push(this._variables[symb]);
+          } else {
+            res.push(symb);
+          }
+          return i + 1;
         }
-
-        res.push(this._store.sym(this._bindings[""] + v[0]));
-        return j;
-      } else {
+        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 ((0, _utils.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 {
+      return -1;
     }
-  }, {
-    key: "skipSpace",
-    value: function skipSpace(str, i) {
-      /*
-      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";
-
-      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);
-        // console.log(" skipspace ch <" + ch + ">");
-
-        if (whitespace.indexOf(ch) < 0) {
-          //not ws
-          // console.log(" skipspace 2 ch <" + ch + ">");
-          if (str.charAt(j) === '#') {
-            for (;; j++) {
-              // console.log("    skipspace2 j= "+j + " i= " + i + " n= " + str.length);
-              if (j === str.length) {
-                return -1; // EOF
-              }
+  }
+  skipSpace(str, i) {
+    /*
+    Skip white space, newlines and comments.
+    return -1 if EOF, else position of first non-ws character*/
 
-              if (str.charAt(j) === '\n') {
-                this.lines = this.lines + 1;
-                break;
-              }
+    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);
+      // console.log(" skipspace ch <" + ch + ">");
+      if (whitespace.indexOf(ch) < 0) {
+        //not ws
+        // console.log(" skipspace 2 ch <" + ch + ">");
+        if (str.charAt(j) === '#') {
+          for (;; j++) {
+            // console.log("    skipspace2 j= "+j + " i= " + i + " n= " + str.length);
+            if (j === str.length) {
+              return -1; // EOF
             }
 
-            ;
-          } else {
-            // Not hash - something interesting
-            // console.log(" skipspace 3 ch <" + ch + ">");
-            return j;
+            if (str.charAt(j) === '\n') {
+              this.lines = this.lines + 1;
+              break;
+            }
           }
+          ;
         } else {
-          // Whitespace
-          // console.log(" skipspace 5 ch <" + ch + ">");
-          if (str.charAt(j) === '\n') {
-            this.lines = this.lines + 1;
-          }
+          // Not hash - something interesting
+          // console.log(" skipspace 3 ch <" + ch + ">");
+          return j;
+        }
+      } else {
+        // Whitespace
+        // console.log(" skipspace 5 ch <" + ch + ">");
+        if (str.charAt(j) === '\n') {
+          this.lines = this.lines + 1;
         }
-      } // next j
-
-
-      return -1; // EOF
-    }
-  }, {
-    key: "variable",
-    value: function variable(str, i, res) {
-      /*
-      ?abc -> variable(:abc)
-      */
-      var j = this.skipSpace(str, i);
-
-      if (j < 0) {
-        return -1;
       }
+    } // next j
+    return -1; // EOF
+  }
 
-      if (str.slice(j, j + 1) != "?") {
-        return -1;
-      }
+  variable(str, i, res) {
+    /*
+    ?abc -> variable(:abc)
+    */
 
-      var j = j + 1;
-      var i = j;
+    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;
+  }
+  bareWord(str, i, res) {
+    /*
+    abc -> :abc
+    */
 
-      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;
-      }
+    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;
+  }
+  qname(str, i, res) {
+    /*
+     xyz:def -> ('xyz', 'def')
+    If not in keywords and keywordsSet: def -> ('', 'def')
+    :def -> ('', 'def')
+    */
 
-      while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
-        var i = i + 1;
+    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;
+        } else {
+          break;
+        }
       }
-
-      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));
+    } 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;
+        } else {
+          break;
+        }
       }
-
-      res.push(this._store.variable(str.slice(j, i)));
+      res.push(new pyjslib_Tuple([pfx, ln]));
       return i;
+    } else {
+      if (ln && this.keywordsSet && (0, _utils.ArrayIndexOf)(this.keywords, ln) < 0) {
+        res.push(new pyjslib_Tuple(["", ln]));
+        return i;
+      }
+      return -1;
     }
-  }, {
-    key: "bareWord",
-    value: function bareWord(str, i, res) {
-      /*
-      abc -> :abc
-      */
+  }
+  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 ch = str.charAt(j);
-
-      if ("0123456789-".indexOf(ch) >= 0) {
-        return -1;
-      }
-
-      if (_notNameChars.indexOf(ch) >= 0) {
+      var delim = null;
+      let 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];
+        var s = pairFudge[1];
+        res.push(this._store.literal(s));
+        diag_progress("New string const ", s, j);
+        return j;
+      } else {
         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;
     }
-  }, {
-    key: "qname",
-    value: function qname(str, i, res) {
-      /*
-       xyz:def -> ('xyz', 'def')
-      If not in keywords and keywordsSet: def -> ('', 'def')
-      :def -> ('', 'def')
-      */
-      var i = this.skipSpace(str, i);
-
-      if (i < 0) {
-        return -1;
-      }
-
-      var c = str.charAt(i);
-
-      if ("0123456789-+".indexOf(c) >= 0) {
+  }
+  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;
-      }
-
-      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;
-          } else {
-            break;
-          }
-        }
       } else {
-        var ln = "";
+        var i = j;
       }
-
-      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;
+      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 {
-            break;
+            res.push(this._store.literal(val, this._store.sym(DATE_DATATYPE)));
           }
-        }
-
-        res.push(new pyjslib_Tuple([pfx, ln]));
-        return i;
-      } else {
-        if (ln && this.keywordsSet && (0, _utils.ArrayIndexOf)(this.keywords, ln) < 0) {
-          res.push(new pyjslib_Tuple(["", ln]));
-          return i;
-        }
-
-        return -1;
-      }
-    }
-  }, {
-    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;
+          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) {
+            res.push(this._store.literal(parseFloat(val), this._store.sym(DECIMAL_DATATYPE)));
           } else {
-            delim = ch;
+            res.push(this._store.literal(parseInt(val), this._store.sym(INTEGER_DATATYPE)));
           }
-
-          var i = i + pyjslib_len(delim);
-          var pairFudge = this.strconst(str, i, delim);
-          var j = pairFudge[0];
-          var s = pairFudge[1];
-          res.push(this._store.literal(s));
-          diag_progress("New string const ", s, j);
-          return j;
-        } else {
-          return -1;
         }
+        ;
+        return j; // Where we have got up to
       }
-    }
-  }, {
-    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;
+      if (str.charAt(i) == "\"") {
+        if (str.slice(i, i + 3) == "\"\"\"") {
+          var delim = "\"\"\"";
         } 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 {
-              res.push(this._store.literal(val, this._store.sym(DATE_DATATYPE)));
-            }
-          } 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) {
-              res.push(this._store.literal(parseFloat(val), this._store.sym(DECIMAL_DATATYPE)));
-            } else {
-              res.push(this._store.literal(parseInt(val), this._store.sym(INTEGER_DATATYPE)));
-            }
+          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 @");
           }
-
-          ;
-          return j; // Where we have got up to
+          var i = langcode.lastIndex + j + 1;
+          var lang = str.slice(j + 1, i);
+          var j = i;
         }
-
-        if (str.charAt(i) == "\"") {
-          if (str.slice(i, i + 3) == "\"\"\"") {
-            var delim = "\"\"\"";
-          } 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 {
-          return -1;
+        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 {
+        return -1;
       }
     }
-  }, {
-    key: "strconst",
-    value: function strconst(str, i, delim) {
-      /*
-      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;
+  }
+  strconst(str, i, delim) {
+    /*
+    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;
+      } else if (ch == "\r") {
+        var j = i + 1;
+        continue;
+      } else if (ch == "\n") {
+        if (delim == "\"") {
+          throw BadSyntax(this._thisDoc, startline, str, i, "newline found in string literal");
         }
-
-        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));
+        this.lines = this.lines + 1;
+        var ustr = ustr + ch;
+        var j = i + 1;
+        this.previousLine = this.startOfLine;
+        this.startOfLine = j;
+      } 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 i = j + interesting.lastIndex - 1;
-        var ustr = ustr + str.slice(j, i);
-        var ch = str.charAt(i);
-
-        if (ch == "\"") {
-          var j = i;
-          continue;
-        } else if (ch == "\r") {
-          var j = i + 1;
-          continue;
-        } else if (ch == "\n") {
-          if (delim == "\"") {
-            throw BadSyntax(this._thisDoc, startline, str, i, "newline found in string literal");
-          }
-
-          this.lines = this.lines + 1;
+        var k = string_find("abfrtvn\\\"", ch);
+        if (k >= 0) {
+          var uch = "\a\b\f\r\t\v\n\\\"".charAt(k);
+          var ustr = ustr + uch;
+          var j = j + 1;
+        } else if (ch == "u") {
+          var pairFudge = this.uEscape(str, j + 1, startline);
+          var j = pairFudge[0];
+          var ch = pairFudge[1];
           var ustr = ustr + ch;
-          var j = i + 1;
-          this.previousLine = this.startOfLine;
-          this.startOfLine = j;
-        } 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;
-            var j = j + 1;
-          } else if (ch == "u") {
-            var pairFudge = this.uEscape(str, j + 1, startline);
-            var j = pairFudge[0];
-            var ch = pairFudge[1];
-            var ustr = ustr + ch;
-          } else if (ch == "U") {
-            var pairFudge = this.UEscape(str, j + 1, startline);
-            var j = pairFudge[0];
-            var ch = pairFudge[1];
-            var ustr = ustr + ch;
-          } else {
-            throw BadSyntax(this._thisDoc, this.lines, str, i, "bad escape");
-          }
+        } else if (ch == "U") {
+          var pairFudge = this.UEscape(str, j + 1, startline);
+          var j = pairFudge[0];
+          var ch = pairFudge[1];
+          var ustr = ustr + ch;
+        } else {
+          throw BadSyntax(this._thisDoc, this.lines, str, i, "bad escape");
         }
       }
-
-      throw BadSyntax(this._thisDoc, this.lines, str, i, "unterminated string literal");
-    }
-  }, {
-    key: "uEscape",
-    value: function uEscape(str, i, startline) {
-      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;
+    }
+    throw BadSyntax(this._thisDoc, this.lines, str, i, "unterminated string literal");
+  }
+  uEscape(str, i, startline) {
+    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 uch = String.fromCharCode(value);
-      return new pyjslib_Tuple([j, uch]);
-    }
-  }, {
-    key: "UEscape",
-    value: function UEscape(str, i, startline) {
-      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 k = string_find("0123456789abcdef", ch);
+      if (k < 0) {
+        throw BadSyntax(this._thisDoc, startline, str, i, "bad string literal hex escape");
       }
-
-      var uch = stringFromCharCode("0x" + pyjslib_slice(value, 2, 10) - 0);
-      return new pyjslib_Tuple([j, uch]);
+      var value = value * 16 + k;
+      var count = count + 1;
     }
-  }]);
-  return SinkParser;
-}();
-
+    var uch = String.fromCharCode(value);
+    return new pyjslib_Tuple([j, uch]);
+  }
+  UEscape(str, i, startline) {
+    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]);
+  }
+}
 exports.SinkParser = 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;
@@ -1817,47 +1429,38 @@ 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) + "\"";
-  var e = new SyntaxError(msg, uri, lineNo);
+  let lineNo = lines + 1;
+  let msg = "Line " + lineNo + " of <" + uri + ">: Bad syntax: " + why + "\nat: \"" + str.slice(i, i + 30) + "\"";
+  let e = new SyntaxError(msg, uri, lineNo);
   e.lineNo = lineNo;
   e.characterInFile = i;
   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;
       }
@@ -1867,8 +1470,6 @@ function stripCR(str) {
       throw e;
     }
   }
-
   return res;
 }
-
 function dummyWrite(x) {}