fix(espower): store scopes in a stack to push/pop them in a consisten…

…t way refs: power-assert-js/power-assert#78 refs: power-assert-js/power-assert#79
power-assert-js · Feb 19, 2017 · 5e9373f · 5e9373f
1 parent f0b2db8
commit 5e9373f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/instrumentor.js b/lib/instrumentor.js
@@ -29,13 +29,14 @@ Instrumentor.prototype.createVisitor = function (ast) {
     var storage = {};
     var skipping = false;
     var scopeManager = escope.analyze(ast);
-    var currentScope = scopeManager.acquire(ast);
-    var globalScope = currentScope;
+    var globalScope = scopeManager.acquire(ast);
+    var scopeStack = [];
+    scopeStack.push(globalScope);
     var transformation = new Transformation();
     var visitor = {
         enter: function (currentNode, parentNode) {
             if (/Function/.test(currentNode.type)) {
-                currentScope = scopeManager.acquire(currentNode);
+                scopeStack.push(scopeManager.acquire(currentNode));
             }
             var controller = this;
             var path = controller.path();
@@ -56,7 +57,8 @@ Instrumentor.prototype.createVisitor = function (ast) {
                         storage: storage,
                         transformation: transformation,
                         globalScope: globalScope,
-                        currentScope: currentScope
+                        scopeManager: scopeManager,
+                        currentScope: scopeStack[scopeStack.length - 1]
                     }, that.options));
                     assertionVisitor.enter(controller);
                     return undefined;
@@ -98,7 +100,7 @@ Instrumentor.prototype.createVisitor = function (ast) {
                 return resultTree;
             } finally {
                 if (/Function/.test(currentNode.type)) {
-                    currentScope = currentScope.upper;
+                    scopeStack.pop();
                 }
             }
         }