Rename {Js,Deps}FileParser as {Js,Deps}FileRegexParser.

We have two JavaScript dependency parsers: JsFileParser (regex-based) and JsfileParser (non-regex-based). This CL renames the first so that the two aren't as easily confused.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=259063514

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

@@ -38,7 +38,7 @@
 import com.google.javascript.jscomp.SortingErrorManager.ErrorReportGenerator;
 import com.google.javascript.jscomp.deps.BrowserModuleResolver;
 import com.google.javascript.jscomp.deps.BrowserWithTransformedPrefixesModuleResolver;
-import com.google.javascript.jscomp.deps.JsFileParser;
+import com.google.javascript.jscomp.deps.JsFileRegexParser;
 import com.google.javascript.jscomp.deps.ModuleLoader;
 import com.google.javascript.jscomp.deps.ModuleLoader.ModuleResolverFactory;
 import com.google.javascript.jscomp.deps.NodeModuleResolver;
@@ -2025,7 +2025,7 @@ private List<CompilerInput> parsePotentialModules(Iterable<CompilerInput> inputs
     for (CompilerInput input : inputsToProcess) {
       // Only process files that are detected as ES6 modules
       if (!options.getDependencyOptions().shouldPrune()
-          || !JsFileParser.isSupported()
+          || !JsFileRegexParser.isSupported()
           || "es6".equals(input.getLoadFlags().get("module"))) {
         filteredInputs.add(input);
       }

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

@@ -26,7 +26,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.javascript.jscomp.deps.DependencyInfo;
-import com.google.javascript.jscomp.deps.JsFileParser;
+import com.google.javascript.jscomp.deps.JsFileRegexParser;
 import com.google.javascript.jscomp.deps.ModuleLoader;
 import com.google.javascript.jscomp.deps.ModuleLoader.ModulePath;
 import com.google.javascript.jscomp.deps.SimpleDependencyInfo;
@@ -301,16 +301,16 @@ private DependencyInfo generateDependencyInfo() {
         compiler.getErrorManager(), "Expected compiler to call an error manager: %s", this);
 
     // If the code is a JsAst, then it was originally JS code, and is compatible with the
-    // regex-based parsing of JsFileParser.
-    if (ast instanceof JsAst && JsFileParser.isSupported()) {
+    // regex-based parsing of JsFileRegexParser.
+    if (ast instanceof JsAst && JsFileRegexParser.isSupported()) {
       // Look at the source code.
       // Note: it's OK to use getName() instead of
       // getPathRelativeToClosureBase() here because we're not using
       // this to generate deps files. (We're only using it for
       // symbol dependencies.)
       try {
         DependencyInfo info =
-            new JsFileParser(compiler.getErrorManager())
+            new JsFileRegexParser(compiler.getErrorManager())
                 .setModuleLoader(compiler.getModuleLoader())
                 .setIncludeGoogBase(true)
                 .parseFile(getName(), getName(), getCode());
@@ -483,7 +483,7 @@ void visitEs6ModuleName(Node n, Node parent) {
       checkArgument(n.isString());
       checkArgument(parent.isExport() || parent.isImport());
 
-      // TODO(blickly): Move this (and the duplicated logic in JsFileParser/Es6RewriteModules)
+      // TODO(blickly): Move this (and the duplicated logic in JsFileRegexParser/Es6RewriteModules)
       // into ModuleLoader.
       String moduleName = n.getString();
       if (moduleName.startsWith("goog:")) {

src/com/google/javascript/jscomp/deps/DefaultDependencyResolver.java

@@ -141,7 +141,7 @@ private void addDependency(String symbol, Set<String> seen, List<String> list)
   /** Parses a block of code for goog.require statements and extracts the required symbols. */
   private static Collection<String> parseRequires(String code, boolean addClosureBase) {
     ErrorManager errorManager = new LoggerErrorManager(logger);
-    JsFileParser parser = new JsFileParser(errorManager);
+    JsFileRegexParser parser = new JsFileRegexParser(errorManager);
     DependencyInfo deps =
         parser.parseFile("<unknown path>", "<unknown path>", code);
     List<String> requires = new ArrayList<>();

src/com/google/javascript/jscomp/deps/DependencyFile.java

@@ -89,8 +89,7 @@ private void loadGraph() throws ServiceException {
 
     // Parse the deps.js file.
     ErrorManager errorManager = new LoggerErrorManager(logger);
-    DepsFileParser parser =
-        new DepsFileParser(errorManager);
+    DepsFileRegexParser parser = new DepsFileRegexParser(errorManager);
     List<DependencyInfo> depInfos =
         parser.parseFile(getName(), getContent());
 

src/com/google/javascript/jscomp/deps/DepsFileParser.java → src/com/google/javascript/jscomp/deps/DepsFileRegexParser.java

@@ -42,13 +42,13 @@
 /**
  * A parser that can extract dependency information from existing deps.js files.
  *
- * <p>See //javascript/closure/deps.js for an example file.</p>
+ * <p>See //javascript/closure/deps.js for an example file.
  *
  * @author agrieve@google.com (Andrew Grieve)
  */
 @GwtIncompatible("java.util.regex")
-public final class DepsFileParser extends JsFileLineParser {
-  private static final Logger logger = Logger.getLogger(DepsFileParser.class.getName());
+public final class DepsFileRegexParser extends JsFileLineParser {
+  private static final Logger logger = Logger.getLogger(DepsFileRegexParser.class.getName());
 
   /**
    * Pattern for matching JavaScript string literals. The group is:
@@ -80,16 +80,15 @@ public final class DepsFileParser extends JsFileLineParser {
    *
    * @param errorManager Handles parse errors.
    */
-  public DepsFileParser(ErrorManager errorManager) {
+  public DepsFileRegexParser(ErrorManager errorManager) {
     this(Functions.identity(), errorManager);
   }
 
   /**
    * @param pathTranslator Translates paths in different build systems.
    * @param errorManager Handles parse errors.
    */
-  public DepsFileParser(Function<String, String> pathTranslator,
-      ErrorManager errorManager) {
+  public DepsFileRegexParser(Function<String, String> pathTranslator, ErrorManager errorManager) {
     super(errorManager);
     this.pathTranslator = pathTranslator;
   }

src/com/google/javascript/jscomp/deps/DepsGenerator.java

@@ -403,8 +403,8 @@ private void addToProvideMap(
     }
   }
 
-  protected DepsFileParser createDepsFileParser() {
-    DepsFileParser depsParser = new DepsFileParser(errorManager);
+  protected DepsFileRegexParser createDepsFileParser() {
+    DepsFileRegexParser depsParser = new DepsFileRegexParser(errorManager);
     depsParser.setShortcutMode(true);
     return depsParser;
   }
@@ -421,7 +421,7 @@ protected boolean shouldSkipDepsFile(SourceFile file) {
    * closure-relative path -> DependencyInfo.
    */
   private Map<String, DependencyInfo> parseDepsFiles() throws IOException {
-    DepsFileParser depsParser = createDepsFileParser();
+    DepsFileRegexParser depsParser = createDepsFileParser();
     Map<String, DependencyInfo> depsFiles = new LinkedHashMap<>();
     for (SourceFile file : deps) {
       if (!shouldSkipDepsFile(file)) {
@@ -455,7 +455,7 @@ private Map<String, DependencyInfo> parseDepsFiles() throws IOException {
   }
 
   private DependencyInfo removeRelativePathProvide(DependencyInfo info) {
-    // DepsFileParser adds an ES6 module's relative path to closure as a provide so that
+    // DepsFileRegexParser adds an ES6 module's relative path to closure as a provide so that
     // the resulting depgraph is valid. But we don't want to write this "fake" provide
     // back out, so remove it here.
     return SimpleDependencyInfo.Builder.from(info)
@@ -477,7 +477,7 @@ private DependencyInfo removeRelativePathProvide(DependencyInfo info) {
   private Map<String, DependencyInfo> parseSources(
       Set<String> preparsedFiles) throws IOException {
     Map<String, DependencyInfo> parsedFiles = new LinkedHashMap<>();
-    JsFileParser jsParser = new JsFileParser(errorManager).setModuleLoader(loader);
+    JsFileRegexParser jsParser = new JsFileRegexParser(errorManager).setModuleLoader(loader);
     Compiler compiler = new Compiler();
     compiler.init(ImmutableList.of(), ImmutableList.of(), new CompilerOptions());
 

src/com/google/javascript/jscomp/deps/JsFileParser.java → src/com/google/javascript/jscomp/deps/JsFileRegexParser.java

@@ -36,15 +36,15 @@
 import java.util.regex.Pattern;
 
 /**
- * A parser that can extract dependency information from a .js file, including
- * goog.require, goog.provide, goog.module, import statements, and export statements.
+ * A parser that can extract dependency information from a .js file, including goog.require,
+ * goog.provide, goog.module, import statements, and export statements.
  *
  * @author agrieve@google.com (Andrew Grieve)
  */
 @GwtIncompatible("java.util.regex")
-public final class JsFileParser extends JsFileLineParser {
+public final class JsFileRegexParser extends JsFileLineParser {
 
-  private static final Logger logger = Logger.getLogger(JsFileParser.class.getName());
+  private static final Logger logger = Logger.getLogger(JsFileRegexParser.class.getName());
 
   /** Pattern for matching goog.provide(*) and goog.require(*). */
   private static final Pattern GOOG_PROVIDE_REQUIRE_PATTERN =
@@ -133,36 +133,33 @@ private enum ModuleType {
    *
    * @param errorManager Handles parse errors.
    */
-  public JsFileParser(ErrorManager errorManager) {
+  public JsFileRegexParser(ErrorManager errorManager) {
     super(errorManager);
   }
 
   /**
-   * Sets whether we should create implicit provides and requires of the
-   * root namespace.
+   * Sets whether we should create implicit provides and requires of the root namespace.
    *
-   * When generating deps files, you do not want this behavior. Deps files
-   * need base.js to run anyway, so they don't need information about it.
+   * <p>When generating deps files, you do not want this behavior. Deps files need base.js to run
+   * anyway, so they don't need information about it.
    *
-   * When generating abstract build graphs, you probably do want this behavior.
-   * It will create an implicit dependency of all files with provides/requires
-   * on base.js.
+   * <p>When generating abstract build graphs, you probably do want this behavior. It will create an
+   * implicit dependency of all files with provides/requires on base.js.
    *
    * @return this for easy chaining.
    */
-  public JsFileParser setIncludeGoogBase(boolean include) {
-    checkState(JsFileParser.isSupported());
+  public JsFileRegexParser setIncludeGoogBase(boolean include) {
+    checkState(JsFileRegexParser.isSupported());
     includeGoogBase = include;
     return this;
   }
 
   /**
-   * Sets a list of "module root" URIs, which allow relativizing filenames
-   * for modules.
+   * Sets a list of "module root" URIs, which allow relativizing filenames for modules.
    *
    * @return this for easy chaining.
    */
-  public JsFileParser setModuleLoader(ModuleLoader loader) {
+  public JsFileRegexParser setModuleLoader(ModuleLoader loader) {
     this.loader = loader;
     return this;
   }

src/com/google/javascript/jscomp/gwt/super/com/google/javascript/jscomp/deps/JsFileParser.java → src/com/google/javascript/jscomp/gwt/super/com/google/javascript/jscomp/deps/JsFileRegexParser.java

@@ -18,22 +18,21 @@
 
 import com.google.javascript.jscomp.ErrorManager;
 
-/** GWT compatible no-op replacement for {@code JsFileParser} */
-public final class JsFileParser {
-  public JsFileParser(ErrorManager errorManager) {
-  }
+/** GWT compatible no-op replacement for {@code JsFileRegexParser} */
+public final class JsFileRegexParser {
+  public JsFileRegexParser(ErrorManager errorManager) {}
 
-  public JsFileParser setModuleLoader(ModuleLoader loader) {
-    throw new UnsupportedOperationException("JsFileParser.setModuleLoader not implemented");
+  public JsFileRegexParser setModuleLoader(ModuleLoader loader) {
+    throw new UnsupportedOperationException("JsFileRegexParser.setModuleLoader not implemented");
   }
 
-  public JsFileParser setIncludeGoogBase(boolean include) {
-    throw new UnsupportedOperationException("JsFileParser.setIncludeGoogBase not implemented");
+  public JsFileRegexParser setIncludeGoogBase(boolean include) {
+    throw new UnsupportedOperationException("JsFileRegexParser.setIncludeGoogBase not implemented");
   }
 
   public DependencyInfo parseFile(String filePath, String closureRelativePath,
       String fileContents) {
-    throw new UnsupportedOperationException("JsFileParser.parseFile not implemented");
+    throw new UnsupportedOperationException("JsFileRegexParser.parseFile not implemented");
   }
 
   public static boolean isSupported() {

test/com/google/javascript/jscomp/RewriteGoogJsImportsTest.java

@@ -37,7 +37,8 @@
 
 @RunWith(JUnit4.class)
 public final class RewriteGoogJsImportsTest extends CompilerTestCase {
-  // JsFileParser determines if this file is base.js by looking at the first comment of the file.
+  // JsFileRegexParser determines if this file is base.js by looking at the first comment of the
+  // file.
   private static final SourceFile BASE =
       SourceFile.fromCode("/closure/base.js", "/** @provideGoog */");
 

test/com/google/javascript/jscomp/deps/DepsFileParserTest.java → test/com/google/javascript/jscomp/deps/DepsFileRegexParserTest.java

@@ -30,21 +30,21 @@
 import org.junit.runners.JUnit4;
 
 /**
- * Tests for {@link DepsFileParser}.
+ * Tests for {@link DepsFileRegexParser}.
  *
  * @author agrieve@google.com (Andrew Grieve)
  */
 @RunWith(JUnit4.class)
-public final class DepsFileParserTest {
+public final class DepsFileRegexParserTest {
 
-  private DepsFileParser parser;
+  private DepsFileRegexParser parser;
   private ErrorManager errorManager;
   private static final String SRC_PATH = "/path/1.js";
 
   @Before
   public void setUp() {
     errorManager = new PrintStreamErrorManager(System.err);
-    parser = new DepsFileParser(errorManager);
+    parser = new DepsFileRegexParser(errorManager);
     parser.setShortcutMode(true);
   }
 

test/com/google/javascript/jscomp/deps/JsFileParserTest.java → test/com/google/javascript/jscomp/deps/JsFileRegexParserTest.java

@@ -32,14 +32,14 @@
 import org.junit.runners.JUnit4;
 
 /**
- * Tests for {@link JsFileParser}.
+ * Tests for {@link JsFileRegexParser}.
  *
  * @author agrieve@google.com (Andrew Grieve)
  */
 @RunWith(JUnit4.class)
-public final class JsFileParserTest {
+public final class JsFileRegexParserTest {
 
-  JsFileParser parser;
+  JsFileRegexParser parser;
   private ErrorManager errorManager;
 
   private static final String SRC_PATH = "a";
@@ -48,7 +48,7 @@ public final class JsFileParserTest {
   @Before
   public void setUp() {
     errorManager = new PrintStreamErrorManager(System.err);
-    parser = new JsFileParser(errorManager);
+    parser = new JsFileRegexParser(errorManager);
     parser.setShortcutMode(true);
   }