Simplify and fix line mode.

Fixes #156.

Author: RubenVerborgh

lib/N3Lexer.js

@@ -17,31 +17,40 @@ var escapeReplacements = {
 };
 var illegalIriChars = /[\x00-\x20<>\\"\{\}\|\^\`]/;
 
+var lineModeRegExps = {
+  _iri: true,
+  _unescapedIri: true,
+  _unescapedQuote: true,
+  _singleQuote: true,
+  _langcode: true,
+  _blank: true,
+  _newline: true,
+  _comment: true,
+  _whitespace: true,
+  _endOfFile: true,
+};
+var invalidRegExp = /$0^/;
+
 // ## Constructor
 function N3Lexer(options) {
   if (!(this instanceof N3Lexer))
     return new N3Lexer(options);
   options = options || {};
 
   // In line mode (N-Triples or N-Quads), only simple features may be parsed
-  if (options.lineMode) {
+  if (this._lineMode = !!options.lineMode) {
+    this._n3Mode = false;
     // Don't tokenize special literals
-    this._tripleApos = this._tripleQuote = this._number = this._boolean = /$0^/;
-    // Swap the tokenize method for a restricted version
-    var self = this;
-    this._tokenize = this.tokenize;
-    this.tokenize = function (input, callback) {
-      this._tokenize(input, function (error, token) {
-        if (!error && /^(?:IRI|blank|literal|langcode|typeIRI|\.|eof)$/.test(token.type))
-          callback && callback(error, token);
-        else
-          callback && callback(error || self._syntaxError(token.type, callback = null));
-      });
-    };
+    for (var key in this) {
+      if (!(key in lineModeRegExps) && this[key] instanceof RegExp)
+        this[key] = invalidRegExp;
+    }
+  }
+  // When not in line mode, enable N3 functionality by default
+  else {
+    this._n3Mode = options.n3 !== false;
   }
-  // Enable N3 functionality by default
-  this._n3Mode = options.n3 !== false;
-  // Disable comment tokens by default
+  // Don't output comment tokens by default
   this._comments = !!options.comments;
 }
 
@@ -302,9 +311,10 @@ N3Lexer.prototype = {
       case ')':
       case '{':
       case '}':
-        // The next token is punctuation
-        matchLength = 1;
-        type = firstChar;
+        if (!this._lineMode) {
+          matchLength = 1;
+          type = firstChar;
+        }
         break;
 
       default:

test/N3Parser-test.js

@@ -1126,7 +1126,7 @@ describe('N3Parser', function () {
       shouldNotParse(parser, '<urn:a:a> <= <urn:b:b>.', 'Unexpected "<=" on line 1.'));
 
     it('should not parse a formula as object',
-      shouldNotParse(parser, '<urn:a:a> <urn:b:b> {}.', 'Unexpected "{" on line 1.'));
+      shouldNotParse(parser, '<urn:a:a> <urn:b:b> {}.', 'Unexpected "{}." on line 1.'));
 
     it('should not parse @forSome',
       shouldNotParse(parser, '@forSome <x>.', 'Unexpected "@forSome" on line 1.'));
@@ -1165,7 +1165,7 @@ describe('N3Parser', function () {
       shouldNotParse(parser, '<urn:a:a> <= <urn:b:b>.', 'Unexpected "<=" on line 1.'));
 
     it('should not parse a formula as object',
-      shouldNotParse(parser, '<urn:a:a> <urn:b:b> {}.', 'Unexpected "{" on line 1.'));
+      shouldNotParse(parser, '<urn:a:a> <urn:b:b> {}.', 'Unexpected "{}." on line 1.'));
 
     it('should not parse @forSome',
       shouldNotParse(parser, '@forSome <x>.', 'Unexpected "@forSome" on line 1.'));