Rename JsDelegationRemover to JsInliner. Patch by: bobv Review by: scottb git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1522 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java index 70c616c..71949bb 100644 --- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java +++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -49,7 +49,7 @@ import com.google.gwt.dev.jjs.impl.ReplaceRebinds; import com.google.gwt.dev.jjs.impl.TypeMap; import com.google.gwt.dev.jjs.impl.TypeTightener; -import com.google.gwt.dev.js.JsDelegationRemover; +import com.google.gwt.dev.js.JsInliner; import com.google.gwt.dev.js.JsNormalizer; import com.google.gwt.dev.js.JsObfuscateNamer; import com.google.gwt.dev.js.JsPrettyNamer; @@ -397,8 +397,8 @@ // (10) Apply optimizations to JavaScript AST do { didChange = false; - // Remove delegating/trampoline functions - didChange = JsDelegationRemover.exec(jsProgram) || didChange; + // Inline JavaScript function invocations + didChange = JsInliner.exec(jsProgram) || didChange; // Remove unused functions, possible didChange = JsUnusedFunctionRemover.exec(jsProgram) || didChange; } while (didChange);
diff --git a/dev/core/src/com/google/gwt/dev/js/JsHoister.java b/dev/core/src/com/google/gwt/dev/js/JsHoister.java index 27fede8..6451bbe 100644 --- a/dev/core/src/com/google/gwt/dev/js/JsHoister.java +++ b/dev/core/src/com/google/gwt/dev/js/JsHoister.java
@@ -44,7 +44,7 @@ /** * A utility class to clone JsExpression AST members for use by - * {@link JsDelegationRemover}. <b>Not all expressions are necessarily + * {@link JsInliner}. <b>Not all expressions are necessarily * implemented</b>, only those that are safe to hoist into outer call sites. */ final class JsHoister {
diff --git a/dev/core/src/com/google/gwt/dev/js/JsDelegationRemover.java b/dev/core/src/com/google/gwt/dev/js/JsInliner.java similarity index 99% rename from dev/core/src/com/google/gwt/dev/js/JsDelegationRemover.java rename to dev/core/src/com/google/gwt/dev/js/JsInliner.java index 9f88d85..16b8ff8 100644 --- a/dev/core/src/com/google/gwt/dev/js/JsDelegationRemover.java +++ b/dev/core/src/com/google/gwt/dev/js/JsInliner.java
@@ -65,9 +65,9 @@ import java.util.Stack; /** - * Collapses delegating method calls. + * Perform inlining optimizations on the JavaScript AST. */ -public class JsDelegationRemover { +public class JsInliner { /** * This is used to clean up duplication invocations of a clinit. Whenever * there is a possible branch in program flow, the remover will create a new @@ -954,6 +954,6 @@ /** * Utility class. */ - private JsDelegationRemover() { + private JsInliner() { } }
diff --git a/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java b/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java index ef97683..a2af182 100644 --- a/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java +++ b/dev/core/src/com/google/gwt/dev/js/JsUnusedFunctionRemover.java
@@ -80,7 +80,7 @@ if (toRemove.containsKey(name)) { // Removing a static initializer indicates a problem in - // JsDelegationRemover. + // JsInliner. if (name.getIdent().equals("$clinit")) { throw new InternalCompilerException("Tried to remove clinit " + name.getStaticRef().toSource());