Skip to content

Commit fdc5b5d

Browse files
committed
Minor clean up.
1 parent 611ab78 commit fdc5b5d

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamStateMachine.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public class StreamStateMachine {
218218

219219
private Map<BasicBlockInContext<IExplodedBasicBlock>, OrdinalSet<InstanceKey>> terminalBlockToPossibleReceivers = new HashMap<>();
220220

221-
private Map<InstanceKey, Stream> instanceKeyToStream;
221+
private Map<InstanceKey, Stream> instanceToStreamMap = new HashMap<>();
222222

223223
private Set<IDFAState> computeMergedTypeState(InstanceKey instanceKey,
224224
BasicBlockInContext<IExplodedBasicBlock> block, StreamAttributeTypestateRule rule) {
@@ -696,7 +696,7 @@ private void discoverIfReduceOrderingPossiblyMatters(EclipseProjectAnalysisEngin
696696

697697
for (InstanceKey instanceKey : receivers) {
698698
// get the stream for the instance key.
699-
Stream stream = instanceKeyToStream.get(instanceKey);
699+
Stream stream = instanceToStreamMap.get(instanceKey);
700700

701701
LOGGER.log(Level.WARNING, "Unable to derive ROM for : " + stream.getCreation(), e);
702702
stream.addStatusEntry(PreconditionFailure.NON_DETERMINABLE_REDUCTION_ORDERING,
@@ -1075,7 +1075,7 @@ public void start(Set<Stream> streamSet, EclipseProjectAnalysisEngine<InstanceKe
10751075

10761076
// create a mapping between stream instances (from the analysis) and stream
10771077
// objects (from the refactoring).
1078-
createInstanceKeyStreamMap(streamSet, engine);
1078+
fillInstanceToStreamMap(streamSet, engine);
10791079

10801080
discoverTerminalOperations();
10811081

@@ -1112,8 +1112,8 @@ public void start(Set<Stream> streamSet, EclipseProjectAnalysisEngine<InstanceKe
11121112
propagateStreamInstanceProperty(instancesWhoseReduceOrderingPossiblyMatters);
11131113

11141114
// for stream instance key.
1115-
for (InstanceKey streamInstanceKey : instanceKeyToStream.keySet()) {
1116-
Stream stream = instanceKeyToStream.get(streamInstanceKey);
1115+
for (InstanceKey streamInstanceKey : instanceToStreamMap.keySet()) {
1116+
Stream stream = instanceToStreamMap.get(streamInstanceKey);
11171117

11181118
// determine possible side-effects.
11191119
stream.setHasPossibleSideEffects(instancesWithSideEffects.contains(streamInstanceKey));
@@ -1164,10 +1164,8 @@ private void fillInstanceToPredecessorMap(EclipseProjectAnalysisEngine<InstanceK
11641164
}
11651165
}
11661166

1167-
private void createInstanceKeyStreamMap(Set<Stream> streamSet, EclipseProjectAnalysisEngine<InstanceKey> engine)
1167+
private void fillInstanceToStreamMap(Set<Stream> streamSet, EclipseProjectAnalysisEngine<InstanceKey> engine)
11681168
throws InvalidClassFileException, IOException, CoreException {
1169-
instanceKeyToStream = new HashMap<>();
1170-
11711169
for (Stream stream : streamSet) {
11721170
InstanceKey instanceKey = null;
11731171
try {
@@ -1186,7 +1184,7 @@ private void createInstanceKeyStreamMap(Set<Stream> streamSet, EclipseProjectAna
11861184
}
11871185
continue; // next stream.
11881186
}
1189-
instanceKeyToStream.put(instanceKey, stream);
1187+
instanceToStreamMap.put(instanceKey, stream);
11901188
} // end each stream.
11911189
}
11921190

0 commit comments

Comments
 (0)