[WIP] Slightly better error messages

src/parser/util.js

@@ -74,7 +74,7 @@ pp.semicolon = function () {
 // raise an unexpected token error at given pos.
 
 pp.expect = function (type, pos) {
-  return this.eat(type) || this.unexpected(pos);
+  return this.eat(type) || this.unexpected(pos, `Unexpected token, expected ${type.label}`);
 };
 
 // Raise an unexpected token error.

test/fixtures/core/uncategorised/378/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected token, expected , (1:9)"
 }

test/fixtures/core/uncategorised/392/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:12)"
-}
+  "throws": "Unexpected token, expected , (1:12)"
+}

test/fixtures/core/uncategorised/393/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:16)"
-}
+  "throws": "Unexpected token, expected , (1:16)"
+}

test/fixtures/core/uncategorised/394/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:13)"
-}
+  "throws": "Unexpected token, expected , (1:13)"
+}

test/fixtures/core/uncategorised/396/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:18)"
-}
+  "throws": "Unexpected token, expected ) (1:18)"
+}

test/fixtures/core/uncategorised/406/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:2)"
-}
+  "throws": "Unexpected token, expected ( (1:2)"
+}

test/fixtures/core/uncategorised/415/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:15)"
-}
+  "throws": "Unexpected token, expected ; (1:15)"
+}

test/fixtures/core/uncategorised/416/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:14)"
-}
+  "throws": "Unexpected token, expected ; (1:14)"
+}

test/fixtures/core/uncategorised/458/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
-}
+  "throws": "Unexpected token, expected while (1:9)"
+}

test/fixtures/es2015/uncategorised/109/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:16)"
+  "throws": "Unexpected token, expected ; (1:16)"
 }

test/fixtures/es2015/uncategorised/235/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:16)"
-}
+  "throws": "Unexpected token, expected ; (1:16)"
+}

test/fixtures/es2015/uncategorised/236/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:16)"
-}
+  "throws": "Unexpected token, expected ; (1:16)"
+}

test/fixtures/es2015/uncategorised/255/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
-}
+  "throws": "Unexpected token, expected ] (1:9)"
+}

test/fixtures/es2015/uncategorised/261/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:17)"
-}
+  "throws": "Unexpected token, expected ( (1:17)"
+}

test/fixtures/es2015/uncategorised/262/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:22)"
-}
+  "throws": "Unexpected token, expected { (1:22)"
+}

test/fixtures/es2015/uncategorised/265/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:7)"
-}
+  "throws": "Unexpected token, expected ( (1:7)"
+}

test/fixtures/es2015/uncategorised/266/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:18)"
-}
+  "throws": "Unexpected token, expected } (1:18)"
+}

test/fixtures/es2015/uncategorised/267/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:11)"
-}
+  "throws": "Unexpected token, expected } (1:11)"
+}

test/fixtures/es2015/uncategorised/268/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:13)"
-}
+  "throws": "Unexpected token, expected { (1:13)"
+}

test/fixtures/es2015/uncategorised/277/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:18)"
-}
+  "throws": "Unexpected token, expected ) (1:18)"
+}

test/fixtures/es2015/uncategorised/278/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:19)"
-}
+  "throws": "Unexpected token, expected ) (1:19)"
+}

test/fixtures/es2015/uncategorised/283/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:5)"
-}
+  "throws": "Unexpected token, expected ) (1:5)"
+}

test/fixtures/es2015/uncategorised/340/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:15)"
-}
+  "throws": "Unexpected token, expected { (1:15)"
+}

test/fixtures/es2015/uncategorised/341/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:19)"
-}
+  "throws": "Unexpected token, expected { (1:19)"
+}

test/fixtures/es2015/uncategorised/342/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:22)"
-}
+  "throws": "Unexpected token, expected { (1:22)"
+}

test/fixtures/es2015/uncategorised/96/options.json

@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "Unexpected token (1:7)"
-}
+  "throws": "Unexpected token, expected { (1:7)"
+}

test/fixtures/es2017/async-functions/4/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:11)"
+  "throws": "Unexpected token, expected ( (1:11)"
 }

test/fixtures/es2017/async-functions/5/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:10)"
+  "throws": "Unexpected token, expected ( (1:10)"
 }