diff --git a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java index 7c2443fc0ec..f648d641d43 100644 --- a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java +++ b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java @@ -30,7 +30,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Stack; /** @@ -59,7 +58,7 @@ class AnalyzePrototypeProperties implements CompilerPass { private final JSModule firstModule; // Properties that are implicitly used as part of the JS language. - private static final Set IMPLICITLY_USED_PROPERTIES = + private static final ImmutableSet IMPLICITLY_USED_PROPERTIES = ImmutableSet.of("length", "toString", "valueOf"); // A graph where the nodes are property names or variable names, diff --git a/src/com/google/javascript/jscomp/NodeUtil.java b/src/com/google/javascript/jscomp/NodeUtil.java index 91e3a757ac3..59ee4430f1c 100644 --- a/src/com/google/javascript/jscomp/NodeUtil.java +++ b/src/com/google/javascript/jscomp/NodeUtil.java @@ -65,14 +65,8 @@ public final class NodeUtil { static final char LARGEST_BASIC_LATIN = 0x7f; /** the set of builtin constructors that don't have side effects. */ - private static final Set CONSTRUCTORS_WITHOUT_SIDE_EFFECTS = - ImmutableSet.of( - "Array", - "Date", - "Error", - "Object", - "RegExp", - "XMLHttpRequest"); + private static final ImmutableSet CONSTRUCTORS_WITHOUT_SIDE_EFFECTS = + ImmutableSet.of("Array", "Date", "Error", "Object", "RegExp", "XMLHttpRequest"); // Utility class; do not instantiate. private NodeUtil() {} @@ -1243,14 +1237,12 @@ static boolean constructorCallHasSideEffects(Node callNode) { // A list of built-in object creation or primitive type cast functions that // can also be called as constructors but lack side-effects. // TODO(johnlenz): consider adding an extern annotation for this. - private static final Set BUILTIN_FUNCTIONS_WITHOUT_SIDEEFFECTS = - ImmutableSet.of( - "Object", "Array", "String", "Number", "Boolean", "RegExp", "Error"); - private static final Set OBJECT_METHODS_WITHOUT_SIDEEFFECTS = + private static final ImmutableSet BUILTIN_FUNCTIONS_WITHOUT_SIDEEFFECTS = + ImmutableSet.of("Object", "Array", "String", "Number", "Boolean", "RegExp", "Error"); + private static final ImmutableSet OBJECT_METHODS_WITHOUT_SIDEEFFECTS = ImmutableSet.of("toString", "valueOf"); - private static final Set REGEXP_METHODS = - ImmutableSet.of("test", "exec"); - private static final Set STRING_REGEXP_METHODS = + private static final ImmutableSet REGEXP_METHODS = ImmutableSet.of("test", "exec"); + private static final ImmutableSet STRING_REGEXP_METHODS = ImmutableSet.of("match", "replace", "search", "split"); /**