Merge pull request #119 from eslint/issue115

New: Add Super node (fixes #115)
eslint · Apr 4, 2015 · a23b65d · a23b65d
2 parents 0193bfe + 461e762
commit a23b65d
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 81 deletions.
diff --git a/espree.js b/espree.js
@@ -2862,7 +2862,7 @@ function parsePrimaryExpression() {
         if (allowSuper && matchKeyword("super") && state.inFunctionBody) {
             marker = markerCreate();
             lex();
-            return markerApply(marker, astNodeFactory.createIdentifier("super"));
+            return markerApply(marker, astNodeFactory.createSuper());
         }
 
         if (matchKeyword("this")) {

diff --git a/lib/ast-node-factory.js b/lib/ast-node-factory.js
diff --git a/lib/ast-node-types.js b/lib/ast-node-types.js
@@ -78,6 +78,7 @@ module.exports = {
     ReturnStatement: "ReturnStatement",
     SequenceExpression: "SequenceExpression",
     SpreadElement: "SpreadElement",
+    Super: "Super",
     SwitchCase: "SwitchCase",
     SwitchStatement: "SwitchStatement",
     TaggedTemplateExpression: "TaggedTemplateExpression",

diff --git a/tests/fixtures/ecma-features/classes/class-one-method-super.result.js b/tests/fixtures/ecma-features/classes/class-one-method-super.result.js
@@ -58,8 +58,7 @@ module.exports = {
                                         "expression": {
                                             "type": "CallExpression",
                                             "callee": {
-                                                "type": "Identifier",
-                                                "name": "super",
+                                                "type": "Super",
                                                 "range": [
                                                     27,
                                                     32
@@ -221,4 +220,4 @@ module.exports = {
             "column": 2
         }
     }
-};
+};
diff --git a/...s/fixtures/ecma-features/superInFunctions/super-function-call-in-object-literal.result.js b/...s/fixtures/ecma-features/superInFunctions/super-function-call-in-object-literal.result.js
@@ -60,8 +60,7 @@ module.exports = {
                                                 "expression": {
                                                     "type": "CallExpression",
                                                     "callee": {
-                                                        "type": "Identifier",
-                                                        "name": "super",
+                                                        "type": "Super",
                                                         "range": [
                                                             41,
                                                             46
@@ -224,4 +223,4 @@ module.exports = {
             "column": 2
         }
     }
-};
+};
diff --git a/tests/fixtures/ecma-features/superInFunctions/super-function-call.result.js b/tests/fixtures/ecma-features/superInFunctions/super-function-call.result.js
@@ -31,8 +31,7 @@ module.exports = {
                         "expression": {
                             "type": "CallExpression",
                             "callee": {
-                                "type": "Identifier",
-                                "name": "super",
+                                "type": "Super",
                                 "range": [
                                     21,
                                     26
@@ -145,4 +144,4 @@ module.exports = {
             "column": 2
         }
     }
-};
+};
diff --git a/...s/fixtures/ecma-features/superInFunctions/super-property-call-in-object-literal.result.js b/...s/fixtures/ecma-features/superInFunctions/super-property-call-in-object-literal.result.js
@@ -63,8 +63,7 @@ module.exports = {
                                                         "type": "MemberExpression",
                                                         "computed": false,
                                                         "object": {
-                                                            "type": "Identifier",
-                                                            "name": "super",
+                                                            "type": "Super",
                                                             "range": [
                                                                 41,
                                                                 46
@@ -260,4 +259,4 @@ module.exports = {
             "column": 2
         }
     }
-};
+};
diff --git a/tests/fixtures/ecma-features/superInFunctions/super-property-call.result.js b/tests/fixtures/ecma-features/superInFunctions/super-property-call.result.js
@@ -34,8 +34,7 @@ module.exports = {
                                 "type": "MemberExpression",
                                 "computed": false,
                                 "object": {
-                                    "type": "Identifier",
-                                    "name": "super",
+                                    "type": "Super",
                                     "range": [
                                         21,
                                         26
@@ -181,4 +180,4 @@ module.exports = {
             "column": 2
         }
     }
-};
+};