New: Support ecmaVersion 7 (fixes #246)

eslint · Feb 25, 2016 · c02edd1 · c02edd1
1 parent c59de3a
commit c02edd1
Show file tree

Hide file tree

Showing 14 changed files with 689 additions and 18 deletions.
diff --git a/espree.js b/espree.js
@@ -389,7 +389,7 @@ acorn.plugins.espree = function(instance) {
      * @throws {SyntaxError} A syntax error.
      * @returns {void}
      */
-    instance.raise = function(pos, message) {
+    instance.raise = instance.raiseRecoverable = function(pos, message) {
         var loc = getLineInfo(this.input, pos);
         var err = new SyntaxError(message);
         err.index = pos;
@@ -509,12 +509,13 @@ function tokenize(code, options) {
             case 3:
             case 5:
             case 6:
+            case 7:
                 acornOptions.ecmaVersion = options.ecmaVersion;
                 extra.ecmaVersion = options.ecmaVersion;
                 break;
 
             default:
-                throw new Error("ecmaVersion must be 3, 5, or 6.");
+                throw new Error("ecmaVersion must be 3, 5, 6, or 7.");
         }
     }
 
@@ -645,12 +646,13 @@ function parse(code, options) {
                 case 3:
                 case 5:
                 case 6:
+                case 7:
                     acornOptions.ecmaVersion = options.ecmaVersion;
                     extra.ecmaVersion = options.ecmaVersion;
                     break;
 
                 default:
-                    throw new Error("ecmaVersion must be 3, 5, or 6.");
+                    throw new Error("ecmaVersion must be 3, 5, 6, or 7.");
             }
         }
 

diff --git a/lib/token-translator.js b/lib/token-translator.js
@@ -131,6 +131,10 @@ TokenTranslator.prototype = {
                 token.type = Token.Keyword;
             }
 
+            if (extra.ecmaVersion > 5 && (token.value === "yield" || token.value === "let")) {
+                token.type = Token.Keyword;
+            }
+
         } else if (type === tt.semi || type === tt.comma ||
                  type === tt.parenL || type === tt.parenR ||
                  type === tt.braceL || type === tt.braceR ||

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   },
   "license": "BSD-2-Clause",
   "dependencies": {
-    "acorn": "^2.7.0",
+    "acorn": "^3.0.4",
     "acorn-jsx": "^2.0.1"
   },
   "devDependencies": {

diff --git a/...res/ecma-version/6/defaultParams-and-arrowFunctions/not-strict-local-eval-multi.result.js b/...res/ecma-version/6/defaultParams-and-arrowFunctions/not-strict-local-eval-multi.result.js
@@ -329,4 +329,4 @@ module.exports = {
             ]
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-version/7/exponential-plusplus.result.js b/tests/fixtures/ecma-version/7/exponential-plusplus.result.js
@@ -0,0 +1,222 @@
+module.exports = {
+    "type": "Program",
+    "loc": {
+        "start": {
+            "line": 2,
+            "column": 0
+        },
+        "end": {
+            "line": 2,
+            "column": 9
+        }
+    },
+    "range": [
+        1,
+        10
+    ],
+    "body": [
+        {
+            "type": "ExpressionStatement",
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 0
+                },
+                "end": {
+                    "line": 2,
+                    "column": 9
+                }
+            },
+            "range": [
+                1,
+                10
+            ],
+            "expression": {
+                "type": "BinaryExpression",
+                "loc": {
+                    "start": {
+                        "line": 2,
+                        "column": 0
+                    },
+                    "end": {
+                        "line": 2,
+                        "column": 8
+                    }
+                },
+                "range": [
+                    1,
+                    9
+                ],
+                "left": {
+                    "type": "UpdateExpression",
+                    "loc": {
+                        "start": {
+                            "line": 2,
+                            "column": 0
+                        },
+                        "end": {
+                            "line": 2,
+                            "column": 3
+                        }
+                    },
+                    "range": [
+                        1,
+                        4
+                    ],
+                    "operator": "++",
+                    "prefix": false,
+                    "argument": {
+                        "type": "Identifier",
+                        "loc": {
+                            "start": {
+                                "line": 2,
+                                "column": 0
+                            },
+                            "end": {
+                                "line": 2,
+                                "column": 1
+                            }
+                        },
+                        "range": [
+                            1,
+                            2
+                        ],
+                        "name": "a"
+                    }
+                },
+                "operator": "**",
+                "right": {
+                    "type": "Literal",
+                    "loc": {
+                        "start": {
+                            "line": 2,
+                            "column": 7
+                        },
+                        "end": {
+                            "line": 2,
+                            "column": 8
+                        }
+                    },
+                    "range": [
+                        8,
+                        9
+                    ],
+                    "value": 2,
+                    "raw": "2"
+                }
+            }
+        }
+    ],
+    "sourceType": "script",
+    "tokens": [
+        {
+            "type": "Identifier",
+            "value": "a",
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 0
+                },
+                "end": {
+                    "line": 2,
+                    "column": 1
+                }
+            },
+            "range": [
+                1,
+                2
+            ]
+        },
+        {
+            "type": {
+                "label": "++/--",
+                "beforeExpr": false,
+                "startsExpr": true,
+                "isLoop": false,
+                "isAssign": false,
+                "prefix": true,
+                "postfix": true,
+                "binop": null
+            },
+            "value": "++",
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 1
+                },
+                "end": {
+                    "line": 2,
+                    "column": 3
+                }
+            },
+            "range": [
+                2,
+                4
+            ]
+        },
+        {
+            "type": {
+                "label": "**",
+                "beforeExpr": true,
+                "startsExpr": false,
+                "isLoop": false,
+                "isAssign": false,
+                "prefix": false,
+                "postfix": false,
+                "binop": null,
+                "updateContext": null
+            },
+            "value": "**",
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 4
+                },
+                "end": {
+                    "line": 2,
+                    "column": 6
+                }
+            },
+            "range": [
+                5,
+                7
+            ]
+        },
+        {
+            "type": "Numeric",
+            "value": "2",
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 7
+                },
+                "end": {
+                    "line": 2,
+                    "column": 8
+                }
+            },
+            "range": [
+                8,
+                9
+            ]
+        },
+        {
+            "type": "Punctuator",
+            "value": ";",
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 8
+                },
+                "end": {
+                    "line": 2,
+                    "column": 9
+                }
+            },
+            "range": [
+                9,
+                10
+            ]
+        }
+    ]
+};
diff --git a/tests/fixtures/ecma-version/7/exponential-plusplus.src.js b/tests/fixtures/ecma-version/7/exponential-plusplus.src.js
@@ -0,0 +1,2 @@
+
+a++ ** 2;
-Original file line number
+Diff line change
@@ Expand Up / @@ -329,4 +329,4 @@ module.exports = { @@
                 ]
             }
         ]
-    };
+    };