cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Slightly better error messages (#150)

Browse Source 
* Slightly better errors

Instead of "Unexpected token" we now print
"Unexpected token, expected <type.label>"
This commit is contained in:
Daniel Tschinder 2016-10-12 16:38:26 +02:00 committed by Henry Zhu
parent 4fc0a3839e
commit d4d6d05d25
71 changed files with 127 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parser/util.js
View File

@ -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.

2
test/fixtures/core/uncategorised/378/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/392/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/393/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/394/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/396/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/406/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/415/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/416/options.json vendored
View File

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

4
test/fixtures/core/uncategorised/458/options.json vendored
View File

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

196
test/fixtures/es2015/uncategorised/109/expected.json vendored
View File

@ -1,196 +0,0 @@
{
"type": "File",
"start": 0,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 36
}
},
"program": {
"type": "Program",
"start": 0,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 36
}
},
"sourceType": "script",
"body": [
{
"type": "ForOfStatement",
"start": 0,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 36
}
},
"left": {
"type": "VariableDeclaration",
"start": 5,
"end": 15,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 15
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 9,
"end": 15,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 15
}
},
"id": {
"type": "Identifier",
"start": 9,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 10
}
},
"name": "x"
},
"init": {
"type": "Literal",
"start": 13,
"end": 15,
"loc": {
"start": {
"line": 1,
"column": 13
},
"end": {
"line": 1,
"column": 15
}
},
"value": 42,
"rawValue": 42,
"raw": "42"
}
}
],
"kind": "var"
},
"right": {
"type": "Identifier",
"start": 19,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 19
},
"end": {
"line": 1,
"column": 23
}
},
"name": "list"
},
"body": {
"type": "ExpressionStatement",
"start": 25,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 36
}
},
"expression": {
"type": "CallExpression",
"start": 25,
"end": 35,
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 35
}
},
"callee": {
"type": "Identifier",
"start": 25,
"end": 32,
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 32
}
},
"name": "process"
},
"arguments": [
{
"type": "Identifier",
"start": 33,
"end": 34,
"loc": {
"start": {
"line": 1,
"column": 33
},
"end": {
"line": 1,
"column": 34
}
},
"name": "x"
}
]
}
}
}
]
},
"comments": []
}

2
test/fixtures/es2015/uncategorised/109/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/235/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/236/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/255/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/261/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/262/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/265/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/266/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/267/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/268/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/277/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/278/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/283/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/340/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/341/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/342/options.json vendored
View File

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

4
test/fixtures/es2015/uncategorised/96/options.json vendored
View File

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

2
test/fixtures/es2017/async-functions/4/options.json vendored
View File

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

2
test/fixtures/es2017/async-functions/5/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-array-pattern/with-default-catch-param-fail/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-arrow-function/arrow-rest-forgetting-comma/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-rest/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-for-of/invalid-const-init/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-for-of/invalid-let-init/options.json vendored
View File

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

146
test/fixtures/esprima/es2015-for-of/invalid-var-init/expected.json vendored
View File

@ -1,146 +0,0 @@
{
"type": "File",
"start": 0,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 21
}
},
"program": {
"type": "Program",
"start": 0,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 21
}
},
"sourceType": "script",
"body": [
{
"type": "ForOfStatement",
"start": 0,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 21
}
},
"left": {
"type": "VariableDeclaration",
"start": 5,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 14
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 9,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 14
}
},
"id": {
"type": "Identifier",
"start": 9,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 10
}
},
"name": "x"
},
"init": {
"type": "Literal",
"start": 13,
"end": 14,
"loc": {
"start": {
"line": 1,
"column": 13
},
"end": {
"line": 1,
"column": 14
}
},
"value": 1,
"rawValue": 1,
"raw": "1"
}
}
],
"kind": "var"
},
"right": {
"type": "Identifier",
"start": 18,
"end": 19,
"loc": {
"start": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 19
}
},
"name": "y"
},
"body": {
"type": "EmptyStatement",
"start": 20,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 20
},
"end": {
"line": 1,
"column": 21
}
}
}
}
]
}
}

2
test/fixtures/esprima/es2015-for-of/invalid-var-init/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-generator/generator-method-with-invalid-computed-name/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-import-declaration/invalid-import-default/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-import-declaration/invalid-import-specifiers/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-lexical-declaration/invalid_const_forin/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-lexical-declaration/invalid_let_forin/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-template-literals/after-switch/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-template-literals/unclosed-interpolation/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-template-literals/unclosed-nested/options.json vendored
View File

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

4
test/fixtures/esprima/es2015-yield/invalid-yield-binding-property/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0060/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0076/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0077/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0078/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0080/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0081/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0102/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0113/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0123/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0124/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0135/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0175/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0258/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0260/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0264/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0265/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0267/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0268/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0275/options.json vendored
View File

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

4
test/fixtures/esprima/invalid-syntax/migrated_0276/options.json vendored
View File

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

2
test/fixtures/experimental/async-generators/for-await-async-context/options.json vendored
View File

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

2
test/fixtures/experimental/class-constructor-call/illegal-generator/options.json vendored
View File

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

2
test/fixtures/experimental/class-constructor-call/illegal-key/options.json vendored
View File

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

2
test/fixtures/experimental/function-sent/inside-function/options.json vendored
View File

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

2
test/fixtures/flow/optional-type/5/options.json vendored
View File

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