Annotate more errors with expected token (babel#172)

Expanding on babel#150, this allows `unexpected()` to accept the expected token type instead of a message string.
This overload is then used in a couple more places (that independently implement a logic similar to `expect()`'s) to construct an `Unexpected token, expected FOO` message.

src/parser/util.js

@@ -27,7 +27,7 @@ pp.expectRelational = function (op) {
   if (this.isRelational(op)) {
     this.next();
   } else {
-    this.unexpected();
+    this.unexpected(null, tt.relational);
   }
 };
 
@@ -67,18 +67,22 @@ pp.isLineTerminator = function () {
 // pretend that there is a semicolon at this position.
 
 pp.semicolon = function () {
-  if (!this.isLineTerminator()) this.unexpected();
+  if (!this.isLineTerminator()) this.unexpected(null, tt.semi);
 };
 
 // Expect a token of a given type. If found, consume it, otherwise,
 // raise an unexpected token error at given pos.
 
 pp.expect = function (type, pos) {
-  return this.eat(type) || this.unexpected(pos, `Unexpected token, expected ${type.label}`);
+  return this.eat(type) || this.unexpected(pos, type);
 };
 
-// Raise an unexpected token error.
+// Raise an unexpected token error. Can take the expected token type
+// instead of a message string.
 
-pp.unexpected = function (pos, message = "Unexpected token") {
-  this.raise(pos != null ? pos : this.state.start, message);
+pp.unexpected = function (pos, messageOrType = "Unexpected token") {
+  if (messageOrType && typeof messageOrType === 'object' && messageOrType.label) {
+    messageOrType = `Unexpected token, expected ${messageOrType.label}`;
+  }
+  this.raise(pos != null ? pos : this.state.start, messageOrType);
 };

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

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

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

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

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

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

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

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

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

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

test/fixtures/es2015/arrow-functions/no-callee/options.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json

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

test/fixtures/esprima/es2015-yield/invalid-yield-expression/options.json

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

test/fixtures/esprima/es2015-yield/invalid-yield-generator-member-expression/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0015/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0020/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0021/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0025/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0026/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0028/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0071/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0072/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0115/options.json

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

test/fixtures/esprima/invalid-syntax/migrated_0257/options.json

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

test/fixtures/experimental/class-properties/asi-failure-computed/options.json

@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected token (3:9)",
+  "throws": "Unexpected token, expected ; (3:9)",
   "plugins": ["classProperties"]
 }

test/fixtures/experimental/class-properties/asi-failure-generator/options.json

@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected token (3:8)",
+  "throws": "Unexpected token, expected ; (3:8)",
   "plugins": ["classProperties"]
 }