Skip to content

Commit

Permalink
Use an ImmutableMap for inputOrder
Browse files Browse the repository at this point in the history
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143453467
  • Loading branch information
lindner authored and blickly committed Jan 3, 2017
1 parent 0006772 commit 535fbff
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/com/google/javascript/jscomp/GlobalVarReferenceMap.java
Expand Up @@ -17,14 +17,14 @@
package com.google.javascript.jscomp; package com.google.javascript.jscomp;


import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference; import com.google.javascript.jscomp.ReferenceCollectingCallback.Reference;
import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection; import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceCollection;
import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceMap; import com.google.javascript.jscomp.ReferenceCollectingCallback.ReferenceMap;
import com.google.javascript.rhino.InputId; import com.google.javascript.rhino.InputId;
import com.google.javascript.rhino.Node; import com.google.javascript.rhino.Node;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
Expand All @@ -44,22 +44,24 @@ class GlobalVarReferenceMap implements ReferenceMap {


private Map<String, ReferenceCollection> refMap = null; private Map<String, ReferenceCollection> refMap = null;


private final Map<InputId, Integer> inputOrder; private final ImmutableMap<InputId, Integer> inputOrder;


/** /**
* @param inputs The ordered list of all inputs for the compiler. * @param inputs The ordered list of all inputs for the compiler.
*/ */
GlobalVarReferenceMap(List<CompilerInput> inputs, List<CompilerInput> externs) { GlobalVarReferenceMap(List<CompilerInput> inputs, List<CompilerInput> externs) {
inputOrder = new HashMap<>(); ImmutableMap.Builder<InputId, Integer> inputOrderBuilder = ImmutableMap.builder();

int ind = 0; int ind = 0;
for (CompilerInput extern : externs) { for (CompilerInput extern : externs) {
inputOrder.put(extern.getInputId(), ind); inputOrderBuilder.put(extern.getInputId(), ind);
ind++; ind++;
} }
for (CompilerInput input : inputs) { for (CompilerInput input : inputs) {
inputOrder.put(input.getInputId(), ind); inputOrderBuilder.put(input.getInputId(), ind);
ind++; ind++;
} }
inputOrder = inputOrderBuilder.build();
} }


@Override @Override
Expand Down

0 comments on commit 535fbff

Please sign in to comment.