diff --git a/src/scope.js b/src/scope.js index 369c696..d48bef5 100644 --- a/src/scope.js +++ b/src/scope.js @@ -315,13 +315,19 @@ export default class Scope { } __referencing(node, assign, writeExpr, maybeImplicitGlobal, partial) { - var ref; // because Array element may be null - if (node && node.type === Syntax.Identifier) { - ref = new Reference(node, this, assign || Reference.READ, writeExpr, maybeImplicitGlobal, !!partial); - this.references.push(ref); - this.__left.push(ref); + if (!node || node.type !== Syntax.Identifier) { + return; + } + + // Specially handle like `this`. + if (node.name === 'super') { + return; } + + let ref = new Reference(node, this, assign || Reference.READ, writeExpr, maybeImplicitGlobal, !!partial); + this.references.push(ref); + this.__left.push(ref); } __detectEval() { diff --git a/test/es6-super.coffee b/test/es6-super.coffee new file mode 100644 index 0000000..ac7a13e --- /dev/null +++ b/test/es6-super.coffee @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2015 Yusuke Suzuki +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +expect = require('chai').expect +harmony = require '../third_party/esprima' +escope = require '..' + +describe 'ES6 super', -> + it 'is not handled as reference', -> + ast = harmony.parse """ + class Hello { + constructor() { + super(); + } + + method() { + super.method(); + } + } + """ + + scopeManager = escope.analyze ast, ecmaVersion: 6 + expect(scopeManager.scopes).to.have.length 4 + + scope = scopeManager.scopes[0] + expect(scope.type).to.be.equal 'global' + expect(scope.variables).to.have.length 1 + expect(scope.variables[0].name).to.be.equal 'Hello' + expect(scope.references).to.have.length 0 + + scope = scopeManager.scopes[1] + expect(scope.type).to.be.equal 'class' + expect(scope.variables).to.have.length 1 + expect(scope.variables[0].name).to.be.equal 'Hello' + expect(scope.references).to.have.length 0 + + scope = scopeManager.scopes[2] + expect(scope.type).to.be.equal 'function' + expect(scope.variables).to.have.length 1 + expect(scope.variables[0].name).to.be.equal 'arguments' + expect(scope.references).to.have.length 0 # super is specially handled like `this`. + + scope = scopeManager.scopes[3] + expect(scope.type).to.be.equal 'function' + expect(scope.variables).to.have.length 1 + expect(scope.variables[0].name).to.be.equal 'arguments' + expect(scope.references).to.have.length 0 # super is specially handled like `this`. + +# vim: set sw=4 ts=4 et tw=80 :