From 39f80eaf817fa42e87e38277723dc038bf4e1ce4 Mon Sep 17 00:00:00 2001 From: bradfordcsmith Date: Thu, 7 Dec 2017 09:28:50 -0800 Subject: [PATCH] Rename RemoveUnusedVars to RemoveUnusedCode ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=178251024 --- .../javascript/jscomp/DefaultPassConfig.java | 18 +++++++++--------- .../javascript/jscomp/OptimizeParameters.java | 2 +- .../jscomp/ReferenceCollectingCallback.java | 2 +- ...veUnusedVars.java => RemoveUnusedCode.java} | 8 ++++---- .../jscomp/DefinitionsRemoverTest.java | 2 +- .../javascript/jscomp/MultiPassTest.java | 2 +- .../javascript/jscomp/OptimizeCallsTest.java | 4 ++-- .../jscomp/OptimizeParametersTest.java | 2 +- ...moveUnusedCodePrototypePropertiesTest.java} | 8 ++++---- ...VarsTest.java => RemoveUnusedCodeTest.java} | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) rename src/com/google/javascript/jscomp/{RemoveUnusedVars.java => RemoveUnusedCode.java} (99%) rename test/com/google/javascript/jscomp/{RemoveUnusedVarsPrototypePropertiesTest.java => RemoveUnusedCodePrototypePropertiesTest.java} (99%) rename test/com/google/javascript/jscomp/{RemoveUnusedVarsTest.java => RemoveUnusedCodeTest.java} (99%) diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java index 5d784e441c2..27733bf7467 100644 --- a/src/com/google/javascript/jscomp/DefaultPassConfig.java +++ b/src/com/google/javascript/jscomp/DefaultPassConfig.java @@ -815,7 +815,7 @@ protected List getOptimizations() { // After inlining some of the variable uses, some variables are unused. // Re-run remove unused vars to clean it up. if (options.removeUnusedVars || options.removeUnusedLocalVars) { - passes.add(lastRemoveUnusedVars()); + passes.add(getRemoveUnusedCodeOnce()); } } @@ -1002,7 +1002,7 @@ private List getMainOptimizationLoop() { } if (options.removeUnusedVars || options.removeUnusedLocalVars) { - passes.add(getRemoveUnusedVars()); + passes.add(getRemoveUnusedCode()); } if (options.j2clPassMode.shouldAddJ2clPasses()) { @@ -2496,7 +2496,7 @@ protected CompilerPass create(AbstractCompiler compiler) { /** * Optimizes unused function arguments, unused return values, and inlines constant parameters. - * Also runs RemoveUnusedVars. + * Also runs RemoveUnusedCode. */ private final PassFactory optimizeCalls = new PassFactory(PassNames.OPTIMIZE_CALLS, false) { @@ -2775,15 +2775,15 @@ protected CompilerPass create(AbstractCompiler compiler) { } }; - private PassFactory getRemoveUnusedVars() { - return getRemoveUnusedVars(false /* isOneTimePass */); + private PassFactory getRemoveUnusedCode() { + return getRemoveUnusedCode(false /* isOneTimePass */); } - private PassFactory lastRemoveUnusedVars() { - return getRemoveUnusedVars(true /* isOneTimePass */); + private PassFactory getRemoveUnusedCodeOnce() { + return getRemoveUnusedCode(true /* isOneTimePass */); } - private PassFactory getRemoveUnusedVars(boolean isOneTimePass) { + private PassFactory getRemoveUnusedCode(boolean isOneTimePass) { /** Removes variables that are never used. */ return new PassFactory(PassNames.REMOVE_UNUSED_VARS, isOneTimePass) { @Override @@ -2791,7 +2791,7 @@ protected CompilerPass create(AbstractCompiler compiler) { boolean removeOnlyLocals = options.removeUnusedLocalVars && !options.removeUnusedVars; boolean preserveAnonymousFunctionNames = options.anonymousFunctionNaming != AnonymousFunctionNamingPolicy.OFF; - return new RemoveUnusedVars.Builder(compiler) + return new RemoveUnusedCode.Builder(compiler) .removeGlobals(!removeOnlyLocals) .preserveFunctionExpressionNames(preserveAnonymousFunctionNames) .removeUnusedPrototypeProperties(options.removeUnusedPrototypeProperties) diff --git a/src/com/google/javascript/jscomp/OptimizeParameters.java b/src/com/google/javascript/jscomp/OptimizeParameters.java index 6cc9b5934a7..f48a6a70283 100644 --- a/src/com/google/javascript/jscomp/OptimizeParameters.java +++ b/src/com/google/javascript/jscomp/OptimizeParameters.java @@ -191,7 +191,7 @@ void tryEliminateUnusedArgs(ArrayList refs) { return; } - // NOTE: RemoveUnusedVars removes any trailing unused formals, so we don't need to + // NOTE: RemoveUnusedCode removes any trailing unused formals, so we don't need to // do for that case. BitSet unremovable = ((BitSet) used.clone()); diff --git a/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java b/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java index 860877bd275..cf1adfc5706 100644 --- a/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java +++ b/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java @@ -266,7 +266,7 @@ public boolean shouldTraverse(NodeTraversal nodeTraversal, Node n, Node parent) // is first referenced, so that the reference lists are in the right order. // // TODO(nicksantos): Maybe generalize this to a continuation mechanism - // like in RemoveUnusedVars. + // like in RemoveUnusedCode. if (NodeUtil.isHoistedFunctionDeclaration(n)) { Node nameNode = n.getFirstChild(); Var functionVar = nodeTraversal.getScope().getVar(nameNode.getString()); diff --git a/src/com/google/javascript/jscomp/RemoveUnusedVars.java b/src/com/google/javascript/jscomp/RemoveUnusedCode.java similarity index 99% rename from src/com/google/javascript/jscomp/RemoveUnusedVars.java rename to src/com/google/javascript/jscomp/RemoveUnusedCode.java index 09f040939e9..6165c4908aa 100644 --- a/src/com/google/javascript/jscomp/RemoveUnusedVars.java +++ b/src/com/google/javascript/jscomp/RemoveUnusedCode.java @@ -86,7 +86,7 @@ * * @author nicksantos@google.com (Nick Santos) */ -class RemoveUnusedVars implements CompilerPass { +class RemoveUnusedCode implements CompilerPass { // Properties that are implicitly used as part of the JS language. private static final ImmutableSet IMPLICITLY_USED_PROPERTIES = @@ -130,7 +130,7 @@ class RemoveUnusedVars implements CompilerPass { private final boolean removeUnusedPrototypeProperties; private final boolean allowRemovalOfExternProperties; - RemoveUnusedVars(Builder builder) { + RemoveUnusedCode(Builder builder) { this.compiler = builder.compiler; this.codingConvention = builder.compiler.getCodingConvention(); this.removeGlobals = builder.removeGlobals; @@ -176,8 +176,8 @@ Builder allowRemovalOfExternProperties(boolean value) { return this; } - RemoveUnusedVars build() { - return new RemoveUnusedVars(this); + RemoveUnusedCode build() { + return new RemoveUnusedCode(this); } } diff --git a/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java b/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java index a3e22db06a4..d4dc57f9ec1 100644 --- a/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java +++ b/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java @@ -24,7 +24,7 @@ /** * Test for {@link DefinitionsRemover}. Basically test for the simple removal cases. More * complicated cases are tested by the clients of {@link DefinitionsRemover} such as {@link - * PureFunctionIdentifierTest} and {@link RemoveUnusedVarsTest}. + * PureFunctionIdentifierTest} and {@link RemoveUnusedCodeTest}. * */ public final class DefinitionsRemoverTest extends CompilerTestCase { diff --git a/test/com/google/javascript/jscomp/MultiPassTest.java b/test/com/google/javascript/jscomp/MultiPassTest.java index b5aaf0d5b5b..3ce5492705e 100644 --- a/test/com/google/javascript/jscomp/MultiPassTest.java +++ b/test/com/google/javascript/jscomp/MultiPassTest.java @@ -387,7 +387,7 @@ private void addRemoveUnusedVars() { new PassFactory("removeUnusedVars", false) { @Override protected CompilerPass create(AbstractCompiler compiler) { - return new RemoveUnusedVars.Builder(compiler).build(); + return new RemoveUnusedCode.Builder(compiler).build(); } }); } diff --git a/test/com/google/javascript/jscomp/OptimizeCallsTest.java b/test/com/google/javascript/jscomp/OptimizeCallsTest.java index 6d95b1ea5d5..9b9a50c358f 100644 --- a/test/com/google/javascript/jscomp/OptimizeCallsTest.java +++ b/test/com/google/javascript/jscomp/OptimizeCallsTest.java @@ -50,7 +50,7 @@ public void process(Node externs, Node root) { defFinder.process(externs, root); new PureFunctionIdentifier(compiler, defFinder).process(externs, root); - new RemoveUnusedVars.Builder(compiler).removeGlobals(true).build().process(externs, root); + new RemoveUnusedCode.Builder(compiler).removeGlobals(true).build().process(externs, root); final OptimizeCalls passes = new OptimizeCalls(compiler); passes.addPass(new OptimizeReturns(compiler)); @@ -204,7 +204,7 @@ public void testCallSiteInteraction_constructors0() { public void testCallSiteInteraction_constructors1() { // NOTE: Ctor1 used trailing parameter is removed by - // RemoveUnusedVars + // RemoveUnusedCode // For now, goog.inherits prevents optimizations test( diff --git a/test/com/google/javascript/jscomp/OptimizeParametersTest.java b/test/com/google/javascript/jscomp/OptimizeParametersTest.java index 039019a1565..cbb3435888e 100644 --- a/test/com/google/javascript/jscomp/OptimizeParametersTest.java +++ b/test/com/google/javascript/jscomp/OptimizeParametersTest.java @@ -18,7 +18,7 @@ package com.google.javascript.jscomp; /** - * Tests for {@link OptimizeParameters}. Note: interaction with {@link RemoveUnusedVars} is + * Tests for {@link OptimizeParameters}. Note: interaction with {@link RemoveUnusedCode} is * tested in {@link OptimizeCallsTest}. */ public final class OptimizeParametersTest extends CompilerTestCase { diff --git a/test/com/google/javascript/jscomp/RemoveUnusedVarsPrototypePropertiesTest.java b/test/com/google/javascript/jscomp/RemoveUnusedCodePrototypePropertiesTest.java similarity index 99% rename from test/com/google/javascript/jscomp/RemoveUnusedVarsPrototypePropertiesTest.java rename to test/com/google/javascript/jscomp/RemoveUnusedCodePrototypePropertiesTest.java index dace82b81ff..83fb36d8a83 100644 --- a/test/com/google/javascript/jscomp/RemoveUnusedVarsPrototypePropertiesTest.java +++ b/test/com/google/javascript/jscomp/RemoveUnusedCodePrototypePropertiesTest.java @@ -20,17 +20,17 @@ import com.google.javascript.rhino.Node; /** - * Tests for {@link RemoveUnusedVars} that cover functionality originally in + * Tests for {@link RemoveUnusedCode} that cover functionality originally in * {@link RemoveUnusedPrototypeProperties}. */ -public final class RemoveUnusedVarsPrototypePropertiesTest extends CompilerTestCase { +public final class RemoveUnusedCodePrototypePropertiesTest extends CompilerTestCase { private static final String EXTERNS = MINIMAL_EXTERNS + "IFoo.prototype.bar; var mExtern; mExtern.bExtern; mExtern['cExtern'];"; private boolean keepGlobals = false; private boolean allowRemovalOfExternProperties = false; - public RemoveUnusedVarsPrototypePropertiesTest() { + public RemoveUnusedCodePrototypePropertiesTest() { super(EXTERNS); } @@ -44,7 +44,7 @@ protected CompilerPass getProcessor(Compiler compiler) { return new CompilerPass() { @Override public void process(Node externs, Node root) { - new RemoveUnusedVars.Builder(compiler) + new RemoveUnusedCode.Builder(compiler) .removeGlobals(!keepGlobals) .removeUnusedPrototypeProperties(true) .allowRemovalOfExternProperties(allowRemovalOfExternProperties) diff --git a/test/com/google/javascript/jscomp/RemoveUnusedVarsTest.java b/test/com/google/javascript/jscomp/RemoveUnusedCodeTest.java similarity index 99% rename from test/com/google/javascript/jscomp/RemoveUnusedVarsTest.java rename to test/com/google/javascript/jscomp/RemoveUnusedCodeTest.java index ed51563582a..2d9082d1bc2 100644 --- a/test/com/google/javascript/jscomp/RemoveUnusedVarsTest.java +++ b/test/com/google/javascript/jscomp/RemoveUnusedCodeTest.java @@ -18,12 +18,12 @@ import com.google.javascript.rhino.Node; -public final class RemoveUnusedVarsTest extends CompilerTestCase { +public final class RemoveUnusedCodeTest extends CompilerTestCase { private boolean removeGlobal; private boolean preserveFunctionExpressionNames; - public RemoveUnusedVarsTest() { + public RemoveUnusedCodeTest() { // Set up externs to be used in the test cases. super("function alert() {} var externVar;"); } @@ -46,7 +46,7 @@ protected CompilerPass getProcessor(final Compiler compiler) { return new CompilerPass() { @Override public void process(Node externs, Node root) { - new RemoveUnusedVars.Builder(compiler) + new RemoveUnusedCode.Builder(compiler) .removeGlobals(removeGlobal) .preserveFunctionExpressionNames(preserveFunctionExpressionNames) .build()