- Split Scope and Var into separate files.

- Don't implement StaticSymbolTable in Scope; scopes are never used as symbol tables.
- Don't implement StaticSymbolTable in SymbolTable; it's never used as the interface.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=87168462

src/com/google/javascript/jscomp/AbstractCompiler.java

@@ -19,7 +19,6 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.parsing.Config;
 import com.google.javascript.jscomp.parsing.parser.trees.Comment;
 import com.google.javascript.jscomp.type.ReverseAbstractInterpreter;

src/com/google/javascript/jscomp/AccessControlUtils.java

@@ -17,7 +17,6 @@
 package com.google.javascript.jscomp;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfo.Visibility;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/AliasExternals.java

@@ -611,7 +611,7 @@ private void getGlobalName(NodeTraversal t, Node dest, Node parent) {
 
         if (aliasable) {
           String name = dest.getString();
-          Scope.Var var = t.getScope().getVar(name);
+          Var var = t.getScope().getVar(name);
 
           if (var != null && !var.isLocal()) {
             globals.put(name, newSymbolForGlobalVar(dest));
@@ -646,7 +646,7 @@ private final class GlobalGatherer extends AbstractPostOrderCallback {
     public void visit(NodeTraversal t, Node n, Node parent) {
       if (n.isName()) {
         String name = n.getString();
-        Scope.Var var = t.getScope().getVar(name);
+        Var var = t.getScope().getVar(name);
 
         // It's ok for var to be null since it won't be in any scope if it's
         // an extern

src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.FixedPointGraphTraversal;
 import com.google.javascript.jscomp.graph.FixedPointGraphTraversal.EdgeCallback;
 import com.google.javascript.jscomp.graph.LinkedDirectedGraph;

src/com/google/javascript/jscomp/CheckAccessControls.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Multimap;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfo.Visibility;
 import com.google.javascript.rhino.Node;
@@ -330,7 +329,7 @@ private void checkNameDeprecation(NodeTraversal t, Node n, Node parent) {
       return;
     }
 
-    Scope.Var var = t.getScope().getVar(n.getString());
+    Var var = t.getScope().getVar(n.getString());
     JSDocInfo docInfo = var == null ? null : var.getJSDocInfo();
 
     if (docInfo != null && docInfo.isDeprecated() &&

src/com/google/javascript/jscomp/CheckEventfulObjectDisposal.java

@@ -22,7 +22,6 @@
 import com.google.common.collect.Maps;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfo.Visibility;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/CheckRequiresForConstructors.java

@@ -191,7 +191,7 @@ private void visitNewNode(NodeTraversal t, Node n) {
       }
 
       String name = root.getString();
-      Scope.Var var = t.getScope().getVar(name);
+      Var var = t.getScope().getVar(name);
       if (var != null && (var.isLocal() || var.isExtern())) {
         return;
       }
@@ -235,7 +235,7 @@ private void maybeAddJsDocUsage(NodeTraversal t, Node n, JSTypeExpression expr)
       Preconditions.checkState(child.isString());
 
       String rootName = Splitter.on('.').split(child.getString()).iterator().next();
-      Scope.Var var = t.getScope().getVar(rootName);
+      Var var = t.getScope().getVar(rootName);
       if (var != null && var.isExtern()) {
         return;
       }

src/com/google/javascript/jscomp/CleanupPasses.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.Lists;
 import com.google.javascript.jscomp.DefaultPassConfig.HotSwapPassFactory;
 import com.google.javascript.jscomp.GlobalVarReferenceMap.GlobalVarRefCleanupPass;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.FunctionTypeI;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.TypeI;

src/com/google/javascript/jscomp/ClosureRewriteModule.java

@@ -19,7 +19,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfoBuilder;

src/com/google/javascript/jscomp/CoalesceVariableNames.java

@@ -26,7 +26,6 @@
 import com.google.javascript.jscomp.LiveVariablesAnalysis.LiveVariableLattice;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphNode;
 import com.google.javascript.jscomp.graph.GraphColoring;
 import com.google.javascript.jscomp.graph.GraphColoring.GreedyGraphColoring;

src/com/google/javascript/jscomp/CollapseProperties.java

@@ -26,7 +26,6 @@
 import com.google.javascript.jscomp.GlobalNamespace.Ref.Type;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/CollapseVariableDeclarations.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;

src/com/google/javascript/jscomp/Compiler.java

@@ -33,7 +33,6 @@
 import com.google.javascript.jscomp.CompilerOptions.DevMode;
 import com.google.javascript.jscomp.JSModuleGraph.MissingModuleException;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.deps.SortedDependencies;
 import com.google.javascript.jscomp.deps.SortedDependencies.CircularDependencyException;
 import com.google.javascript.jscomp.deps.SortedDependencies.MissingProvideException;

src/com/google/javascript/jscomp/ConstCheck.java

@@ -42,7 +42,7 @@ class ConstCheck extends AbstractPostOrderCallback
           "Original definition at {1}");
 
   private final AbstractCompiler compiler;
-  private final Set<Scope.Var> initializedConstants;
+  private final Set<Var> initializedConstants;
 
   /**
    * Creates an instance.
@@ -65,7 +65,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         if (parent != null &&
             parent.isVar()) {
           String name = n.getString();
-          Scope.Var var = t.getScope().getVar(name);
+          Var var = t.getScope().getVar(name);
           if (isConstant(var)) {
             // If a constant is declared in externs, add it to initializedConstants to indicate
             // that it is initialized externally.
@@ -95,7 +95,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         Node lhs = n.getFirstChild();
         if (lhs.isName()) {
           String name = lhs.getString();
-          Scope.Var var = t.getScope().getVar(name);
+          Var var = t.getScope().getVar(name);
           if (isConstant(var)) {
             if (!initializedConstants.add(var)) {
               reportError(t, n, var, name);
@@ -110,7 +110,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         Node lhs = n.getFirstChild();
         if (lhs.isName()) {
           String name = lhs.getString();
-          Scope.Var var = t.getScope().getVar(name);
+          Var var = t.getScope().getVar(name);
           if (isConstant(var)) {
             reportError(t, n, var, name);
           }
@@ -124,14 +124,14 @@ public void visit(NodeTraversal t, Node n, Node parent) {
    * Gets whether a variable is a constant initialized to a literal value at
    * the point where it is declared.
    */
-  private static boolean isConstant(Scope.Var var) {
+  private static boolean isConstant(Var var) {
     return var != null && var.isInferredConst();
   }
 
   /**
    * Reports a reassigned constant error.
    */
-  void reportError(NodeTraversal t, Node n, Scope.Var var, String name) {
+  void reportError(NodeTraversal t, Node n, Var var, String name) {
     JSDocInfo info = NodeUtil.getBestJSDocInfo(n);
     if (info == null || !info.getSuppressions().contains("const")) {
       Node declNode = var.getNode();

src/com/google/javascript/jscomp/ConstParamCheck.java

@@ -85,7 +85,7 @@ public void visit(NodeTraversal traversal, Node node, Node parent) {
 
       if (name.isName()) {
         Scope scope = traversal.getScope();
-        Scope.Var var = scope.getVar(name.getString());
+        Var var = scope.getVar(name.getString());
         if (var == null) {
           return;
         }
@@ -122,7 +122,7 @@ private void checkArgumentConstant(NodeTraversal traversal, Node argument) {
     if (argument.isName()) {
       String name = argument.getString();
       Scope scope = traversal.getScope();
-      Scope.Var var = scope.getVar(name);
+      Var var = scope.getVar(name);
       if (var == null || !var.isInferredConst()) {
         compiler.report(traversal.makeError(
             argument, CONST_NOT_STRING_LITERAL_ERROR, name));

src/com/google/javascript/jscomp/CrossModuleCodeMotion.java

@@ -21,7 +21,6 @@
 import com.google.javascript.jscomp.CodingConvention.SubclassRelationship;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
@@ -58,7 +57,7 @@ class CrossModuleCodeMotion implements CompilerPass {
    * NOTE - I made this a LinkedHashMap to make testing easier. With a regular
    * HashMap, the variables may not output in a consistent order
    */
-  private final Map<Scope.Var, NamedInfo> namedInfo =
+  private final Map<Var, NamedInfo> namedInfo =
       new LinkedHashMap<>();
 
   private final Map<Node, InstanceofInfo> instanceofNodes =

src/com/google/javascript/jscomp/DataFlowAnalysis.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.ControlFlowGraph.Branch;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.Annotation;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphNode;
 import com.google.javascript.jscomp.graph.LatticeElement;

src/com/google/javascript/jscomp/DeadAssignmentsElimination.java

@@ -24,7 +24,6 @@
 import com.google.javascript.jscomp.LiveVariablesAnalysis.LiveVariableLattice;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphNode;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java

@@ -17,7 +17,6 @@
 package com.google.javascript.jscomp;
 
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.Node;
 
 import java.util.HashMap;

src/com/google/javascript/jscomp/Es6RewriteLetConst.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.Multimap;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.Normalize.NormalizeStatements;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfoBuilder;

src/com/google/javascript/jscomp/ExpandJqueryAliases.java

@@ -22,7 +22,6 @@
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;

src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java

@@ -27,7 +27,6 @@
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.NodeTraversal.AbstractShallowCallback;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphEdge;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphNode;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/FunctionInjector.java

@@ -559,7 +559,7 @@ private Node inlineFunction(
   }
 
   private static void removeConstantVarAnnotation(Scope scope, String name) {
-    Scope.Var var = scope.getVar(name);
+    Var var = scope.getVar(name);
     Node nameNode = var == null ? null : var.getNameNode();
     if (nameNode == null) return;
 

src/com/google/javascript/jscomp/FunctionTypeBuilder.java

@@ -31,7 +31,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSTypeExpression;

src/com/google/javascript/jscomp/GlobalNamespace.java

@@ -260,7 +260,7 @@ private static String getTopVarName(String name) {
    * @return Whether the name reference is a global variable reference
    */
   private boolean isGlobalVarReference(String name, Scope s) {
-    Scope.Var v = s.getVar(name);
+    Var v = s.getVar(name);
     if (v == null && externsScope != null) {
       v = externsScope.getVar(name);
     }

src/com/google/javascript/jscomp/GlobalVarReferenceMap.java

@@ -22,7 +22,6 @@
 import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceMap;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.InputId;
 import com.google.javascript.rhino.Node;
 

src/com/google/javascript/jscomp/GroupVariableDeclarations.java

@@ -18,7 +18,6 @@
 
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
 

src/com/google/javascript/jscomp/InferConsts.java

@@ -17,7 +17,6 @@
 package com.google.javascript.jscomp;
 
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
 

src/com/google/javascript/jscomp/InlineObjectLiterals.java

@@ -25,7 +25,6 @@
 import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceMap;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;

src/com/google/javascript/jscomp/InlineVariables.java

@@ -26,7 +26,6 @@
 import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
 import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceMap;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.Node;
 
 import java.util.Iterator;

src/com/google/javascript/jscomp/JsMessageVisitor.java

@@ -22,7 +22,6 @@
 import com.google.debugging.sourcemap.proto.Mapping.OriginalMapping;
 import com.google.javascript.jscomp.JsMessage.Builder;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;

src/com/google/javascript/jscomp/LinkedFlowScope.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.type.FlowScope;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.jstype.JSType;

src/com/google/javascript/jscomp/LiveVariablesAnalysis.java

@@ -19,7 +19,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.ControlFlowGraph.Branch;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphEdge;
 import com.google.javascript.jscomp.graph.LatticeElement;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java

@@ -24,7 +24,6 @@
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.NodeTraversal.ScopedCallback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
 import com.google.javascript.rhino.TokenStream;

src/com/google/javascript/jscomp/MaybeReachingVariableUse.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.ControlFlowGraph.Branch;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphEdge;
 import com.google.javascript.jscomp.graph.GraphNode;
 import com.google.javascript.jscomp.graph.LatticeElement;

src/com/google/javascript/jscomp/MemoizedScopeCreator.java

@@ -22,7 +22,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.jstype.StaticSymbolTable;
 

src/com/google/javascript/jscomp/MustBeReachingVariableDef.java

@@ -21,7 +21,6 @@
 import com.google.common.collect.Sets;
 import com.google.javascript.jscomp.ControlFlowGraph.AbstractCfgNodeTraversalCallback;
 import com.google.javascript.jscomp.ControlFlowGraph.Branch;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.GraphNode;
 import com.google.javascript.jscomp.graph.LatticeElement;
 import com.google.javascript.rhino.Node;

src/com/google/javascript/jscomp/NameAnalyzer.java

@@ -30,7 +30,6 @@
 import com.google.javascript.jscomp.GatherSideEffectSubexpressionsCallback.SideEffectAccumulator;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
 import com.google.javascript.jscomp.NodeTraversal.Callback;
-import com.google.javascript.jscomp.Scope.Var;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphEdge;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphNode;
 import com.google.javascript.jscomp.graph.LinkedDirectedGraph;