diff --git a/packages/babel-parser/src/plugins/flow.js b/packages/babel-parser/src/plugins/flow.js index bff354249893..f628c9d7f1a4 100644 --- a/packages/babel-parser/src/plugins/flow.js +++ b/packages/babel-parser/src/plugins/flow.js @@ -10,7 +10,7 @@ import { types as tc } from "../tokenizer/context"; import * as charCodes from "charcodes"; import { isIteratorStart } from "../util/identifier"; -const primitiveTypes = [ +const reservedTypes = [ "any", "bool", "boolean", @@ -504,8 +504,8 @@ export default (superClass: Class): Class => } checkReservedType(word: string, startLoc: number) { - if (primitiveTypes.indexOf(word) > -1) { - this.raise(startLoc, `Cannot overwrite primitive type ${word}`); + if (reservedTypes.indexOf(word) > -1) { + this.raise(startLoc, `Cannot overwrite reserved type ${word}`); } } diff --git a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json index b67b9224d4c0..b945b9a0a123 100644 --- a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json +++ b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:10)" + "throws": "Cannot overwrite reserved type string (1:10)" } diff --git a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json index 3eddc82b13a2..7aecee1ff0ae 100644 --- a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json +++ b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:21)" + "throws": "Cannot overwrite reserved type string (1:21)" } diff --git a/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json b/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json index 6bf62df4a991..0c2cdd4d777c 100644 --- a/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json +++ b/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:12)" + "throws": "Cannot overwrite reserved type string (1:12)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json index bb5c8425acd9..50bea8a5db27 100644 --- a/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type number (1:5)" + "throws": "Cannot overwrite reserved type number (1:5)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json index 0148048697b7..257d651b33e2 100644 --- a/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type number (1:9)" + "throws": "Cannot overwrite reserved type number (1:9)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json index fb0222c596f6..2c7a5836d8bc 100644 --- a/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:11)" + "throws": "Cannot overwrite reserved type string (1:11)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json index 839b0e04eff9..396a14ca22d4 100644 --- a/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type bool (1:13)" + "throws": "Cannot overwrite reserved type bool (1:13)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json index 7f4fe7d13efb..7624c4d3b99a 100644 --- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:14)" + "throws": "Cannot overwrite reserved type string (1:14)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json index 7f4fe7d13efb..7624c4d3b99a 100644 --- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:14)" + "throws": "Cannot overwrite reserved type string (1:14)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json index 39481cdad495..d64a5d353bf8 100644 --- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:19)" + "throws": "Cannot overwrite reserved type string (1:19)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json index bb13e8023fa8..e425b795f180 100644 --- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:16)" + "throws": "Cannot overwrite reserved type string (1:16)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json index 7f4fe7d13efb..7624c4d3b99a 100644 --- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:14)" + "throws": "Cannot overwrite reserved type string (1:14)" } diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json index 6bf62df4a991..0c2cdd4d777c 100644 --- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json +++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json @@ -1,3 +1,3 @@ { - "throws": "Cannot overwrite primitive type string (1:12)" + "throws": "Cannot overwrite reserved type string (1:12)" } diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json index 5d1868f18b72..e0e70aa3ae18 100644 --- a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json +++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json @@ -4,5 +4,5 @@ "jsx", "flow" ], - "throws": "Cannot overwrite primitive type _ (2:5)" -} \ No newline at end of file + "throws": "Cannot overwrite reserved type _ (2:5)" +} diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json index adbad818fa99..28a0ef1cd1c1 100644 --- a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json +++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json @@ -4,5 +4,5 @@ "jsx", "flow" ], - "throws": "Cannot overwrite primitive type _ (2:13)" -} \ No newline at end of file + "throws": "Cannot overwrite reserved type _ (2:13)" +}