Handle \r\n and \r newlines in get() with scanNewlines = true (that i…

…s, when they're not whitespace)
jeresig · Apr 21, 2011 · 8da0aa5 · 8da0aa5
1 parent d38a83d
commit 8da0aa5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/jslex.js b/lib/jslex.js
@@ -437,7 +437,9 @@ Narcissus.lexer = (function() {
                 this.lexZeroNumber(ch);
             } else if (ch === '"' || ch === "'") {
                 this.lexString(ch);
-            } else if (this.scanNewlines && ch === '\n') {
+            } else if (this.scanNewlines && (ch === '\n' || ch === '\r')) {
+                // if this was a \r, look for \r\n
+                if (ch === '\r' && input[this.cursor] === '\n') this.cursor++;
                 token.type = NEWLINE;
                 token.value = '\n';
                 this.lineno++;