azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced custom Tuple3 with Trinity.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-19 17:36:45 +04:00
parent 93f8d572fc
commit bc1b73aaa6
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FrameMap.java
+9 -20
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.codegen;
import com.google.common.collect.Lists;
import com.intellij.openapi.util.Trinity;
import gnu.trove.TObjectIntHashMap;
import gnu.trove.TObjectIntIterator;
import org.jetbrains.asm4.Type;
@@ -101,46 +102,34 @@ public class FrameMap {
return "inconsistent";
}
class Tuple3<A, B, C> {
private final A _1;
private final B _2;
private final C _3;
Tuple3(A _1, B _2, C _3) {
this._1 = _1;
this._2 = _2;
this._3 = _3;
}
}
List<Tuple3<DeclarationDescriptor, Integer, Integer>> descriptors = Lists.newArrayList();
List<Trinity<DeclarationDescriptor, Integer, Integer>> descriptors = Lists.newArrayList();
for (Object descriptor0 : myVarIndex.keys()) {
DeclarationDescriptor descriptor = (DeclarationDescriptor) descriptor0;
int varIndex = myVarIndex.get(descriptor);
int varSize = myVarSizes.get(descriptor);
descriptors.add(new Tuple3<DeclarationDescriptor, Integer, Integer>(descriptor, varIndex, varSize));
descriptors.add(Trinity.create(descriptor, varIndex, varSize));
}
Collections.sort(descriptors, new Comparator<Tuple3<DeclarationDescriptor, Integer, Integer>>() {
Collections.sort(descriptors, new Comparator<Trinity<DeclarationDescriptor, Integer, Integer>>() {
@Override
public int compare(
Tuple3<DeclarationDescriptor, Integer, Integer> left,
Tuple3<DeclarationDescriptor, Integer, Integer> right
Trinity<DeclarationDescriptor, Integer, Integer> left,
Trinity<DeclarationDescriptor, Integer, Integer> right
) {
return left._2 - right._2;
return left.second - right.second;
}
});
sb.append("size=").append(myMaxIndex);
boolean first = true;
for (Tuple3<DeclarationDescriptor, Integer, Integer> t : descriptors) {
for (Trinity<DeclarationDescriptor, Integer, Integer> t : descriptors) {
if (!first) {
sb.append(", ");
}
first = false;
sb.append(t._1).append(",i=").append(t._2).append(",s=").append(t._3);
sb.append(t.first).append(",i=").append(t.second).append(",s=").append(t.third);
}
return sb.toString();