Rollback "Separated Es6ToEs3Converter into two passes"

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164942628
google · Aug 11, 2017 · eb944ea · eb944ea
1 parent eeb3334
commit eb944ea
Show file tree

Hide file tree

Showing 19 changed files with 270 additions and 425 deletions.
diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java
@@ -184,7 +184,6 @@ protected List<PassFactory> getTranspileOnlyPasses() {
     if (options.needsTranspilationFrom(ES6) || options.needsTranspilationFrom(ES7)) {
       TranspilationPasses.addEs6EarlyPasses(passes);
       TranspilationPasses.addEs6LatePasses(passes);
-      TranspilationPasses.addEs6PassesAfterNTI(passes);
       TranspilationPasses.addPostCheckPasses(passes);
       if (options.rewritePolyfills) {
         TranspilationPasses.addRewritePolyfillPass(passes);
@@ -374,7 +373,6 @@ protected List<PassFactory> getChecks() {
 
     if (options.needsTranspilationFrom(ES6)) {
       TranspilationPasses.addEs6LatePasses(checks);
-      TranspilationPasses.addEs6PassesAfterNTI(checks);
       if (options.rewritePolyfills) {
         TranspilationPasses.addRewritePolyfillPass(checks);
       }
@@ -391,7 +389,7 @@ protected List<PassFactory> getChecks() {
       checks.add(convertStaticInheritance);
     }
 
-    // End of ES6 transpilation passes before NTI.
+    // End of ES6 transpilation passes.
 
     if (!options.skipNonTranspilationPasses) {
       addNonTranspilationCheckPasses(checks);

diff --git a/src/com/google/javascript/jscomp/Es6ConvertSuper.java b/src/com/google/javascript/jscomp/Es6ConvertSuper.java
@@ -16,7 +16,7 @@
 package com.google.javascript.jscomp;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.javascript.jscomp.Es6ToEs3Util.CANNOT_CONVERT_YET;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.CANNOT_CONVERT_YET;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
@@ -30,7 +30,7 @@
 /**
  * Converts {@code super.method()} calls and adds constructors to any classes that lack them.
  *
- * <p>This has to run before the main {@link Es6RewriteClass} pass. The super() constructor calls
+ * <p>This has to run before the main {@link Es6ToEs3Converter} pass. The super() constructor calls
  * are not converted here, but rather in {@link Es6ConvertSuperConstructorCalls}, which runs later.
  */
 public final class Es6ConvertSuper extends NodeTraversal.AbstractPostOrderCallback

diff --git a/src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java b/src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java
@@ -18,7 +18,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.javascript.jscomp.Es6ToEs3Util.CANNOT_CONVERT;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.CANNOT_CONVERT;
 
 import com.google.javascript.jscomp.GlobalNamespace.Name;
 import com.google.javascript.jscomp.GlobalNamespace.Ref;

diff --git a/src/com/google/javascript/jscomp/Es6ExtractClasses.java b/src/com/google/javascript/jscomp/Es6ExtractClasses.java
@@ -17,7 +17,7 @@
 package com.google.javascript.jscomp;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.javascript.jscomp.Es6ToEs3Util.CANNOT_CONVERT;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.CANNOT_CONVERT;
 
 import com.google.javascript.jscomp.ExpressionDecomposer.DecompositionType;
 import com.google.javascript.jscomp.deps.ModuleNames;
@@ -42,7 +42,7 @@
  *   foo($jscomp$classdecl$var0);
  * </code>
  * <p>
- * This must be done before {@link Es6RewriteClass}, because that pass only handles classes
+ * This must be done before {@link Es6ToEs3Converter}, because that pass only handles classes
  * that are declarations or simple assignments.
  * @see Es6RewriteClass#visitClass(NodeTraversal, Node, Node)
  */

diff --git a/src/com/google/javascript/jscomp/Es6RewriteClass.java b/src/com/google/javascript/jscomp/Es6RewriteClass.java
@@ -17,8 +17,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.javascript.jscomp.Es6ToEs3Util.CANNOT_CONVERT;
-import static com.google.javascript.jscomp.Es6ToEs3Util.CANNOT_CONVERT_YET;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.CANNOT_CONVERT;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.CANNOT_CONVERT_YET;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;

diff --git a/src/com/google/javascript/jscomp/Es6RewriteDestructuring.java b/src/com/google/javascript/jscomp/Es6RewriteDestructuring.java
@@ -17,7 +17,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.javascript.jscomp.Es6ToEs3Util.makeIterator;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.makeIterator;
 
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.JSDocInfo;

diff --git a/src/com/google/javascript/jscomp/Es6RewriteGenerators.java b/src/com/google/javascript/jscomp/Es6RewriteGenerators.java
@@ -17,7 +17,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.javascript.jscomp.Es6ToEs3Util.makeIterator;
+import static com.google.javascript.jscomp.Es6ToEs3Converter.makeIterator;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Supplier;
@@ -513,7 +513,7 @@ private void visitBreak() {
         compiler.report(
             JSError.make(
                 currentStatement,
-                Es6ToEs3Util.CANNOT_CONVERT_YET,
+                Es6ToEs3Converter.CANNOT_CONVERT_YET,
                 "Breaking to a label that is not a loop"));
         return;
       }
@@ -637,7 +637,7 @@ private void visitSwitch() {
           compiler.report(
               JSError.make(
                   currentStatement,
-                  Es6ToEs3Util.CANNOT_CONVERT_YET,
+                  Es6ToEs3Converter.CANNOT_CONVERT_YET,
                   "Default case as intermediate case"));
         }
         equivBlock = IR.block(currCase.removeFirstChild());
@@ -1008,7 +1008,7 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
             compiler.report(
                 JSError.make(
                     n,
-                    Es6ToEs3Util.CANNOT_CONVERT_YET,
+                    Es6ToEs3Converter.CANNOT_CONVERT_YET,
                     "Case statements that contain yields"));
             return false;
           }
@@ -1029,7 +1029,7 @@ private void visitYieldExpression(NodeTraversal t, Node n) {
         t.reportCodeChange();
       } else {
         compiler.report(
-            JSError.make(n, Es6ToEs3Util.CANNOT_CONVERT, "Undecomposable expression"));
+            JSError.make(n, Es6ToEs3Converter.CANNOT_CONVERT, "Undecomposable expression"));
       }
     }
 

diff --git a/src/com/google/javascript/jscomp/Es6RewriteModules.java b/src/com/google/javascript/jscomp/Es6RewriteModules.java
@@ -324,7 +324,7 @@ private void visitExport(NodeTraversal t, Node export, Node parent) {
       }
     } else if (export.getBooleanProp(Node.EXPORT_ALL_FROM)) {
       //   export * from 'moduleIdentifier';
-      compiler.report(JSError.make(export, Es6ToEs3Util.CANNOT_CONVERT_YET,
+      compiler.report(JSError.make(export, Es6ToEs3Converter.CANNOT_CONVERT_YET,
           "Wildcard export"));
     } else if (export.hasTwoChildren()) {
       //   export {x, y as z} from 'moduleIdentifier';