Support for ES6 lexical declaration in switch statement.

Refs #1065. Closes #1070.
jquery · Feb 20, 2015 · 74bfd2c · 74bfd2c
1 parent 167c689
commit 74bfd2c
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 1 deletion.
diff --git a/esprima.js b/esprima.js
@@ -3471,7 +3471,7 @@
             if (match('}') || matchKeyword('default') || matchKeyword('case')) {
                 break;
             }
-            statement = parseStatement();
+            statement = parseSourceElement();
             consequent.push(statement);
         }
 

diff --git a/test/test.js b/test/test.js
@@ -19070,6 +19070,90 @@ var testFixture = {
 
     },
 
+    '[ES6] Lexical Declaration': {
+
+        'switch (answer) { case 42: let t = 42; break; }': {
+            type: 'SwitchStatement',
+            discriminant: {
+                type: 'Identifier',
+                name: 'answer',
+                range: [8, 14],
+                loc: {
+                    start: { line: 1, column: 8 },
+                    end: { line: 1, column: 14 }
+                }
+            },
+            cases: [{
+                type: 'SwitchCase',
+                test: {
+                    type: 'Literal',
+                    value: 42,
+                    raw: '42',
+                    range: [23, 25],
+                    loc: {
+                        start: { line: 1, column: 23 },
+                        end: { line: 1, column: 25 }
+                    }
+                },
+                consequent: [{
+                    type: 'VariableDeclaration',
+                    declarations: [{
+                        type: 'VariableDeclarator',
+                        id: {
+                            type: 'Identifier',
+                            name: 't',
+                            range: [31, 32],
+                            loc: {
+                                start: { line: 1, column: 31 },
+                                end: { line: 1, column: 32 }
+                            }
+                        },
+                        init: {
+                            type: 'Literal',
+                            value: 42,
+                            raw: '42',
+                            range: [35, 37],
+                            loc: {
+                                start: { line: 1, column: 35 },
+                                end: { line: 1, column: 37 }
+                            }
+                        },
+                        range: [31, 37],
+                        loc: {
+                            start: { line: 1, column: 31 },
+                            end: { line: 1, column: 37 }
+                        }
+                    }],
+                    kind: 'let',
+                    range: [27, 38],
+                    loc: {
+                        start: { line: 1, column: 27 },
+                        end: { line: 1, column: 38 }
+                    }
+                }, {
+                    type: 'BreakStatement',
+                    label: null,
+                    range: [39, 45],
+                    loc: {
+                        start: { line: 1, column: 39 },
+                        end: { line: 1, column: 45 }
+                    }
+                }],
+                range: [18, 45],
+                loc: {
+                    start: { line: 1, column: 18 },
+                    end: { line: 1, column: 45 }
+                }
+            }],
+            range: [0, 47],
+            loc: {
+                start: { line: 1, column: 0 },
+                end: { line: 1, column: 47 }
+            }
+        }
+
+    },
+
     'Empty Statement': {
 
         ';': {