From 4c97e69df965da4179b639ea3ee2020c98cc3621 Mon Sep 17 00:00:00 2001 From: tbreisacher Date: Thu, 12 Apr 2018 17:27:06 -0700 Subject: [PATCH] Rename traverseEs6 to traverse (and similarly with other methods with "Es6" in the name. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=192698297 --- .../javascript/jscomp/AliasStrings.java | 2 +- .../jscomp/AmbiguateProperties.java | 2 +- .../jscomp/AnalyzePrototypeProperties.java | 4 +- .../google/javascript/jscomp/AngularPass.java | 2 +- .../jscomp/CheckAccessControls.java | 6 +-- .../javascript/jscomp/CheckConformance.java | 2 +- .../jscomp/CheckConstPrivateProperties.java | 4 +- .../jscomp/CheckDebuggerStatement.java | 2 +- .../google/javascript/jscomp/CheckJSDoc.java | 6 +-- .../jscomp/CheckMissingAndExtraRequires.java | 4 +- .../jscomp/CheckMissingGetCssName.java | 2 +- .../javascript/jscomp/CheckProvides.java | 2 +- .../google/javascript/jscomp/CheckRegExp.java | 2 +- .../javascript/jscomp/CheckSideEffects.java | 8 ++-- .../google/javascript/jscomp/CheckSuper.java | 6 +-- .../jscomp/CheckUnusedPrivateProperties.java | 4 +- .../google/javascript/jscomp/ChromePass.java | 4 +- .../javascript/jscomp/ClosureCheckModule.java | 4 +- .../jscomp/ClosureOptimizePrimitives.java | 2 +- .../jscomp/ClosureRewriteClass.java | 4 +- .../jscomp/ClosureRewriteModule.java | 16 ++++---- .../jscomp/CoalesceVariableNames.java | 2 +- .../jscomp/CollapseAnonymousFunctions.java | 2 +- .../javascript/jscomp/CollapseProperties.java | 2 +- .../jscomp/CollapseVariableDeclarations.java | 2 +- .../jscomp/CollectFunctionNames.java | 2 +- .../jscomp/CombinedCompilerPass.java | 6 +-- .../google/javascript/jscomp/Compiler.java | 2 +- .../google/javascript/jscomp/ConstCheck.java | 2 +- .../javascript/jscomp/ConstParamCheck.java | 2 +- .../jscomp/ControlFlowAnalysis.java | 2 +- .../jscomp/ConvertToDottedProperties.java | 2 +- .../jscomp/CoverageInstrumentationPass.java | 4 +- .../jscomp/CreateSyntheticBlocks.java | 2 +- .../jscomp/DartSuperAccessorsPass.java | 8 ++-- .../jscomp/DeadAssignmentsElimination.java | 2 +- .../DeadPropertyAssignmentElimination.java | 4 +- .../jscomp/DeclaredGlobalExternsOnWindow.java | 2 +- .../javascript/jscomp/DefaultPassConfig.java | 2 +- .../jscomp/DefinitionUseSiteFinder.java | 4 +- .../google/javascript/jscomp/Denormalize.java | 2 +- .../jscomp/DisambiguatePrivateProperties.java | 2 +- .../jscomp/DisambiguateProperties.java | 4 +- .../javascript/jscomp/Es6CheckModule.java | 4 +- .../Es6ConvertSuperConstructorCalls.java | 4 +- .../javascript/jscomp/Es6ExternsCheck.java | 2 +- .../Es6RenameVariablesInParamLists.java | 4 +- .../jscomp/Es6RewriteArrowFunction.java | 2 +- .../Es6RewriteBlockScopedDeclaration.java | 18 ++++----- .../javascript/jscomp/Es6RewriteClass.java | 2 +- .../jscomp/Es6RewriteGenerators.java | 12 +++--- .../javascript/jscomp/Es6RewriteModules.java | 10 ++--- .../Es6RewriteModulesToCommonJsModules.java | 2 +- .../jscomp/Es6RewriteScriptsToModules.java | 2 +- .../jscomp/Es6TypedToEs6Converter.java | 12 +++--- .../jscomp/ExportTestFunctions.java | 2 +- .../javascript/jscomp/ExternExportsPass.java | 2 +- .../ExtractPrototypeMemberDeclarations.java | 2 +- .../javascript/jscomp/FieldCleanupPass.java | 2 +- .../jscomp/FindModuleDependencies.java | 4 +- .../jscomp/FlowSensitiveInlineVariables.java | 8 ++-- .../javascript/jscomp/FunctionRewriter.java | 2 +- .../jscomp/FunctionToBlockMutator.java | 2 +- .../jscomp/GatherExternProperties.java | 2 +- .../javascript/jscomp/GatherRawExports.java | 2 +- ...atherSideEffectSubexpressionsCallback.java | 2 +- .../javascript/jscomp/GenerateExports.java | 4 +- .../javascript/jscomp/GlobalNamespace.java | 4 +- .../jscomp/GlobalTypeInfoCollector.java | 14 +++---- .../jscomp/ImplicitNullabilityCheck.java | 2 +- .../javascript/jscomp/InferJSDocInfo.java | 6 +-- .../javascript/jscomp/InlineAliases.java | 4 +- .../javascript/jscomp/InlineFunctions.java | 6 +-- .../javascript/jscomp/InlineProperties.java | 4 +- .../jscomp/InstrumentFunctions.java | 6 +-- .../jscomp/J2clAssertRemovalPass.java | 2 +- .../javascript/jscomp/J2clChecksPass.java | 2 +- .../jscomp/J2clClinitPrunerPass.java | 8 ++-- .../jscomp/J2clConstantHoisterPass.java | 2 +- .../google/javascript/jscomp/J2clPass.java | 4 +- .../jscomp/J2clPropertyInlinerPass.java | 6 +-- .../jscomp/J2clUtilGetDefineRewriterPass.java | 2 +- .../javascript/jscomp/JsMessageVisitor.java | 2 +- .../javascript/jscomp/LineNumberCheck.java | 4 +- .../jscomp/MakeDeclaredNamesUnique.java | 2 +- .../jscomp/MarkNoSideEffectCalls.java | 6 +-- .../javascript/jscomp/MethodCompilerPass.java | 6 +-- .../javascript/jscomp/ModuleMetadata.java | 6 +-- .../jscomp/MoveFunctionDeclarations.java | 2 +- .../jscomp/MustBeReachingVariableDef.java | 2 +- .../jscomp/NameAnonymousFunctions.java | 2 +- .../jscomp/NameAnonymousFunctionsMapped.java | 2 +- .../jscomp/NameBasedDefinitionProvider.java | 6 +-- .../javascript/jscomp/NodeTraversal.java | 39 +++++++++++-------- .../google/javascript/jscomp/Normalize.java | 20 +++++----- .../ObjectPropertyStringPostprocess.java | 2 +- .../ObjectPropertyStringPreprocess.java | 2 +- .../jscomp/OptimizeArgumentsArray.java | 2 +- .../javascript/jscomp/OptimizeCalls.java | 2 +- .../jscomp/PeepholeOptimizationsPass.java | 2 +- .../google/javascript/jscomp/PolymerPass.java | 6 +-- .../google/javascript/jscomp/PrepareAst.java | 4 +- .../jscomp/ProcessClosurePrimitives.java | 2 +- .../jscomp/ProcessCommonJSModules.java | 10 ++--- .../javascript/jscomp/ProcessDefines.java | 2 +- .../javascript/jscomp/ProcessTweaks.java | 2 +- .../jscomp/PureFunctionIdentifier.java | 4 +- .../jscomp/RecordFunctionInformation.java | 2 +- .../jscomp/ReferenceCollectingCallback.java | 2 +- .../jscomp/RemoveSuperMethodsPass.java | 4 +- .../jscomp/RemoveUnusedPolyfills.java | 2 +- .../javascript/jscomp/RenameLabels.java | 2 +- .../javascript/jscomp/RenameProperties.java | 2 +- .../google/javascript/jscomp/RenameVars.java | 2 +- .../javascript/jscomp/ReplaceCssNames.java | 2 +- .../jscomp/ReplaceIdGenerators.java | 4 +- .../javascript/jscomp/ReplaceStrings.java | 2 +- .../jscomp/RescopeGlobalSymbols.java | 6 +-- .../jscomp/RewriteGoogJsImports.java | 6 +-- .../jscomp/RewriteJsonToModule.java | 2 +- .../javascript/jscomp/RewritePolyfills.java | 2 +- .../javascript/jscomp/RuntimeTypeCheck.java | 4 +- .../javascript/jscomp/ScopedAliases.java | 4 +- .../javascript/jscomp/ShadowVariables.java | 4 +- .../jscomp/SideEffectsAnalysis.java | 2 +- .../javascript/jscomp/StrictModeCheck.java | 4 +- .../google/javascript/jscomp/StripCode.java | 2 +- .../jscomp/SubstituteEs6Syntax.java | 2 +- .../jscomp/TransformAMDToCJSModule.java | 6 +-- .../jscomp/TranspilationPasses.java | 4 +- .../javascript/jscomp/TypeInfoCheck.java | 4 +- .../javascript/jscomp/TypedScopeCreator.java | 4 +- .../jscomp/UnreachableCodeElimination.java | 2 +- .../jscomp/VariableReferenceCheck.java | 2 +- .../jscomp/gwt/client/JsfileParser.java | 2 +- .../jscomp/ijs/ConvertToTypedInterface.java | 4 +- .../jscomp/lint/CheckArrayWithGoogObject.java | 4 +- .../jscomp/lint/CheckDuplicateCase.java | 4 +- .../jscomp/lint/CheckEmptyStatements.java | 2 +- .../javascript/jscomp/lint/CheckEnums.java | 2 +- .../jscomp/lint/CheckInterfaces.java | 4 +- .../jscomp/lint/CheckJSDocStyle.java | 6 +-- .../jscomp/lint/CheckMissingSemicolon.java | 2 +- .../jscomp/lint/CheckNullableReturn.java | 4 +- .../jscomp/lint/CheckPrimitiveAsObject.java | 4 +- .../jscomp/lint/CheckPrototypeProperties.java | 4 +- .../CheckRedundantNullabilityModifier.java | 2 +- .../lint/CheckRequiresAndProvidesSorted.java | 4 +- .../jscomp/lint/CheckUnusedLabels.java | 4 +- .../jscomp/lint/CheckUselessBlocks.java | 4 +- .../DeadAssignmentsEliminationTest.java | 2 +- .../jscomp/DefinitionUseSiteFinderTest.java | 4 +- .../jscomp/DefinitionsRemoverTest.java | 2 +- .../javascript/jscomp/DenormalizeTest.java | 2 +- .../jscomp/FunctionInjectorTest.java | 4 +- .../jscomp/FunctionToBlockMutatorTest.java | 2 +- .../javascript/jscomp/InferConstsTest.java | 2 +- .../jscomp/JsMessageVisitorTest.java | 2 +- .../jscomp/MakeDeclaredNamesUniqueTest.java | 2 +- .../jscomp/MarkNoSideEffectCallsTest.java | 4 +- .../jscomp/MustBeReachingVariableDefTest.java | 2 +- .../javascript/jscomp/NodeTraversalTest.java | 26 ++++++------- .../javascript/jscomp/NormalizeTest.java | 2 +- .../jscomp/PolymerClassRewriterTest.java | 2 +- .../jscomp/PolymerPassFindExternsTest.java | 2 +- .../PolymerPassSuppressBehaviorsTest.java | 2 +- .../jscomp/PureFunctionIdentifierTest.java | 4 +- .../javascript/jscomp/ReplaceStringsTest.java | 4 +- .../javascript/jscomp/ScopedAliasesTest.java | 2 +- .../jscomp/SideEffectsAnalysisTest.java | 2 +- .../SourceInformationAnnotatorTest.java | 4 +- .../javascript/jscomp/VarCheckTest.java | 2 +- .../VariableVisibilityAnalysisTest.java | 6 +-- 173 files changed, 350 insertions(+), 345 deletions(-) diff --git a/src/com/google/javascript/jscomp/AliasStrings.java b/src/com/google/javascript/jscomp/AliasStrings.java index 5330122af29..8eec613da35 100644 --- a/src/com/google/javascript/jscomp/AliasStrings.java +++ b/src/com/google/javascript/jscomp/AliasStrings.java @@ -116,7 +116,7 @@ public void process(Node externs, Node root) { logger.fine("Aliasing common strings"); // Traverse the tree and collect strings - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); // 1st edit pass: replace some strings with aliases replaceStringsWithAliases(); diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java index 41837a1b0d8..76667b81b4b 100644 --- a/src/com/google/javascript/jscomp/AmbiguateProperties.java +++ b/src/com/google/javascript/jscomp/AmbiguateProperties.java @@ -176,7 +176,7 @@ private int getIntForType(TypeI type) { public void process(Node externs, Node root) { // Find all property references and record the types on which they occur. // Populate stringNodesToRename, propertyMap, quotedNames. - NodeTraversal.traverseEs6(compiler, root, new ProcessProperties()); + NodeTraversal.traverse(compiler, root, new ProcessProperties()); ImmutableSet.Builder reservedNames = ImmutableSet.builder() .addAll(externedNames) diff --git a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java index b6b705ec45d..aa72921367b 100644 --- a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java +++ b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java @@ -151,11 +151,11 @@ class AnalyzePrototypeProperties implements CompilerPass { public void process(Node externRoot, Node root) { checkState(compiler.getLifeCycleStage().isNormalized()); if (!canModifyExterns) { - NodeTraversal.traverseEs6(compiler, externRoot, + NodeTraversal.traverse(compiler, externRoot, new ProcessExternProperties()); } - NodeTraversal.traverseEs6(compiler, root, new ProcessProperties()); + NodeTraversal.traverse(compiler, root, new ProcessProperties()); FixedPointGraphTraversal t = FixedPointGraphTraversal.newTraversal(new PropagateReferences()); diff --git a/src/com/google/javascript/jscomp/AngularPass.java b/src/com/google/javascript/jscomp/AngularPass.java index 7a328b7c95b..318a54f1ca9 100644 --- a/src/com/google/javascript/jscomp/AngularPass.java +++ b/src/com/google/javascript/jscomp/AngularPass.java @@ -115,7 +115,7 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { // Traverses AST looking for nodes annotated with @ngInject. - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); // iterates through annotated nodes adding $inject property to elements. for (NodeContext entry : injectables) { String name = entry.getName(); diff --git a/src/com/google/javascript/jscomp/CheckAccessControls.java b/src/com/google/javascript/jscomp/CheckAccessControls.java index d8a588be576..608b74cb995 100644 --- a/src/com/google/javascript/jscomp/CheckAccessControls.java +++ b/src/com/google/javascript/jscomp/CheckAccessControls.java @@ -157,8 +157,8 @@ public void process(Node externs, Node root) { collectPass.process(externs, root); defaultVisibilityForFiles = collectPass.getFileOverviewVisibilityMap(); - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, root, this); } @Override @@ -168,7 +168,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) { collectPass.hotSwapScript(scriptRoot, originalRoot); defaultVisibilityForFiles = collectPass.getFileOverviewVisibilityMap(); - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/CheckConformance.java b/src/com/google/javascript/jscomp/CheckConformance.java index f4880d389c9..0842b90fd14 100644 --- a/src/com/google/javascript/jscomp/CheckConformance.java +++ b/src/com/google/javascript/jscomp/CheckConformance.java @@ -79,7 +79,7 @@ public static interface Rule { @Override public void process(Node externs, Node root) { if (!rules.isEmpty()) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } } diff --git a/src/com/google/javascript/jscomp/CheckConstPrivateProperties.java b/src/com/google/javascript/jscomp/CheckConstPrivateProperties.java index 7ee6928e239..a3d06013541 100644 --- a/src/com/google/javascript/jscomp/CheckConstPrivateProperties.java +++ b/src/com/google/javascript/jscomp/CheckConstPrivateProperties.java @@ -47,12 +47,12 @@ class CheckConstPrivateProperties extends NodeTraversal.AbstractPostOrderCallbac @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } /** Reports the property definitions that should use the @const annotation. */ diff --git a/src/com/google/javascript/jscomp/CheckDebuggerStatement.java b/src/com/google/javascript/jscomp/CheckDebuggerStatement.java index addd7ac4487..e196bf6e514 100644 --- a/src/com/google/javascript/jscomp/CheckDebuggerStatement.java +++ b/src/com/google/javascript/jscomp/CheckDebuggerStatement.java @@ -42,7 +42,7 @@ public CheckDebuggerStatement(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/CheckJSDoc.java b/src/com/google/javascript/jscomp/CheckJSDoc.java index 1690bbf99ff..9929fc59dc1 100644 --- a/src/com/google/javascript/jscomp/CheckJSDoc.java +++ b/src/com/google/javascript/jscomp/CheckJSDoc.java @@ -87,13 +87,13 @@ final class CheckJSDoc extends AbstractPostOrderCallback implements HotSwapCompi @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java b/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java index 12f5e5ad9d9..a488e8179d2 100644 --- a/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java +++ b/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java @@ -116,7 +116,7 @@ static enum Mode { @Override public void process(Node externs, Node root) { reset(); - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } @Override @@ -125,7 +125,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) { // b/28869281 for context. mode = Mode.SINGLE_FILE; reset(); - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } // Return true if the name is a class name (starts with an uppercase diff --git a/src/com/google/javascript/jscomp/CheckMissingGetCssName.java b/src/com/google/javascript/jscomp/CheckMissingGetCssName.java index d410fcc10b5..de3e6b078ed 100644 --- a/src/com/google/javascript/jscomp/CheckMissingGetCssName.java +++ b/src/com/google/javascript/jscomp/CheckMissingGetCssName.java @@ -53,7 +53,7 @@ class CheckMissingGetCssName @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/CheckProvides.java b/src/com/google/javascript/jscomp/CheckProvides.java index 33b00a74eb8..db8161ffa93 100644 --- a/src/com/google/javascript/jscomp/CheckProvides.java +++ b/src/com/google/javascript/jscomp/CheckProvides.java @@ -49,7 +49,7 @@ public void process(Node externs, Node root) { public void hotSwapScript(Node scriptRoot, Node originalRoot) { CheckProvidesCallback callback = new CheckProvidesCallback(codingConvention); - NodeTraversal.traverseEs6(compiler, scriptRoot, callback); + NodeTraversal.traverse(compiler, scriptRoot, callback); } private class CheckProvidesCallback extends AbstractShallowCallback { diff --git a/src/com/google/javascript/jscomp/CheckRegExp.java b/src/com/google/javascript/jscomp/CheckRegExp.java index 2894befe7d8..7d7d5ef7fa3 100644 --- a/src/com/google/javascript/jscomp/CheckRegExp.java +++ b/src/com/google/javascript/jscomp/CheckRegExp.java @@ -78,7 +78,7 @@ public CheckRegExp(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/CheckSideEffects.java b/src/com/google/javascript/jscomp/CheckSideEffects.java index e7029351735..acf7da03e18 100644 --- a/src/com/google/javascript/jscomp/CheckSideEffects.java +++ b/src/com/google/javascript/jscomp/CheckSideEffects.java @@ -65,9 +65,9 @@ final class CheckSideEffects extends AbstractPostOrderCallback @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, new GetNoSideEffectExterns()); + NodeTraversal.traverse(compiler, externs, new GetNoSideEffectExterns()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); // Code with hidden side-effect code is common, for example // accessing "el.offsetWidth" forces a reflow in browsers, to allow this @@ -82,7 +82,7 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override @@ -210,7 +210,7 @@ static class StripProtection extends AbstractPostOrderCallback implements Compil @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/CheckSuper.java b/src/com/google/javascript/jscomp/CheckSuper.java index ec35c194f40..225eb120c07 100644 --- a/src/com/google/javascript/jscomp/CheckSuper.java +++ b/src/com/google/javascript/jscomp/CheckSuper.java @@ -44,12 +44,12 @@ public CheckSuper(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override @@ -83,7 +83,7 @@ private boolean visitClass(NodeTraversal t, Node n) { } FindSuper finder = new FindSuper(); - NodeTraversal.traverseEs6(compiler, NodeUtil.getFunctionBody(constructor), finder); + NodeTraversal.traverse(compiler, NodeUtil.getFunctionBody(constructor), finder); if (!finder.found) { t.report(constructor, MISSING_CALL_TO_SUPER); diff --git a/src/com/google/javascript/jscomp/CheckUnusedPrivateProperties.java b/src/com/google/javascript/jscomp/CheckUnusedPrivateProperties.java index eba0256d510..7b389090a8d 100644 --- a/src/com/google/javascript/jscomp/CheckUnusedPrivateProperties.java +++ b/src/com/google/javascript/jscomp/CheckUnusedPrivateProperties.java @@ -55,12 +55,12 @@ class CheckUnusedPrivateProperties @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } private void reportUnused(NodeTraversal t) { diff --git a/src/com/google/javascript/jscomp/ChromePass.java b/src/com/google/javascript/jscomp/ChromePass.java index b4cfcbc22d0..e9f9073727e 100644 --- a/src/com/google/javascript/jscomp/ChromePass.java +++ b/src/com/google/javascript/jscomp/ChromePass.java @@ -113,7 +113,7 @@ public ChromePass(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override @@ -352,7 +352,7 @@ private void visitNamespaceDefinition(Node crDefineCallNode, Node parent) { Map exports = objectLitToMap(objectLit); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, functionBlock, new RenameInternalsToExternalsCallback(namespace, exports, functionBlock)); diff --git a/src/com/google/javascript/jscomp/ClosureCheckModule.java b/src/com/google/javascript/jscomp/ClosureCheckModule.java index 0de85992658..52e9225ff34 100644 --- a/src/com/google/javascript/jscomp/ClosureCheckModule.java +++ b/src/com/google/javascript/jscomp/ClosureCheckModule.java @@ -186,12 +186,12 @@ public ClosureCheckModule(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/ClosureOptimizePrimitives.java b/src/com/google/javascript/jscomp/ClosureOptimizePrimitives.java index 15b941461d3..d39cb44eaaf 100644 --- a/src/com/google/javascript/jscomp/ClosureOptimizePrimitives.java +++ b/src/com/google/javascript/jscomp/ClosureOptimizePrimitives.java @@ -87,7 +87,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { @Override public void process(Node externs, Node root) { FindPrimitives pass = new FindPrimitives(); - NodeTraversal.traverseEs6(compiler, root, pass); + NodeTraversal.traverse(compiler, root, pass); } /** diff --git a/src/com/google/javascript/jscomp/ClosureRewriteClass.java b/src/com/google/javascript/jscomp/ClosureRewriteClass.java index 8454fdda662..baf3511f370 100644 --- a/src/com/google/javascript/jscomp/ClosureRewriteClass.java +++ b/src/com/google/javascript/jscomp/ClosureRewriteClass.java @@ -103,7 +103,7 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override @@ -498,7 +498,7 @@ private void rewriteGoogDefineClass(NodeTraversal t, Node exprRoot, final ClassD Node argList = cls.classModifier.getSecondChild(); Node arg = argList.getFirstChild(); final String argName = arg.getString(); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, cls.classModifier.getLastChild(), new AbstractPostOrderCallback() { diff --git a/src/com/google/javascript/jscomp/ClosureRewriteModule.java b/src/com/google/javascript/jscomp/ClosureRewriteModule.java index 590e350bc57..25d2a0c884f 100644 --- a/src/com/google/javascript/jscomp/ClosureRewriteModule.java +++ b/src/com/google/javascript/jscomp/ClosureRewriteModule.java @@ -701,7 +701,7 @@ private void processAllFiles(Deque scriptDescriptions, Node s if (scriptParent == null) { return; } - NodeTraversal.traverseEs6(compiler, scriptParent, new UnwrapGoogLoadModule()); + NodeTraversal.traverse(compiler, scriptParent, new UnwrapGoogLoadModule()); // Record all the scripts first so that the googModuleNamespaces global state can be complete // before doing any updating also queue up scriptDescriptions for later use in ScriptUpdater @@ -711,8 +711,8 @@ private void processAllFiles(Deque scriptDescriptions, Node s pushScript(new ScriptDescription()); currentScript.rootNode = c; scriptDescriptions.addLast(currentScript); - NodeTraversal.traverseEs6(compiler, c, new ScriptPreprocessor()); - NodeTraversal.traverseEs6(compiler, c, new ScriptRecorder()); + NodeTraversal.traverse(compiler, c, new ScriptPreprocessor()); + NodeTraversal.traverse(compiler, c, new ScriptRecorder()); popScript(); } @@ -725,7 +725,7 @@ private void processAllFiles(Deque scriptDescriptions, Node s // scriptDescriptions that were queued up by all the recording. for (Node c = scriptParent.getFirstChild(); c != null; c = c.getNext()) { pushScript(scriptDescriptions.removeFirst()); - NodeTraversal.traverseEs6(compiler, c, new ScriptUpdater()); + NodeTraversal.traverse(compiler, c, new ScriptUpdater()); popScript(); } } @@ -733,20 +733,20 @@ private void processAllFiles(Deque scriptDescriptions, Node s @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { checkState(scriptRoot.isScript(), scriptRoot); - NodeTraversal.traverseEs6(compiler, scriptRoot, new UnwrapGoogLoadModule()); + NodeTraversal.traverse(compiler, scriptRoot, new UnwrapGoogLoadModule()); rewriteState.removeRoot(originalRoot); pushScript(new ScriptDescription()); currentScript.rootNode = scriptRoot; - NodeTraversal.traverseEs6(compiler, scriptRoot, new ScriptPreprocessor()); - NodeTraversal.traverseEs6(compiler, scriptRoot, new ScriptRecorder()); + NodeTraversal.traverse(compiler, scriptRoot, new ScriptPreprocessor()); + NodeTraversal.traverse(compiler, scriptRoot, new ScriptRecorder()); if (compiler.hasHaltingErrors()) { return; } - NodeTraversal.traverseEs6(compiler, scriptRoot, new ScriptUpdater()); + NodeTraversal.traverse(compiler, scriptRoot, new ScriptUpdater()); popScript(); reportUnrecognizedRequires(); diff --git a/src/com/google/javascript/jscomp/CoalesceVariableNames.java b/src/com/google/javascript/jscomp/CoalesceVariableNames.java index f2e0158dddf..22f6a4149bb 100644 --- a/src/com/google/javascript/jscomp/CoalesceVariableNames.java +++ b/src/com/google/javascript/jscomp/CoalesceVariableNames.java @@ -99,7 +99,7 @@ public int compare(Var v1, Var v2) { public void process(Node externs, Node root) { checkNotNull(externs); checkNotNull(root); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); compiler.setLifeCycleStage(LifeCycleStage.RAW); } diff --git a/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java b/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java index c0feb50b0aa..4fabbf46a15 100644 --- a/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java +++ b/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java @@ -48,7 +48,7 @@ public CollapseAnonymousFunctions(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/CollapseProperties.java b/src/com/google/javascript/jscomp/CollapseProperties.java index b4ac266db89..d941320c547 100644 --- a/src/com/google/javascript/jscomp/CollapseProperties.java +++ b/src/com/google/javascript/jscomp/CollapseProperties.java @@ -638,7 +638,7 @@ private void checkForHosedThisReferences(Node function, JSDocInfo docInfo, (docInfo != null && (docInfo.isConstructorOrInterface() || docInfo.hasThisType())) || function.isArrowFunction(); if (!isAllowedToReferenceThis) { - NodeTraversal.traverseEs6(compiler, function.getLastChild(), + NodeTraversal.traverse(compiler, function.getLastChild(), new NodeTraversal.AbstractShallowCallback() { @Override public void visit(NodeTraversal t, Node n, Node parent) { diff --git a/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java b/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java index 027eba39611..d2d81b14e6a 100644 --- a/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java +++ b/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java @@ -103,7 +103,7 @@ public void process(Node externs, Node root) { collapses.clear(); nodesToCollapse.clear(); - NodeTraversal.traverseEs6(compiler, root, new GatherCollapses()); + NodeTraversal.traverse(compiler, root, new GatherCollapses()); if (!collapses.isEmpty()) { applyCollapses(); diff --git a/src/com/google/javascript/jscomp/CollectFunctionNames.java b/src/com/google/javascript/jscomp/CollectFunctionNames.java index dd372d64c97..ce2907904ad 100644 --- a/src/com/google/javascript/jscomp/CollectFunctionNames.java +++ b/src/com/google/javascript/jscomp/CollectFunctionNames.java @@ -132,7 +132,7 @@ private static class FunctionRecord implements Serializable { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } public FunctionNames getFunctionNames() { diff --git a/src/com/google/javascript/jscomp/CombinedCompilerPass.java b/src/com/google/javascript/jscomp/CombinedCompilerPass.java index 3f22829d3bc..2b5545e2bbc 100644 --- a/src/com/google/javascript/jscomp/CombinedCompilerPass.java +++ b/src/com/google/javascript/jscomp/CombinedCompilerPass.java @@ -73,7 +73,7 @@ final class CombinedCompilerPass implements HotSwapCompilerPass, static void traverse(AbstractCompiler compiler, Node root, List callbacks) { if (callbacks.size() == 1) { - NodeTraversal.traverseEs6(compiler, root, callbacks.get(0)); + NodeTraversal.traverse(compiler, root, callbacks.get(0)); } else { (new CombinedCompilerPass(compiler, callbacks)).process(null, root); } @@ -151,12 +151,12 @@ boolean isActive() { @Override public final void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java index f71f63c42fa..dfc32b63e1c 100644 --- a/src/com/google/javascript/jscomp/Compiler.java +++ b/src/com/google/javascript/jscomp/Compiler.java @@ -1859,7 +1859,7 @@ Node parseInputs() { SourceInformationAnnotator sia = new SourceInformationAnnotator( input.getName(), options.devMode != DevMode.OFF); - NodeTraversal.traverseEs6(this, n, sia); + NodeTraversal.traverse(this, n, sia); } if (NodeUtil.isFromTypeSummary(n)) { diff --git a/src/com/google/javascript/jscomp/ConstCheck.java b/src/com/google/javascript/jscomp/ConstCheck.java index a8170d20417..fae97aa0a5d 100644 --- a/src/com/google/javascript/jscomp/ConstCheck.java +++ b/src/com/google/javascript/jscomp/ConstCheck.java @@ -53,7 +53,7 @@ public ConstCheck(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } @Override diff --git a/src/com/google/javascript/jscomp/ConstParamCheck.java b/src/com/google/javascript/jscomp/ConstParamCheck.java index 62e8048d10e..adf092c11ad 100644 --- a/src/com/google/javascript/jscomp/ConstParamCheck.java +++ b/src/com/google/javascript/jscomp/ConstParamCheck.java @@ -57,7 +57,7 @@ public ConstParamCheck(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { checkState(compiler.getLifeCycleStage().isNormalized()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } /** diff --git a/src/com/google/javascript/jscomp/ControlFlowAnalysis.java b/src/com/google/javascript/jscomp/ControlFlowAnalysis.java index 5b7f5a4be63..5a02792abfe 100644 --- a/src/com/google/javascript/jscomp/ControlFlowAnalysis.java +++ b/src/com/google/javascript/jscomp/ControlFlowAnalysis.java @@ -156,7 +156,7 @@ public void process(Node externs, Node root) { astPosition = new HashMap<>(); nodePriorities = new HashMap<>(); cfg = new AstControlFlowGraph(computeFallThrough(root), nodePriorities, edgeAnnotations); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); astPosition.put(null, ++astPositionCounter); // the implicit return is last. // Now, generate the priority of nodes by doing a depth-first diff --git a/src/com/google/javascript/jscomp/ConvertToDottedProperties.java b/src/com/google/javascript/jscomp/ConvertToDottedProperties.java index f32838a362c..dac5dfbd0cb 100644 --- a/src/com/google/javascript/jscomp/ConvertToDottedProperties.java +++ b/src/com/google/javascript/jscomp/ConvertToDottedProperties.java @@ -38,7 +38,7 @@ class ConvertToDottedProperties extends AbstractPostOrderCallback @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/CoverageInstrumentationPass.java b/src/com/google/javascript/jscomp/CoverageInstrumentationPass.java index 1eb34715b58..378dac93e0c 100644 --- a/src/com/google/javascript/jscomp/CoverageInstrumentationPass.java +++ b/src/com/google/javascript/jscomp/CoverageInstrumentationPass.java @@ -85,12 +85,12 @@ private void addHeaderCode(Node script) { public void process(Node externsNode, Node rootNode) { if (rootNode.hasChildren()) { if (instrumentOption == InstrumentOption.BRANCH_ONLY) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, rootNode, new BranchCoverageInstrumentationCallback(compiler, instrumentationData)); } else { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, rootNode, new CoverageInstrumentationCallback(compiler, instrumentationData, reach)); diff --git a/src/com/google/javascript/jscomp/CreateSyntheticBlocks.java b/src/com/google/javascript/jscomp/CreateSyntheticBlocks.java index 22396d41230..c65bb2516c7 100644 --- a/src/com/google/javascript/jscomp/CreateSyntheticBlocks.java +++ b/src/com/google/javascript/jscomp/CreateSyntheticBlocks.java @@ -75,7 +75,7 @@ public CreateSyntheticBlocks(AbstractCompiler compiler, @Override public void process(Node externs, Node root) { // Find and validate the markers. - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); // Complain about any unmatched markers. for (Node node : markerStack) { diff --git a/src/com/google/javascript/jscomp/DartSuperAccessorsPass.java b/src/com/google/javascript/jscomp/DartSuperAccessorsPass.java index a97277f867c..770e53ce9ea 100644 --- a/src/com/google/javascript/jscomp/DartSuperAccessorsPass.java +++ b/src/com/google/javascript/jscomp/DartSuperAccessorsPass.java @@ -144,7 +144,7 @@ private void visitSuperSet(Node superSet) { checkArgument(superSet.isAssign()); // First, recurse on the assignment's right-hand-side. - NodeTraversal.traverseEs6(compiler, superSet.getLastChild(), this); + NodeTraversal.traverse(compiler, superSet.getLastChild(), this); Node rhs = superSet.getLastChild(); Node superGet = superSet.getFirstChild(); @@ -187,12 +187,12 @@ private Node renameProperty(Node propertyName) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } } diff --git a/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java b/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java index 3c27f9b1075..3403c010476 100644 --- a/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java +++ b/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java @@ -59,7 +59,7 @@ public void process(Node externs, Node root) { checkNotNull(externs); checkNotNull(root); checkState(compiler.getLifeCycleStage().isNormalized()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/DeadPropertyAssignmentElimination.java b/src/com/google/javascript/jscomp/DeadPropertyAssignmentElimination.java index 66d7d290bf4..8d26eab5bec 100644 --- a/src/com/google/javascript/jscomp/DeadPropertyAssignmentElimination.java +++ b/src/com/google/javascript/jscomp/DeadPropertyAssignmentElimination.java @@ -76,7 +76,7 @@ public void process(Node externs, Node root) { } GetterSetterCollector getterSetterCollector = new GetterSetterCollector(); - NodeTraversal.traverseEs6(compiler, root, getterSetterCollector); + NodeTraversal.traverse(compiler, root, getterSetterCollector); // If there's any potentially unknown getter/setter property, back off of the optimization. if (getterSetterCollector.unknownGetterSetterPresent) { @@ -113,7 +113,7 @@ public void enterChangeScopeRoot(AbstractCompiler compiler, Node root) { FindCandidateAssignmentTraversal traversal = new FindCandidateAssignmentTraversal(blacklistedPropNames, NodeUtil.isConstructor(root)); - NodeTraversal.traverseEs6(compiler, body, traversal); + NodeTraversal.traverse(compiler, body, traversal); // Any candidate property assignment can have a write removed if that write is never read // and it's written to at least one more time. diff --git a/src/com/google/javascript/jscomp/DeclaredGlobalExternsOnWindow.java b/src/com/google/javascript/jscomp/DeclaredGlobalExternsOnWindow.java index 8dee2798a5e..9d896b7de0f 100644 --- a/src/com/google/javascript/jscomp/DeclaredGlobalExternsOnWindow.java +++ b/src/com/google/javascript/jscomp/DeclaredGlobalExternsOnWindow.java @@ -43,7 +43,7 @@ public DeclaredGlobalExternsOnWindow(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, this); + NodeTraversal.traverse(compiler, externs, this); addWindowProperties(); } diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java index 9ac99192297..fed799a03df 100644 --- a/src/com/google/javascript/jscomp/DefaultPassConfig.java +++ b/src/com/google/javascript/jscomp/DefaultPassConfig.java @@ -2132,7 +2132,7 @@ class GlobalTypeResolver implements HotSwapCompilerPass { public void process(Node externs, Node root) { // If NTI is enabled, erase the NTI types from the AST before adding the old types. if (this.compiler.getOptions().getNewTypeInference()) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( this.compiler, root, new NodeTraversal.AbstractPostOrderCallback(){ @Override diff --git a/src/com/google/javascript/jscomp/DefinitionUseSiteFinder.java b/src/com/google/javascript/jscomp/DefinitionUseSiteFinder.java index 3f273128ef4..7b886f832ea 100644 --- a/src/com/google/javascript/jscomp/DefinitionUseSiteFinder.java +++ b/src/com/google/javascript/jscomp/DefinitionUseSiteFinder.java @@ -70,7 +70,7 @@ public DefinitionUseSiteFinder(AbstractCompiler compiler) { @Override public void process(Node externs, Node source) { super.process(externs, source); - NodeTraversal.traverseEs6(compiler, source, new UseSiteGatheringCallback()); + NodeTraversal.traverse(compiler, source, new UseSiteGatheringCallback()); } /** @@ -191,7 +191,7 @@ public void rebuildScopeRoots(List changedScopeRoots, List deletedSc } } - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, changedScopeRoots, new UseSiteGatheringCallback(), false); } diff --git a/src/com/google/javascript/jscomp/Denormalize.java b/src/com/google/javascript/jscomp/Denormalize.java index 5b6cd28f078..54073b16304 100644 --- a/src/com/google/javascript/jscomp/Denormalize.java +++ b/src/com/google/javascript/jscomp/Denormalize.java @@ -54,7 +54,7 @@ class Denormalize implements CompilerPass, Callback, Behavior { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); // Don't inline the VAR declaration if this compilation involves old-style ctemplates. if (compiler.getOptions().syntheticBlockStartMarker == null) { (new ReferenceCollectingCallback(compiler, this, new Es6SyntacticScopeCreator(compiler))) diff --git a/src/com/google/javascript/jscomp/DisambiguatePrivateProperties.java b/src/com/google/javascript/jscomp/DisambiguatePrivateProperties.java index 80799db2a79..4a30c113d2b 100644 --- a/src/com/google/javascript/jscomp/DisambiguatePrivateProperties.java +++ b/src/com/google/javascript/jscomp/DisambiguatePrivateProperties.java @@ -54,7 +54,7 @@ class DisambiguatePrivateProperties @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/DisambiguateProperties.java b/src/com/google/javascript/jscomp/DisambiguateProperties.java index 4f09001e19c..4be6e1ee423 100644 --- a/src/com/google/javascript/jscomp/DisambiguateProperties.java +++ b/src/com/google/javascript/jscomp/DisambiguateProperties.java @@ -351,10 +351,10 @@ public void process(Node externs, Node root) { this.ancestorInterfaces = new HashMap<>(); this.gtwpCache = new HashMap<>(); // Gather names of properties in externs; these properties can't be renamed. - NodeTraversal.traverseEs6(compiler, externs, new FindExternProperties()); + NodeTraversal.traverse(compiler, externs, new FindExternProperties()); // Look at each unquoted property access and decide if that property will // be renamed. - NodeTraversal.traverseEs6(compiler, root, new FindRenameableProperties()); + NodeTraversal.traverse(compiler, root, new FindRenameableProperties()); // Do the actual renaming. renameProperties(); } diff --git a/src/com/google/javascript/jscomp/Es6CheckModule.java b/src/com/google/javascript/jscomp/Es6CheckModule.java index 85117a289f3..70734a38159 100644 --- a/src/com/google/javascript/jscomp/Es6CheckModule.java +++ b/src/com/google/javascript/jscomp/Es6CheckModule.java @@ -39,12 +39,12 @@ public Es6CheckModule(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java b/src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java index 861d08bc4b9..2f46a397706 100644 --- a/src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java +++ b/src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java @@ -259,7 +259,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { } } }; - NodeTraversal.traverseEs6(compiler, functionBody, checkForDefinedReturnValue); + NodeTraversal.traverse(compiler, functionBody, checkForDefinedReturnValue); return foundNonEmptyReturn; } } @@ -446,7 +446,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { } } }; - NodeTraversal.traverseEs6(compiler, constructorBody, replaceThisWithSuperThis); + NodeTraversal.traverse(compiler, constructorBody, replaceThisWithSuperThis); } private String getSuperClassQName(Node constructor) { diff --git a/src/com/google/javascript/jscomp/Es6ExternsCheck.java b/src/com/google/javascript/jscomp/Es6ExternsCheck.java index 086b1e0ac76..fc54206e929 100644 --- a/src/com/google/javascript/jscomp/Es6ExternsCheck.java +++ b/src/com/google/javascript/jscomp/Es6ExternsCheck.java @@ -48,7 +48,7 @@ private boolean hasEs6Syntax(Node root) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, this); + NodeTraversal.traverse(compiler, externs, this); if (!hasSymbolExterns) { if (hasEs6Syntax(root)) { compiler.report(JSError.make(MISSING_ES6_EXTERNS)); diff --git a/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java b/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java index 0030e3b3ff1..006d040318e 100644 --- a/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java +++ b/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java @@ -51,7 +51,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { Node paramList = n.getSecondChild(); final CollectReferences collector = new CollectReferences(); - NodeTraversal.traverseEs6(compiler, paramList, new NodeTraversal.AbstractPreOrderCallback() { + NodeTraversal.traverse(compiler, paramList, new NodeTraversal.AbstractPreOrderCallback() { @Override public final boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { if (parent == null) { @@ -60,7 +60,7 @@ public final boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { if ((parent.isDefaultValue() && n == parent.getLastChild()) || (parent.isComputedProp() && n == parent.getFirstChild())) { - NodeTraversal.traverseEs6(compiler, n, collector); + NodeTraversal.traverse(compiler, n, collector); return false; } return true; diff --git a/src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java b/src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java index 540a6bf5258..3e9d0f335f8 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java +++ b/src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java @@ -140,7 +140,7 @@ private void visitArrowFunction(NodeTraversal t, Node n, ThisContext thisContext } UpdateThisAndArgumentsReferences updater = new UpdateThisAndArgumentsReferences(compiler); - NodeTraversal.traverseEs6(compiler, body, updater); + NodeTraversal.traverse(compiler, body, updater); thisContext.needsThisVar = thisContext.needsThisVar || updater.changedThis; thisContext.needsArgumentsVar = thisContext.needsArgumentsVar || updater.changedArguments; diff --git a/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java b/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java index 6839a9a6a0e..6fef2980640 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java +++ b/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java @@ -113,13 +113,13 @@ && inLoop(n)) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new CollectUndeclaredNames()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, new CollectUndeclaredNames()); + NodeTraversal.traverse(compiler, root, this); // Needed for let / const declarations in .d.ts externs. TranspilationPasses.processTranspile(compiler, externs, transpiledFeatures, this); - NodeTraversal.traverseEs6(compiler, root, new Es6RenameReferences(renameTable)); + NodeTraversal.traverse(compiler, root, new Es6RenameReferences(renameTable)); LoopClosureTransformer transformer = new LoopClosureTransformer(); - NodeTraversal.traverseEs6(compiler, root, transformer); + NodeTraversal.traverse(compiler, root, transformer); transformer.transformLoopClosure(); rewriteDeclsToVars(); TranspilationPasses.markFeaturesAsTranspiledAway(compiler, transpiledFeatures); @@ -127,11 +127,11 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, new CollectUndeclaredNames()); - NodeTraversal.traverseEs6(compiler, scriptRoot, this); - NodeTraversal.traverseEs6(compiler, scriptRoot, new Es6RenameReferences(renameTable)); + NodeTraversal.traverse(compiler, scriptRoot, new CollectUndeclaredNames()); + NodeTraversal.traverse(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, new Es6RenameReferences(renameTable)); LoopClosureTransformer transformer = new LoopClosureTransformer(); - NodeTraversal.traverseEs6(compiler, scriptRoot, transformer); + NodeTraversal.traverse(compiler, scriptRoot, transformer); transformer.transformLoopClosure(); rewriteDeclsToVars(); TranspilationPasses.markFeaturesAsTranspiledAway(compiler, transpiledFeatures); @@ -498,7 +498,7 @@ private boolean maybeUpdateContinueStatements(Node loopNode, String breakLabel) loopParent.isLabel() ? loopParent.getFirstChild().getString() : null; ContinueStatementUpdater continueStatementUpdater = new ContinueStatementUpdater(breakLabel, originalLoopLabel); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, NodeUtil.getLoopCodeBlock(loopNode), continueStatementUpdater); return continueStatementUpdater.replacedAContinueStatement; } diff --git a/src/com/google/javascript/jscomp/Es6RewriteClass.java b/src/com/google/javascript/jscomp/Es6RewriteClass.java index 460be3aaa9d..e5d71628e27 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteClass.java +++ b/src/com/google/javascript/jscomp/Es6RewriteClass.java @@ -132,7 +132,7 @@ private void checkClassReassignment(Node clazz) { return; } CheckClassAssignments checkAssigns = new CheckClassAssignments(name); - NodeTraversal.traverseEs6(compiler, enclosingFunction, checkAssigns); + NodeTraversal.traverse(compiler, enclosingFunction, checkAssigns); } /** diff --git a/src/com/google/javascript/jscomp/Es6RewriteGenerators.java b/src/com/google/javascript/jscomp/Es6RewriteGenerators.java index 461629e11a3..35c0fac648f 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteGenerators.java +++ b/src/com/google/javascript/jscomp/Es6RewriteGenerators.java @@ -315,7 +315,7 @@ public void transpile() { originalGeneratorBody.replaceWith(newGeneratorBody); - NodeTraversal.traverseEs6(compiler, originalGeneratorBody, new YieldNodeMarker()); + NodeTraversal.traverse(compiler, originalGeneratorBody, new YieldNodeMarker()); // Transpile statements from original generator function while (originalGeneratorBody.hasChildren()) { @@ -548,10 +548,10 @@ Node exposeYieldAndTranspileRest(Node n) { // If expression put into expression result YieldExposer may turn it into an "if" statement. boolean isExpression = IR.mayBeExpression(n); Node block = IR.block(isExpression ? IR.returnNode(n) : n); - NodeTraversal.traverseEs6(compiler, n, new YieldExposer()); + NodeTraversal.traverse(compiler, n, new YieldExposer()); // Make sure newly created statements are correctly marked for recursive transpileStatement() // calls. - NodeTraversal.traverseEs6(compiler, block, new YieldNodeMarker()); + NodeTraversal.traverse(compiler, block, new YieldNodeMarker()); // The last child of decomposed block free of side effects. Node decomposed = block.getLastChild().detach(); @@ -578,7 +578,7 @@ Node prepareNodeForWrite(@Nullable Node n) { // Need to wrap a node so it can be replaced in the tree with some other node if nessesary. Node wrapper = IR.mayBeStatement(n) ? IR.block(n) : IR.exprResult(n); - NodeTraversal.traverseEs6(compiler, wrapper, context.new UnmarkedNodeTranspiler()); + NodeTraversal.traverse(compiler, wrapper, context.new UnmarkedNodeTranspiler()); checkState(wrapper.hasOneChild()); return wrapper.removeFirstChild(); } @@ -1026,7 +1026,7 @@ class SwitchCase { /** Finds the only YIELD node in a tree. */ Node findYield(Node n) { YieldFinder yieldFinder = new YieldFinder(); - NodeTraversal.traverseEs6(compiler, n, yieldFinder); + NodeTraversal.traverse(compiler, n, yieldFinder); return yieldFinder.getYieldNode(); } @@ -1346,7 +1346,7 @@ public void checkStateIsEmpty() { /** Adds a block of original code to the end of the current case. */ void transpileUnmarkedBlock(Node block) { if (block.hasChildren()) { - NodeTraversal.traverseEs6(compiler, block, new UnmarkedNodeTranspiler()); + NodeTraversal.traverse(compiler, block, new UnmarkedNodeTranspiler()); while (block.hasChildren()) { writeGeneratedNode(block.removeFirstChild()); } diff --git a/src/com/google/javascript/jscomp/Es6RewriteModules.java b/src/com/google/javascript/jscomp/Es6RewriteModules.java index fbe1ba75a5e..c8f18a56ba7 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteModules.java +++ b/src/com/google/javascript/jscomp/Es6RewriteModules.java @@ -174,7 +174,7 @@ public void hotSwapScript(Node scriptNode, Node originalRoot) { if (isEs6ModuleRoot(scriptNode)) { processFile(scriptNode); } else { - NodeTraversal.traverseEs6(compiler, scriptNode, new RewriteRequiresForEs6Modules()); + NodeTraversal.traverse(compiler, scriptNode, new RewriteRequiresForEs6Modules()); } } @@ -184,7 +184,7 @@ public void hotSwapScript(Node scriptNode, Node originalRoot) { private void processFile(Node root) { checkArgument(isEs6ModuleRoot(root), root); clearState(); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } public void clearState() { @@ -562,7 +562,7 @@ private void inlineModuleToGlobalScope(Node moduleNode) { } private void visitScript(NodeTraversal t, Node script) { - NodeTraversal.traverseEs6(compiler, script, new FindMutatedExports()); + NodeTraversal.traverse(compiler, script, new FindMutatedExports()); inlineModuleToGlobalScope(script.getFirstChild()); @@ -581,7 +581,7 @@ private void visitScript(NodeTraversal t, Node script) { Node moduleVar = createExportsObject(t, script); // Rename vars to not conflict in global scope. - NodeTraversal.traverseEs6(compiler, script, new RenameGlobalVars(moduleName)); + NodeTraversal.traverse(compiler, script, new RenameGlobalVars(moduleName)); // Rename the exports object to something we can reference later. moduleVar.getFirstChild().setString(moduleName); @@ -677,7 +677,7 @@ private void addGetterExport( } private void rewriteRequires(Node script) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, script, new AbstractPostOrderCallback() { diff --git a/src/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModules.java b/src/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModules.java index 76c5b5954a8..54897d18097 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModules.java +++ b/src/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModules.java @@ -59,7 +59,7 @@ public Es6RewriteModulesToCommonJsModules(AbstractCompiler compiler) { public void process(Node externs, Node root) { for (Node script : root.children()) { if (Es6RewriteModules.isEs6ModuleRoot(script)) { - NodeTraversal.traverseEs6(compiler, script, new Rewriter(compiler, script)); + NodeTraversal.traverse(compiler, script, new Rewriter(compiler, script)); } } } diff --git a/src/com/google/javascript/jscomp/Es6RewriteScriptsToModules.java b/src/com/google/javascript/jscomp/Es6RewriteScriptsToModules.java index 0e908dc58fb..781596bcc2a 100644 --- a/src/com/google/javascript/jscomp/Es6RewriteScriptsToModules.java +++ b/src/com/google/javascript/jscomp/Es6RewriteScriptsToModules.java @@ -57,7 +57,7 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptNode, Node originalRoot) { checkArgument(scriptNode.isScript()); - NodeTraversal.traverseEs6(compiler, scriptNode, this); + NodeTraversal.traverse(compiler, scriptNode, this); } @Override diff --git a/src/com/google/javascript/jscomp/Es6TypedToEs6Converter.java b/src/com/google/javascript/jscomp/Es6TypedToEs6Converter.java index 9d917d8f796..065369ba624 100644 --- a/src/com/google/javascript/jscomp/Es6TypedToEs6Converter.java +++ b/src/com/google/javascript/jscomp/Es6TypedToEs6Converter.java @@ -108,10 +108,10 @@ public final class Es6TypedToEs6Converter implements NodeTraversal.Callback, Hot @Override public void process(Node externs, Node scriptRoot) { ScanNamespaces scanner = new ScanNamespaces(); - NodeTraversal.traverseEs6(compiler, externs, scanner); - NodeTraversal.traverseEs6(compiler, scriptRoot, scanner); - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, externs, scanner); + NodeTraversal.traverse(compiler, scriptRoot, scanner); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, scriptRoot, this); if (!compiler.hasHaltingErrors()) { compiler.setFeatureSet(compiler.getFeatureSet().withoutTypes()); } @@ -120,8 +120,8 @@ public void process(Node externs, Node scriptRoot) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { ScanNamespaces scanner = new ScanNamespaces(); - NodeTraversal.traverseEs6(compiler, scriptRoot, scanner); - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, scanner); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/ExportTestFunctions.java b/src/com/google/javascript/jscomp/ExportTestFunctions.java index c57e6b864be..d2f4f8fd390 100644 --- a/src/com/google/javascript/jscomp/ExportTestFunctions.java +++ b/src/com/google/javascript/jscomp/ExportTestFunctions.java @@ -217,7 +217,7 @@ private boolean isNameDeclaredClass(Node node) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new ExportTestFunctionsNodes()); + NodeTraversal.traverse(compiler, root, new ExportTestFunctionsNodes()); } // Adds exportSymbol(testFunctionName, testFunction); diff --git a/src/com/google/javascript/jscomp/ExternExportsPass.java b/src/com/google/javascript/jscomp/ExternExportsPass.java index 2e5c38e40b7..2739fc58fff 100644 --- a/src/com/google/javascript/jscomp/ExternExportsPass.java +++ b/src/com/google/javascript/jscomp/ExternExportsPass.java @@ -438,7 +438,7 @@ private void initExportMethods() { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); // Sort by path length to ensure that the longer // paths (which may depend on the shorter ones) diff --git a/src/com/google/javascript/jscomp/ExtractPrototypeMemberDeclarations.java b/src/com/google/javascript/jscomp/ExtractPrototypeMemberDeclarations.java index f18bf3b2548..22e9b32de40 100644 --- a/src/com/google/javascript/jscomp/ExtractPrototypeMemberDeclarations.java +++ b/src/com/google/javascript/jscomp/ExtractPrototypeMemberDeclarations.java @@ -137,7 +137,7 @@ enum Pattern { @Override public void process(Node externs, Node root) { GatherExtractionInfo extractionInfo = new GatherExtractionInfo(); - NodeTraversal.traverseEs6(compiler, root, extractionInfo); + NodeTraversal.traverse(compiler, root, extractionInfo); if (extractionInfo.shouldExtract()) { doExtraction(extractionInfo); } diff --git a/src/com/google/javascript/jscomp/FieldCleanupPass.java b/src/com/google/javascript/jscomp/FieldCleanupPass.java index c9c953bfa7f..63b3c5eda11 100644 --- a/src/com/google/javascript/jscomp/FieldCleanupPass.java +++ b/src/com/google/javascript/jscomp/FieldCleanupPass.java @@ -46,7 +46,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) { String srcName = originalRoot.getSourceFileName(); Callback cb = new QualifiedNameSearchTraversal(compiler.getTypeRegistry(), srcName); - NodeTraversal.traverseEs6(compiler, originalRoot, cb); + NodeTraversal.traverse(compiler, originalRoot, cb); } @Override diff --git a/src/com/google/javascript/jscomp/FindModuleDependencies.java b/src/com/google/javascript/jscomp/FindModuleDependencies.java index 92b9c911221..8f2ceb9427d 100644 --- a/src/com/google/javascript/jscomp/FindModuleDependencies.java +++ b/src/com/google/javascript/jscomp/FindModuleDependencies.java @@ -109,7 +109,7 @@ public void process(Node root) { input.addOrderedRequire(Require.BASE); } - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); if (moduleType == ModuleType.ES6) { convertToEs6Module(root, true); @@ -265,7 +265,7 @@ private boolean convertToEs6Module(Node root, boolean skipGoogProvideModuleCheck } if (!skipGoogProvideModuleCheck) { FindGoogProvideOrGoogModule finder = new FindGoogProvideOrGoogModule(); - NodeTraversal.traverseEs6(compiler, root, finder); + NodeTraversal.traverse(compiler, root, finder); if (finder.isFound()) { return false; } diff --git a/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java b/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java index 1458f6b0633..8af156f7494 100644 --- a/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java +++ b/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java @@ -189,7 +189,7 @@ public void enterScope(NodeTraversal t) { // Using the forward reaching definition search to find all the inline // candidates - NodeTraversal.traverseEs6(compiler, t.getScopeRoot(), new GatherCandidates()); + NodeTraversal.traverse(compiler, t.getScopeRoot(), new GatherCandidates()); // Compute the backward reaching use. The CFG can be reused. reachingUses = new MaybeReachingVariableUse(cfg, t.getScope(), compiler, scopeCreator); reachingUses.analyze(); @@ -335,7 +335,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { final Node cfgNode = n; gatherCb.setCfgNode(cfgNode); - NodeTraversal.traverseEs6(compiler, cfgNode, gatherCb); + NodeTraversal.traverse(compiler, cfgNode, gatherCb); } } @@ -531,7 +531,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { } } }; - NodeTraversal.traverseEs6(compiler, n, gatherCb); + NodeTraversal.traverse(compiler, n, gatherCb); } /** @@ -572,7 +572,7 @@ private boolean isAssignChain(Node child, Node ancestor) { } }; - NodeTraversal.traverseEs6(compiler, cfgNode, gatherCb); + NodeTraversal.traverse(compiler, cfgNode, gatherCb); } /** diff --git a/src/com/google/javascript/jscomp/FunctionRewriter.java b/src/com/google/javascript/jscomp/FunctionRewriter.java index 16ddd2c297f..febda68306c 100644 --- a/src/com/google/javascript/jscomp/FunctionRewriter.java +++ b/src/com/google/javascript/jscomp/FunctionRewriter.java @@ -69,7 +69,7 @@ public void process(Node externs, Node root) { // Accumulate possible reductions in the reduction multi-map. They // will be applied in the loop below. - NodeTraversal.traverseEs6(compiler, root, + NodeTraversal.traverse(compiler, root, new ReductionGatherer(reducers, reductionMap)); // Apply reductions iff they will provide some savings. diff --git a/src/com/google/javascript/jscomp/FunctionToBlockMutator.java b/src/com/google/javascript/jscomp/FunctionToBlockMutator.java index e495f45e4f8..74c454c7790 100644 --- a/src/com/google/javascript/jscomp/FunctionToBlockMutator.java +++ b/src/com/google/javascript/jscomp/FunctionToBlockMutator.java @@ -255,7 +255,7 @@ private static void fixUninitializedVarDeclarations(Node n, Node containingBlock private void makeLocalNamesUnique(Node fnNode, boolean isCallInLoop) { Supplier idSupplier = compiler.getUniqueNameIdSupplier(); // Make variable names unique to this instance. - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fnNode), diff --git a/src/com/google/javascript/jscomp/GatherExternProperties.java b/src/com/google/javascript/jscomp/GatherExternProperties.java index b0135b55a11..b0da707b9ab 100644 --- a/src/com/google/javascript/jscomp/GatherExternProperties.java +++ b/src/com/google/javascript/jscomp/GatherExternProperties.java @@ -53,7 +53,7 @@ public GatherExternProperties(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, this); + NodeTraversal.traverse(compiler, externs, this); compiler.setExternProperties(ImmutableSet.copyOf(externProperties)); } diff --git a/src/com/google/javascript/jscomp/GatherRawExports.java b/src/com/google/javascript/jscomp/GatherRawExports.java index 708a8ecf2ae..0ed72263b16 100644 --- a/src/com/google/javascript/jscomp/GatherRawExports.java +++ b/src/com/google/javascript/jscomp/GatherRawExports.java @@ -51,7 +51,7 @@ class GatherRawExports extends AbstractPostOrderCallback @Override public void process(Node externs, Node root) { checkState(compiler.getLifeCycleStage().isNormalized()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallback.java b/src/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallback.java index 1821c9f733d..b8e899211ed 100644 --- a/src/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallback.java +++ b/src/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallback.java @@ -159,7 +159,7 @@ public void keepSimplifiedHookExpression(Node hook, private Node simplifyShortCircuitBranch(Node node) { List parts = new ArrayList<>(); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, node, new GatherSideEffectSubexpressionsCallback( compiler, diff --git a/src/com/google/javascript/jscomp/GenerateExports.java b/src/com/google/javascript/jscomp/GenerateExports.java index 77885db4f89..04488639750 100644 --- a/src/com/google/javascript/jscomp/GenerateExports.java +++ b/src/com/google/javascript/jscomp/GenerateExports.java @@ -74,7 +74,7 @@ Set getExportedVariableNames() { public void process(Node externs, Node root) { FindExportableNodes findExportableNodes = new FindExportableNodes( compiler, allowNonGlobalExports); - NodeTraversal.traverseEs6(compiler, root, findExportableNodes); + NodeTraversal.traverse(compiler, root, findExportableNodes); Map exports = findExportableNodes.getExports(); Set localExports = findExportableNodes.getLocalExports(); @@ -206,7 +206,7 @@ private void addStatement(Node context, Node stmt) { } private void annotate(Node node) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, node, new PrepareAst.PrepareAnnotations()); } diff --git a/src/com/google/javascript/jscomp/GlobalNamespace.java b/src/com/google/javascript/jscomp/GlobalNamespace.java index b1d93fbf055..3fa88bab16d 100644 --- a/src/com/google/javascript/jscomp/GlobalNamespace.java +++ b/src/com/google/javascript/jscomp/GlobalNamespace.java @@ -230,11 +230,11 @@ private void scanFromNode( private void process() { if (hasExternsRoot()) { inExterns = true; - NodeTraversal.traverseEs6(compiler, externsRoot, new BuildGlobalNamespace()); + NodeTraversal.traverse(compiler, externsRoot, new BuildGlobalNamespace()); } inExterns = false; - NodeTraversal.traverseEs6(compiler, root, new BuildGlobalNamespace()); + NodeTraversal.traverse(compiler, root, new BuildGlobalNamespace()); generated = true; externsScope = null; } diff --git a/src/com/google/javascript/jscomp/GlobalTypeInfoCollector.java b/src/com/google/javascript/jscomp/GlobalTypeInfoCollector.java index cd5b294d25e..2e7946ae961 100644 --- a/src/com/google/javascript/jscomp/GlobalTypeInfoCollector.java +++ b/src/com/google/javascript/jscomp/GlobalTypeInfoCollector.java @@ -334,10 +334,10 @@ public void process(Node externs, Node root) { // (1) Find names of classes, interfaces, typedefs, enums, and namespaces // defined in the global scope. CollectNamedTypes rootCnt = new CollectNamedTypes(globalScope); - NodeTraversal.traverseEs6(this.compiler, externs, this.orderedExterns); + NodeTraversal.traverse(this.compiler, externs, this.orderedExterns); rootCnt.collectNamedTypesInExterns(); defineObjectAndFunctionIfMissing(); - NodeTraversal.traverseEs6(compiler, root, rootCnt); + NodeTraversal.traverse(compiler, root, rootCnt); // (2) Determine the type represented by each typedef and each enum globalScope.resolveTypedefs(getTypeParser()); globalScope.resolveEnums(getTypeParser()); @@ -345,7 +345,7 @@ public void process(Node externs, Node root) { for (int i = 1; i < this.scopes.size(); i++) { NTIScope s = this.scopes.get(i); CollectNamedTypes cnt = new CollectNamedTypes(s); - NodeTraversal.traverseEs6(compiler, s.getBody(), cnt); + NodeTraversal.traverse(compiler, s.getBody(), cnt); s.resolveTypedefs(getTypeParser()); s.resolveEnums(getTypeParser()); if (NewTypeInference.measureMem) { @@ -358,9 +358,9 @@ public void process(Node externs, Node root) { // - Declare properties on types ProcessScope rootPs = new ProcessScope(globalScope); if (externs != null) { - NodeTraversal.traverseEs6(compiler, externs, rootPs); + NodeTraversal.traverse(compiler, externs, rootPs); } - NodeTraversal.traverseEs6(compiler, root, rootPs); + NodeTraversal.traverse(compiler, root, rootPs); // (5) Things that must happen after the traversal of the scope rootPs.finishProcessingScope(); @@ -368,7 +368,7 @@ public void process(Node externs, Node root) { for (int i = 1; i < this.scopes.size(); i++) { NTIScope s = this.scopes.get(i); ProcessScope ps = new ProcessScope(s); - NodeTraversal.traverseEs6(compiler, s.getBody(), ps); + NodeTraversal.traverse(compiler, s.getBody(), ps); ps.finishProcessingScope(); if (NewTypeInference.measureMem) { NewTypeInference.updatePeakMem(); @@ -422,7 +422,7 @@ public void process(Node externs, Node root) { // Traverse the externs and annotate them with types. // Only works for the top level, not inside function bodies. - NodeTraversal.traverseEs6( + NodeTraversal.traverse( this.compiler, externs, new NodeTraversal.AbstractShallowCallback() { @Override public void visit(NodeTraversal t, Node n, Node parent) { diff --git a/src/com/google/javascript/jscomp/ImplicitNullabilityCheck.java b/src/com/google/javascript/jscomp/ImplicitNullabilityCheck.java index 928e1caf147..c2b66c17d9c 100644 --- a/src/com/google/javascript/jscomp/ImplicitNullabilityCheck.java +++ b/src/com/google/javascript/jscomp/ImplicitNullabilityCheck.java @@ -50,7 +50,7 @@ public ImplicitNullabilityCheck(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } /** diff --git a/src/com/google/javascript/jscomp/InferJSDocInfo.java b/src/com/google/javascript/jscomp/InferJSDocInfo.java index b732d399c5d..28bfd8b6f2b 100644 --- a/src/com/google/javascript/jscomp/InferJSDocInfo.java +++ b/src/com/google/javascript/jscomp/InferJSDocInfo.java @@ -69,10 +69,10 @@ class InferJSDocInfo extends AbstractPostOrderCallback @Override public void process(Node externs, Node root) { if (externs != null) { - NodeTraversal.traverseEs6(compiler, externs, this); + NodeTraversal.traverse(compiler, externs, this); } if (root != null) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } } @@ -80,7 +80,7 @@ public void process(Node externs, Node root) { public void hotSwapScript(Node root, Node originalRoot) { checkNotNull(root); checkState(root.isScript()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/InlineAliases.java b/src/com/google/javascript/jscomp/InlineAliases.java index ea5ab15df3b..df23b039a0d 100644 --- a/src/com/google/javascript/jscomp/InlineAliases.java +++ b/src/com/google/javascript/jscomp/InlineAliases.java @@ -56,8 +56,8 @@ final class InlineAliases implements CompilerPass { @Override public void process(Node externs, Node root) { namespace = new GlobalNamespace(compiler, root); - NodeTraversal.traverseEs6(compiler, root, new AliasesCollector()); - NodeTraversal.traverseEs6(compiler, root, new AliasesInliner()); + NodeTraversal.traverse(compiler, root, new AliasesCollector()); + NodeTraversal.traverse(compiler, root, new AliasesInliner()); } private class AliasesCollector extends AbstractPostOrderCallback { diff --git a/src/com/google/javascript/jscomp/InlineFunctions.java b/src/com/google/javascript/jscomp/InlineFunctions.java index 6c10e5cd011..e50c7e1ba8f 100644 --- a/src/com/google/javascript/jscomp/InlineFunctions.java +++ b/src/com/google/javascript/jscomp/InlineFunctions.java @@ -113,11 +113,11 @@ FunctionState getOrCreateFunctionState(String fnName) { public void process(Node externs, Node root) { checkState(compiler.getLifeCycleStage().isNormalized()); - NodeTraversal.traverseEs6(compiler, root, new FindCandidateFunctions()); + NodeTraversal.traverse(compiler, root, new FindCandidateFunctions()); if (fns.isEmpty()) { return; // Nothing left to do. } - NodeTraversal.traverseEs6(compiler, root, new FindCandidatesReferences(fns, anonFns)); + NodeTraversal.traverse(compiler, root, new FindCandidatesReferences(fns, anonFns)); trimCandidatesNotMeetingMinimumRequirements(); if (fns.isEmpty()) { return; // Nothing left to do. @@ -140,7 +140,7 @@ public void process(Node externs, Node root) { } resolveInlineConflicts(); decomposeExpressions(); - NodeTraversal.traverseEs6(compiler, root, new CallVisitor(fns, anonFns, new Inline(injector))); + NodeTraversal.traverse(compiler, root, new CallVisitor(fns, anonFns, new Inline(injector))); removeInlinedFunctions(); } diff --git a/src/com/google/javascript/jscomp/InlineProperties.java b/src/com/google/javascript/jscomp/InlineProperties.java index 428e483069d..f408e7e8d02 100644 --- a/src/com/google/javascript/jscomp/InlineProperties.java +++ b/src/com/google/javascript/jscomp/InlineProperties.java @@ -95,8 +95,8 @@ private TypeI getTypeI(Node n) { @Override public void process(Node externs, Node root) { // Find and replace the properties in non-extern AST. - NodeTraversal.traverseEs6(compiler, root, new GatherCandidates()); - NodeTraversal.traverseEs6(compiler, root, new ReplaceCandidates()); + NodeTraversal.traverse(compiler, root, new GatherCandidates()); + NodeTraversal.traverse(compiler, root, new ReplaceCandidates()); } class GatherCandidates extends AbstractPostOrderCallback { diff --git a/src/com/google/javascript/jscomp/InstrumentFunctions.java b/src/com/google/javascript/jscomp/InstrumentFunctions.java index dbf038e4a4d..156c4d9e63a 100644 --- a/src/com/google/javascript/jscomp/InstrumentFunctions.java +++ b/src/com/google/javascript/jscomp/InstrumentFunctions.java @@ -107,9 +107,9 @@ public void process(Node externs, Node root) { } } - NodeTraversal.traverseEs6(compiler, root, + NodeTraversal.traverse(compiler, root, new RemoveCallback(declarationsToRemove)); - NodeTraversal.traverseEs6(compiler, root, new InstrumentCallback()); + NodeTraversal.traverse(compiler, root, new InstrumentCallback()); if (!appNameSetter.isEmpty()) { Node call = IR.call( @@ -202,7 +202,7 @@ private class InstrumentReturns implements NodeTraversal.Callback { */ void process(Node function) { Node body = function.getLastChild(); - NodeTraversal.traverseEs6(compiler, body, this); + NodeTraversal.traverse(compiler, body, this); if (!allPathsReturn(function)) { Node call = newReportFunctionExitNode(function, null); diff --git a/src/com/google/javascript/jscomp/J2clAssertRemovalPass.java b/src/com/google/javascript/jscomp/J2clAssertRemovalPass.java index 6b3d6922d39..cb8bcab59b9 100644 --- a/src/com/google/javascript/jscomp/J2clAssertRemovalPass.java +++ b/src/com/google/javascript/jscomp/J2clAssertRemovalPass.java @@ -33,7 +33,7 @@ public void process(Node externs, Node root) { return; } - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/J2clChecksPass.java b/src/com/google/javascript/jscomp/J2clChecksPass.java index 6a27c2291d1..903f6ea0b92 100644 --- a/src/com/google/javascript/jscomp/J2clChecksPass.java +++ b/src/com/google/javascript/jscomp/J2clChecksPass.java @@ -100,6 +100,6 @@ private String getSourceName(TypeI jsType) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } } diff --git a/src/com/google/javascript/jscomp/J2clClinitPrunerPass.java b/src/com/google/javascript/jscomp/J2clClinitPrunerPass.java index df537a61aec..3d66448cab2 100644 --- a/src/com/google/javascript/jscomp/J2clClinitPrunerPass.java +++ b/src/com/google/javascript/jscomp/J2clClinitPrunerPass.java @@ -76,7 +76,7 @@ public void process(Node externs, Node root) { private void removeRedundantClinits(Node root, List changedScopeNodes) { RedundantClinitPruner redundantClinitPruner = new RedundantClinitPruner(); - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, root, getNonNestedParentScopeNodes(changedScopeNodes), @@ -84,14 +84,14 @@ private void removeRedundantClinits(Node root, List changedScopeNodes) { redundantClinitPruner, // FunctionCallback true); - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, root, changedScopeNodes, new LookAheadRedundantClinitPruner(), false); } private void pruneEmptyClinits(Node root, List changedScopes) { // Clear emptiedClinitMethods before EmptyClinitPruner to populate only with new ones. emptiedClinitMethods.clear(); - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, root, changedScopes, new EmptyClinitPruner(), false); // Make sure replacements are to final destination instead of pointing intermediate ones. @@ -112,7 +112,7 @@ private Node resolveReplacement(Node node) { private Multimap collectClinitReferences(Node root) { final Multimap clinitReferences = HashMultimap.create(); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, root, new AbstractPostOrderCallback() { diff --git a/src/com/google/javascript/jscomp/J2clConstantHoisterPass.java b/src/com/google/javascript/jscomp/J2clConstantHoisterPass.java index 53caf3e090f..518c04c75eb 100644 --- a/src/com/google/javascript/jscomp/J2clConstantHoisterPass.java +++ b/src/com/google/javascript/jscomp/J2clConstantHoisterPass.java @@ -46,7 +46,7 @@ public void process(Node externs, Node root) { final Multimap fieldAssignments = ArrayListMultimap.create(); final Set hoistableFunctions = new HashSet<>(); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, root, new AbstractPostOrderCallback() { diff --git a/src/com/google/javascript/jscomp/J2clPass.java b/src/com/google/javascript/jscomp/J2clPass.java index 32412f44f2e..1668c495627 100644 --- a/src/com/google/javascript/jscomp/J2clPass.java +++ b/src/com/google/javascript/jscomp/J2clPass.java @@ -113,8 +113,8 @@ private ClassStaticFunctionsInliner( } private void run() { - NodeTraversal.traverseEs6(compiler, root, new FunctionDefsCollector()); - NodeTraversal.traverseEs6(compiler, root, new StaticCallInliner()); + NodeTraversal.traverse(compiler, root, new FunctionDefsCollector()); + NodeTraversal.traverse(compiler, root, new StaticCallInliner()); } private class FunctionDefsCollector implements Callback { diff --git a/src/com/google/javascript/jscomp/J2clPropertyInlinerPass.java b/src/com/google/javascript/jscomp/J2clPropertyInlinerPass.java index 27591e7b368..d00d09e0ebc 100644 --- a/src/com/google/javascript/jscomp/J2clPropertyInlinerPass.java +++ b/src/com/google/javascript/jscomp/J2clPropertyInlinerPass.java @@ -70,9 +70,9 @@ class StaticFieldGetterSetterInliner { private void run() { GatherJ2CLClassGetterSetters gatherer = new GatherJ2CLClassGetterSetters(); - NodeTraversal.traverseEs6(compiler, root, gatherer); + NodeTraversal.traverse(compiler, root, gatherer); Map result = gatherer.getResults(); - NodeTraversal.traverseEs6(compiler, root, new DetermineInlinableProperties(result)); + NodeTraversal.traverse(compiler, root, new DetermineInlinableProperties(result)); new InlinePropertiesPass(result).run(); } @@ -355,7 +355,7 @@ private class InlinePropertiesPass extends AbstractPostOrderCallback { } private void run() { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); for (J2clProperty prop : propertiesByName.values()) { if (prop.isSafeToInline) { diff --git a/src/com/google/javascript/jscomp/J2clUtilGetDefineRewriterPass.java b/src/com/google/javascript/jscomp/J2clUtilGetDefineRewriterPass.java index 1bf4fe36373..f57837be863 100644 --- a/src/com/google/javascript/jscomp/J2clUtilGetDefineRewriterPass.java +++ b/src/com/google/javascript/jscomp/J2clUtilGetDefineRewriterPass.java @@ -36,7 +36,7 @@ public void process(Node externs, Node root) { return; } defines = new ProcessDefines(compiler, null, true).collectDefines(externs, root).keySet(); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/JsMessageVisitor.java b/src/com/google/javascript/jscomp/JsMessageVisitor.java index 97fe30283c6..3276f8d3d58 100644 --- a/src/com/google/javascript/jscomp/JsMessageVisitor.java +++ b/src/com/google/javascript/jscomp/JsMessageVisitor.java @@ -171,7 +171,7 @@ protected JsMessageVisitor(AbstractCompiler compiler, @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); for (Node msgNode : googMsgNodes) { compiler.report(JSError.make(msgNode, diff --git a/src/com/google/javascript/jscomp/LineNumberCheck.java b/src/com/google/javascript/jscomp/LineNumberCheck.java index 3c8e3b4d119..9da8b5d1ac2 100644 --- a/src/com/google/javascript/jscomp/LineNumberCheck.java +++ b/src/com/google/javascript/jscomp/LineNumberCheck.java @@ -44,14 +44,14 @@ class LineNumberCheck implements Callback, CompilerPass { public void setCheckSubTree(Node root) { requiresLineNumbers = true; - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void process(Node externs, Node root) { requiresLineNumbers = false; - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java b/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java index 8420dd79e28..c2de8707f03 100644 --- a/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java +++ b/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java @@ -239,7 +239,7 @@ private ContextualRenameInverter(AbstractCompiler compiler, boolean markChanges) @Override public void process(Node externs, Node js) { - NodeTraversal.traverseEs6(compiler, js, this); + NodeTraversal.traverse(compiler, js, this); } public static String getOriginalName(String name) { diff --git a/src/com/google/javascript/jscomp/MarkNoSideEffectCalls.java b/src/com/google/javascript/jscomp/MarkNoSideEffectCalls.java index acce6e1cd34..c3a41a168a1 100644 --- a/src/com/google/javascript/jscomp/MarkNoSideEffectCalls.java +++ b/src/com/google/javascript/jscomp/MarkNoSideEffectCalls.java @@ -55,12 +55,12 @@ public void process(Node externs, Node root) { // Gather the list of function nodes that have @nosideeffects annotations. // For use by SetNoSideEffectCallProperty. - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, externs, new GatherNoSideEffectFunctions()); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, root, new GatherNoSideEffectFunctions()); - NodeTraversal.traverseEs6(compiler, root, new SetNoSideEffectCallProperty(defFinder)); + NodeTraversal.traverse(compiler, root, new SetNoSideEffectCallProperty(defFinder)); } /** diff --git a/src/com/google/javascript/jscomp/MethodCompilerPass.java b/src/com/google/javascript/jscomp/MethodCompilerPass.java index 64b50420dab..6e949c49638 100644 --- a/src/com/google/javascript/jscomp/MethodCompilerPass.java +++ b/src/com/google/javascript/jscomp/MethodCompilerPass.java @@ -69,11 +69,11 @@ public void process(Node externs, Node root) { methodDefinitions.clear(); if (externs != null) { - NodeTraversal.traverseEs6(compiler, externs, new GetExternMethods()); + NodeTraversal.traverse(compiler, externs, new GetExternMethods()); } - NodeTraversal.traverseRootsEs6(compiler, new GatherSignatures(), externs, root); - NodeTraversal.traverseRootsEs6(compiler, getActingCallback(), externs, root); + NodeTraversal.traverseRoots(compiler, new GatherSignatures(), externs, root); + NodeTraversal.traverseRoots(compiler, getActingCallback(), externs, root); } /** diff --git a/src/com/google/javascript/jscomp/ModuleMetadata.java b/src/com/google/javascript/jscomp/ModuleMetadata.java index cb425603a8a..a7de2ec2654 100644 --- a/src/com/google/javascript/jscomp/ModuleMetadata.java +++ b/src/com/google/javascript/jscomp/ModuleMetadata.java @@ -445,8 +445,8 @@ private void checkDuplicates(String namespace, NodeTraversal t, Node n) { public void process(Node externs, Node root) { finder = new Finder(); - NodeTraversal.traverseEs6(compiler, externs, finder); - NodeTraversal.traverseEs6(compiler, root, finder); + NodeTraversal.traverse(compiler, externs, finder); + NodeTraversal.traverse(compiler, root, finder); } private void remove(Module module) { @@ -467,7 +467,7 @@ public void hotSwapScript(Node scriptRoot) { Module existing = modulesByPath.get(compiler.getInput(scriptRoot.getInputId()).getPath().toString()); remove(existing); - NodeTraversal.traverseEs6(compiler, scriptRoot, finder); + NodeTraversal.traverse(compiler, scriptRoot, finder); } /** diff --git a/src/com/google/javascript/jscomp/MoveFunctionDeclarations.java b/src/com/google/javascript/jscomp/MoveFunctionDeclarations.java index 90319af59e8..39f107f7675 100644 --- a/src/com/google/javascript/jscomp/MoveFunctionDeclarations.java +++ b/src/com/google/javascript/jscomp/MoveFunctionDeclarations.java @@ -63,7 +63,7 @@ class MoveFunctionDeclarations implements Callback, CompilerPass { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); for (Entry> entry : Multimaps.asMap(functions).entrySet()) { Node addingRoot = compiler.getNodeForCodeInsertion(entry.getKey()); List fnNodes = Lists.reverse(entry.getValue()); diff --git a/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java b/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java index 5e31c2ffe9e..7a9e67cb88b 100644 --- a/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java +++ b/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java @@ -439,7 +439,7 @@ private static boolean isParameter(Var v) { * in the def's depends set. */ private void computeDependence(final Definition def, Node rValue) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, rValue, new AbstractCfgNodeTraversalCallback() { diff --git a/src/com/google/javascript/jscomp/NameAnonymousFunctions.java b/src/com/google/javascript/jscomp/NameAnonymousFunctions.java index 2816f741202..26df2cb2dc0 100644 --- a/src/com/google/javascript/jscomp/NameAnonymousFunctions.java +++ b/src/com/google/javascript/jscomp/NameAnonymousFunctions.java @@ -51,7 +51,7 @@ class NameAnonymousFunctions implements CompilerPass { public void process(Node externs, Node root) { AnonymousFunctionNamingCallback namingCallback = new AnonymousFunctionNamingCallback(new AnonymousFunctionNamer()); - NodeTraversal.traverseEs6(compiler, root, namingCallback); + NodeTraversal.traverse(compiler, root, namingCallback); logger.fine("Named " + namedCount + " anon functions using " + bytesUsed + " bytes"); } diff --git a/src/com/google/javascript/jscomp/NameAnonymousFunctionsMapped.java b/src/com/google/javascript/jscomp/NameAnonymousFunctionsMapped.java index 6cc70bbf883..cc25fb82952 100644 --- a/src/com/google/javascript/jscomp/NameAnonymousFunctionsMapped.java +++ b/src/com/google/javascript/jscomp/NameAnonymousFunctionsMapped.java @@ -73,7 +73,7 @@ class NameAnonymousFunctionsMapped implements CompilerPass { public void process(Node externs, Node root) { AnonymousFunctionNamingCallback namingCallback = new AnonymousFunctionNamingCallback(new MappedFunctionNamer()); - NodeTraversal.traverseEs6(compiler, root, namingCallback); + NodeTraversal.traverse(compiler, root, namingCallback); logger.fine("Named " + namedCount + " anon functions using " + bytesUsed + " bytes"); } diff --git a/src/com/google/javascript/jscomp/NameBasedDefinitionProvider.java b/src/com/google/javascript/jscomp/NameBasedDefinitionProvider.java index 79bf13592fa..ddee8a12d95 100644 --- a/src/com/google/javascript/jscomp/NameBasedDefinitionProvider.java +++ b/src/com/google/javascript/jscomp/NameBasedDefinitionProvider.java @@ -85,10 +85,10 @@ public void process(Node externs, Node source) { this.hasProcessBeenRun = true; - NodeTraversal.traverseEs6(compiler, externs, new DefinitionGatheringCallback(true)); + NodeTraversal.traverse(compiler, externs, new DefinitionGatheringCallback(true)); dropUntypedExterns(); - NodeTraversal.traverseEs6(compiler, source, new DefinitionGatheringCallback(false)); + NodeTraversal.traverse(compiler, source, new DefinitionGatheringCallback(false)); } public void rebuildScopeRoots(List changedScopeRoots, List deletedScopeRoots) { @@ -102,7 +102,7 @@ public void rebuildScopeRoots(List changedScopeRoots, List deletedSc } DefinitionGatheringCallback cb = new DefinitionGatheringCallback(); - NodeTraversal.traverseEs6ScopeRoots(compiler, null, changedScopeRoots, cb, cb, false); + NodeTraversal.traverseScopeRoots(compiler, null, changedScopeRoots, cb, cb, false); } /** @return Whether the node has a JSDoc that actually declares something. */ diff --git a/src/com/google/javascript/jscomp/NodeTraversal.java b/src/com/google/javascript/jscomp/NodeTraversal.java index 4132c6caca4..5a65a6ec22f 100644 --- a/src/com/google/javascript/jscomp/NodeTraversal.java +++ b/src/com/google/javascript/jscomp/NodeTraversal.java @@ -309,6 +309,12 @@ public void traverse(Node root) { } } + /** Traverses using the ES6SyntacticScopeCreator */ + public static void traverse(AbstractCompiler compiler, Node root, Callback cb) { + NodeTraversal t = new NodeTraversal(compiler, cb, new Es6SyntacticScopeCreator(compiler)); + t.traverse(root); + } + void traverseRoots(Node externs, Node root) { try { Node scopeRoot = externs.getParent(); @@ -328,6 +334,12 @@ void traverseRoots(Node externs, Node root) { } } + public static void traverseRoots( + AbstractCompiler compiler, Callback cb, Node externs, Node root) { + NodeTraversal t = new NodeTraversal(compiler, cb, new Es6SyntacticScopeCreator(compiler)); + t.traverseRoots(externs, root); + } + private static final String MISSING_SOURCE = "[source unknown]"; private String formatNodePosition(Node n) { @@ -445,13 +457,13 @@ private void traverseScopeRoot(Node scopeRoot) { * @param root If scopeNodes is null, this method will just traverse 'root' instead. If scopeNodes * is not null, this parameter is ignored. */ - public static void traverseEs6ScopeRoots( + public static void traverseScopeRoots( AbstractCompiler compiler, @Nullable Node root, @Nullable List scopeNodes, final Callback cb, final boolean traverseNested) { - traverseEs6ScopeRoots(compiler, root, scopeNodes, cb, null, traverseNested); + traverseScopeRoots(compiler, root, scopeNodes, cb, null, traverseNested); } /** @@ -462,7 +474,7 @@ public static void traverseEs6ScopeRoots( * @param root If scopeNodes is null, this method will just traverse 'root' instead. If scopeNodes * is not null, this parameter is ignored. */ - public static void traverseEs6ScopeRoots( + public static void traverseScopeRoots( AbstractCompiler compiler, @Nullable Node root, @Nullable List scopeNodes, @@ -470,19 +482,19 @@ public static void traverseEs6ScopeRoots( @Nullable final ChangeScopeRootCallback changeCallback, final boolean traverseNested) { if (scopeNodes == null) { - NodeTraversal.traverseEs6(compiler, root, cb); + NodeTraversal.traverse(compiler, root, cb); } else { MemoizedScopeCreator scopeCreator = new MemoizedScopeCreator(new Es6SyntacticScopeCreator(compiler)); for (final Node scopeNode : scopeNodes) { - traverseSingleEs6ScopeRoot( + traverseSingleScopeRoot( compiler, cb, changeCallback, traverseNested, scopeCreator, scopeNode); } } } - private static void traverseSingleEs6ScopeRoot( + private static void traverseSingleScopeRoot( AbstractCompiler compiler, final Callback cb, @Nullable ChangeScopeRootCallback changeCallback, @@ -659,7 +671,7 @@ public Node getCurrentNode() { public static void traverseChangedFunctions( final AbstractCompiler compiler, final ChangeScopeRootCallback callback) { final Node jsRoot = compiler.getJsRoot(); - NodeTraversal.traverseEs6(compiler, jsRoot, + NodeTraversal.traverse(compiler, jsRoot, new AbstractPreOrderCallback() { @Override public final boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { @@ -672,12 +684,11 @@ public final boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { } /** - * Traverses using the ES6SyntacticScopeCreator + * Use #traverse(AbstractCompiler, Node, Callback) */ - // TODO (stephshi): rename to "traverse" when the old traverse method is no longer used + @Deprecated public static void traverseEs6(AbstractCompiler compiler, Node root, Callback cb) { - NodeTraversal t = new NodeTraversal(compiler, cb, new Es6SyntacticScopeCreator(compiler)); - t.traverse(root); + traverse(compiler, root, cb); } /** Traverses from a particular scope node using the ES6SyntacticScopeCreator */ @@ -696,12 +707,6 @@ public static void traverseTyped(AbstractCompiler compiler, Node root, Callback t.traverse(root); } - public static void traverseRootsEs6( - AbstractCompiler compiler, Callback cb, Node externs, Node root) { - NodeTraversal t = new NodeTraversal(compiler, cb, new Es6SyntacticScopeCreator(compiler)); - t.traverseRoots(externs, root); - } - /** * @deprecated Use the ES6SyntacticScopeCreator instead. */ diff --git a/src/com/google/javascript/jscomp/Normalize.java b/src/com/google/javascript/jscomp/Normalize.java index e94dc8f5041..8bdb54b6620 100644 --- a/src/com/google/javascript/jscomp/Normalize.java +++ b/src/com/google/javascript/jscomp/Normalize.java @@ -78,9 +78,9 @@ class Normalize implements CompilerPass { static void normalizeSyntheticCode( AbstractCompiler compiler, Node js, String prefix) { - NodeTraversal.traverseEs6(compiler, js, + NodeTraversal.traverse(compiler, js, new Normalize.NormalizeStatements(compiler, false)); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, js, new MakeDeclaredNamesUnique( @@ -93,7 +93,7 @@ static void normalizeSyntheticCode( static Node parseAndNormalizeTestCode( AbstractCompiler compiler, String code) { Node js = compiler.parseTestCode(code); - NodeTraversal.traverseEs6(compiler, js, + NodeTraversal.traverse(compiler, js, new Normalize.NormalizeStatements(compiler, false)); return js; } @@ -108,19 +108,19 @@ private void reportCodeChange(String changeDescription, Node n) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new RemoveEmptyClassMembers()); - NodeTraversal.traverseRootsEs6( + NodeTraversal.traverse(compiler, root, new RemoveEmptyClassMembers()); + NodeTraversal.traverseRoots( compiler, new NormalizeStatements(compiler, assertOnChange), externs, root); removeDuplicateDeclarations(externs, root); MakeDeclaredNamesUnique renamer = new MakeDeclaredNamesUnique(); - NodeTraversal.traverseRootsEs6(compiler, renamer, externs, root); + NodeTraversal.traverseRoots(compiler, renamer, externs, root); new PropagateConstantAnnotationsOverVars(compiler, assertOnChange) .process(externs, root); FindExposeAnnotations findExposeAnnotations = new FindExposeAnnotations(); - NodeTraversal.traverseEs6(compiler, root, findExposeAnnotations); + NodeTraversal.traverse(compiler, root, findExposeAnnotations); if (!findExposeAnnotations.exposedProperties.isEmpty()) { - NodeTraversal.traverseEs6(compiler, root, + NodeTraversal.traverse(compiler, root, new RewriteExposedProperties( findExposeAnnotations.exposedProperties)); } @@ -217,7 +217,7 @@ static class PropagateConstantAnnotationsOverVars @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } @Override @@ -272,7 +272,7 @@ public void process(Node externs, Node root) { Node externsAndJs = root.getParent(); checkState(externsAndJs != null); checkState(externsAndJs.hasChild(externs)); - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } private final Map constantMap = new HashMap<>(); diff --git a/src/com/google/javascript/jscomp/ObjectPropertyStringPostprocess.java b/src/com/google/javascript/jscomp/ObjectPropertyStringPostprocess.java index 0c6376675b9..97f786122d8 100644 --- a/src/com/google/javascript/jscomp/ObjectPropertyStringPostprocess.java +++ b/src/com/google/javascript/jscomp/ObjectPropertyStringPostprocess.java @@ -46,7 +46,7 @@ public ObjectPropertyStringPostprocess(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new Callback()); + NodeTraversal.traverse(compiler, root, new Callback()); } private class Callback extends AbstractPostOrderCallback { diff --git a/src/com/google/javascript/jscomp/ObjectPropertyStringPreprocess.java b/src/com/google/javascript/jscomp/ObjectPropertyStringPreprocess.java index 107809ab2fa..fb4a7b59914 100644 --- a/src/com/google/javascript/jscomp/ObjectPropertyStringPreprocess.java +++ b/src/com/google/javascript/jscomp/ObjectPropertyStringPreprocess.java @@ -64,7 +64,7 @@ public void process(Node externs, Node root) { addExternDeclaration(externs, IR.var( IR.name(NodeUtil.EXTERN_OBJECT_PROPERTY_STRING))); - NodeTraversal.traverseEs6(compiler, root, new Callback()); + NodeTraversal.traverse(compiler, root, new Callback()); } private static void addExternDeclaration(Node externs, Node declarationStmt) { diff --git a/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java b/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java index 86115a7fb2d..38c1b11c30e 100644 --- a/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java +++ b/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java @@ -90,7 +90,7 @@ class OptimizeArgumentsArray implements CompilerPass, ScopedCallback { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, checkNotNull(root), this); + NodeTraversal.traverse(compiler, checkNotNull(root), this); } @Override diff --git a/src/com/google/javascript/jscomp/OptimizeCalls.java b/src/com/google/javascript/jscomp/OptimizeCalls.java index 7a03a791c4d..1edfc3fa53e 100644 --- a/src/com/google/javascript/jscomp/OptimizeCalls.java +++ b/src/com/google/javascript/jscomp/OptimizeCalls.java @@ -358,7 +358,7 @@ public void exitScope(NodeTraversal t) { static ReferenceMap buildPropAndGlobalNameReferenceMap( AbstractCompiler compiler, Node externs, Node root) { final ReferenceMap references = new ReferenceMap(); - NodeTraversal.traverseRootsEs6(compiler, new ReferenceMapBuildingCallback( + NodeTraversal.traverseRoots(compiler, new ReferenceMapBuildingCallback( compiler, references), externs, root); return references; } diff --git a/src/com/google/javascript/jscomp/PeepholeOptimizationsPass.java b/src/com/google/javascript/jscomp/PeepholeOptimizationsPass.java index 10d3b716b92..ecaf1de6f7c 100644 --- a/src/com/google/javascript/jscomp/PeepholeOptimizationsPass.java +++ b/src/com/google/javascript/jscomp/PeepholeOptimizationsPass.java @@ -64,7 +64,7 @@ public void process(Node externs, Node root) { for (List changedScopeNodes = compiler.getChangedScopeNodesForPass(passName); changedScopeNodes == null || !changedScopeNodes.isEmpty(); changedScopeNodes = compiler.getChangedScopeNodesForPass(passName)) { - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, root, changedScopeNodes, new PeepCallback(), false); // Cancel the fixed point if requested. diff --git a/src/com/google/javascript/jscomp/PolymerPass.java b/src/com/google/javascript/jscomp/PolymerPass.java index f1cc15b9774..2e5b9b68738 100644 --- a/src/com/google/javascript/jscomp/PolymerPass.java +++ b/src/com/google/javascript/jscomp/PolymerPass.java @@ -74,7 +74,7 @@ final class PolymerPass extends AbstractPostOrderCallback implements HotSwapComp @Override public void process(Node externs, Node root) { PolymerPassFindExterns externsCallback = new PolymerPassFindExterns(); - NodeTraversal.traverseEs6(compiler, externs, externsCallback); + NodeTraversal.traverse(compiler, externs, externsCallback); polymerElementExterns = externsCallback.getPolymerElementExterns(); polymerElementProps = externsCallback.getPolymerElementProps(); @@ -95,10 +95,10 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); PolymerPassSuppressBehaviors suppressBehaviorsCallback = new PolymerPassSuppressBehaviors(compiler); - NodeTraversal.traverseEs6(compiler, scriptRoot, suppressBehaviorsCallback); + NodeTraversal.traverse(compiler, scriptRoot, suppressBehaviorsCallback); } @Override diff --git a/src/com/google/javascript/jscomp/PrepareAst.java b/src/com/google/javascript/jscomp/PrepareAst.java index 8fe7c690e4f..13c1d49f7b9 100644 --- a/src/com/google/javascript/jscomp/PrepareAst.java +++ b/src/com/google/javascript/jscomp/PrepareAst.java @@ -60,11 +60,11 @@ public void process(Node externs, Node root) { // they currently aren't valid during validity checks. In particular, // they DIRECT_EVAL shouldn't be applied after inlining has been performed. if (externs != null) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, externs, new PrepareAnnotations()); } if (root != null) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, root, new PrepareAnnotations()); } } diff --git a/src/com/google/javascript/jscomp/ProcessClosurePrimitives.java b/src/com/google/javascript/jscomp/ProcessClosurePrimitives.java index 23d0983df71..d2bc2d766f6 100644 --- a/src/com/google/javascript/jscomp/ProcessClosurePrimitives.java +++ b/src/com/google/javascript/jscomp/ProcessClosurePrimitives.java @@ -197,7 +197,7 @@ Set getExportedVariableNames() { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); for (Node n : defineCalls) { replaceGoogDefines(n); diff --git a/src/com/google/javascript/jscomp/ProcessCommonJSModules.java b/src/com/google/javascript/jscomp/ProcessCommonJSModules.java index ad064dc29e1..04b44ed84f8 100644 --- a/src/com/google/javascript/jscomp/ProcessCommonJSModules.java +++ b/src/com/google/javascript/jscomp/ProcessCommonJSModules.java @@ -71,7 +71,7 @@ public ProcessCommonJSModules(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override @@ -84,7 +84,7 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { } FindImportsAndExports finder = new FindImportsAndExports(); - NodeTraversal.traverseEs6(compiler, n, finder); + NodeTraversal.traverse(compiler, n, finder); CompilerInput.ModuleType moduleType = compiler.getInput(n.getInputId()).getJsModuleType(); @@ -109,7 +109,7 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { if (needsRetraverse) { finder = new FindImportsAndExports(); - NodeTraversal.traverseEs6(compiler, n, finder); + NodeTraversal.traverse(compiler, n, finder); } } @@ -128,10 +128,10 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { } } else if (needsRetraverse) { finder = new FindImportsAndExports(); - NodeTraversal.traverseEs6(compiler, n, finder); + NodeTraversal.traverse(compiler, n, finder); } - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, n, new RewriteModule( diff --git a/src/com/google/javascript/jscomp/ProcessDefines.java b/src/com/google/javascript/jscomp/ProcessDefines.java index 1dccf491b73..9545d7cecb5 100644 --- a/src/com/google/javascript/jscomp/ProcessDefines.java +++ b/src/com/google/javascript/jscomp/ProcessDefines.java @@ -220,7 +220,7 @@ Map collectDefines(Node externs, Node root) { } CollectDefines pass = new CollectDefines(compiler, allDefines); - NodeTraversal.traverseRootsEs6(compiler, pass, externs, root); + NodeTraversal.traverseRoots(compiler, pass, externs, root); return pass.getAllDefines(); } diff --git a/src/com/google/javascript/jscomp/ProcessTweaks.java b/src/com/google/javascript/jscomp/ProcessTweaks.java index b5c0cbeb9b6..e705a8ff4a5 100644 --- a/src/com/google/javascript/jscomp/ProcessTweaks.java +++ b/src/com/google/javascript/jscomp/ProcessTweaks.java @@ -309,7 +309,7 @@ private void applyCompilerDefaultValueOverrides( */ private CollectTweaksResult collectTweaks(Node root) { CollectTweaks pass = new CollectTweaks(); - NodeTraversal.traverseEs6(compiler, root, pass); + NodeTraversal.traverse(compiler, root, pass); Map tweakInfos = pass.allTweaks; for (TweakInfo tweakInfo : tweakInfos.values()) { diff --git a/src/com/google/javascript/jscomp/PureFunctionIdentifier.java b/src/com/google/javascript/jscomp/PureFunctionIdentifier.java index 2715e0e1a1e..478f1d7bbc8 100644 --- a/src/com/google/javascript/jscomp/PureFunctionIdentifier.java +++ b/src/com/google/javascript/jscomp/PureFunctionIdentifier.java @@ -127,8 +127,8 @@ public void process(Node externsAst, Node srcAst) { buildGraph(); - NodeTraversal.traverseEs6(compiler, externs, new FunctionAnalyzer(true)); - NodeTraversal.traverseEs6(compiler, root, new FunctionAnalyzer(false)); + NodeTraversal.traverse(compiler, externs, new FunctionAnalyzer(true)); + NodeTraversal.traverse(compiler, root, new FunctionAnalyzer(false)); propagateSideEffects(); diff --git a/src/com/google/javascript/jscomp/RecordFunctionInformation.java b/src/com/google/javascript/jscomp/RecordFunctionInformation.java index 3e28ec725db..c9b6384d55d 100644 --- a/src/com/google/javascript/jscomp/RecordFunctionInformation.java +++ b/src/com/google/javascript/jscomp/RecordFunctionInformation.java @@ -56,7 +56,7 @@ FunctionInformationMap getMap() { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java b/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java index 61edcc59812..2a2f13147a5 100644 --- a/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java +++ b/src/com/google/javascript/jscomp/ReferenceCollectingCallback.java @@ -139,7 +139,7 @@ void processScope(Scope scope) { */ @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } /** diff --git a/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java b/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java index 222d01f04cb..70af81b6704 100644 --- a/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java +++ b/src/com/google/javascript/jscomp/RemoveSuperMethodsPass.java @@ -46,8 +46,8 @@ public RemoveSuperMethodsPass(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new RemoveSuperMethodsCallback()); - NodeTraversal.traverseEs6(compiler, root, new FilterDuplicateMethods()); + NodeTraversal.traverse(compiler, root, new RemoveSuperMethodsCallback()); + NodeTraversal.traverse(compiler, root, new FilterDuplicateMethods()); for (Map.Entry entry : removeCandidates.entrySet()) { Node removalTarget = entry.getValue().getGrandparent(); Node removalParent = removalTarget.getParent(); diff --git a/src/com/google/javascript/jscomp/RemoveUnusedPolyfills.java b/src/com/google/javascript/jscomp/RemoveUnusedPolyfills.java index e18ae4636b1..2ee5fde54d6 100644 --- a/src/com/google/javascript/jscomp/RemoveUnusedPolyfills.java +++ b/src/com/google/javascript/jscomp/RemoveUnusedPolyfills.java @@ -59,7 +59,7 @@ class RemoveUnusedPolyfills implements CompilerPass { @Override public void process(Node externs, Node root) { CollectUnusedPolyfills collector = new CollectUnusedPolyfills(); - NodeTraversal.traverseEs6(compiler, root, collector); + NodeTraversal.traverse(compiler, root, collector); for (Node node : collector.removableNodes()) { Node parent = node.getParent(); NodeUtil.removeChild(parent, node); diff --git a/src/com/google/javascript/jscomp/RenameLabels.java b/src/com/google/javascript/jscomp/RenameLabels.java index 69d773ff8b8..079de3c6b23 100644 --- a/src/com/google/javascript/jscomp/RenameLabels.java +++ b/src/com/google/javascript/jscomp/RenameLabels.java @@ -280,7 +280,7 @@ LabelInfo getLabelInfo(String name) { @Override public void process(Node externs, Node root) { // Do variable reference counting. - NodeTraversal.traverseEs6(compiler, root, new ProcessLabels(markChanges)); + NodeTraversal.traverse(compiler, root, new ProcessLabels(markChanges)); } private static class LabelInfo { diff --git a/src/com/google/javascript/jscomp/RenameProperties.java b/src/com/google/javascript/jscomp/RenameProperties.java index dfddac01a44..25ca8e4f4a8 100644 --- a/src/com/google/javascript/jscomp/RenameProperties.java +++ b/src/com/google/javascript/jscomp/RenameProperties.java @@ -187,7 +187,7 @@ public int compare(Property p1, Property p2) { public void process(Node externs, Node root) { checkState(compiler.getLifeCycleStage().isNormalized()); - NodeTraversal.traverseEs6(compiler, root, new ProcessProperties()); + NodeTraversal.traverse(compiler, root, new ProcessProperties()); Set reservedNames = Sets.newHashSetWithExpectedSize(externedNames.size() + quotedNames.size()); diff --git a/src/com/google/javascript/jscomp/RenameVars.java b/src/com/google/javascript/jscomp/RenameVars.java index 579b2ccda38..9834d411174 100644 --- a/src/com/google/javascript/jscomp/RenameVars.java +++ b/src/com/google/javascript/jscomp/RenameVars.java @@ -347,7 +347,7 @@ public void process(Node externs, Node root) { originalNameByNode.clear(); // Do variable reference counting. - NodeTraversal.traverseEs6(compiler, root, new ProcessVars()); + NodeTraversal.traverse(compiler, root, new ProcessVars()); // Make sure that new names don't overlap with extern names. reservedNames.addAll(externNames); diff --git a/src/com/google/javascript/jscomp/ReplaceCssNames.java b/src/com/google/javascript/jscomp/ReplaceCssNames.java index 89eb4c1e0b7..14b767e2386 100644 --- a/src/com/google/javascript/jscomp/ReplaceCssNames.java +++ b/src/com/google/javascript/jscomp/ReplaceCssNames.java @@ -136,7 +136,7 @@ public void process(Node externs, Node root) { // only be called before this pass is actually run. symbolMap = getCssRenamingMap(); - NodeTraversal.traverseEs6(compiler, root, new Traversal()); + NodeTraversal.traverse(compiler, root, new Traversal()); } @VisibleForTesting diff --git a/src/com/google/javascript/jscomp/ReplaceIdGenerators.java b/src/com/google/javascript/jscomp/ReplaceIdGenerators.java index 8185da2cd96..9f4f6e5d069 100644 --- a/src/com/google/javascript/jscomp/ReplaceIdGenerators.java +++ b/src/com/google/javascript/jscomp/ReplaceIdGenerators.java @@ -325,9 +325,9 @@ name, createNameSupplier( @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new GatherGenerators()); + NodeTraversal.traverse(compiler, root, new GatherGenerators()); if (!nameGenerators.isEmpty()) { - NodeTraversal.traverseEs6(compiler, root, new ReplaceGenerators()); + NodeTraversal.traverse(compiler, root, new ReplaceGenerators()); } } diff --git a/src/com/google/javascript/jscomp/ReplaceStrings.java b/src/com/google/javascript/jscomp/ReplaceStrings.java index c43b3c23fba..ff5bb61a1b0 100644 --- a/src/com/google/javascript/jscomp/ReplaceStrings.java +++ b/src/com/google/javascript/jscomp/ReplaceStrings.java @@ -191,7 +191,7 @@ VariableMap getStringMap() { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/RescopeGlobalSymbols.java b/src/com/google/javascript/jscomp/RescopeGlobalSymbols.java index d2820c7f533..269875b747a 100644 --- a/src/com/google/javascript/jscomp/RescopeGlobalSymbols.java +++ b/src/com/google/javascript/jscomp/RescopeGlobalSymbols.java @@ -162,7 +162,7 @@ public void process(Node externs, Node root) { // Rewrite all references to global symbols to properties of a single symbol: // Turn global named function statements into var assignments. - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, root, new RewriteGlobalClassFunctionDeclarationsToVarAssignmentsCallback()); // Find global names that are used in more than one module. Those that @@ -176,11 +176,11 @@ public void process(Node externs, Node root) { // Rewrite all references to be property accesses of the single symbol. RewriteScopeCallback rewriteScope = new RewriteScopeCallback(); - NodeTraversal.traverseEs6(compiler, root, rewriteScope); + NodeTraversal.traverse(compiler, root, rewriteScope); // Remove the var from statements in global scope if the declared names have been rewritten // in the previous pass. - NodeTraversal.traverseEs6(compiler, root, new RemoveGlobalVarCallback()); + NodeTraversal.traverse(compiler, root, new RemoveGlobalVarCallback()); rewriteScope.declareModuleGlobals(); } diff --git a/src/com/google/javascript/jscomp/RewriteGoogJsImports.java b/src/com/google/javascript/jscomp/RewriteGoogJsImports.java index 7733620afec..3611c3d9386 100644 --- a/src/com/google/javascript/jscomp/RewriteGoogJsImports.java +++ b/src/com/google/javascript/jscomp/RewriteGoogJsImports.java @@ -106,7 +106,7 @@ private class FindExports extends AbstractPreOrderCallback { public FindExports(Node googRoot) { checkState(Es6RewriteModules.isEs6ModuleRoot(googRoot)); exportedNames = new HashSet<>(); - NodeTraversal.traverseEs6(compiler, googRoot, this); + NodeTraversal.traverse(compiler, googRoot, this); } private void visitExport(Node export) { @@ -158,7 +158,7 @@ private class ReferenceReplacer extends AbstractPostOrderCallback { public ReferenceReplacer(Node script, Node googImportNode) { this.googImportNode = googImportNode; - NodeTraversal.traverseEs6(compiler, script, this); + NodeTraversal.traverse(compiler, script, this); if (googImportNode.getSecondChild().isImportStar()) { if (hasBadExport) { @@ -309,7 +309,7 @@ private Node findGoogImportNode(Node scriptRoot) { public void hotSwapScript(Node scriptRoot, Node originalRoot) { if (Es6RewriteModules.isEs6ModuleRoot(scriptRoot)) { Node googImportNode = findGoogImportNode(scriptRoot); - NodeTraversal.traverseEs6(compiler, scriptRoot, new FindReexports(googImportNode != null)); + NodeTraversal.traverse(compiler, scriptRoot, new FindReexports(googImportNode != null)); // exportsFinder can be null in LINT_AND_REWRITE which indicates that goog.js is not part of // the input. Meaning we should just lint and do not do any rewriting. diff --git a/src/com/google/javascript/jscomp/RewriteJsonToModule.java b/src/com/google/javascript/jscomp/RewriteJsonToModule.java index 31910dc12af..3d8d05bf940 100644 --- a/src/com/google/javascript/jscomp/RewriteJsonToModule.java +++ b/src/com/google/javascript/jscomp/RewriteJsonToModule.java @@ -62,7 +62,7 @@ public ImmutableMap getPackageJsonMainEntries() { @Override public void process(Node externs, Node root) { checkState(root.isScript()); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/RewritePolyfills.java b/src/com/google/javascript/jscomp/RewritePolyfills.java index 486868de6cd..5f97103a46b 100644 --- a/src/com/google/javascript/jscomp/RewritePolyfills.java +++ b/src/com/google/javascript/jscomp/RewritePolyfills.java @@ -168,7 +168,7 @@ public RewritePolyfills(AbstractCompiler compiler) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { Traverser traverser = new Traverser(); - NodeTraversal.traverseEs6(compiler, scriptRoot, traverser); + NodeTraversal.traverse(compiler, scriptRoot, traverser); if (!traverser.libraries.isEmpty()) { Node lastNode = null; diff --git a/src/com/google/javascript/jscomp/RuntimeTypeCheck.java b/src/com/google/javascript/jscomp/RuntimeTypeCheck.java index 8436bbc9b8b..818d2a4f025 100644 --- a/src/com/google/javascript/jscomp/RuntimeTypeCheck.java +++ b/src/com/google/javascript/jscomp/RuntimeTypeCheck.java @@ -79,8 +79,8 @@ private String getName(JSType type) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new AddMarkers(compiler)); - NodeTraversal.traverseEs6(compiler, root, new AddChecks()); + NodeTraversal.traverse(compiler, root, new AddMarkers(compiler)); + NodeTraversal.traverse(compiler, root, new AddChecks()); addBoilerplateCode(); new Normalize(compiler, false).process(externs, root); } diff --git a/src/com/google/javascript/jscomp/ScopedAliases.java b/src/com/google/javascript/jscomp/ScopedAliases.java index 3833f8c90f9..16b034b8a76 100644 --- a/src/com/google/javascript/jscomp/ScopedAliases.java +++ b/src/com/google/javascript/jscomp/ScopedAliases.java @@ -148,7 +148,7 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node root, Node originalRoot) { Traversal traversal = new Traversal(); - NodeTraversal.traverseEs6(compiler, root, traversal); + NodeTraversal.traverse(compiler, root, traversal); if (!traversal.hasErrors()) { // Apply the aliases. @@ -635,7 +635,7 @@ private void renameNamespaceShadows(NodeTraversal t) { renamer.addDeclaredName(s, false); } MakeDeclaredNamesUnique uniquifier = new MakeDeclaredNamesUnique(renamer); - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(t.getScopeRoot()), uniquifier, true); } } diff --git a/src/com/google/javascript/jscomp/ShadowVariables.java b/src/com/google/javascript/jscomp/ShadowVariables.java index 5437526c390..1401373efaa 100644 --- a/src/com/google/javascript/jscomp/ShadowVariables.java +++ b/src/com/google/javascript/jscomp/ShadowVariables.java @@ -111,8 +111,8 @@ public void process(Node externs, Node root) { // variable usage frequency map. // // 3. Updates the pseudo naming map if needed. - NodeTraversal.traverseEs6(compiler, root, new GatherReferenceInfo()); - NodeTraversal.traverseEs6(compiler, root, new DoShadowVariables()); + NodeTraversal.traverse(compiler, root, new GatherReferenceInfo()); + NodeTraversal.traverse(compiler, root, new DoShadowVariables()); if (oldPseudoNameMap != null) { oldPseudoNameMap.putAll(deltaPseudoNameMap); diff --git a/src/com/google/javascript/jscomp/SideEffectsAnalysis.java b/src/com/google/javascript/jscomp/SideEffectsAnalysis.java index 71e7f05a36b..fb1bef803c3 100644 --- a/src/com/google/javascript/jscomp/SideEffectsAnalysis.java +++ b/src/com/google/javascript/jscomp/SideEffectsAnalysis.java @@ -769,7 +769,7 @@ LocationSummary calculateLocationSummary(Node node) { private Set findStorageLocationReferences(Node root) { final Set references = new HashSet<>(); - NodeTraversal.traverseEs6(compiler, root, new AbstractShallowCallback() { + NodeTraversal.traverse(compiler, root, new AbstractShallowCallback() { @Override public void visit(NodeTraversal t, Node n, Node parent) { if (NodeUtil.isGet(n) diff --git a/src/com/google/javascript/jscomp/StrictModeCheck.java b/src/com/google/javascript/jscomp/StrictModeCheck.java index 2f9a0c07d99..bb70bb67382 100644 --- a/src/com/google/javascript/jscomp/StrictModeCheck.java +++ b/src/com/google/javascript/jscomp/StrictModeCheck.java @@ -98,8 +98,8 @@ class StrictModeCheck extends AbstractPostOrderCallback } @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); - NodeTraversal.traverseEs6(compiler, root, new NonExternChecks()); + NodeTraversal.traverseRoots(compiler, this, externs, root); + NodeTraversal.traverse(compiler, root, new NonExternChecks()); } @Override public void visit(NodeTraversal t, Node n, Node parent) { diff --git a/src/com/google/javascript/jscomp/StripCode.java b/src/com/google/javascript/jscomp/StripCode.java index d64af6be0ec..5b6fb75a5fd 100644 --- a/src/com/google/javascript/jscomp/StripCode.java +++ b/src/com/google/javascript/jscomp/StripCode.java @@ -94,7 +94,7 @@ public void process(Node externs, Node root) { stripTypePrefixes.add(type + "."); } - NodeTraversal.traverseEs6(compiler, root, new Strip()); + NodeTraversal.traverse(compiler, root, new Strip()); } // ------------------------------------------------------------------------- diff --git a/src/com/google/javascript/jscomp/SubstituteEs6Syntax.java b/src/com/google/javascript/jscomp/SubstituteEs6Syntax.java index 52b4b6233c7..10a5f33b3ac 100644 --- a/src/com/google/javascript/jscomp/SubstituteEs6Syntax.java +++ b/src/com/google/javascript/jscomp/SubstituteEs6Syntax.java @@ -41,7 +41,7 @@ public void process(Node externs, Node root) { @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/TransformAMDToCJSModule.java b/src/com/google/javascript/jscomp/TransformAMDToCJSModule.java index 125a4ff59f4..c10fcc8010c 100644 --- a/src/com/google/javascript/jscomp/TransformAMDToCJSModule.java +++ b/src/com/google/javascript/jscomp/TransformAMDToCJSModule.java @@ -57,7 +57,7 @@ public TransformAMDToCJSModule(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, new TransformAMDModulesCallback()); + NodeTraversal.traverse(compiler, root, new TransformAMDModulesCallback()); } private static void unsupportedDefineError(NodeTraversal t, Node n) { @@ -124,7 +124,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { handleRequiresAndParamList(t, n, script, requiresNode, callback); Node callbackBlock = callback.getChildAtIndex(2); - NodeTraversal.traverseEs6(compiler, callbackBlock, + NodeTraversal.traverse(compiler, callbackBlock, new DefineCallbackReturnCallback()); moveCallbackContentToTopLevel(parent, script, callbackBlock); @@ -185,7 +185,7 @@ private void handleRequire(NodeTraversal t, Node defineNode, Node script, while (true) { String renamed = aliasName + VAR_RENAME_SUFFIX + renameIndex; if (!globalScope.hasSlot(renamed)) { - NodeTraversal.traverseEs6(compiler, callback, + NodeTraversal.traverse(compiler, callback, new RenameCallback(aliasName, renamed)); aliasName = renamed; break; diff --git a/src/com/google/javascript/jscomp/TranspilationPasses.java b/src/com/google/javascript/jscomp/TranspilationPasses.java index 2705aa9fbaf..fdedf2c6242 100644 --- a/src/com/google/javascript/jscomp/TranspilationPasses.java +++ b/src/com/google/javascript/jscomp/TranspilationPasses.java @@ -448,7 +448,7 @@ static void processTranspile( if (isScriptEs6OrHigher(singleRoot)) { for (Callback callback : callbacks) { singleRoot.putBooleanProp(Node.TRANSPILED, true); - NodeTraversal.traverseEs6(compiler, singleRoot, callback); + NodeTraversal.traverse(compiler, singleRoot, callback); } } } @@ -470,7 +470,7 @@ static void hotSwapTranspile( if (isScriptEs6OrHigher(scriptRoot)) { for (Callback callback : callbacks) { scriptRoot.putBooleanProp(Node.TRANSPILED, true); - NodeTraversal.traverseEs6(compiler, scriptRoot, callback); + NodeTraversal.traverse(compiler, scriptRoot, callback); } } } diff --git a/src/com/google/javascript/jscomp/TypeInfoCheck.java b/src/com/google/javascript/jscomp/TypeInfoCheck.java index 6dfaada6c68..6a514ac2492 100644 --- a/src/com/google/javascript/jscomp/TypeInfoCheck.java +++ b/src/com/google/javascript/jscomp/TypeInfoCheck.java @@ -30,13 +30,13 @@ final class TypeInfoCheck implements Callback, CompilerPass { public void setCheckSubTree(Node root) { requiresTypes = true; - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void process(Node externs, Node root) { requiresTypes = false; - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/TypedScopeCreator.java b/src/com/google/javascript/jscomp/TypedScopeCreator.java index d6eb6942ce8..284a7e7faa1 100644 --- a/src/com/google/javascript/jscomp/TypedScopeCreator.java +++ b/src/com/google/javascript/jscomp/TypedScopeCreator.java @@ -2246,9 +2246,9 @@ private class FirstOrderFunctionAnalyzer extends AbstractScopedCallback { void process(Node externs, Node root) { if (externs == null) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } else { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } } diff --git a/src/com/google/javascript/jscomp/UnreachableCodeElimination.java b/src/com/google/javascript/jscomp/UnreachableCodeElimination.java index 83c2cc530c7..42d7de5c309 100644 --- a/src/com/google/javascript/jscomp/UnreachableCodeElimination.java +++ b/src/com/google/javascript/jscomp/UnreachableCodeElimination.java @@ -74,7 +74,7 @@ public void enterChangeScopeRoot(AbstractCompiler compiler, Node root) { } do { codeChanged = false; - NodeTraversal.traverseEs6(compiler, root, new EliminationPass(cfg)); + NodeTraversal.traverse(compiler, root, new EliminationPass(cfg)); } while (codeChanged); } }); diff --git a/src/com/google/javascript/jscomp/VariableReferenceCheck.java b/src/com/google/javascript/jscomp/VariableReferenceCheck.java index fb991ae5b76..969292e035b 100644 --- a/src/com/google/javascript/jscomp/VariableReferenceCheck.java +++ b/src/com/google/javascript/jscomp/VariableReferenceCheck.java @@ -178,7 +178,7 @@ public void afterExitScope(NodeTraversal t, ReferenceMap referenceMap) { private void checkDefaultParam( Var param, final Scope scope, final Set varsInFunctionBody) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, param.getParentNode().getSecondChild(), /** diff --git a/src/com/google/javascript/jscomp/gwt/client/JsfileParser.java b/src/com/google/javascript/jscomp/gwt/client/JsfileParser.java index 240e452820b..d7e60110467 100644 --- a/src/com/google/javascript/jscomp/gwt/client/JsfileParser.java +++ b/src/com/google/javascript/jscomp/gwt/client/JsfileParser.java @@ -235,7 +235,7 @@ private static FileInfo parse(String code, String filename, @Nullable Reporter r parseComment(comment, info); } } - NodeTraversal.traverseEs6(compiler, parsed.ast, new Traverser(info)); + NodeTraversal.traverse(compiler, parsed.ast, new Traverser(info)); return info; } diff --git a/src/com/google/javascript/jscomp/ijs/ConvertToTypedInterface.java b/src/com/google/javascript/jscomp/ijs/ConvertToTypedInterface.java index a2c2dffca29..ee13eb6b1e3 100644 --- a/src/com/google/javascript/jscomp/ijs/ConvertToTypedInterface.java +++ b/src/com/google/javascript/jscomp/ijs/ConvertToTypedInterface.java @@ -123,8 +123,8 @@ public void process(Node externs, Node root) { private void processFile(Node scriptNode) { checkArgument(scriptNode.isScript()); FileInfo currentFile = new FileInfo(); - NodeTraversal.traverseEs6(compiler, scriptNode, new RemoveNonDeclarations()); - NodeTraversal.traverseEs6(compiler, scriptNode, new PropagateConstJsdoc(currentFile)); + NodeTraversal.traverse(compiler, scriptNode, new RemoveNonDeclarations()); + NodeTraversal.traverse(compiler, scriptNode, new PropagateConstJsdoc(currentFile)); new SimplifyDeclarations(compiler, currentFile).simplifyAll(); } diff --git a/src/com/google/javascript/jscomp/lint/CheckArrayWithGoogObject.java b/src/com/google/javascript/jscomp/lint/CheckArrayWithGoogObject.java index 1efef0752b5..ae488ee6d29 100644 --- a/src/com/google/javascript/jscomp/lint/CheckArrayWithGoogObject.java +++ b/src/com/google/javascript/jscomp/lint/CheckArrayWithGoogObject.java @@ -96,11 +96,11 @@ public void visit(NodeTraversal t, Node n, Node parent) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } } diff --git a/src/com/google/javascript/jscomp/lint/CheckDuplicateCase.java b/src/com/google/javascript/jscomp/lint/CheckDuplicateCase.java index d38ba1fae97..d335f135269 100644 --- a/src/com/google/javascript/jscomp/lint/CheckDuplicateCase.java +++ b/src/com/google/javascript/jscomp/lint/CheckDuplicateCase.java @@ -50,12 +50,12 @@ public CheckDuplicateCase(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckEmptyStatements.java b/src/com/google/javascript/jscomp/lint/CheckEmptyStatements.java index ff92427c64e..e972a02dbc8 100644 --- a/src/com/google/javascript/jscomp/lint/CheckEmptyStatements.java +++ b/src/com/google/javascript/jscomp/lint/CheckEmptyStatements.java @@ -39,7 +39,7 @@ public CheckEmptyStatements(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckEnums.java b/src/com/google/javascript/jscomp/lint/CheckEnums.java index 544d2ed4f97..a8c1e2cc344 100644 --- a/src/com/google/javascript/jscomp/lint/CheckEnums.java +++ b/src/com/google/javascript/jscomp/lint/CheckEnums.java @@ -52,7 +52,7 @@ public CheckEnums(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckInterfaces.java b/src/com/google/javascript/jscomp/lint/CheckInterfaces.java index e048ba9b0d9..0fb7d64c941 100644 --- a/src/com/google/javascript/jscomp/lint/CheckInterfaces.java +++ b/src/com/google/javascript/jscomp/lint/CheckInterfaces.java @@ -53,12 +53,12 @@ public CheckInterfaces(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } /** Whether a function is an interface constructor, or a method on an interface. */ diff --git a/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java b/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java index 65a89f0886e..8e56f1f2972 100644 --- a/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java +++ b/src/com/google/javascript/jscomp/lint/CheckJSDocStyle.java @@ -115,8 +115,8 @@ public CheckJSDocStyle(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); - NodeTraversal.traverseEs6(compiler, externs, new ExternsCallback()); + NodeTraversal.traverse(compiler, root, this); + NodeTraversal.traverse(compiler, externs, new ExternsCallback()); } @Override @@ -410,7 +410,7 @@ private void checkReturn(NodeTraversal t, Node function, JSDocInfo jsDoc) { } FindNonTrivialReturn finder = new FindNonTrivialReturn(); - NodeTraversal.traverseEs6(compiler, function.getLastChild(), finder); + NodeTraversal.traverse(compiler, function.getLastChild(), finder); if (finder.found) { t.report(function, MISSING_RETURN_JSDOC); } diff --git a/src/com/google/javascript/jscomp/lint/CheckMissingSemicolon.java b/src/com/google/javascript/jscomp/lint/CheckMissingSemicolon.java index 26f13ad8c8e..97e602543bc 100644 --- a/src/com/google/javascript/jscomp/lint/CheckMissingSemicolon.java +++ b/src/com/google/javascript/jscomp/lint/CheckMissingSemicolon.java @@ -42,7 +42,7 @@ public CheckMissingSemicolon(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckNullableReturn.java b/src/com/google/javascript/jscomp/lint/CheckNullableReturn.java index ce548c40c55..6cb220ddd21 100644 --- a/src/com/google/javascript/jscomp/lint/CheckNullableReturn.java +++ b/src/com/google/javascript/jscomp/lint/CheckNullableReturn.java @@ -158,11 +158,11 @@ public boolean shouldTraverse(NodeTraversal nodeTraversal, Node n, Node parent) @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, originalRoot, this); + NodeTraversal.traverse(compiler, originalRoot, this); } } diff --git a/src/com/google/javascript/jscomp/lint/CheckPrimitiveAsObject.java b/src/com/google/javascript/jscomp/lint/CheckPrimitiveAsObject.java index d4fd707b567..b9e94eee71f 100644 --- a/src/com/google/javascript/jscomp/lint/CheckPrimitiveAsObject.java +++ b/src/com/google/javascript/jscomp/lint/CheckPrimitiveAsObject.java @@ -56,12 +56,12 @@ public CheckPrimitiveAsObject(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckPrototypeProperties.java b/src/com/google/javascript/jscomp/lint/CheckPrototypeProperties.java index 412ef06eb0a..970e57b4544 100644 --- a/src/com/google/javascript/jscomp/lint/CheckPrototypeProperties.java +++ b/src/com/google/javascript/jscomp/lint/CheckPrototypeProperties.java @@ -52,12 +52,12 @@ public CheckPrototypeProperties(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, originalRoot, this); + NodeTraversal.traverse(compiler, originalRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckRedundantNullabilityModifier.java b/src/com/google/javascript/jscomp/lint/CheckRedundantNullabilityModifier.java index 7595cbaf9bf..0f2b77d1942 100644 --- a/src/com/google/javascript/jscomp/lint/CheckRedundantNullabilityModifier.java +++ b/src/com/google/javascript/jscomp/lint/CheckRedundantNullabilityModifier.java @@ -52,7 +52,7 @@ public CheckRedundantNullabilityModifier(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6(compiler, this, externs, root); + NodeTraversal.traverseRoots(compiler, this, externs, root); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckRequiresAndProvidesSorted.java b/src/com/google/javascript/jscomp/lint/CheckRequiresAndProvidesSorted.java index 6f788142955..2a1722af4cc 100644 --- a/src/com/google/javascript/jscomp/lint/CheckRequiresAndProvidesSorted.java +++ b/src/com/google/javascript/jscomp/lint/CheckRequiresAndProvidesSorted.java @@ -68,12 +68,12 @@ public CheckRequiresAndProvidesSorted(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } public static final String getSortKey(Node n) { diff --git a/src/com/google/javascript/jscomp/lint/CheckUnusedLabels.java b/src/com/google/javascript/jscomp/lint/CheckUnusedLabels.java index d6e7f123db6..2ef000539dd 100644 --- a/src/com/google/javascript/jscomp/lint/CheckUnusedLabels.java +++ b/src/com/google/javascript/jscomp/lint/CheckUnusedLabels.java @@ -54,12 +54,12 @@ public CheckUnusedLabels(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } @Override diff --git a/src/com/google/javascript/jscomp/lint/CheckUselessBlocks.java b/src/com/google/javascript/jscomp/lint/CheckUselessBlocks.java index e93d93ca144..62b3a541e1b 100644 --- a/src/com/google/javascript/jscomp/lint/CheckUselessBlocks.java +++ b/src/com/google/javascript/jscomp/lint/CheckUselessBlocks.java @@ -59,12 +59,12 @@ public CheckUselessBlocks(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override public void hotSwapScript(Node scriptRoot, Node originalRoot) { - NodeTraversal.traverseEs6(compiler, scriptRoot, this); + NodeTraversal.traverse(compiler, scriptRoot, this); } /** diff --git a/test/com/google/javascript/jscomp/DeadAssignmentsEliminationTest.java b/test/com/google/javascript/jscomp/DeadAssignmentsEliminationTest.java index ed299be94d3..2323eee1d4b 100644 --- a/test/com/google/javascript/jscomp/DeadAssignmentsEliminationTest.java +++ b/test/com/google/javascript/jscomp/DeadAssignmentsEliminationTest.java @@ -39,7 +39,7 @@ protected CompilerPass getProcessor(final Compiler compiler) { return new CompilerPass() { @Override public void process(Node externs, Node js) { - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, js, new DeadAssignmentsElimination(compiler)); } }; diff --git a/test/com/google/javascript/jscomp/DefinitionUseSiteFinderTest.java b/test/com/google/javascript/jscomp/DefinitionUseSiteFinderTest.java index b2d6275e6ac..e0164f56d26 100644 --- a/test/com/google/javascript/jscomp/DefinitionUseSiteFinderTest.java +++ b/test/com/google/javascript/jscomp/DefinitionUseSiteFinderTest.java @@ -577,8 +577,8 @@ private class DefinitionEnumerator @Override public void process(Node externs, Node root) { passUnderTest.process(externs, root); - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, root, this); buildFound(passUnderTest, found); } diff --git a/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java b/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java index d4dc57f9ec1..549972c3de5 100644 --- a/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java +++ b/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java @@ -84,7 +84,7 @@ protected CompilerPass getProcessor(final Compiler compiler) { // Create a pass that removes all the definitions. return (Node externs, Node root) -> { DefinitionsGatherer definitionsGatherer = new DefinitionsGatherer(); - NodeTraversal.traverseEs6(compiler, root, definitionsGatherer); + NodeTraversal.traverse(compiler, root, definitionsGatherer); for (Definition def : definitionsGatherer.definitions) { def.remove(compiler); } diff --git a/test/com/google/javascript/jscomp/DenormalizeTest.java b/test/com/google/javascript/jscomp/DenormalizeTest.java index 51302fcc15d..8166bcfb770 100644 --- a/test/com/google/javascript/jscomp/DenormalizeTest.java +++ b/test/com/google/javascript/jscomp/DenormalizeTest.java @@ -328,7 +328,7 @@ public NormalizeAndDenormalizePass(AbstractCompiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, normalizePass); + NodeTraversal.traverse(compiler, root, normalizePass); denormalizePass.process(externs, root); } } diff --git a/test/com/google/javascript/jscomp/FunctionInjectorTest.java b/test/com/google/javascript/jscomp/FunctionInjectorTest.java index b5fb57aca8d..a27a12894b7 100644 --- a/test/com/google/javascript/jscomp/FunctionInjectorTest.java +++ b/test/com/google/javascript/jscomp/FunctionInjectorTest.java @@ -1528,7 +1528,7 @@ public boolean call(NodeTraversal t, Node n, Node parent) { compiler.resetUniqueNameId(); TestCallback test = new TestCallback(fnName, tester); - NodeTraversal.traverseEs6(compiler, tree, test); + NodeTraversal.traverse(compiler, tree, test); } private void validateSourceInfo(Compiler compiler, Node subtree) { @@ -1623,7 +1623,7 @@ public boolean call(NodeTraversal t, Node n, Node parent) { ChangeVerifier verifier = new ChangeVerifier(compiler).snapshot(mainRoot); TestCallback test = new TestCallback(fnName, tester); - NodeTraversal.traverseEs6(compiler, tree, test); + NodeTraversal.traverse(compiler, tree, test); verifier.checkRecordedChanges("helperInlineReferenceToFunction", mainRoot); } diff --git a/test/com/google/javascript/jscomp/FunctionToBlockMutatorTest.java b/test/com/google/javascript/jscomp/FunctionToBlockMutatorTest.java index 25f9d8d92f9..128b1fefcd3 100644 --- a/test/com/google/javascript/jscomp/FunctionToBlockMutatorTest.java +++ b/test/com/google/javascript/jscomp/FunctionToBlockMutatorTest.java @@ -291,7 +291,7 @@ public void helperMutate(String code, String expectedResult, String fnName, Stri compiler.resetUniqueNameId(); TestCallback test = new TestCallback(fnName, tester); - NodeTraversal.traverseEs6(compiler, script, test); + NodeTraversal.traverse(compiler, script, test); } @FunctionalInterface diff --git a/test/com/google/javascript/jscomp/InferConstsTest.java b/test/com/google/javascript/jscomp/InferConstsTest.java index 8ed7d8702eb..1b0f2992e1a 100644 --- a/test/com/google/javascript/jscomp/InferConstsTest.java +++ b/test/com/google/javascript/jscomp/InferConstsTest.java @@ -44,7 +44,7 @@ public CompilerPass getProcessor(final Compiler compiler) { @Override public void process(Node externs, Node root) { new InferConsts(compiler).process(externs, root); - NodeTraversal.traverseEs6(compiler, root, constFinder); + NodeTraversal.traverse(compiler, root, constFinder); } }; } diff --git a/test/com/google/javascript/jscomp/JsMessageVisitorTest.java b/test/com/google/javascript/jscomp/JsMessageVisitorTest.java index b71df8f2026..3d0ff8bcddc 100644 --- a/test/com/google/javascript/jscomp/JsMessageVisitorTest.java +++ b/test/com/google/javascript/jscomp/JsMessageVisitorTest.java @@ -820,7 +820,7 @@ private void extractMessages(String input) { JsMessageVisitor visitor = new CollectMessages(compiler); if (renameMessages) { RenameMessagesVisitor renameMessagesVisitor = new RenameMessagesVisitor(); - NodeTraversal.traverseEs6(compiler, root, renameMessagesVisitor); + NodeTraversal.traverse(compiler, root, renameMessagesVisitor); } visitor.process(null, root); } diff --git a/test/com/google/javascript/jscomp/MakeDeclaredNamesUniqueTest.java b/test/com/google/javascript/jscomp/MakeDeclaredNamesUniqueTest.java index b921cf14cce..7e09d2bfbef 100644 --- a/test/com/google/javascript/jscomp/MakeDeclaredNamesUniqueTest.java +++ b/test/com/google/javascript/jscomp/MakeDeclaredNamesUniqueTest.java @@ -49,7 +49,7 @@ public void process(Node externs, Node root) { renamer = new MakeDeclaredNamesUnique(new InlineRenamer(compiler.getCodingConvention(), compiler.getUniqueNameIdSupplier(), localNamePrefix, removeConst, true, null)); } - NodeTraversal.traverseRootsEs6(compiler, renamer, externs, root); + NodeTraversal.traverseRoots(compiler, renamer, externs, root); } }; } else { diff --git a/test/com/google/javascript/jscomp/MarkNoSideEffectCallsTest.java b/test/com/google/javascript/jscomp/MarkNoSideEffectCallsTest.java index 5606978b5b3..95136cad4f0 100644 --- a/test/com/google/javascript/jscomp/MarkNoSideEffectCallsTest.java +++ b/test/com/google/javascript/jscomp/MarkNoSideEffectCallsTest.java @@ -261,8 +261,8 @@ private class NoSideEffectCallEnumerator @Override public void process(Node externs, Node root) { passUnderTest.process(externs, root); - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java b/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java index 8d19e8530a5..e542cc074d2 100644 --- a/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java +++ b/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java @@ -226,7 +226,7 @@ private void computeDefUse(String src) { defUse.analyze(); def = null; use = null; - NodeTraversal.traverseEs6(compiler, root, new LabelFinder()); + NodeTraversal.traverse(compiler, root, new LabelFinder()); assertNotNull("Code should have an instruction labeled D", def); assertNotNull("Code should have an instruction labeled U", use); } diff --git a/test/com/google/javascript/jscomp/NodeTraversalTest.java b/test/com/google/javascript/jscomp/NodeTraversalTest.java index 1a43e220605..4586a4f713b 100644 --- a/test/com/google/javascript/jscomp/NodeTraversalTest.java +++ b/test/com/google/javascript/jscomp/NodeTraversalTest.java @@ -118,7 +118,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { try { String code = "function foo() {}"; Node tree = parse(compiler, code); - NodeTraversal.traverseEs6(compiler, tree, cb); + NodeTraversal.traverse(compiler, tree, cb); fail("Expected RuntimeException"); } catch (RuntimeException e) { assertThat(e) @@ -136,7 +136,7 @@ public void testGetScopeRoot() { " var b", "}"); Node tree = parse(compiler, code); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( compiler, tree, new NodeTraversal.ScopedCallback() { @@ -169,7 +169,7 @@ public void testGetHoistScopeRoot() { " if (true) { var XXX; }", "}"); Node tree = parse(compiler, code); - NodeTraversal.traverseEs6(compiler, tree, + NodeTraversal.traverse(compiler, tree, new NodeTraversal.Callback() { @Override @@ -252,7 +252,7 @@ private void assertChangesRecorded(String code, NodeTraversal.Callback callback) Node tree = parseRoots(compiler, externs, code); ChangeVerifier changeVerifier = new ChangeVerifier(compiler).snapshot(tree); - NodeTraversal.traverseRootsEs6( + NodeTraversal.traverseRoots( compiler, callback, tree.getFirstChild(), tree.getSecondChild()); changeVerifier.checkRecordedChanges(tree); } @@ -268,7 +268,7 @@ public void testGetLineNoAndGetCharno() { + "}"; Node tree = parse(compiler, code); final StringBuilder builder = new StringBuilder(); - NodeTraversal.traverseEs6(compiler, tree, + NodeTraversal.traverse(compiler, tree, new NodeTraversal.ScopedCallback() { @Override @@ -580,14 +580,14 @@ public void testTraverseEs6ScopeRoots_isLimitedToScope() { Node fooFunction = tree.getFirstChild(); // Traverse without entering nested scopes. - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fooFunction), callback, false); assertThat(callback.strings).containsExactly("string in foo"); callback.strings.clear(); // Traverse *with* entering nested scopes, now also sees "string nested in baz". - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fooFunction), callback, true); assertThat(callback.strings).containsExactly("string in foo", "string nested in baz"); } @@ -613,7 +613,7 @@ public void testTraverseEs6ScopeRoots_parentScopesWork() { Node fooFunction = tree.getSecondChild().getFirstFirstChild(); // Traverse without entering nested scopes. - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fooFunction), callback, false); assertThat(callback.varNames) .containsExactly("varDefinedInScript", "foo", "bar", "varDefinedInFoo", "baz"); @@ -621,7 +621,7 @@ public void testTraverseEs6ScopeRoots_parentScopesWork() { callback.varNames.clear(); // Traverse *with* entering nested scopes, now also sees "varDefinedInBaz". - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fooFunction), callback, true); assertThat(callback.varNames) .containsExactly( @@ -642,7 +642,7 @@ public void testTraverseEs6ScopeRoots_callsEnterFunction() { Node barFunction = fooFunction.getNext(); Node bazFunction = barFunction.getNext(); - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fooFunction, barFunction, bazFunction), @@ -681,7 +681,7 @@ public void exitScope(NodeTraversal t) {} Node tree = parse(compiler, code); Node fooFunction = tree.getFirstChild(); - NodeTraversal.traverseEs6ScopeRoots( + NodeTraversal.traverseScopeRoots( compiler, null, ImmutableList.of(fooFunction), @@ -704,14 +704,14 @@ public void visit(NodeTraversal t, Node n, Node parent) { } }; - NodeTraversal.traverseEs6(compiler, tree, countingCallback); + NodeTraversal.traverse(compiler, tree, countingCallback); assertThat(counter.get()).isEqualTo(3); counter.set(0); Thread.currentThread().interrupt(); try { - NodeTraversal.traverseEs6(compiler, tree, countingCallback); + NodeTraversal.traverse(compiler, tree, countingCallback); fail("Expected a RuntimeException;"); } catch (RuntimeException e) { assertThat(e).hasCauseThat().hasCauseThat().isInstanceOf(InterruptedException.class); diff --git a/test/com/google/javascript/jscomp/NormalizeTest.java b/test/com/google/javascript/jscomp/NormalizeTest.java index c67638cdc7e..c73e85347de 100644 --- a/test/com/google/javascript/jscomp/NormalizeTest.java +++ b/test/com/google/javascript/jscomp/NormalizeTest.java @@ -871,7 +871,7 @@ public void testShadowFunctionName() { private Set findNodesWithProperty(Node root, final byte prop) { final Set set = new HashSet<>(); - NodeTraversal.traverseEs6( + NodeTraversal.traverse( getLastCompiler(), root, new AbstractPostOrderCallback() { diff --git a/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java b/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java index 5f1f890bf2a..9f23ddcd3ce 100644 --- a/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java +++ b/test/com/google/javascript/jscomp/PolymerClassRewriterTest.java @@ -165,7 +165,7 @@ private void parseAndRewrite(String code, int version) { globalNamespace = new GlobalNamespace(compiler, rootNode); PolymerPassFindExterns findExternsCallback = new PolymerPassFindExterns(); Node externs = compiler.parseTestCode(EXTERNS); - NodeTraversal.traverseEs6(compiler, externs, findExternsCallback); + NodeTraversal.traverse(compiler, externs, findExternsCallback); rewriter = new PolymerClassRewriter( diff --git a/test/com/google/javascript/jscomp/PolymerPassFindExternsTest.java b/test/com/google/javascript/jscomp/PolymerPassFindExternsTest.java index 3b33b2becfa..b8de1b10682 100644 --- a/test/com/google/javascript/jscomp/PolymerPassFindExternsTest.java +++ b/test/com/google/javascript/jscomp/PolymerPassFindExternsTest.java @@ -67,7 +67,7 @@ protected CompilerPass getProcessor(final Compiler compiler) { return new CompilerPass() { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, externs, findExternsCallback); + NodeTraversal.traverse(compiler, externs, findExternsCallback); } }; } diff --git a/test/com/google/javascript/jscomp/PolymerPassSuppressBehaviorsTest.java b/test/com/google/javascript/jscomp/PolymerPassSuppressBehaviorsTest.java index 0d8d73691f9..964803e399d 100644 --- a/test/com/google/javascript/jscomp/PolymerPassSuppressBehaviorsTest.java +++ b/test/com/google/javascript/jscomp/PolymerPassSuppressBehaviorsTest.java @@ -67,7 +67,7 @@ protected CompilerPass getProcessor(final Compiler compiler) { public void process(Node externs, Node root) { PolymerPassSuppressBehaviors suppressBehaviorsCallback = new PolymerPassSuppressBehaviors(compiler); - NodeTraversal.traverseEs6(compiler, root, suppressBehaviorsCallback); + NodeTraversal.traverse(compiler, root, suppressBehaviorsCallback); } }; } diff --git a/test/com/google/javascript/jscomp/PureFunctionIdentifierTest.java b/test/com/google/javascript/jscomp/PureFunctionIdentifierTest.java index 78344bb54e0..7cbed5942cc 100644 --- a/test/com/google/javascript/jscomp/PureFunctionIdentifierTest.java +++ b/test/com/google/javascript/jscomp/PureFunctionIdentifierTest.java @@ -227,8 +227,8 @@ public void process(Node externs, Node root) { // Ensure that debug report computation doesn't crash. pureFunctionIdentifier.getDebugReport(); - NodeTraversal.traverseEs6(compiler, externs, this); - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, externs, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/test/com/google/javascript/jscomp/ReplaceStringsTest.java b/test/com/google/javascript/jscomp/ReplaceStringsTest.java index fcd088f1bd0..11beea6119f 100644 --- a/test/com/google/javascript/jscomp/ReplaceStringsTest.java +++ b/test/com/google/javascript/jscomp/ReplaceStringsTest.java @@ -130,13 +130,13 @@ public void process(Node externs, Node js) { propertiesToErrorFor.put("foobar", CheckLevel.ERROR); if (rename) { - NodeTraversal.traverseEs6(compiler, js, new Renamer()); + NodeTraversal.traverse(compiler, js, new Renamer()); } new CollapseProperties(compiler, PropertyCollapseLevel.ALL).process(externs, js); if (runDisambiguateProperties) { SourceInformationAnnotator sia = new SourceInformationAnnotator("test", false /* checkAnnotated */); - NodeTraversal.traverseEs6(compiler, js, sia); + NodeTraversal.traverse(compiler, js, sia); new DisambiguateProperties(compiler, propertiesToErrorFor).process(externs, js); } diff --git a/test/com/google/javascript/jscomp/ScopedAliasesTest.java b/test/com/google/javascript/jscomp/ScopedAliasesTest.java index 2ab534ef40d..68d566e1329 100644 --- a/test/com/google/javascript/jscomp/ScopedAliasesTest.java +++ b/test/com/google/javascript/jscomp/ScopedAliasesTest.java @@ -1254,7 +1254,7 @@ public TypeVerifyingPass(Compiler compiler) { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, this); + NodeTraversal.traverse(compiler, root, this); } @Override diff --git a/test/com/google/javascript/jscomp/SideEffectsAnalysisTest.java b/test/com/google/javascript/jscomp/SideEffectsAnalysisTest.java index e96df96bb3e..a1c7ceeefc8 100644 --- a/test/com/google/javascript/jscomp/SideEffectsAnalysisTest.java +++ b/test/com/google/javascript/jscomp/SideEffectsAnalysisTest.java @@ -608,7 +608,7 @@ private SideEffectsAnalysis compileAndRun(String js, private Node findLabeledStatement(String label) { LabeledStatementSearcher s = new LabeledStatementSearcher(label); - NodeTraversal.traverseEs6(getLastCompiler(), getLastCompiler().jsRoot, s); + NodeTraversal.traverse(getLastCompiler(), getLastCompiler().jsRoot, s); assertNotNull("Label " + label + " should be in the source code", s.found); return s.found; diff --git a/test/com/google/javascript/jscomp/SourceInformationAnnotatorTest.java b/test/com/google/javascript/jscomp/SourceInformationAnnotatorTest.java index 360780ba621..bef6dccd856 100644 --- a/test/com/google/javascript/jscomp/SourceInformationAnnotatorTest.java +++ b/test/com/google/javascript/jscomp/SourceInformationAnnotatorTest.java @@ -29,7 +29,7 @@ protected CompilerPass getProcessor(final Compiler compiler) { return new CompilerPass() { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseEs6(compiler, root, + NodeTraversal.traverse(compiler, root, new SourceInformationAnnotator("", false)); }}; } @@ -40,7 +40,7 @@ public void testPreserveAnnotatedName() { name.setOriginalName("bar"); root.addChildToBack(name); - NodeTraversal.traverseEs6(new Compiler(), root, + NodeTraversal.traverse(new Compiler(), root, new SourceInformationAnnotator("", false)); assertEquals("bar", name.getOriginalName()); } diff --git a/test/com/google/javascript/jscomp/VarCheckTest.java b/test/com/google/javascript/jscomp/VarCheckTest.java index 9aeb87491ea..c74114fa0c9 100644 --- a/test/com/google/javascript/jscomp/VarCheckTest.java +++ b/test/com/google/javascript/jscomp/VarCheckTest.java @@ -772,7 +772,7 @@ private static final class VariableTestCheck implements CompilerPass { @Override public void process(Node externs, Node root) { - NodeTraversal.traverseRootsEs6( + NodeTraversal.traverseRoots( compiler, new AbstractPostOrderCallback() { @Override diff --git a/test/com/google/javascript/jscomp/VariableVisibilityAnalysisTest.java b/test/com/google/javascript/jscomp/VariableVisibilityAnalysisTest.java index bc14d7abac4..5985aff5d23 100644 --- a/test/com/google/javascript/jscomp/VariableVisibilityAnalysisTest.java +++ b/test/com/google/javascript/jscomp/VariableVisibilityAnalysisTest.java @@ -174,7 +174,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { } }; - NodeTraversal.traverseEs6(getLastCompiler(), getLastCompiler().jsRoot, findParameter); + NodeTraversal.traverse(getLastCompiler(), getLastCompiler().jsRoot, findParameter); return foundNode[0]; } @@ -201,7 +201,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { } }; - NodeTraversal.traverseEs6(getLastCompiler(), getLastCompiler().jsRoot, findFunction); + NodeTraversal.traverse(getLastCompiler(), getLastCompiler().jsRoot, findFunction); return foundNode[0]; } @@ -210,7 +210,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { private Node searchLabel(String label) { LabeledVariableSearcher s = new LabeledVariableSearcher(label); - NodeTraversal.traverseEs6(getLastCompiler(), getLastCompiler().jsRoot, s); + NodeTraversal.traverse(getLastCompiler(), getLastCompiler().jsRoot, s); assertNotNull("Label " + label + " should be in the source code", s.found); return s.found;