Skip to content

Commit

Permalink
Handle super like this
Browse files Browse the repository at this point in the history
  • Loading branch information
Constellation committed Mar 9, 2015
1 parent 5de878b commit 19a2e45
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 5 deletions.
16 changes: 11 additions & 5 deletions src/scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
69 changes: 69 additions & 0 deletions test/es6-super.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2015 Yusuke Suzuki <[email protected]>
#
# 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 <COPYRIGHT HOLDER> 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 :

0 comments on commit 19a2e45

Please sign in to comment.