Merge branch 'master' into harmony

2016-06-09 22:29:52 +02:00
parent dcfc514c38 31d5825a86
commit fa29344781
9 changed files with 142 additions and 6 deletions
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -501,6 +501,8 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            break;
        } else if (ch == "\\") {
            prev_backslash = true;
+        } else if ("\r\n\u2028\u2029".indexOf(ch) >= 0) {
+            parse_error("Unexpected line terminator");
        } else {
            regexp += ch;
        }