[royale-compiler] 01/06: revert back to original passes

[aharui]

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch ReleaseModules
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 29eea23bc52d621c22c35c08b15b3c804c9e0f9e
Author: Alex Harui <aha...@apache.org>
AuthorDate: Tue Jan 11 00:28:53 2022 -0800

    revert back to original passes
---
 .../javascript/jscomp/RoyaleClosurePassConfig.java | 33 ++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git 
a/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleClosurePassConfig.java
 
b/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleClosurePassConfig.java
index fef8ed8..b07142b 100644
--- 
a/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleClosurePassConfig.java
+++ 
b/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleClosurePassConfig.java
@@ -1358,13 +1358,20 @@ public final class RoyaleClosurePassConfig extends 
PassConfig {
                @Override
         protected HotSwapCompilerPass create(final AbstractCompiler compiler) {
           preprocessorSymbolTableFactory.maybeInitialize(compiler);
+          /*
           final ProcessClosurePrimitivesWithModuleSupport pass =
               new ProcessClosurePrimitivesWithModuleSupport(
                   compiler,
                   preprocessorSymbolTableFactory.getInstanceOrNull(),
                   options.brokenClosureRequiresLevel,
                   options.shouldPreservesGoogProvidesAndRequires());
-
+                 */
+          final ProcessClosurePrimitives pass =
+                  new ProcessClosurePrimitives(
+                      compiler,
+                      preprocessorSymbolTableFactory.getInstanceOrNull(),
+                      options.brokenClosureRequiresLevel,
+                      options.shouldPreservesGoogProvidesAndRequires());
           return new HotSwapCompilerPass() {
             @Override
             public void process(Node externs, Node root) {
@@ -2472,7 +2479,8 @@ public final class RoyaleClosurePassConfig extends 
PassConfig {
       new PassFactory(PassNames.COLLAPSE_PROPERTIES, true) {
         @Override
         protected CompilerPass create(AbstractCompiler compiler) {
-          return new CollapsePropertiesWithModuleSupport(compiler, 
options.getPropertyCollapseLevel(), sourceFileName, varRenameMapFile);
+          //return new CollapsePropertiesWithModuleSupport(compiler, 
options.getPropertyCollapseLevel(), sourceFileName, varRenameMapFile);
+          return new CollapseProperties(compiler, 
options.getPropertyCollapseLevel());
         }
 
         @Override
@@ -3099,6 +3107,7 @@ public final class RoyaleClosurePassConfig extends 
PassConfig {
           return new CompilerPass() {
             @Override
             public void process(Node externs, Node root) {
+              /*
               RenamePropertiesWithModuleSupport rprop =
                   new RenamePropertiesWithModuleSupport(
                       compiler,
@@ -3108,6 +3117,12 @@ public final class RoyaleClosurePassConfig extends 
PassConfig {
                       options.getPropertyReservedNamingNonFirstChars(),
                       options.nameGenerator,
                       null);
+              */
+              RenameProperties rprop = 
+                         new RenameProperties(
+                                         compiler,
+                                         options.generatePseudoNames,
+                              options.nameGenerator);
               rprop.process(externs, root);
               compiler.setPropertyMap(rprop.getPropertyMap());
             }
@@ -3152,6 +3167,7 @@ public final class RoyaleClosurePassConfig extends 
PassConfig {
     }
     reservedNames.addAll(compiler.getExportedNames());
     reservedNames.addAll(ParserRunner.getReservedVars());
+    /*
     RenameVarsWithModuleSupport rn = new RenameVarsWithModuleSupport(
         compiler,
         options.renamePrefix,
@@ -3164,6 +3180,19 @@ public final class RoyaleClosurePassConfig extends 
PassConfig {
         reservedChars,
         reservedNames,
         options.nameGenerator);
+    */
+    RenameVars rn = new RenameVars(
+            compiler,
+            options.renamePrefix,
+            options.variableRenaming == VariableRenamingPolicy.LOCAL,
+            preserveAnonymousFunctionNames,
+            options.generatePseudoNames,
+            options.shadowVariables,
+            options.preferStableNames,
+            prevVariableMap,
+            reservedChars,
+            reservedNames,
+               options.nameGenerator);
     rn.process(externs, root);
     return rn.getVariableMap();
   }