Renamed some scoping classes to make their usage clearer.

pkg/compiler/lib/src/ssa/builder.dart

Index: pkg/compiler/lib/src/ssa/builder.dart
diff --git a/pkg/compiler/lib/src/ssa/builder.dart b/pkg/compiler/lib/src/ssa/builder.dart
index 7939217b27e0c03920e2bfba3c8b9bf5e72d9eed..59ef35393ab1e9fc700da097c084b74cc6178fc7 100644
--- a/pkg/compiler/lib/src/ssa/builder.dart
+++ b/pkg/compiler/lib/src/ssa/builder.dart
@@ -1011,7 +1011,7 @@ class SsaAstGraphBuilder extends ast.Visitor
       ScopeInfo newScopeInfo = closureDataLookup.getScopeInfo(callee);
       localsHandler.scopeInfo = newScopeInfo;
       if (resolvedAst.kind == ResolvedAstKind.PARSED) {
-        localsHandler.enterScope(closureDataLookup.getClosureScope(callee),
+        localsHandler.enterScope(closureDataLookup.getScopeInClosure(callee),
             forGenerativeConstructorBody: callee.isGenerativeConstructorBody);
       }
       buildInitializers(callee, constructorResolvedAsts, fieldValues);
@@ -1366,7 +1366,8 @@ class SsaAstGraphBuilder extends ast.Visitor
       // If there are locals that escape (ie mutated in closures), we
       // pass the box to the constructor.
       // The box must be passed before any type variable.
-      ClosureScope scopeData = closureDataLookup.getClosureScope(constructor);
+      ScopeInClosure scopeData =
+          closureDataLookup.getScopeInClosure(constructor);
       if (scopeData.requiresContextBox) {
         bodyCallInputs.add(localsHandler.readLocal(scopeData.context));
       }
@@ -1427,7 +1428,7 @@ class SsaAstGraphBuilder extends ast.Visitor
     localsHandler.startFunction(
         element,
         closureDataLookup.getScopeInfo(element),
-        closureDataLookup.getClosureScope(element),
+        closureDataLookup.getScopeInClosure(element),
         parameters,
         isGenerativeConstructorBody: element.isGenerativeConstructorBody);
     close(new HGoto()).addSuccessor(block);
@@ -1461,7 +1462,7 @@ class SsaAstGraphBuilder extends ast.Visitor
         ParameterElement parameterElement = _parameterElement;
         if (element.isGenerativeConstructorBody) {
           if (closureDataLookup
-              .getClosureScope(element)
+              .getScopeInClosure(element)
               .isBoxed(parameterElement)) {
             // The parameter will be a field in the box passed as the
             // last parameter. So no need to have it.
@@ -1705,7 +1706,7 @@ class SsaAstGraphBuilder extends ast.Visitor
 
     loopHandler.handleLoop(
         node,
-        closureDataLookup.getLoopClosureScope(node),
+        closureDataLookup.getLoopScopeInClosure(node),
         elements.getTargetDefinition(node),
         buildInitializer,
         buildCondition,
@@ -1720,7 +1721,7 @@ class SsaAstGraphBuilder extends ast.Visitor
       return popBoolified();
     }
 
-    loopHandler.handleLoop(node, closureDataLookup.getLoopClosureScope(node),
+    loopHandler.handleLoop(node, closureDataLookup.getLoopScopeInClosure(node),
         elements.getTargetDefinition(node), () {}, buildCondition, () {}, () {
       visit(node.body);
     });
@@ -1729,7 +1730,7 @@ class SsaAstGraphBuilder extends ast.Visitor
   visitDoWhile(ast.DoWhile node) {
     assert(isReachable);
     LocalsHandler savedLocals = new LocalsHandler.from(localsHandler);
-    var loopClosureInfo = closureDataLookup.getLoopClosureScope(node);
+    var loopClosureInfo = closureDataLookup.getLoopScopeInClosure(node);
     localsHandler.startLoop(loopClosureInfo);
     loopDepth++;
     JumpTarget target = elements.getTargetDefinition(node);
@@ -5439,7 +5440,7 @@ class SsaAstGraphBuilder extends ast.Visitor
     buildProtectedByFinally(() {
       loopHandler.handleLoop(
           node,
-          closureDataLookup.getLoopClosureScope(node),
+          closureDataLookup.getLoopScopeInClosure(node),
           elements.getTargetDefinition(node),
           buildInitializer,
           buildCondition,
@@ -5512,7 +5513,7 @@ class SsaAstGraphBuilder extends ast.Visitor
 
     loopHandler.handleLoop(
         node,
-        closureDataLookup.getLoopClosureScope(node),
+        closureDataLookup.getLoopScopeInClosure(node),
         elements.getTargetDefinition(node),
         buildInitializer,
         buildCondition,
@@ -5637,7 +5638,7 @@ class SsaAstGraphBuilder extends ast.Visitor
 
     loopHandler.handleLoop(
         node,
-        closureDataLookup.getLoopClosureScope(node),
+        closureDataLookup.getLoopScopeInClosure(node),
         elements.getTargetDefinition(node),
         buildInitializer,
         buildCondition,
@@ -5992,8 +5993,14 @@ class SsaAstGraphBuilder extends ast.Visitor
     }
 
     void buildLoop() {
-      loopHandler.handleLoop(node, closureDataLookup.getLoopClosureScope(node),
-          switchTarget, () {}, buildCondition, () {}, buildSwitch);
+      loopHandler.handleLoop(
+          node,
+          closureDataLookup.getLoopScopeInClosure(node),
+          switchTarget,
+          () {},
+          buildCondition,
+          () {},
+          buildSwitch);
     }
 
     if (hasDefault) {